openxml-docx 0.9.0 → 0.10.0

data/lib/openxml/docx/elements/embed_bold_italic.rb

@@ -0,0 +1,25 @@
+module OpenXml
+  module Docx
+    module Elements
+      class EmbedBoldItalic < Element
+        namespace :w
+
+        with_namespace :w do
+          attribute :font_key, expects: :bracketed_guid, displays_as: :fontKey
+          attribute :subsetted, expects: :true_or_false
+        end
+
+        attribute :relationship_id, expects: :string, displays_as: :id, namespace: :r
+
+
+      private
+
+        def bracketed_guid(value)
+          guid_regex = /\{[0-9A-F]{8}\-[0-9A-F]{4}\-[0-9A-F]{4}\-[0-9A-F]{4}\-[0-9A-F]{12}\}/ # Regex taken from spec section 22.9.2.4
+          raise ArgumentError, "Not a validly-formatted GUID" unless value =~ guid_regex
+        end
+
+      end
+    end
+  end
+end

data/lib/openxml/docx/elements/embed_italic.rb

@@ -0,0 +1,25 @@
+module OpenXml
+  module Docx
+    module Elements
+      class EmbedItalic < Element
+        namespace :w
+
+        with_namespace :w do
+          attribute :font_key, expects: :bracketed_guid, displays_as: :fontKey
+          attribute :subsetted, expects: :true_or_false
+        end
+
+        attribute :relationship_id, expects: :string, displays_as: :id, namespace: :r
+
+
+      private
+
+        def bracketed_guid(value)
+          guid_regex = /\{[0-9A-F]{8}\-[0-9A-F]{4}\-[0-9A-F]{4}\-[0-9A-F]{4}\-[0-9A-F]{12}\}/ # Regex taken from spec section 22.9.2.4
+          raise ArgumentError, "Not a validly-formatted GUID" unless value =~ guid_regex
+        end
+
+      end
+    end
+  end
+end

data/lib/openxml/docx/elements/embed_regular.rb

@@ -0,0 +1,25 @@
+module OpenXml
+  module Docx
+    module Elements
+      class EmbedRegular < Element
+        namespace :w
+
+        with_namespace :w do
+          attribute :font_key, expects: :bracketed_guid, displays_as: :fontKey
+          attribute :subsetted, expects: :true_or_false
+        end
+
+        attribute :relationship_id, expects: :string, displays_as: :id, namespace: :r
+
+
+      private
+
+        def bracketed_guid(value)
+          guid_regex = /\{[0-9A-F]{8}\-[0-9A-F]{4}\-[0-9A-F]{4}\-[0-9A-F]{4}\-[0-9A-F]{12}\}/ # Regex taken from spec section 22.9.2.4
+          raise ArgumentError, "Not a validly-formatted GUID (#{value})" unless value =~ guid_regex
+        end
+
+      end
+    end
+  end
+end

data/lib/openxml/docx/elements/family.rb

@@ -0,0 +1,22 @@
+module OpenXml
+  module Docx
+    module Elements
+      class Family < Element
+        namespace :w
+
+        with_namespace :w do
+          attribute :value, expects: :valid_font_family, displays_as: :val
+        end
+
+      private
+
+        def valid_font_family(value)
+          ok_values = %i(auto decorative modern roman script swiss) # From the spec section 17.18.30
+          message = "Invalid font family type (#{value}). Valid options are: #{ok_values.join(", ")}."
+          raise ArgumentError, message unless ok_values.inculde? value
+        end
+
+      end
+    end
+  end
+end

data/lib/openxml/docx/elements/font.rb

@@ -0,0 +1,14 @@
+module OpenXml
+  module Docx
+    module Elements
+      class Font < Container
+        namespace :w
+
+        with_namespace :w do
+          attribute :font_name, expects: :string, displays_as: :name
+        end
+
+      end
+    end
+  end
+end

data/lib/openxml/docx/elements/grid_column.rb

@@ -2,9 +2,9 @@ module OpenXml
   module Docx
     module Elements
       class GridColumn < Element
-        tag :gridColumn
+        tag :gridCol
 
-        attribute :w, expects: :integer
+        attribute :w, expects: :integer, namespace: :w
 
       end
     end

data/lib/openxml/docx/elements/group_shape.rb

@@ -0,0 +1,10 @@
+module OpenXml
+  module Docx
+    module Elements
+      class GroupShape < Container
+        tag :grpSp
+
+      end
+    end
+  end
+end

