openxml-docx 0.10.1 → 0.10.2

data/spec/elements/word_processing_drawing_effect_extent_spec.rb

@@ -10,10 +10,15 @@ describe OpenXml::Docx::Elements::WordProcessingDrawingEffectExtent do
   end
 
 
-  for_attribute(:bottom_edge, displays_as: :b) do
-    with_values([1234, -1234])do
+  for_attribute(:bottom_edge) do
+    with_value(1234)do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<wp:effectExtent b=\"1234\"/>"
+    end
+
+    with_value(-1234)do
+      it_should_assign_successfully
+      it_should_output "<wp:effectExtent b=\"-1234\"/>"
     end
 
     with_value("wrong") do
@@ -21,10 +26,15 @@ describe OpenXml::Docx::Elements::WordProcessingDrawingEffectExtent do
     end
   end
 
-  for_attribute(:left_edge, displays_as: :l) do
-    with_values([1234, -1234])do
+  for_attribute(:left_edge) do
+    with_value(1234)do
+      it_should_assign_successfully
+      it_should_output "<wp:effectExtent l=\"1234\"/>"
+    end
+
+    with_value(-1234)do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<wp:effectExtent l=\"-1234\"/>"
     end
 
     with_value("wrong") do
@@ -32,10 +42,15 @@ describe OpenXml::Docx::Elements::WordProcessingDrawingEffectExtent do
     end
   end
 
-  for_attribute(:right_edge, displays_as: :r) do
-    with_value([1234, -1234])do
+  for_attribute(:right_edge) do
+    with_value(1234)do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<wp:effectExtent r=\"1234\"/>"
+    end
+
+    with_value(-1234)do
+      it_should_assign_successfully
+      it_should_output "<wp:effectExtent r=\"-1234\"/>"
     end
 
     with_value("wrong") do
@@ -43,10 +58,15 @@ describe OpenXml::Docx::Elements::WordProcessingDrawingEffectExtent do
     end
   end
 
-  for_attribute(:top_edge, displays_as: :t) do
-    with_value([1234, -1234])do
+  for_attribute(:top_edge) do
+    with_value(1234)do
+      it_should_assign_successfully
+      it_should_output "<wp:effectExtent t=\"1234\"/>"
+    end
+
+    with_value(-1234)do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<wp:effectExtent t=\"-1234\"/>"
     end
 
     with_value("wrong") do

data/spec/elements/word_processing_drawing_extent_spec.rb

@@ -9,10 +9,10 @@ describe OpenXml::Docx::Elements::WordProcessingDrawingExtent do
     it_should_output "<wp:extent/>", assign: false
   end
 
-  for_attribute(:extent_length, displays_as: :cx) do
+  for_attribute(:extent_length) do
     with_value(1234)do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<wp:extent cx=\"1234\"/>"
     end
 
     with_value(-1234) do
@@ -20,10 +20,10 @@ describe OpenXml::Docx::Elements::WordProcessingDrawingExtent do
     end
   end
 
-  for_attribute(:extent_width, displays_as: :cy) do
+  for_attribute(:extent_width) do
     with_value(1234)do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<wp:extent cy=\"1234\"/>"
     end
 
     with_value(-1234) do

data/spec/elements/word_processing_drawing_object_nv_properties_spec.rb

@@ -9,10 +9,10 @@ describe OpenXml::Docx::Elements::WordProcessingDrawingObjectNvProperties do
     it_should_output "<wp:docPr/>", assign: false
   end
 
-  for_attribute(:description, displays_as: :descr) do
+  for_attribute(:description) do
     with_value("valid value")do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<wp:docPr descr=\"valid value\"/>"
     end
 
     with_value(1234) do
@@ -23,7 +23,7 @@ describe OpenXml::Docx::Elements::WordProcessingDrawingObjectNvProperties do
   for_attribute(:hidden) do
     with_value(true)do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<wp:docPr hidden=\"true\"/>"
     end
 
     with_value(1234) do
