openxml-docx 0.10.0 → 0.10.1

data/lib/openxml/drawingml/elements/blip.rb

@@ -0,0 +1,18 @@
+module OpenXml
+  module DrawingML
+    module Elements
+      class Blip < OpenXml::Docx::Elements::Container
+        namespace :a
+        tag :blip
+
+        attribute :compression_state, one_of: %i(email hqprint none print screen), displays_as: :cstate
+
+        with_namespace :r do
+          attribute :embed, expects: :string
+          attribute :link, expects: :string
+        end
+
+      end
+    end
+  end
+end

data/lib/openxml/drawingml/elements/blip_fill.rb

@@ -6,7 +6,7 @@ module OpenXml
         tag :blipFill
 
         attribute :dpi, expects: :integer
-        attribute :rotWithShape, expects: :true_or_false
+        attribute :rotate_with_shape, expects: :true_or_false, displays_as: :rotWithShape
 
       end
     end

data/lib/openxml/drawingml/elements/fill_rectangle.rb

@@ -0,0 +1,16 @@
+module OpenXml
+  module DrawingML
+    module Elements
+      class FillRectangle < OpenXml::Docx::Elements::Element
+        namespace :a
+        tag :fillRect
+
+        attribute :bottom_offset, expects: :percentage, displays_as: :b
+        attribute :left_offset, expects: :percentage, displays_as: :l
+        attribute :right_offset, expects: :percentage, displays_as: :r
+        attribute :top_offset, expects: :percentage, displays_as: :t
+
+      end
+    end
+  end
+end

data/lib/openxml/drawingml/elements/graphic_frame_locks.rb

@@ -4,12 +4,12 @@ module OpenXml
       class GraphicFrameLocks < OpenXml::Docx::Elements::Element
         namespace :a
 
-        attribute :noChangeAspect, expects: :true_or_false
-        attribute :noDrilldown, expects: :true_or_false
-        attribute :noGrouping, expects: :true_or_false, displays_as: :noGrp
-        attribute :noMove, expects: :true_or_false
-        attribute :noResize, expects: :true_or_false
-        attribute :noSelect, expects: :true_or_false
+        attribute :disallow_aspect_ratio_changes, expects: :true_or_false, displays_as: :noChangeAspect
+        attribute :disallow_drilldown, expects: :true_or_false, displays_as: :noDrilldown
+        attribute :disallow_grouping, expects: :true_or_false, displays_as: :noGrp
+        attribute :disallow_moving, expects: :true_or_false, displays_as: :noMove
+        attribute :disallow_resizing, expects: :true_or_false, displays_as: :noResize
+        attribute :disallow_selection, expects: :true_or_false, displays_as: :noSelect
 
       end
     end

data/lib/openxml/drawingml/elements/non_visual_drawing_properties.rb

@@ -5,7 +5,7 @@ module OpenXml
         namespace :pic
         tag :cNvPr
 
-        attribute :descr, expects: :string
+        attribute :description, expects: :string, displays_as: :descr
         attribute :hidden, expects: :true_or_false
         attribute :id, expects: :positive_integer
         attribute :picture_name, expects: :string, displays_as: :name

data/lib/openxml/drawingml/elements/picture_locks.rb

@@ -0,0 +1,23 @@
+module OpenXml
+  module DrawingML
+    module Elements
+      class PictureLocks < OpenXml::Docx::Elements::Element
+        namespace :a
+        tag :picLocks
+
+        attribute :hide_adjust_handles, expects: :true_or_false, displays_as: :noAdjustHandles
+        attribute :disallow_arrowhead_changes, expects: :true_or_false, displays_as: :noChangeArrowheads
+        attribute :disallow_aspect_ratio_changes, expects: :true_or_false, displays_as: :noChangeAspect
+        attribute :disallow_shape_type_changes, expects: :true_or_false, displays_as: :noChangeShapeType
+        attribute :disallow_cropping, expects: :true_or_false, displays_as: :noCrop
+        attribute :disallow_editing_points, expects: :true_or_false, displays_as: :noEditPoints
+        attribute :disallow_grouping, expects: :true_or_false, displays_as: :noGrp
+        attribute :disallow_moving, expects: :true_or_false, displays_as: :noMove
+        attribute :disallow_resizing, expects: :true_or_false, displays_as: :noResize
+        attribute :disallow_rotation, expects: :true_or_false, displays_as: :noRot
+        attribute :disallow_selection, expects: :true_or_false, displays_as: :noSelect
+
+      end
+    end
+  end
+end