data/lib/openxml/docx/elements/markup_compatibility_alternate_content.rb

@@ -0,0 +1,10 @@
+module OpenXml
+  module Docx
+    module Elements
+      class MarkupCompatibilityAlternateContent < Container
+        tag :AlternateContent
+        namespace :mc
+      end
+    end
+  end
+end

data/lib/openxml/docx/elements/markup_compatibility_choice.rb

@@ -0,0 +1,13 @@
+module OpenXml
+  module Docx
+    module Elements
+      class MarkupCompatibilityChoice < Container
+        tag :Choice
+        namespace :mc
+
+        attribute :Required, expects: :string
+
+      end
+    end
+  end
+end

data/lib/openxml/docx/elements/markup_compatibility_fallback.rb

@@ -0,0 +1,10 @@
+module OpenXml
+  module Docx
+    module Elements
+      class MarkupCompatibilityFallback < Container
+        tag :Fallback
+        namespace :mc
+      end
+    end
+  end
+end

data/lib/openxml/docx/elements/paper_source.rb

@@ -4,8 +4,10 @@ module OpenXml
       class PaperSource < ComplexProperty
         tag :paperSrc
 
-        attribute :first, expects: :integer
-        attribute :other, expects: :integer
+        with_namespace :w do
+          attribute :first, expects: :integer
+          attribute :other, expects: :integer
+        end
 
       end
     end

data/lib/openxml/docx/elements/section_properties.rb

@@ -0,0 +1,9 @@
+module OpenXml
+  module Docx
+    module Elements
+      class SectionProperties < Container
+        tag :sectPr
+      end
+    end
+  end
+end

data/lib/openxml/docx/elements/symbol.rb

@@ -4,8 +4,10 @@ module OpenXml
       class Symbol < Element
         tag :sym
 
-        attribute :font, expects: :string
-        attribute :character, expects: :hex_digit_4, displays_as: :char
+        with_namespace :w do
+          attribute :font, expects: :string
+          attribute :character, expects: :hex_digit_4, displays_as: :char
+        end
 
       end
     end

data/lib/openxml/docx/elements/table.rb

@@ -10,7 +10,6 @@ module OpenXml
         value_property :alignment
         value_property :table_caption
         value_property :table_description
-        value_property :table_layout
         value_property :table_overlap
         value_property :table_style
 
@@ -20,6 +19,7 @@ module OpenXml
         property :table_cell_margins
         property :table_cell_spacing
         property :table_indent
+        property :table_layout
         property :table_look
         property :table_p_pr
         property :table_width

data/lib/openxml/docx/elements/table_cell.rb

@@ -4,7 +4,7 @@ module OpenXml
       class TableCell < Container
         tag :tc
 
-        attribute :id
+        attribute :id, namespace: :w
 
         value_property :div_id
         value_property :grid_span
@@ -12,6 +12,7 @@ module OpenXml
         value_property :no_wrap
         value_property :table_cell_fit_text
         value_property :text_direction
+        value_property :v_align
 
         property :conditional_formatting
         property :headers

data/lib/openxml/docx/elements/table_row.rb

@@ -4,10 +4,12 @@ module OpenXml
       class TableRow < Container
         tag :tr
 
-        attribute :rsidDel, expects: :valid_long_hex
-        attribute :rsidR, expects: :valid_long_hex
-        attribute :rsidRPr, expects: :valid_long_hex
-        attribute :risdTr, expects: :valid_long_hex
+        with_namespace :w do
+          attribute :rsidDel, expects: :valid_long_hex
+          attribute :rsidR, expects: :valid_long_hex
+          attribute :rsidRPr, expects: :valid_long_hex
+          attribute :risdTr, expects: :valid_long_hex
+        end
 
         value_property :cant_split
         value_property :div_id
@@ -20,7 +22,7 @@ module OpenXml
 
         property :conditional_formatting
         property :table_cell_spacing
-        property :tr_height
+        property :table_row_height
         property :w_after
         property :w_before
 

data/lib/openxml/docx/elements/text.rb

@@ -6,9 +6,7 @@ module OpenXml
 
         tag :t
 
-        attribute :space, expects: :valid_space_preserve, namespace: :xml
-
-        VALID_SPACE_PRESERVES = [:preserve, nil]
+        attribute :space, one_of: [:preserve, nil], namespace: :xml
 
         def initialize(text=nil)
           @text = text
