openxml-docx 0.9.0 → 0.10.0

data/openxml-docx.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = "~> 2.0"
 
   gem.add_dependency "nokogiri"
-  gem.add_dependency "openxml-package", ">= 0.2.1"
+  gem.add_dependency "openxml-package", ">= 0.2.2"
 
   gem.add_development_dependency "pry"
   gem.add_development_dependency "rspec"

data/spec/elements/absolute_position_tab_spec.rb

@@ -5,20 +5,15 @@ describe OpenXml::Docx::Elements::AbsolutePositionTab do
 
   it_should_use tag: :ptab, name: "absolute_position_tab"
 
-  for_attribute(:alignment) do
-    with_value(:center) do
-      it_should_assign_successfully
-      it_should_output "<w:ptab w:alignment=\"center\"/>"
-    end
-
-    with_value(:left) do
-      it_should_assign_successfully
-      it_should_output "<w:ptab w:alignment=\"left\"/>"
-    end
+  with_no_attributes_set do
+    it_should_output "<w:ptab/>", assign: false
+  end
 
-    with_value(:right) do
+  for_attribute(:alignment, with_namespace: :w) do
+    allowed = %i(center left right)
+    with_values(allowed) do
       it_should_assign_successfully
-      it_should_output "<w:ptab w:alignment=\"right\"/>"
+      it_should_output_regular_xml
     end
 
     with_value(:somethingElse) do
@@ -26,30 +21,11 @@ describe OpenXml::Docx::Elements::AbsolutePositionTab do
     end
   end
 
-  for_attribute(:leader) do
-    with_value(:dot) do
-      it_should_assign_successfully
-      it_should_output "<w:ptab w:leader=\"dot\"/>"
-    end
-
-    with_value(:hyphen) do
-      it_should_assign_successfully
-      it_should_output "<w:ptab w:leader=\"hyphen\"/>"
-    end
-
-    with_value(:middleDot) do
+  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 "<w:ptab w:leader=\"middleDot\"/>"
-    end
-
-    with_value(:none) do
-      it_should_assign_successfully
-      it_should_output "<w:ptab w:leader=\"none\"/>"
-    end
-
-    with_value(:underscore) do
-      it_should_assign_successfully
-      it_should_output "<w:ptab w:leader=\"underscore\"/>"
+      it_should_output_regular_xml
     end
 
     with_value(:somethingElse) do
@@ -57,15 +33,11 @@ describe OpenXml::Docx::Elements::AbsolutePositionTab do
     end
   end
 
-  for_attribute(:relativeTo) do
-    with_value(:indent) do
+  for_attribute(:relativeTo, with_namespace: :w) do
+    allowed = %i(indent margin)
+    with_values(allowed) 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 "<w:ptab w:relativeTo=\"margin\"/>"
+      it_should_output_regular_xml
     end
 
     with_value(:somethingElse) do
@@ -73,10 +45,6 @@ describe OpenXml::Docx::Elements::AbsolutePositionTab do
     end
   end
 
-  with_no_attributes_set do
-    it_should_output "<w:ptab/>", assign: false
-  end
-
   with_these_attributes_set(alignment: :center, relativeTo: :margin) do
     it_should_output "<w:ptab w:alignment=\"center\" w:relativeTo=\"margin\"/>", assign: false
   end

data/spec/elements/bidi_embed_spec.rb

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

data/spec/elements/bidi_override_spec.rb

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

data/spec/elements/break_spec.rb

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

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) do
+  for_attribute(:id, with_namespace: :r) do
     with_value("rId8") do
       it_should_assign_successfully
-      it_should_output "<w:contentPart r:id=\"rId8\"/>"
+      it_should_output_regular_xml
     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) do
+  for_attribute(:id, with_namespace: :r) do
     with_value("rId5") do
       it_should_assign_successfully
-      it_should_output "<w:control r:id=\"rId5\"/>"
+      it_should_output_regular_xml
     end
 
     with_value("") do
@@ -16,10 +16,10 @@ describe OpenXml::Docx::Elements::Control do
     end
   end
 
-  for_attribute(:unique_name) do
+  for_attribute(:unique_name, displays_as: :name, with_namespace: :w) do
     with_value("CheckBox1") do
       it_should_assign_successfully
-      it_should_output "<w:control w:name=\"CheckBox1\"/>"
+      it_should_output_regular_xml
     end
 
     with_value("") do
@@ -27,10 +27,10 @@ describe OpenXml::Docx::Elements::Control do
     end
   end
 
-  for_attribute(:shape_id) do
+  for_attribute(:shape_id, displays_as: :shapeid, with_namespace: :w) do
     with_value("_x0000_s1027") do
       it_should_assign_successfully
-      it_should_output "<w:control w:shapeid=\"_x0000_s1027\"/>"
+      it_should_output_regular_xml
     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) do
+  for_attribute(:space, with_namespace: :xml) 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 "<w:del xml:space=\"preserve\"/>"
+      it_should_output_regular_xml
     end
 
     with_value(:the_final_frontier) do

data/spec/elements/drawing_spec.rb

@@ -0,0 +1,11 @@
+require "spec_helper"
+
+describe OpenXml::Docx::Elements::Drawing do
+  include ElementTestMacros
+
+  it_should_use tag: :drawing, name: "drawing"
+
+  with_no_attributes_set do
+    it_should_output "<w:drawing/>", assign: false
+  end
+end

data/spec/elements/drawingml/adjust_values_list_spec.rb