data/lib/openxml/drawingml/elements/picture_shape_properties.rb

@@ -0,0 +1,13 @@
+module OpenXml
+  module DrawingML
+    module Elements
+      class PictureShapeProperties < OpenXml::Docx::Elements::Container
+        namespace :pic
+        tag :spPr
+
+        attribute :black_and_white_mode, one_of: %i(auto black blackGray blackWhite clr gray grayWhite hidden invGray ltGray white), displays_as: :bwMode
+
+      end
+    end
+  end
+end

data/lib/openxml/drawingml/elements/source_rectangle.rb

@@ -0,0 +1,16 @@
+module OpenXml
+  module DrawingML
+    module Elements
+      class SourceRectangle < OpenXml::Docx::Elements::Element
+        namespace :a
+        tag :srcRect
+
+        attribute :bottom_offset, expects: :percentage, displays_as: :b
+        attribute :left_offset, expects: :percentage, displays_as: :l
+        attribute :right_offset, expects: :percentage, displays_as: :r
+        attribute :top_offset, expects: :percentage, displays_as: :t
+
+      end
+    end
+  end
+end

data/lib/openxml/drawingml/elements/stretch.rb

@@ -0,0 +1,10 @@
+module OpenXml
+  module DrawingML
+    module Elements
+      class Stretch < OpenXml::Docx::Elements::Container
+        namespace :a
+
+      end
+    end
+  end
+end

data/spec/elements/book_fold_printing_sheets_spec.rb

@@ -0,0 +1,27 @@
+require "spec_helper"
+
+describe OpenXml::Docx::Elements::BookFoldPrintingSheets do
+  include ElementTestMacros
+
+  it_should_use tag: :bookFoldPrintingSheets, name: "book_fold_printing_sheets"
+
+  for_attribute(:value) do
+    with_value(1) do
+      it_should_assign_successfully
+      it_should_output "<w:bookFoldPrintingSheets w:val=\"1\"/>"
+    end
+
+    with_value(-1) do
+      it_should_raise_an_exception
+    end
+
+    with_value(1.1) do
+      it_should_raise_an_exception
+    end
+
+    with_value(:not_a_number) do
+      it_should_raise_an_exception
+    end
+  end
+
+end

data/spec/elements/book_fold_printing_spec.rb

@@ -0,0 +1,19 @@
+require "spec_helper"
+
+describe OpenXml::Docx::Elements::BookFoldPrinting do
+  include ElementTestMacros
+
+  it_should_use tag: :bookFoldPrinting, name: "book_fold_printing"
+
+  for_attribute(:value) do
+    with_value(true) do
+      it_should_assign_successfully
+      it_should_output "<w:bookFoldPrinting w:val=\"true\"/>"
+    end
+
+    with_value("true") do
+      it_should_raise_an_exception
+    end
+  end
+
+end

data/spec/elements/book_fold_reverse_printing_spec.rb

@@ -0,0 +1,19 @@
+require "spec_helper"
+
+describe OpenXml::Docx::Elements::BookFoldReversePrinting do
+  include ElementTestMacros
+
+  it_should_use tag: :bookFoldRevPrinting, name: "book_fold_reverse_printing"
+
+  for_attribute(:value) do
+    with_value(true) do
+      it_should_assign_successfully
+      it_should_output "<w:bookFoldRevPrinting w:val=\"true\"/>"
+    end
+
+    with_value("true") do
+      it_should_raise_an_exception
+    end
+  end
+
+end