@@ -17,13 +15,6 @@ module OpenXml
         def to_xml(xml)
           xml["w"].public_send(tag, text, xml_attributes)
         end
-
-      private
-
-        def valid_space_preserve(value)
-          valid_in? value, VALID_SPACE_PRESERVES
-        end
-
       end
     end
   end

data/lib/openxml/docx/elements/vml_container.rb

@@ -0,0 +1,10 @@
+module OpenXml
+  module Docx
+    module Elements
+      class VmlContainer < Container
+        tag :pict
+
+      end
+    end
+  end
+end

data/lib/openxml/docx/elements/word_processing_drawing_anchor.rb

@@ -0,0 +1,23 @@
+module OpenXml
+  module Docx
+    module Elements
+      class WordProcessingDrawingAnchor < Container
+        tag :anchor
+        namespace :wp
+
+        attribute :allowOverlap, expects: :true_or_false
+        attribute :behindDoc, expects: :true_or_false
+        attribute :distB, expects: :positive_integer
+        attribute :distL, expects: :positive_integer
+        attribute :distR, expects: :positive_integer
+        attribute :distT, expects: :positive_integer
+        attribute :hidden, expects: :true_or_false
+        attribute :layoutInCell, expects: :true_or_false
+        attribute :locked, expects: :true_or_false
+        attribute :relativeHeight, expects: :positive_integer
+        attribute :simplePos, expects: :true_or_false
+
+      end
+    end
+  end
+end

data/lib/openxml/docx/elements/word_processing_drawing_effect_extent.rb

@@ -0,0 +1,16 @@
+module OpenXml
+  module Docx
+    module Elements
+      class WordProcessingDrawingEffectExtent < Element
+        tag :effectExtent
+        namespace :wp
+
+        attribute :bottom_edge, expects: :integer, displays_as: :b
+        attribute :left_edge, expects: :integer, displays_as: :l
+        attribute :right_edge, expects: :integer, displays_as: :r
+        attribute :top_edge, expects: :integer, displays_as: :t
+
+      end
+    end
+  end
+end

data/lib/openxml/docx/elements/word_processing_drawing_extent.rb

@@ -0,0 +1,14 @@
+module OpenXml
+  module Docx
+    module Elements
+      class WordProcessingDrawingExtent < Element
+        tag :extent
+        namespace :wp
+
+        attribute :extent_length, expects: :positive_integer, displays_as: :cx
+        attribute :extent_width, expects: :positive_integer, displays_as: :cy
+
+      end
+    end
+  end
+end

data/lib/openxml/docx/elements/word_processing_drawing_nv_graphic_frame_properties.rb

@@ -0,0 +1,11 @@
+module OpenXml
+  module Docx
+    module Elements
+      class WordProcessingDrawingNvGraphicFrameProperties < Container
+        tag :cNvGraphicFramePr
+        namespace :wp
+
+      end
+    end
+  end
+end

data/lib/openxml/docx/elements/word_processing_drawing_object_nv_properties.rb

@@ -0,0 +1,17 @@
+module OpenXml
+  module Docx
+    module Elements
+      class WordProcessingDrawingObjectNvProperties < Element
+        tag :docPr
+        namespace :wp
+
+        attribute :description, expects: :string, displays_as: :descr
+        attribute :hidden, expects: :true_or_false
+        attribute :id, expects: :positive_integer
+        attribute :property_name, expects: :string, displays_as: :name
+        attribute :title, expects: :string
+
+      end
+    end
+  end
+end

data/lib/openxml/docx/elements/word_processing_drawing_position_h.rb

@@ -0,0 +1,23 @@
+module OpenXml
+  module Docx
+    module Elements
+      class WordProcessingDrawingPositionH < Container
+        tag :positionH
+        namespace :wp
+
+        attribute :relativeFrom, expects: :valid_relative_from
+
+      private
+
+        def valid_relative_from(value)
+          raise ArgumentError unless ok_values.include? value
+        end
+
+        def ok_values
+          %i(character column insideMargin leftMargin margin outsideMargin
+          page rightMargin)
+        end
+      end
+    end
+  end
+end

data/lib/openxml/docx/elements/word_processing_drawing_position_offset.rb

@@ -0,0 +1,10 @@
+module OpenXml
+  module Docx
+    module Elements
+      class WordProcessingDrawingPositionOffset < Container
+        tag :posOffset
+        namespace :wp
+      end
+    end
+  end
+end