openxml-docx 0.10.1 → 0.10.2

data/spec/elements/drawingml/non_visual_shape_drawing_properties_spec.rb

@@ -0,0 +1,24 @@
+require "spec_helper"
+
+describe OpenXml::DrawingML::Elements::NonVisualShapeDrawingProperties do
+  include ElementTestMacros
+
+  it_should_use tag: :cNvSpPr, name: "non_visual_shape_drawing_properties"
+
+  for_attribute(:textbox) do
+    with_value(true) do
+      it_should_assign_successfully
+      it_should_output "<wps:cNvSpPr txBox=\"true\"/>"
+    end
+
+    with_value(false) do
+      it_should_assign_successfully
+      it_should_output "<wps:cNvSpPr txBox=\"false\"/>"
+    end
+
+    with_value(:not_a_boolean) do
+      it_should_raise_an_exception
+    end
+  end
+
+end

data/spec/elements/drawingml/offset_spec.rb

@@ -8,9 +8,14 @@ describe OpenXml::DrawingML::Elements::Offset do
   attributes = %i(x y)
 
   for_attribute(:x) do
-    with_values([1, -1]) do
+    with_value(1) do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<a:off x=\"1\"/>"
+    end
+
+    with_value(-1) do
+      it_should_assign_successfully
+      it_should_output "<a:off x=\"-1\"/>"
     end
 
     with_values([1.1, :not_a_number]) do
@@ -19,9 +24,14 @@ describe OpenXml::DrawingML::Elements::Offset do
   end
 
   for_attribute(:y) do
-    with_values([1, -1]) do
+    with_value(1) do
+      it_should_assign_successfully
+      it_should_output "<a:off y=\"1\"/>"
+    end
+
+    with_value(-1) do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<a:off y=\"-1\"/>"
     end
 
     with_values([1.1, :not_a_number]) do

data/spec/elements/drawingml/outline_spec.rb

@@ -5,11 +5,15 @@ describe OpenXml::DrawingML::Elements::Outline do
 
   it_should_use tag: :ln, name: "outline"
 
-  for_attribute(:alignment, displays_as: :algn) do
-    allowed = %i(ctr in)
-    with_values(allowed) do
+  for_attribute(:alignment) do
+    with_value(:ctr) do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<a:ln algn=\"ctr\"/>"
+    end
+
+    with_value(:in) do
+      it_should_assign_successfully
+      it_should_output "<a:ln algn=\"in\"/>"
     end
 
     with_value(:not_ok) do
@@ -18,10 +22,11 @@ describe OpenXml::DrawingML::Elements::Outline do
   end
 
   for_attribute(:cap) do
-    allowed = %i(flat rnd sq)
-    with_values(allowed) do
-      it_should_assign_successfully
-      it_should_output_regular_xml
+    %i(flat rnd sq).each do |allowed_value|
+      with_value(allowed_value) do
+        it_should_assign_successfully
+        it_should_output "<a:ln cap=\"#{allowed_value}\"/>"
+      end
     end
 
     with_value(:not_ok) do
@@ -29,11 +34,12 @@ describe OpenXml::DrawingML::Elements::Outline do
     end
   end
 
-  for_attribute(:compound_type, displays_as: :cmpd) do
-    allowed = %i(dbl sng thickThin thinThick tri)
-    with_values(allowed) do
-      it_should_assign_successfully
-      it_should_output_regular_xml
+  for_attribute(:compound_type) do
+    %i(dbl sng thickThin thinThick tri).each do |allowed_value|
+      with_value(allowed_value) do
+        it_should_assign_successfully
+        it_should_output "<a:ln cmpd=\"#{allowed_value}\"/>"
+      end
     end
 
     with_value(:not_ok) do
@@ -44,7 +50,7 @@ describe OpenXml::DrawingML::Elements::Outline do
   for_attribute(:width, displays_as: :w) do
     with_value(1) do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<a:ln w=\"1\"/>"
     end
 
     with_values([1.1, -1]) do

data/spec/elements/drawingml/preset_geometry_spec.rb

@@ -8,7 +8,7 @@ describe OpenXml::DrawingML::Elements::PresetGeometry do
   for_attribute(:preset, displays_as: :prst) do
     with_value(:roundRect) do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<a:prstGeom prst=\"roundRect\"/>"
     end
 
     with_value(:invalidGeometry) do

data/spec/elements/drawingml/preset_text_warp_spec.rb