data/spec/elements/drawingml/blip_fill_spec.rb

@@ -16,10 +16,15 @@ describe OpenXml::DrawingML::Elements::BlipFill do
     end
   end
 
-  for_attribute(:rotWithShape) do
-    with_values([true, false]) do
+  for_attribute(:rotate_with_shape) do
+    with_value(true) do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<pic:blipFill rotWithShape=\"true\"/>"
+    end
+
+    with_value(false) do
+      it_should_assign_successfully
+      it_should_output "<pic:blipFill rotWithShape=\"false\"/>"
     end
 
     with_value(:not_a_boolean) do

data/spec/elements/drawingml/blip_spec.rb

@@ -0,0 +1,47 @@
+require "spec_helper"
+
+describe OpenXml::DrawingML::Elements::Blip do
+  include ElementTestMacros
+
+  it_should_use tag: :blip, name: "blip"
+
+  for_attribute(:compression_state) do
+    %i(email hqprint none print screen).each do |good_value|
+      with_value(good_value) do
+        it_should_assign_successfully
+        it_should_output "<a:blip cstate=\"#{good_value}\"/>"
+      end
+    end
+
+    with_value(:no_good) do
+      it_should_raise_an_exception
+    end
+  end
+
+  for_attribute(:embed) do
+    with_value("StringRelId") do
+      it_should_assign_successfully
+      it_should_output "<a:blip r:embed=\"StringRelId\"/>"
+    end
+
+    with_value(:not_a_string) do
+      it_should_raise_an_exception
+    end
+  end
+
+  for_attribute(:link) do
+    with_value("ExternalStringRelId") do
+      it_should_assign_successfully
+      it_should_output "<a:blip r:link=\"ExternalStringRelId\"/>"
+    end
+
+    with_value(:not_a_string) do
+      it_should_raise_an_exception
+    end
+  end
+
+  with_no_attributes_set do
+    it_should_output "<a:blip/>", assign: false
+  end
+
+end

data/spec/elements/drawingml/fill_rectangle_spec.rb

@@ -0,0 +1,76 @@
+require "spec_helper"
+
+describe OpenXml::DrawingML::Elements::FillRectangle do
+  include ElementTestMacros
+
+  it_should_use tag: :fillRect, name: "fill_rectangle"
+
+  for_attribute(:bottom_offset) do
+    with_value("10%") do
+      it_should_assign_successfully
+      it_should_output "<a:fillRect b=\"10%\"/>"
+    end
+
+    with_value("10.1%") do
+      it_should_assign_successfully
+      it_should_output "<a:fillRect b=\"10.1%\"/>"
+    end
+
+    with_values(["10", 10, "%"]) do
+      it_should_raise_an_exception
+    end
+  end
+
+  for_attribute(:left_offset) do
+    with_value("10%") do
+      it_should_assign_successfully
+      it_should_output "<a:fillRect l=\"10%\"/>"
+    end
+
+    with_value("10.1%") do
+      it_should_assign_successfully
+      it_should_output "<a:fillRect l=\"10.1%\"/>"
+    end
+
+    with_values(["10", 10, "%"]) do
+      it_should_raise_an_exception
+    end
+  end
+
+  for_attribute(:right_offset) do
+    with_value("10%") do
+      it_should_assign_successfully
+      it_should_output "<a:fillRect r=\"10%\"/>"
+    end
+
+    with_value("10.1%") do
+      it_should_assign_successfully
+      it_should_output "<a:fillRect r=\"10.1%\"/>"
+    end
+
+    with_values(["10", 10, "%"]) do
+      it_should_raise_an_exception
+    end
+  end
+
+  for_attribute(:top_offset) do
+    with_value("10%") do
+      it_should_assign_successfully
+      it_should_output "<a:fillRect t=\"10%\"/>"
+    end
+
+    with_value("10.1%") do
+      it_should_assign_successfully
+      it_should_output "<a:fillRect t=\"10.1%\"/>"
+    end
+
+    with_values(["10", 10, "%"]) do
+      it_should_raise_an_exception
+    end
+  end
+
+  with_no_attributes_set do
+    it_should_output "<a:fillRect/>", assign: false
+  end
+
+end