@@ -34,7 +34,7 @@ describe OpenXml::Docx::Elements::WordProcessingDrawingObjectNvProperties do
   for_attribute(:id) do
     with_value(1)do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<wp:docPr id=\"1\"/>"
     end
 
     with_value("invalid") do
@@ -45,7 +45,7 @@ describe OpenXml::Docx::Elements::WordProcessingDrawingObjectNvProperties do
   for_attribute(:object_name, displays_as: :name) do
     with_value("valid")do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<wp:docPr name=\"valid\"/>"
     end
 
     with_value(1234) do
@@ -56,7 +56,7 @@ describe OpenXml::Docx::Elements::WordProcessingDrawingObjectNvProperties do
   for_attribute(:title) do
     with_value("valid")do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<wp:docPr title=\"valid\"/>"
     end
 
     with_value(1234) do

data/spec/elements/word_processing_drawing_simple_position_spec.rb

@@ -10,23 +10,33 @@ describe OpenXml::Docx::Elements::WordProcessingDrawingSimplePosition do
   end
 
   for_attribute(:x) do
-    with_value([1234, -1234])do
+    with_value(1234)do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<wp:simplePos x=\"1234\"/>"
     end
 
-    with_value("hey") do
+    with_value(-1234)do
+      it_should_assign_successfully
+      it_should_output "<wp:simplePos x=\"-1234\"/>"
+    end
+
+    with_values([12.34, "not a number"]) do
       it_should_raise_an_exception
     end
   end
 
   for_attribute(:y) do
-    with_value([1234, -1234])do
+    with_value(1234)do
+      it_should_assign_successfully
+      it_should_output "<wp:simplePos y=\"1234\"/>"
+    end
+
+    with_value(-1234)do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<wp:simplePos y=\"-1234\"/>"
     end
 
-    with_value("hey") do
+    with_values([12.34, "not a number"]) do
       it_should_raise_an_exception
     end
   end

data/spec/elements/word_processing_shapes_body_properties_spec.rb

@@ -6,10 +6,11 @@ describe OpenXml::Docx::Elements::WordProcessingShapesBodyProperties do
   it_should_use tag: :bodyPr, name: "word_processing_shapes_body_properties"
 
   for_attribute(:anchor)do
-    allowed = %i(b ctr dist just t)
-    with_values(allowed) do
-      it_should_assign_successfully
-      it_should_output_regular_xml
+    %i(b ctr dist just t).each do |allowed|
+      with_value(allowed) do
+        it_should_assign_successfully
+        it_should_output "<wps:bodyPr anchor=\"#{allowed}\"/>"
+      end
     end
 
     with_value(:notRight) do
@@ -17,10 +18,10 @@ describe OpenXml::Docx::Elements::WordProcessingShapesBodyProperties do
     end
   end
 
-  for_attribute(:anchorCtr)do
+  for_attribute(:anchor_center, displays_as: :anchorCtr)do
     with_value(true) do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<wps:bodyPr anchorCtr=\"true\"/>"
     end
 
     with_value(1234) do
@@ -31,7 +32,7 @@ describe OpenXml::Docx::Elements::WordProcessingShapesBodyProperties do
   for_attribute(:bottom_inset, displays_as: :bIns)do
     with_value(1234) do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<wps:bodyPr bIns=\"1234\"/>"
     end
 
     with_value(-1234) do
@@ -42,7 +43,7 @@ describe OpenXml::Docx::Elements::WordProcessingShapesBodyProperties do
   for_attribute(:compatible_line_spacing, displays_as: :compatLnSpc)do
     with_value(true) do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<wps:bodyPr compatLnSpc=\"true\"/>"
     end
 
     with_value(1234) do
@@ -53,7 +54,7 @@ describe OpenXml::Docx::Elements::WordProcessingShapesBodyProperties do
   for_attribute(:force_anti_alias, displays_as: :forceAA)do
     with_value(true) do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<wps:bodyPr forceAA=\"true\"/>"
     end
 
     with_value(1234) do
