Merge pull request #64 from openxml/toggle-to-onoff

Reimplement ToggleProperty in terms of OnOffProperty

Author: boblail

lib/openxml/docx/properties.rb

@@ -14,7 +14,6 @@ module Properties
 require "openxml/docx/properties/string_property"
 require "openxml/docx/properties/on_off_property"
 require "openxml/docx/properties/toggle_property"
-require "openxml/docx/properties/explicit_toggle_property"
 require "openxml/docx/properties/string_property"
 require "openxml/docx/properties/container_property"
 require "openxml/docx/properties/transparent_container_property"

lib/openxml/docx/properties/bold.rb

@@ -1,7 +1,7 @@
 module OpenXml
   module Docx
     module Properties
-      class Bold < ExplicitToggleProperty
+      class Bold < ToggleProperty
         tag :b
 
       end

lib/openxml/docx/properties/explicit_toggle_property.rb

@@ -1,7 +1,7 @@
 module OpenXml
   module Docx
     module Properties
-      class Italics < ExplicitToggleProperty
+      class Italics < ToggleProperty
         tag :i
 
       end

lib/openxml/docx/properties/italics.rb

@@ -4,11 +4,12 @@ module Properties
       class OnOffProperty < ValueProperty
 
         def ok_values
-          [nil, :on, :off]
+          [true, false, :on, :off] # :on and :off are from the Transitional Spec
         end
 
         def to_xml(xml)
-          xml["w"].public_send(tag, "w:val" => value) if value
+          return xml["w"].public_send(tag) if value == true
+          xml["w"].public_send(tag, "w:val" => value)
         end
 
       end

lib/openxml/docx/properties/on_off_property.rb

@@ -1,16 +1,12 @@
 module OpenXml
   module Docx
     module Properties
-      class ToggleProperty < ValueProperty
-
-        def ok_values
-          [nil, true, false]
-        end
-
-        def to_xml(xml)
-          xml["w"].public_send(tag) if value
-        end
-
+      class ToggleProperty < OnOffProperty
+        # Toggle properties are no different in representation than on/off properties;
+        # rather, the difference is in how they compose with one another (cf.
+        # Section 17.7.3). It's helpful, then, to retain the concept, but entirely
+        # unnecessary to duplicate implementation.
+        # cf. Section A.6.9 of the spec, and Section A.7.9 of the transitional spec.
       end
     end
   end

lib/openxml/docx/properties/toggle_property.rb

@@ -3,7 +3,7 @@
 describe OpenXml::Docx::Properties::Bidi do
   include ValuePropertyTestMacros
 
-  it_should_use tag: :bidi, name: "bidi"
+  it_should_use tag: :bidi, name: "bidi", value: true
 
   with_value(true) do
     it_should_work
@@ -12,12 +12,11 @@
 
   with_value(false) do
     it_should_work
-    it_should_output ""
+    it_should_output "<w:bidi w:val=\"false\"/>"
   end
 
   with_value(nil) do
-    it_should_work
-    it_should_output ""
+    it_should_not_work
   end
 
 end

spec/properties/bidi_spec.rb

@@ -3,7 +3,7 @@
 describe OpenXml::Docx::Properties::Bold do
   include ValuePropertyTestMacros
 
-  it_should_use tag: :b, name: "bold"
+  it_should_use tag: :b, name: "bold", value: true
 
   with_value(true) do
     it_should_work
@@ -16,8 +16,7 @@
   end
 
   with_value(nil) do
-    it_should_work
-    it_should_output ""
+    it_should_not_work
   end
 
 end

spec/properties/bold_spec.rb

@@ -3,7 +3,7 @@
 describe OpenXml::Docx::Properties::CantSplit do
   include ValuePropertyTestMacros
 
-  it_should_use tag: :cantSplit, name: "cant_split"
+  it_should_use tag: :cantSplit, name: "cant_split", value: true
 
   with_value(true) do
     it_should_work
@@ -12,12 +12,11 @@
 
   with_value(false) do
     it_should_work
-    it_should_output ""
+    it_should_output "<w:cantSplit w:val=\"false\"/>"
   end
 
   with_value(nil) do
-    it_should_work
-    it_should_output ""
+    it_should_not_work
   end
 
 end

spec/properties/cant_split_spec.rb

@@ -3,7 +3,7 @@
 describe OpenXml::Docx::Properties::Caps do
   include ValuePropertyTestMacros
 
-  it_should_use tag: :caps, name: "caps"
+  it_should_use tag: :caps, name: "caps", value: true
 
   with_value(true) do
     it_should_work
@@ -12,12 +12,11 @@
 
   with_value(false) do
     it_should_work
-    it_should_output ""
+    it_should_output "<w:caps w:val=\"false\"/>"
   end
 
   with_value(nil) do
-    it_should_work
-    it_should_output ""
+    it_should_not_work
   end
 
 end