data/spec/elements/drawingml/graphic_frame_locks_spec.rb

@@ -5,10 +5,15 @@ describe OpenXml::DrawingML::Elements::GraphicFrameLocks do
 
   it_should_use tag: :graphicFrameLocks, name: "graphic_frame_locks"
 
-  for_attribute(:noChangeAspect) do
-    with_values([true, false]) do
+  for_attribute(:disallow_aspect_ratio_changes) do
+    with_value(true) do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<a:graphicFrameLocks noChangeAspect=\"true\"/>"
+    end
+
+    with_value(false) do
+      it_should_assign_successfully
+      it_should_output "<a:graphicFrameLocks noChangeAspect=\"false\"/>"
     end
 
     with_value(:neither) do
@@ -16,10 +21,15 @@ describe OpenXml::DrawingML::Elements::GraphicFrameLocks do
     end
   end
 
-  for_attribute(:noDrilldown) do
-    with_values([true, false]) do
+  for_attribute(:disallow_drilldown) do
+    with_value(true) do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<a:graphicFrameLocks noDrilldown=\"true\"/>"
+    end
+
+    with_value(false) do
+      it_should_assign_successfully
+      it_should_output "<a:graphicFrameLocks noDrilldown=\"false\"/>"
     end
 
     with_value(:neither) do
@@ -27,10 +37,15 @@ describe OpenXml::DrawingML::Elements::GraphicFrameLocks do
     end
   end
 
-  for_attribute(:noGrouping, displays_as: :noGrp) do
-    with_values([true, false]) do
+  for_attribute(:disallow_grouping) do
+    with_value(true) do
+      it_should_assign_successfully
+      it_should_output "<a:graphicFrameLocks noGrp=\"true\"/>"
+    end
+
+    with_value(false) do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<a:graphicFrameLocks noGrp=\"false\"/>"
     end
 
     with_value(:neither) do
@@ -38,21 +53,30 @@ describe OpenXml::DrawingML::Elements::GraphicFrameLocks do
     end
   end
 
-  for_attribute(:noMove) do
-    with_values([true, false]) do
+  for_attribute(:disallow_moving) do
+    with_value(true) do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<a:graphicFrameLocks noMove=\"true\"/>"
     end
 
+    with_value(false) do
+      it_should_assign_successfully
+      it_should_output "<a:graphicFrameLocks noMove=\"false\"/>"
+    end
     with_value(:neither) do
       it_should_raise_an_exception
     end
   end
 
-  for_attribute(:noResize) do
-    with_values([true, false]) do
+  for_attribute(:disallow_resizing) do
+    with_value(true) do
+      it_should_assign_successfully
+      it_should_output "<a:graphicFrameLocks noResize=\"true\"/>"
+    end
+
+    with_value(false) do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<a:graphicFrameLocks noResize=\"false\"/>"
     end
 
     with_value(:neither) do
@@ -60,10 +84,15 @@ describe OpenXml::DrawingML::Elements::GraphicFrameLocks do
     end
   end
 
-  for_attribute(:noSelect) do
-    with_values([true, false]) do
+  for_attribute(:disallow_selection) do
+    with_value(true) do
+      it_should_assign_successfully
+      it_should_output "<a:graphicFrameLocks noSelect=\"true\"/>"
+    end
+
+    with_value(false) do
       it_should_assign_successfully
-      it_should_output_regular_xml
+      it_should_output "<a:graphicFrameLocks noSelect=\"false\"/>"
     end
 
     with_value(:neither) do