@@ -61,10 +62,10 @@ describe OpenXml::Docx::Elements::WordProcessingShapesBodyProperties do
     end
   end
 
-  for_attribute(:fromWordArt)do
+  for_attribute(:from_word_art, displays_as: :fromWordArt)do
     with_value(true) do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<wps:bodyPr fromWordArt=\"true\"/>"
     end
 
     with_value(1234) do
@@ -72,11 +73,12 @@ describe OpenXml::Docx::Elements::WordProcessingShapesBodyProperties do
     end
   end
 
-  for_attribute(:horzOverflow)do
-    allowed = %i(clip overflow)
-    with_values(allowed) do
-      it_should_assign_successfully
-      it_should_output_regular_xml
+  for_attribute(:horizontal_overflow, displays_as: :horzOverflow)do
+    %i(clip overflow).each do |allowed|
+      with_value(allowed) do
+        it_should_assign_successfully
+        it_should_output "<wps:bodyPr horzOverflow=\"#{allowed}\"/>"
+      end
     end
 
     with_value(:notRight) do
@@ -87,7 +89,7 @@ describe OpenXml::Docx::Elements::WordProcessingShapesBodyProperties do
   for_attribute(:left_inset, displays_as: :lIns)do
     with_value(1234) do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<wps:bodyPr lIns=\"1234\"/>"
     end
 
     with_value(-1234) do
@@ -95,14 +97,13 @@ describe OpenXml::Docx::Elements::WordProcessingShapesBodyProperties do
     end
   end
 
-  for_attribute(:numCol)do
-    allowed = (1..16).to_a
-    with_values(allowed) do
+  for_attribute(:number_of_columns, displays_as: :numCol)do
+    with_value(9) do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<wps:bodyPr numCol=\"9\"/>"
     end
 
-    with_value(:notRight) do
+    with_value([0, 17, :not_a_number]) do
       it_should_raise_an_exception
     end
   end
@@ -110,7 +111,7 @@ describe OpenXml::Docx::Elements::WordProcessingShapesBodyProperties do
   for_attribute(:right_inset, displays_as: :rIns)do
     with_value(1234) do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<wps:bodyPr rIns=\"1234\"/>"
     end
 
     with_value(-1234) do
@@ -119,9 +120,14 @@ describe OpenXml::Docx::Elements::WordProcessingShapesBodyProperties do
   end
 
   for_attribute(:rotation, displays_as: :rot)do
-    with_values([1234, -1234]) do
+    with_value(1234) do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<wps:bodyPr rot=\"1234\"/>"
+    end
+
+    with_value(-1234) do
+      it_should_assign_successfully
+      it_should_output "<wps:bodyPr rot=\"-1234\"/>"
     end
 
     with_value("not valid") do
@@ -132,7 +138,7 @@ describe OpenXml::Docx::Elements::WordProcessingShapesBodyProperties do
   for_attribute(:right_to_left_columns, displays_as: :rtlCol)do
     with_value(true) do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<wps:bodyPr rtlCol=\"true\"/>"
     end
 
     with_value(1234) do
@@ -143,7 +149,7 @@ describe OpenXml::Docx::Elements::WordProcessingShapesBodyProperties do
   for_attribute(:space_between_columns, displays_as: :spcCol)do
     with_value(1234) do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<wps:bodyPr spcCol=\"1234\"/>"
     end
 
     with_value(-1234) do
@@ -154,7 +160,7 @@ describe OpenXml::Docx::Elements::WordProcessingShapesBodyProperties do
   for_attribute(:paragraph_spacing, displays_as: :spcFirstLastPara)do
     with_value(true) do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<wps:bodyPr spcFirstLastPara=\"true\"/>"
     end
 
     with_value(1234) do
