openxml-docx 0.10.1 → 0.10.2

data/spec/elements/absolute_position_tab_spec.rb

@@ -9,11 +9,12 @@ describe OpenXml::Docx::Elements::AbsolutePositionTab do
     it_should_output "<w:ptab/>", assign: false
   end
 
-  for_attribute(:alignment, with_namespace: :w) do
-    allowed = %i(center left right)
-    with_values(allowed) do
-      it_should_assign_successfully
-      it_should_output_regular_xml
+  for_attribute(:alignment) do
+   %i(center left right).each do |allowed_value|
+      with_value(allowed_value) do
+        it_should_assign_successfully
+        it_should_output "<w:ptab w:alignment=\"#{allowed_value}\"/>"
+      end
     end
 
     with_value(:somethingElse) do
@@ -21,11 +22,12 @@ describe OpenXml::Docx::Elements::AbsolutePositionTab do
     end
   end
 
-  for_attribute(:leader, with_namespace: :w) do
-    allowed = %i(dot hyphen middleDot none underscore)
-    with_values(allowed) do
-      it_should_assign_successfully
-      it_should_output_regular_xml
+  for_attribute(:leader) do
+    %i(dot hyphen middleDot none underscore).each do |allowed_value|
+      with_value(allowed_value) do
+        it_should_assign_successfully
+        it_should_output "<w:ptab w:leader=\"#{allowed_value}\"/>"
+      end
     end
 
     with_value(:somethingElse) do
@@ -33,11 +35,15 @@ describe OpenXml::Docx::Elements::AbsolutePositionTab do
     end
   end
 
-  for_attribute(:relativeTo, with_namespace: :w) do
-    allowed = %i(indent margin)
-    with_values(allowed) do
+  for_attribute(:relative_to) do
+    with_value(:indent) do
+      it_should_assign_successfully
+      it_should_output "<w:ptab w:relativeTo=\"indent\"/>"
+    end
+
+    with_value(:margin) do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<w:ptab w:relativeTo=\"margin\"/>"
     end
 
     with_value(:somethingElse) do
@@ -45,7 +51,7 @@ describe OpenXml::Docx::Elements::AbsolutePositionTab do
     end
   end
 
-  with_these_attributes_set(alignment: :center, relativeTo: :margin) do
+  with_these_attributes_set(alignment: :center, relative_to: :margin) do
     it_should_output "<w:ptab w:alignment=\"center\" w:relativeTo=\"margin\"/>", assign: false
   end
 

data/spec/elements/background_spec.rb

@@ -0,0 +1,52 @@
+require "spec_helper"
+
+describe OpenXml::Docx::Elements::Background do
+  include ElementTestMacros
+
+  it_should_use tag: :background, name: "background"
+
+  for_attribute(:color) do
+    with_value("FF00AA") do
+      it_should_assign_successfully
+      it_should_output "<w:background w:color=\"FF00AA\"/>"
+    end
+
+    with_values([:blue, "1ff0aa"]) do
+      it_should_raise_an_exception
+    end
+  end
+
+  for_attribute(:theme_color) do
+    with_value(:accent1) do
+      it_should_assign_successfully
+      it_should_output "<w:background w:themeColor=\"accent1\"/>"
+    end
+
+    with_value(:not_allowed) do
+      it_should_raise_an_exception
+    end
+  end
+
+  for_attribute(:theme_shade) do
+    with_value("0F") do
+      it_should_assign_successfully
+      it_should_output "<w:background w:themeShade=\"0F\"/>"
+    end
+
+    with_values([:red, "00FF", "0f"]) do
+      it_should_raise_an_exception
+    end
+  end
+
+  for_attribute(:theme_tint) do
+    with_value("0F") do
+      it_should_assign_successfully
+      it_should_output "<w:background w:themeTint=\"0F\"/>"
+    end
+
+    with_values([:red, "00FF", "0f"]) do
+      it_should_raise_an_exception
+    end
+  end
+
+end

data/spec/elements/bidi_embed_spec.rb

@@ -5,11 +5,19 @@ describe OpenXml::Docx::Elements::BidiEmbed do
 
   it_should_use tag: :dir, name: "bidi_embed"
 
-  for_attribute(:direction, displays_as: :val, with_namespace: :w) do
-    allowed = %i(rtl ltr)
-    with_values(allowed) do
+  for_attribute(:direction) do
+    with_value(:rtl) do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<w:dir w:val=\"rtl\"/>"
+    end
+
+    with_value(:ltr) do
+      it_should_assign_successfully
+      it_should_output "<w:dir w:val=\"ltr\"/>"
+    end
+
+    with_value(:not_allowed) do
+      it_should_raise_an_exception
     end
   end
 

data/spec/elements/bidi_override_spec.rb

@@ -5,11 +5,19 @@ describe OpenXml::Docx::Elements::BidiOverride do
 
   it_should_use tag: :bdo, name: "bidi_override"
 