@@ -0,0 +1,36 @@
+require "spec_helper"
+
+describe OpenXml::DrawingML::Elements::PresetTextWarp do
+  include ElementTestMacros
+  it_should_use tag: :prstTxWarp, name: "preset_text_warp"
+
+  presets = %i(textArchDown textArchDownPour textArchUp
+              textArchUpPour textButton textButtonPour
+              textCanDown textCanUp textCascadeDown
+              textCascadeUp textChevron textChevronInverted
+              textCircle textCirclePour textCurveDown
+              textCurveUp textDeflate textDeflateBottom
+              textDeflateInflate textDeflateTop
+              textDoubleWave1 textFadeDown textFadeLeft
+              textFadeRight textFadeUp textInflate
+              textInflateBottom textInflateTop textNoShape
+              textPlain textRingInside textRingOutside
+              textSlantDown textSlantUp textStop textTriangle
+              textTriangleInverted textWave1 textWave2
+              textWave4)
+
+  for_attribute(:preset) do
+    presets.each do |preset|
+      with_value(preset) do
+        it_should_assign_successfully
+        it_should_output "<a:prstTxWarp prst=\"#{preset}\"/>"
+      end
+    end
+
+    with_values([1, false, :incorrect]) do
+      it_should_raise_an_exception
+    end
+
+  end
+
+end

data/spec/elements/drawingml/shape_guide_spec.rb

@@ -23,10 +23,10 @@ describe OpenXml::DrawingML::Elements::ShapeGuide do
                "tan h w",
                "val 100" ] # Arguments to formulae can be a variable, a positive integer, or a negative integer
 
-  for_attribute(:guide_name, displays_as: :name) do
+  for_attribute(:guide_name) do
     with_value("Some String") do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<a:gd name=\"Some String\"/>"
     end
 
     with_values([1, :not_a_string]) do
@@ -37,7 +37,11 @@ describe OpenXml::DrawingML::Elements::ShapeGuide do
   for_attribute(:formula, displays_as: :fmla) do
     with_values(formulae) do
       it_should_assign_successfully
-      it_should_output_regular_xml
+    end
+
+    with_value("*/ h 10 -100") do
+      it_should_assign_successfully
+      it_should_output "<a:gd fmla=\"*/ h 10 -100\"/>"
     end
 
     not_allowed = ["a^2 + b^2 = c^2", "Not a formula", 2 ]

data/spec/elements/drawingml/srgb_color_spec.rb

@@ -5,14 +5,13 @@ describe OpenXml::DrawingML::Elements::SRGBColor do
 
   it_should_use tag: :srgbClr, name: "srgb_color"
 
-  for_attribute(:value, displays_as: :val) do
+  for_attribute(:value) do
     with_value("FFFFFF") do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<a:srgbClr val=\"FFFFFF\"/>"
     end
 
-    not_allowed = ["blue", :blue, 23]
-    with_values(not_allowed) do
+    with_values(["blue", :blue, 23]) do
       it_should_raise_an_exception
     end
   end

data/spec/elements/drawingml/tail_end_spec.rb

@@ -5,11 +5,12 @@ describe OpenXml::DrawingML::Elements::TailEnd do
 
   it_should_use tag: :tailEnd, name: "tail_end"
 
-  for_attribute(:length, displays_as: :len) do
-    allowed = %i(lg med sm)
-    with_values(allowed) do
-      it_should_assign_successfully
-      it_should_output_regular_xml
+  for_attribute(:length) do
+    %i(lg med sm).each do |allowed_value|
+      with_value(allowed_value) do
+        it_should_assign_successfully
+        it_should_output "<a:tailEnd len=\"#{allowed_value}\"/>"
+      end
     end
 
     with_value(:bad_value) do
@@ -18,10 +19,11 @@ describe OpenXml::DrawingML::Elements::TailEnd do
   end
 
   for_attribute(:type) do
-    allowed = %i(arrow diamond none oval stealth triangle)
-    with_values(allowed) do
-      it_should_assign_successfully
-      it_should_output_regular_xml
+    %i(arrow diamond none oval stealth triangle).each do |allowed_value|
+      with_value(allowed_value) do
+        it_should_assign_successfully
+        it_should_output "<a:tailEnd type=\"#{allowed_value}\"/>"
+      end
     end
 
     with_value(:bad_value) do
@@ -29,11 +31,12 @@ describe OpenXml::DrawingML::Elements::TailEnd do
     end
   end
 
-  for_attribute(:width, displays_as: :w) do
-    allowed = %i(lg med sm)
-    with_values(allowed) do
-      it_should_assign_successfully
-      it_should_output_regular_xml
+  for_attribute(:width) do
+    %i(lg med sm).each do |allowed_value|
+      with_value(allowed_value) do
+        it_should_assign_successfully
+        it_should_output "<a:tailEnd w=\"#{allowed_value}\"/>"
+      end
     end
 
     with_value(:bad_value) do

data/spec/elements/drawingml/transform_effect_spec.rb

@@ -5,55 +5,76 @@ describe OpenXml::DrawingML::Elements::TransformEffect do
 
   it_should_use tag: :xfrm, name: "transform_effect"
 
-  for_attribute(:horizontal_skew, displays_as: :kx) do
-    with_values([1, -1]) do
+  for_attribute(:horizontal_skew) do
+    with_value(1) do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<a:xfrm kx=\"1\"/>"
     end
 
-    with_value(:not_a_number) do
+    with_value(-1) do
+      it_should_assign_successfully
+      it_should_output "<a:xfrm kx=\"-1\"/>"
+    end
+
+    with_value([:not_a_number, 12.34]) do
       it_should_raise_an_exception
     end
   end
 