@@ -165,7 +171,7 @@ describe OpenXml::Docx::Elements::WordProcessingShapesBodyProperties do
   for_attribute(:top_inset, displays_as: :tIns)do
     with_value(1234) do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<wps:bodyPr tIns=\"1234\"/>"
     end
 
     with_value(-1234) do
@@ -176,7 +182,7 @@ describe OpenXml::Docx::Elements::WordProcessingShapesBodyProperties do
   for_attribute(:upright)do
     with_value(true) do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<wps:bodyPr upright=\"true\"/>"
     end
 
     with_value(1234) do
@@ -184,11 +190,12 @@ describe OpenXml::Docx::Elements::WordProcessingShapesBodyProperties do
     end
   end
 
-  for_attribute(:vert)do
-    allowed = %i(eaVert horz mongolianVert vert vert270 wordArt Vert wordArtVertRtl)
-    with_values(allowed) do
-      it_should_assign_successfully
-      it_should_output_regular_xml
+  for_attribute(:vertical, displays_as: :vert)do
+    %i(eaVert horz mongolianVert vert vert270 wordArt Vert wordArtVertRtl).each do |allowed|
+      with_value(allowed) do
+        it_should_assign_successfully
+        it_should_output "<wps:bodyPr vert=\"#{allowed}\"/>"
+      end
     end
 
     with_value(:notRight) do
@@ -196,11 +203,12 @@ describe OpenXml::Docx::Elements::WordProcessingShapesBodyProperties do
     end
   end
 
-  for_attribute(:vertOverflow)do
-    allowed = %i(clip ellipsis overflow)
-    with_values(allowed) do
-      it_should_assign_successfully
-      it_should_output_regular_xml
+  for_attribute(:vertical_overflow, displays_as: :vertOverflow)do
+    %i(clip ellipsis overflow).each do |allowed|
+      with_value(allowed) do
+        it_should_assign_successfully
+        it_should_output "<wps:bodyPr vertOverflow=\"#{allowed}\"/>"
+      end
     end
 
     with_value(:notRight) do
@@ -209,10 +217,11 @@ describe OpenXml::Docx::Elements::WordProcessingShapesBodyProperties do
   end
 
   for_attribute(:wrap)do
-    allowed = %i(none square)
-    with_values(allowed) do
-      it_should_assign_successfully
-      it_should_output_regular_xml
+    %i(none square).each do |allowed|
+      with_value(allowed) do
+        it_should_assign_successfully
+        it_should_output "<wps:bodyPr wrap=\"#{allowed}\"/>"
+      end
     end
 
     with_value(:notRight) do

data/spec/elements/word_processing_shapes_shape_properties_spec.rb

@@ -5,11 +5,12 @@ describe OpenXml::Docx::Elements::WordProcessingShapesShapeProperties do
 
   it_should_use tag: :spPr, name: "word_processing_shapes_shape_properties"
 
-  for_attribute(:bwMode) do
-    allowed = %i(auto black blackGray blackWhite clr gray grayWhite hidden invGray ltGray white)
-    with_values(allowed) do
-      it_should_assign_successfully
-      it_should_output_regular_xml
+  for_attribute(:bw_mode) do
+    %i(auto black blackGray blackWhite clr gray grayWhite hidden invGray ltGray white).each do |allowed_value|
+      with_value(allowed_value) do
+        it_should_assign_successfully
+        it_should_output "<wps:spPr bwMode=\"#{allowed_value}\"/>"
+      end
     end
 
     with_value(:notRight) do

data/spec/elements/word_processing_shapes_shape_spec.rb

@@ -9,10 +9,10 @@ describe OpenXml::Docx::Elements::WordProcessingShapesShape do
     it_should_output "<wps:wsp/>", assign: false
   end
 
-  for_attribute(:normalEastAsianFlow) do
+  for_attribute(:normal_east_asian_flow) do
     with_value(true)do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<wps:wsp normalEastAsianFlow=\"true\"/>"
     end
 
     with_value("invalid") do