-  for_attribute(:direction, displays_as: :val, with_namespace: :w) do
-    allowed = %i(rtl ltr)
-    with_values(allowed) do
+  for_attribute(:direction) do
+    with_value(:rtl) do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<w:bdo w:val=\"rtl\"/>"
+    end
+
+    with_value(:ltr) do
+      it_should_assign_successfully
+      it_should_output "<w:bdo w:val=\"ltr\"/>"
+    end
+
+    with_value(:not_allowed) do
+      it_should_raise_an_exception
     end
   end
 

data/spec/elements/break_spec.rb

@@ -5,11 +5,12 @@ describe OpenXml::Docx::Elements::Break do
 
   it_should_use tag: :br, name: "break"
 
-  for_attribute(:clear, with_namespace: :w) do
-    allowed = %i(all left none right)
-    with_values(allowed) do
-      it_should_assign_successfully
-      it_should_output_regular_xml
+  for_attribute(:clear) do
+    %i(all left none right).each do |allowed_value|
+      with_value(allowed_value) do
+        it_should_assign_successfully
+        it_should_output "<w:br w:clear=\"#{allowed_value}\"/>"
+      end
     end
 
     with_value(:somethingElse) do
@@ -17,11 +18,12 @@ describe OpenXml::Docx::Elements::Break do
     end
   end
 
-  for_attribute(:type, with_namespace: :w) do
-    allowed = %i(column page textWrapping)
-    with_values(allowed) do
-      it_should_assign_successfully
-      it_should_output_regular_xml
+  for_attribute(:type) do
+    %i(column page textWrapping).each do |allowed_value|
+      with_value(allowed_value) do
+        it_should_assign_successfully
+        it_should_output "<w:br w:type=\"#{allowed_value}\"/>"
+      end
     end
 
     with_value(:somethingElse) do

data/spec/elements/compatibility_setting_spec.rb

@@ -0,0 +1,41 @@
+require "spec_helper"
+
+describe OpenXml::Docx::Elements::CompatibilitySetting do
+  include ElementTestMacros
+
+  it_should_use tag: :compatSetting, name: "compatibility_setting"
+
+  for_attribute(:setting_name) do
+    with_value("A String") do
+      it_should_assign_successfully
+      it_should_output "<w:compatSetting w:name=\"A String\"/>"
+    end
+
+    with_values([0, :not_a_string]) do
+      it_should_raise_an_exception
+    end
+  end
+
+  for_attribute(:uri) do
+    with_value("A String") do
+      it_should_assign_successfully
+      it_should_output "<w:compatSetting w:uri=\"A String\"/>"
+    end
+
+    with_values([0, :not_a_string]) do
+      it_should_raise_an_exception
+    end
+  end
+
+  for_attribute(:value) do
+    with_value("A String") do
+      it_should_assign_successfully
+      it_should_output "<w:compatSetting w:val=\"A String\"/>"
+    end
+
+    with_values([0, :not_a_string]) do
+      it_should_raise_an_exception
+    end
+  end
+
+end

data/spec/elements/compatibility_settings_spec.rb

@@ -0,0 +1,8 @@
+require "spec_helper"
+
+describe OpenXml::Docx::Elements::CompatibilitySettings do
+  include ElementTestMacros
+
+  it_should_use tag: :compat, name: "compatibility_settings"
+
+end

data/spec/elements/content_part_spec.rb

@@ -5,10 +5,10 @@ describe OpenXml::Docx::Elements::ContentPart do
 
   it_should_use tag: :contentPart, name: "content_part"
 
-  for_attribute(:id, with_namespace: :r) do
+  for_attribute(:id) do
     with_value("rId8") do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<w:contentPart r:id=\"rId8\"/>"
     end
 
     with_value("") do

data/spec/elements/control_spec.rb

@@ -5,10 +5,10 @@ describe OpenXml::Docx::Elements::Control do
 
   it_should_use tag: :control, name: "control"
 
-  for_attribute(:id, with_namespace: :r) do
+  for_attribute(:id) do
     with_value("rId5") do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<w:control r:id=\"rId5\"/>"
     end
 
     with_value("") do
@@ -16,10 +16,10 @@ describe OpenXml::Docx::Elements::Control do
     end
   end
 
-  for_attribute(:unique_name, displays_as: :name, with_namespace: :w) do
+  for_attribute(:unique_name) do
     with_value("CheckBox1") do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<w:control w:name=\"CheckBox1\"/>"
     end
 
     with_value("") do
@@ -30,7 +30,7 @@ describe OpenXml::Docx::Elements::Control do
   for_attribute(:shape_id, displays_as: :shapeid, with_namespace: :w) do
     with_value("_x0000_s1027") do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<w:control w:shapeid=\"_x0000_s1027\"/>"
     end
 
     with_value("") do