@@ -0,0 +1,8 @@
+require "spec_helper"
+
+describe OpenXml::DrawingML::Elements::AdjustValuesList do
+  include ElementTestMacros
+
+  it_should_use tag: :avLst, name: "adjust_values_list"
+
+end

data/spec/elements/drawingml/blip_fill_spec.rb

@@ -0,0 +1,34 @@
+require "spec_helper"
+
+describe OpenXml::DrawingML::Elements::BlipFill do
+  include ElementTestMacros
+
+  it_should_use tag: :blipFill, name: "blip_fill"
+
+  for_attribute(:dpi) do
+    with_values([1, -1]) do
+      it_should_assign_successfully
+      it_should_output_regular_xml
+    end
+
+    with_value(:not_a_number) do
+      it_should_raise_an_exception
+    end
+  end
+
+  for_attribute(:rotWithShape) do
+    with_values([true, false]) do
+      it_should_assign_successfully
+      it_should_output_regular_xml
+    end
+
+    with_value(:not_a_boolean) do
+      it_should_raise_an_exception
+    end
+  end
+
+  with_no_attributes_set do
+    it_should_output "<pic:blipFill/>", assign: false
+  end
+
+end

data/spec/elements/drawingml/extension_list_spec.rb

@@ -0,0 +1,8 @@
+require "spec_helper"
+
+describe OpenXml::DrawingML::Elements::ExtensionList do
+  include ElementTestMacros
+
+  it_should_use tag: :extLst, name: "extension_list"
+
+end

data/spec/elements/drawingml/extension_spec.rb

@@ -0,0 +1,19 @@
+require "spec_helper"
+
+describe OpenXml::DrawingML::Elements::Extension do
+  include ElementTestMacros
+
+  it_should_use tag: :ext, name: "extension"
+
+  for_attribute(:uri) do
+    with_value("http://schemas.microsoft.com/office/word/2010/wordprocessingShape") do
+      it_should_assign_successfully
+      it_should_output "<a:ext uri=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\"/>"
+    end
+
+    with_value(:not_a_string) do
+      it_should_raise_an_exception
+    end
+  end
+
+end

data/spec/elements/drawingml/extents_spec.rb

@@ -0,0 +1,33 @@
+require "spec_helper"
+
+describe OpenXml::DrawingML::Elements::Extents do
+  include ElementTestMacros
+
+  it_should_use tag: :ext, name: "extents"
+
+  attributes = { extent_length: :cx, extent_width: :cy }
+
+  for_attribute(:extent_length, displays_as: :cx) do
+    with_value(1) do
+      it_should_assign_successfully
+      it_should_output_regular_xml
+    end
+
+    with_values([-1, 1.1, :not_a_number]) do
+      it_should_raise_an_exception
+    end
+  end
+
+  for_attribute(:extent_width, displays_as: :cy) do
+    with_value(1) do
+      it_should_assign_successfully
+      it_should_output_regular_xml
+    end
+
+    with_values([-1, 1.1, :not_a_number]) do
+      it_should_raise_an_exception
+    end
+
+  end
+
+end

data/spec/elements/drawingml/graphic_data_spec.rb

@@ -0,0 +1,19 @@
+require "spec_helper"
+
+describe OpenXml::DrawingML::Elements::GraphicData do
+  include ElementTestMacros
+
+  it_should_use tag: :graphicData, name: "graphic_data"
+
+  for_attribute(:uri) do
+    with_value("http://schemas.microsoft.com/office/word/2010/wordprocessingShape") do
+      it_should_assign_successfully
+      it_should_output "<a:graphicData uri=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\"/>"
+    end
+
+    with_value(:not_a_string) do
+      it_should_raise_an_exception
+    end
+  end
+
+end

data/spec/elements/drawingml/graphic_frame_locks_spec.rb

@@ -0,0 +1,78 @@
+require "spec_helper"
+
+describe OpenXml::DrawingML::Elements::GraphicFrameLocks do
+  include ElementTestMacros
+
+  it_should_use tag: :graphicFrameLocks, name: "graphic_frame_locks"
+
+  for_attribute(:noChangeAspect) do
+    with_values([true, false]) do
+      it_should_assign_successfully
+      it_should_output_regular_xml
+    end
+
+    with_value(:neither) do
+      it_should_raise_an_exception
+    end
+  end
+
+  for_attribute(:noDrilldown) do
+    with_values([true, false]) do
+      it_should_assign_successfully
+      it_should_output_regular_xml
+    end
+
+    with_value(:neither) do
+      it_should_raise_an_exception
+    end
+  end
+
+  for_attribute(:noGrouping, displays_as: :noGrp) do
+    with_values([true, false]) do
+      it_should_assign_successfully
+      it_should_output_regular_xml
+    end
+
+    with_value(:neither) do
+      it_should_raise_an_exception
+    end
+  end
+
+  for_attribute(:noMove) do
+    with_values([true, false]) do
+      it_should_assign_successfully
+      it_should_output_regular_xml
+    end
+
+    with_value(:neither) do
+      it_should_raise_an_exception
+    end
+  end
+
+  for_attribute(:noResize) do
+    with_values([true, false]) do
+      it_should_assign_successfully
+      it_should_output_regular_xml
+    end
+
+    with_value(:neither) do
+      it_should_raise_an_exception
+    end
+  end
+
+  for_attribute(:noSelect) do
+    with_values([true, false]) do
+      it_should_assign_successfully
+      it_should_output_regular_xml
+    end
+
+    with_value(:neither) do
+      it_should_raise_an_exception
+    end
+  end
+
+  with_no_attributes_set do
+    it_should_output "<a:graphicFrameLocks/>", assign: false
+  end
+
+end