-  for_attribute(:vertical_skew, displays_as: :ky) do
-    with_values([1, -1]) do
+  for_attribute(:vertical_skew) do
+    with_value(1) do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<a:xfrm ky=\"1\"/>"
     end
 
-    with_value(:not_a_number) do
+    with_value(-1) do
+      it_should_assign_successfully
+      it_should_output "<a:xfrm ky=\"-1\"/>"
+    end
+
+    with_value([:not_a_number, 12.34]) do
       it_should_raise_an_exception
     end
   end
 
-  for_attribute(:horizontal_shift, displays_as: :tx) do
-    with_values([1, -1]) do
+  for_attribute(:horizontal_shift) do
+    with_value(1) do
+      it_should_assign_successfully
+      it_should_output "<a:xfrm tx=\"1\"/>"
+    end
+
+    with_value(-1) do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<a:xfrm tx=\"-1\"/>"
     end
 
-    with_value(:not_a_number) do
+    with_value([:not_a_number, 12.34]) do
       it_should_raise_an_exception
     end
   end
 
-  for_attribute(:vertical_shift, displays_as: :ty) do
-    with_values([1, -1]) do
+  for_attribute(:vertical_shift) do
+    with_value(1) do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<a:xfrm ty=\"1\"/>"
     end
 
-    with_value(:not_a_number) do
+    with_value(-1) do
+      it_should_assign_successfully
+      it_should_output "<a:xfrm ty=\"-1\"/>"
+    end
+
+    with_value([:not_a_number, 12.34]) do
       it_should_raise_an_exception
     end
   end
 
-  for_attribute(:horizontal_ratio, displays_as: :sx) do
-    allowed = %w(1% -1% 1.1%)
-    with_values(allowed) do
-      it_should_assign_successfully
-      it_should_output_regular_xml
+  for_attribute(:horizontal_ratio) do
+    %w(1% -1% 1.1%).each do |allowed_value|
+      with_value(allowed_value) do
+        it_should_assign_successfully
+        it_should_output "<a:xfrm sx=\"#{allowed_value}\"/>"
+      end
     end
 
     with_values(["1", 1]) do
@@ -61,11 +82,12 @@ describe OpenXml::DrawingML::Elements::TransformEffect do
     end
   end
 
-  for_attribute(:vertical_ratio, displays_as: :sy) do
-    allowed = %w(1% -1% 1.1%)
-    with_values(allowed) do
-      it_should_assign_successfully
-      it_should_output_regular_xml
+  for_attribute(:vertical_ratio) do
+    %w(1% -1% 1.1%).each do |allowed_value|
+      with_value(allowed_value) do
+        it_should_assign_successfully
+        it_should_output "<a:xfrm sy=\"#{allowed_value}\"/>"
+      end
     end
 
     with_values(["1", 1]) do

data/spec/elements/markup_compatibility_choice_spec.rb

@@ -9,10 +9,10 @@ describe OpenXml::Docx::Elements::MarkupCompatibilityChoice do
     it_should_output "<mc:Choice/>", assign: false
   end
 
-  for_attribute(:Required) do
+  for_attribute(:requires) do
     with_value("wps") do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<mc:Choice Requires=\"wps\"/>"
     end
 
     with_value(1234) do

data/spec/elements/paragraph_spec.rb

@@ -30,4 +30,29 @@ describe OpenXml::Docx::Elements::Paragraph do
     it_should_output_correct_xml
   end
 
+  context "with section properties" do
+    before(:each) do
+      @instance = described_class.new
+      ps = OpenXml::Docx::Properties::PageSize.new
+      ps.height = 15840
+      ps.width = 12240
+      @instance.section << ps
+
+      pm = OpenXml::Docx::Properties::PageMargins.new
+      pm.bottom = 1440
+      pm.footer = 720
+      pm.header = 720
+      pm.left = 1440
+      pm.right = 1440
+      pm.top = 1440
+
+      @instance.section << pm
+      columns = OpenXml::Docx::Properties::Columns.new
+      columns.space = 720
+      @instance.section << columns
+
+    end
+
+    it_should_output_correct_xml node_xml: "paragraph_with_section_properties"
+  end
 end

data/spec/elements/symbol_spec.rb

@@ -5,10 +5,10 @@ describe OpenXml::Docx::Elements::Symbol do
 
   it_should_use tag: :sym, name: "symbol"
 
-  for_attribute(:font, with_namespace: :w) do
+  for_attribute(:font) do
     with_value("Wingdings") do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<w:sym w:font=\"Wingdings\"/>"
     end
 
     with_value(123) do
@@ -16,10 +16,10 @@ describe OpenXml::Docx::Elements::Symbol do
     end
   end
 
-  for_attribute(:character, with_namespace: :w, displays_as: :char) do
+  for_attribute(:character) do
     with_value("43FD") do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<w:sym w:char=\"43FD\"/>"
     end
 
     with_value("43gg") do