data/spec/elements/deleted_text_spec.rb

@@ -5,7 +5,7 @@ describe OpenXml::Docx::Elements::DeletedText do
 
   it_should_use tag: :del, name: "deleted_text"
 
-  for_attribute(:space, with_namespace: :xml) do
+  for_attribute(:space) do
     with_value(nil) do
       it_should_assign_successfully
       it_should_output "<w:del/>"
@@ -13,7 +13,7 @@ describe OpenXml::Docx::Elements::DeletedText do
 
     with_value(:preserve) do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<w:del xml:space=\"preserve\"/>"
     end
 
     with_value(:the_final_frontier) do

data/spec/elements/drawingml/blip_fill_spec.rb

@@ -6,12 +6,17 @@ describe OpenXml::DrawingML::Elements::BlipFill do
   it_should_use tag: :blipFill, name: "blip_fill"
 
   for_attribute(:dpi) do
-    with_values([1, -1]) do
+    with_value(1) do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<pic:blipFill dpi=\"1\"/>"
     end
 
-    with_value(:not_a_number) do
+    with_value(-1) do
+      it_should_assign_successfully
+      it_should_output "<pic:blipFill dpi=\"-1\"/>"
+    end
+
+    with_values([:not_a_number, 12.34]) do
       it_should_raise_an_exception
     end
   end

data/spec/elements/drawingml/extents_spec.rb

@@ -7,10 +7,10 @@ describe OpenXml::DrawingML::Elements::Extents do
 
   attributes = { extent_length: :cx, extent_width: :cy }
 
-  for_attribute(:extent_length, displays_as: :cx) do
+  for_attribute(:extent_length) do
     with_value(1) do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<a:ext cx=\"1\"/>"
     end
 
     with_values([-1, 1.1, :not_a_number]) do
@@ -18,10 +18,10 @@ describe OpenXml::DrawingML::Elements::Extents do
     end
   end
 
-  for_attribute(:extent_width, displays_as: :cy) do
+  for_attribute(:extent_width) do
     with_value(1) do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<a:ext cy=\"1\"/>"
     end
 
     with_values([-1, 1.1, :not_a_number]) do

data/spec/elements/drawingml/head_end_spec.rb

@@ -5,11 +5,12 @@ describe OpenXml::DrawingML::Elements::HeadEnd do
 
   it_should_use tag: :headEnd, name: "head_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:headEnd len=\"#{allowed_value}\"/>"
+      end
     end
 
     with_value(:bad_value) do
@@ -18,10 +19,11 @@ describe OpenXml::DrawingML::Elements::HeadEnd 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:headEnd type=\"#{allowed_value}\"/>"
+      end
     end
 
     with_value(:bad_value) do
@@ -30,10 +32,11 @@ describe OpenXml::DrawingML::Elements::HeadEnd do
   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
+    %i(lg med sm).each do |allowed_value|
+      with_value(allowed_value) do
+        it_should_assign_successfully
+        it_should_output "<a:headEnd w=\"#{allowed_value}\"/>"
+      end
     end
 
     with_value(:bad_value) do

data/spec/elements/drawingml/no_autofit_spec.rb

@@ -0,0 +1,8 @@
+require "spec_helper"
+
+describe OpenXml::DrawingML::Elements::NoAutofit do
+  include ElementTestMacros
+
+  it_should_use tag: :noAutofit, name: "no_autofit"
+
+end

data/spec/elements/drawingml/non_visual_drawing_properties_spec.rb

@@ -5,10 +5,10 @@ describe OpenXml::DrawingML::Elements::NonVisualDrawingProperties do
 
   it_should_use tag: :cNvPr, name: "non_visual_drawing_properties"
 
-  for_attribute(:description, displays_as: :descr) do
+  for_attribute(:description) do
     with_value("string") do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<pic:cNvPr descr=\"string\"/>"
     end
 
     with_value(:not_a_string) do
@@ -35,7 +35,7 @@ describe OpenXml::DrawingML::Elements::NonVisualDrawingProperties do
   for_attribute(:id) do
     with_value(123) do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<pic:cNvPr id=\"123\"/>"
     end
 
     with_values([-123, :not_a_number]) do
@@ -43,10 +43,10 @@ describe OpenXml::DrawingML::Elements::NonVisualDrawingProperties do
     end
   end
 
-  for_attribute(:picture_name, displays_as: :name) do
+  for_attribute(:picture_name) do
     with_value("string") do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<pic:cNvPr name=\"string\"/>"
     end
 
     with_value(:not_a_string) do
@@ -57,7 +57,7 @@ describe OpenXml::DrawingML::Elements::NonVisualDrawingProperties do
   for_attribute(:title) do
     with_value("string") do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<pic:cNvPr title=\"string\"/>"
     end
 
     with_value(:not_a_string) do