openxml-docx 0.9.0 → 0.10.0

data/lib/openxml/docx/properties.rb

@@ -15,7 +15,6 @@ require "openxml/docx/properties/string_property"
 require "openxml/docx/properties/on_off_property"
 require "openxml/docx/properties/toggle_property"
 require "openxml/docx/properties/string_property"
-require "openxml/docx/properties/width_property"
 require "openxml/docx/properties/container_property"
 require "openxml/docx/properties/style"
 Dir.glob("#{File.join(File.dirname(__FILE__), "properties", "*.rb")}").each do |file|

data/lib/openxml/docx/properties/alignment.rb

@@ -5,7 +5,7 @@ module OpenXml
         tag :jc
 
         def ok_values
-          [:both, :center, :distribute, :end, :highKashida, :lowKashida, :mediumKashida, :numTab, :start, :thaiDistribute]
+          %i(both center distribute end highKashida lowKashida mediumKashida numTab start thaiDistribute left right)
         end
 
       end

data/lib/openxml/docx/properties/base_property.rb

@@ -22,6 +22,11 @@ module OpenXml
             @property_name = args.first if args.any?
             @name
           end
+
+          def namespace(*args)
+            @namespace = args.first if args.any?
+            @namespace
+          end
         end
 
         def initialize(tag=nil, *args)
@@ -52,6 +57,14 @@ module OpenXml
           (class_name[0, 1].downcase + class_name[1..-1]).to_sym
         end
 
+        def namespace
+          self.class.namespace || default_namespace
+        end
+
+        def default_namespace
+          :w
+        end
+
       private
 
         def class_name

data/lib/openxml/docx/properties/border.rb

@@ -4,15 +4,17 @@ module OpenXml
       class Border < ComplexProperty
         attr_reader :tag
 
-        attribute :color, expects: :hex_color
-        attribute :frame, expects: :true_or_false
-        attribute :shadow, expects: :true_or_false
-        attribute :size, expects: :positive_integer, displays_as: :sz
-        attribute :space, expects: :positive_integer
-        attribute :theme_color, expects: :valid_theme_color
-        attribute :theme_shade, expects: :hex_digit
-        attribute :theme_tint, expects: :hex_digit
-        attribute :type, expects: :valid_type, displays_as: :val
+        with_namespace :w do
+          attribute :color, expects: :hex_color
+          attribute :frame, expects: :true_or_false
+          attribute :shadow, expects: :true_or_false
+          attribute :size, expects: :positive_integer, displays_as: :sz
+          attribute :space, expects: :positive_integer
+          attribute :theme_color, expects: :valid_theme_color
+          attribute :theme_shade, expects: :hex_digit
+          attribute :theme_tint, expects: :hex_digit
+          attribute :type, expects: :valid_type, displays_as: :val
+        end
 
         def initialize(tag=:bdr)
           @tag = tag

data/lib/openxml/docx/properties/color.rb

@@ -2,10 +2,12 @@ module OpenXml
   module Docx
     module Properties
       class Color < ComplexProperty
-        attribute :color, expects: :hex_color, displays_as: :val
-        attribute :theme_color, expects: :valid_theme_color
-        attribute :theme_shade, expects: :hex_digit
-        attribute :theme_tint, expects: :hex_digit
+        with_namespace :w do
+          attribute :color, expects: :hex_color, displays_as: :val
+          attribute :theme_color, expects: :valid_theme_color
+          attribute :theme_shade, expects: :hex_digit
+          attribute :theme_tint, expects: :hex_digit
+        end
 
       end
     end

data/lib/openxml/docx/properties/column.rb

@@ -4,8 +4,10 @@ module OpenXml
       class Column < ComplexProperty
         tag :col
 
-        attribute :space, expects: :positive_integer
-        attribute :width, expects: :positive_integer, displays_as: :w
+        with_namespace :w do
+          attribute :space, expects: :positive_integer
+          attribute :width, expects: :positive_integer, displays_as: :w
+        end
 
         def initialize(space, width)
           self.space = space

data/lib/openxml/docx/properties/columns.rb

@@ -7,10 +7,12 @@ module OpenXml
         tag :cols
         child_class :column
 
-        attribute :equal_width, expects: :true_or_false
-        attribute :number, expects: :integer, displays_as: :num
-        attribute :separator, expects: :true_or_false, displays_as: :sep
-        attribute :space, expects: :integer
+        with_namespace :w do
+          attribute :equal_width, expects: :true_or_false
+          attribute :number, expects: :integer, displays_as: :num
+          attribute :separator, expects: :true_or_false, displays_as: :sep
+          attribute :space, expects: :integer
+        end
       end
     end
   end

data/lib/openxml/docx/properties/complex_property.rb

@@ -6,7 +6,7 @@ module OpenXml
 
         def to_xml(xml)
           return unless render?
-          xml["w"].public_send(tag, xml_attributes)
+          xml[namespace].public_send(tag, xml_attributes)
         end
 
         def render?

data/lib/openxml/docx/properties/conditional_formatting.rb

@@ -4,18 +4,20 @@ module OpenXml
       class ConditionalFormatting < ComplexProperty
         tag :cnfStyle
 
-        attribute :even_horizontal_band, expects: :true_or_false, displays_as: :evenHBand
-        attribute :even_vertical_band, expects: :true_or_false, displays_as: :evenVBand
-        attribute :first_column, expects: :true_or_false
-        attribute :first_row, expects: :true_or_false
-        attribute :first_row_first_column, expects: :true_or_false
-        attribute :first_row_last_column, expects: :true_or_false
-        attribute :last_column, expects: :true_or_false
-        attribute :last_row, expects: :true_or_false
-        attribute :last_row_first_column, expects: :true_or_false
-        attribute :last_row_last_column, expects: :true_or_false
-        attribute :odd_horizontal_band, expects: :true_or_false, displays_as: :oddHBand
-        attribute :odd_vertical_band, expects: :true_or_false, displays_as: :oddVBand
+        with_namespace :w do
+          attribute :even_horizontal_band, expects: :true_or_false, displays_as: :evenHBand
+          attribute :even_vertical_band, expects: :true_or_false, displays_as: :evenVBand
+          attribute :first_column, expects: :true_or_false
+          attribute :first_row, expects: :true_or_false
+          attribute :first_row_first_column, expects: :true_or_false
+          attribute :first_row_last_column, expects: :true_or_false
+          attribute :last_column, expects: :true_or_false
+          attribute :last_row, expects: :true_or_false
+          attribute :last_row_first_column, expects: :true_or_false
+          attribute :last_row_last_column, expects: :true_or_false
+          attribute :odd_horizontal_band, expects: :true_or_false, displays_as: :oddHBand
+          attribute :odd_vertical_band, expects: :true_or_false, displays_as: :oddVBand
+        end
 
       end
     end

data/lib/openxml/docx/properties/document_grid.rb

@@ -4,16 +4,10 @@ module OpenXml
       class DocumentGrid < ComplexProperty
         tag :docGrid
 
-        attribute :char_space, expects: :integer
-        attribute :line_pitch, expects: :integer
-        attribute :type, expects: :valid_grid_type
-
-        VALID_GRID_TYPES = %i(default lines linesAndChars snapToChars)
-
-      private
-
-        def valid_grid_type(value)
-          valid_in? value, VALID_GRID_TYPES
+        with_namespace :w do
+          attribute :char_space, expects: :integer
+          attribute :line_pitch, expects: :integer
+          attribute :type, one_of: %i(default lines linesAndChars snapToChars)
         end
 
       end

data/lib/openxml/docx/properties/east_asian_layout.rb

@@ -2,18 +2,13 @@ module OpenXml
   module Docx
     module Properties
       class EastAsianLayout < ComplexProperty
-        attribute :combine, expects: :on_or_off
-        attribute :combine_brackets, expects: :valid_bracket
-        attribute :id, expects: :integer
-        attribute :vertical, expects: :on_or_off, displays_as: :vert
-        attribute :vertical_compress, expects: :on_or_off, displays_as: :vertCompress
 
-        VALID_BRACKETS = %i(angle curly none round square)
-
-      private
-
-        def valid_bracket(value)
-          valid_in? value, VALID_BRACKETS
+        with_namespace :w do
+          attribute :combine, expects: :on_or_off
+          attribute :combine_brackets, one_of: %i(angle curly none round square)
+          attribute :id, expects: :integer
+          attribute :vertical, expects: :on_or_off, displays_as: :vert
+          attribute :vertical_compress, expects: :on_or_off, displays_as: :vertCompress
         end
 
       end

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

@@ -4,28 +4,24 @@ module OpenXml
       class Font < ComplexProperty
         tag :rFonts
 
-        attribute :ascii, expects: :string
-        attribute :ascii_theme, expects: :valid_theme
-        attribute :complex, expects: :string, displays_as: :cs
-        attribute :complex_theme, expects: :valid_theme, displays_as: :cstheme
-        attribute :east_asia, expects: :string
-        attribute :east_asia_theme, expects: :valid_theme
-        attribute :high_ansi, expects: :string, displays_as: :hAnsi
-        attribute :high_ansi_theme, expects: :valid_theme, displays_as: :hAnsiTheme
-        attribute :hint, expects: :valid_hint
-
-        VALID_HINTS = %i(cs default eastAsia)
-
-        VALID_THEMES = %i(majorAscii majorBidi majorEastAsia majorHAnsi minorAscii minorBidi minorEastAsia minorHAnsi)
-
-      private
-
-        def valid_theme(value)
-          valid_in? value, VALID_THEMES
-        end
-
-        def valid_hint(value)
-          valid_in? value, VALID_HINTS
+        with_namespace :w do
+          attribute :ascii, expects: :string
+          attribute :ascii_theme, one_of: %i(majorAscii majorBidi majorEastAsia
+                                                majorHAnsi minorAscii minorBidi
+                                                minorEastAsia minorHAnsi)
+          attribute :complex, expects: :string, displays_as: :cs
+          attribute :complex_theme, displays_as: :cstheme, one_of: %i(majorAscii majorBidi majorEastAsia
+                                                                      majorHAnsi minorAscii minorBidi
+                                                                      minorEastAsia minorHAnsi)
+          attribute :east_asia, expects: :string
+          attribute :east_asia_theme, one_of: %i(majorAscii majorBidi majorEastAsia
+                                                majorHAnsi minorAscii minorBidi
+                                                minorEastAsia minorHAnsi)
+          attribute :high_ansi, expects: :string, displays_as: :hAnsi
+          attribute :high_ansi_theme, displays_as: :hAnsiTheme, one_of: %i(majorAscii majorBidi majorEastAsia
+                                                                        majorHAnsi minorAscii minorBidi
+                                                                        minorEastAsia minorHAnsi)
+          attribute :hint, one_of: %i(cs default eastAsia)
         end
 
       end

data/lib/openxml/docx/properties/footer_reference.rb

@@ -0,0 +1,21 @@
+module OpenXml
+  module Docx
+    module Properties
+      class FooterReference < ComplexProperty
+        namespace :w
+
+        attribute :id, expects: :string, namespace: :r
+        attribute :type, expects: :valid_footer_type, namespace: :w
+
+      private
+
+        def valid_footer_type(value)
+          ok_values = %i(default even first)
+          message = "Invalid footer type (#{value}). Allowed types are: #{ok_values.join(", ")}."
+          raise ArgumentError, message unless ok_values.include? value
+        end
+
+      end
+    end
+  end
+end

data/lib/openxml/docx/properties/frame.rb

@@ -4,53 +4,22 @@ module OpenXml
       class Frame < ComplexProperty
         tag :framePr
 
-        attribute :anchor_lock, expects: :true_or_false
-        attribute :drop_cap, expects: :valid_drop_cap
-        attribute :height, expects: :positive_integer, displays_as: :h
-        attribute :height_rule, expects: :valid_height_rule, displays_as: :hRule
-        attribute :horizontal_anchor, expects: :valid_anchor, displays_as: :hAnchor
-        attribute :horizontal_padding, expects: :positive_integer, displays_as: :hSpace
-        attribute :horizontal_position, expects: :integer, displays_as: :x
-        attribute :lines, expects: :positive_integer
-        attribute :relative_horizontal_position, expects: :valid_relative_horizontal_position, displays_as: :xAlign
-        attribute :relative_vertical_position, expects: :valid_relative_vertical_position, displays_as: :yAlign
-        attribute :vertical_anchor, expects: :valid_anchor, displays_as: :vAnchor
-        attribute :vertical_padding, expects: :positive_integer, displays_as: :vSpace
-        attribute :vertical_position, expects: :integer, displays_as: :y
-        attribute :width, expects: :positive_integer, displays_as: :w
-        attribute :wrap, expects: :valid_wrap
-
-        VALID_ANCHORS = %i(margin page text)
-        VALID_DROP_CAPS = %i(drop margin none)
-        VALID_HEIGHT_RULES = %i(atLeast auto exact)
-        VALID_RELATIVE_HORIZONTAL_POSITIONS = %i(center inside left outside right)
-        VALID_RELATIVE_VERTICAL_POSITIONS = %i(bottom center inline inside outside top)
-        VALID_WRAPS = %i(around auto none notBeside through tight)
-
-      private
-
-        def valid_drop_cap(value)
-          valid_in? value, VALID_DROP_CAPS
-        end
-
-        def valid_anchor(value)
-          valid_in? value, VALID_ANCHORS
-        end
-
-        def valid_height_rule(value)
-          valid_in? value, VALID_HEIGHT_RULES
-        end
-
-        def valid_relative_horizontal_position(value)
-          valid_in? value, VALID_RELATIVE_HORIZONTAL_POSITIONS
-        end
-
-        def valid_relative_vertical_position(value)
-          valid_in? value, VALID_RELATIVE_VERTICAL_POSITIONS
-        end
-
-        def valid_wrap(value)
-          valid_in? value, VALID_WRAPS
+        with_namespace :w do
+          attribute :anchor_lock, expects: :true_or_false
+          attribute :drop_cap, one_of: %i(drop margin none)
+          attribute :height, expects: :positive_integer, displays_as: :h
+          attribute :height_rule, one_of: %i(atLeast auto exact), displays_as: :hRule
+          attribute :horizontal_anchor, one_of: %i(margin page text), displays_as: :hAnchor
+          attribute :horizontal_padding, expects: :positive_integer, displays_as: :hSpace
+          attribute :horizontal_position, expects: :integer, displays_as: :x
+          attribute :lines, expects: :positive_integer
+          attribute :relative_horizontal_position, one_of: %i(center inside left outside right), displays_as: :xAlign
+          attribute :relative_vertical_position, one_of: %i(bottom center inline inside outside top), displays_as: :yAlign
+          attribute :vertical_anchor, one_of: %i(margin page text), displays_as: :vAnchor
+          attribute :vertical_padding, expects: :positive_integer, displays_as: :vSpace
+          attribute :vertical_position, expects: :integer, displays_as: :y
+          attribute :width, expects: :positive_integer, displays_as: :w
+          attribute :wrap, one_of: %i(around auto none notBeside through tight)
         end
 
       end

data/lib/openxml/docx/properties/header_reference.rb

@@ -0,0 +1,21 @@
+module OpenXml
+  module Docx
+    module Properties
+      class HeaderReference < ComplexProperty
+        namespace :w
+
+        attribute :id, expects: :string, namespace: :r
+        attribute :type, expects: :valid_header_type, namespace: :w
+
+      private
+
+        def valid_header_type(value)
+          ok_values = %i(default even first)
+          message = "Invalid header type (#{value}). Allowed types are: #{ok_values.join(", ")}."
+          raise ArgumentError, message unless ok_values.include? value
+        end
+
+      end
+    end
+  end
+end

data/lib/openxml/docx/properties/indentation.rb

@@ -4,14 +4,17 @@ module OpenXml
       class Indentation < ComplexProperty
         tag :ind
 
-        attribute :end, expects: :integer
-        attribute :end_characters, expects: :integer, displays_as: :endChars
-        attribute :hanging, expects: :integer
-        attribute :hanging_characters, expects: :integer, displays_as: :hangingChars
-        attribute :first_line, expects: :integer
-        attribute :first_line_characters, expects: :integer, displays_as: :firstLineChars
-        attribute :start, expects: :integer
-        attribute :start_characters, expects: :integer, displays_as: :startChars
+        with_namespace :w do
+          attribute :end, expects: :integer
+          attribute :end_characters, expects: :integer, displays_as: :endChars
+          attribute :hanging, expects: :integer
+          attribute :hanging_characters, expects: :integer, displays_as: :hangingChars
+          attribute :first_line, expects: :integer
+          attribute :first_line_characters, expects: :integer, displays_as: :firstLineChars
+          attribute :start, expects: :integer
+          attribute :start_characters, expects: :integer, displays_as: :startChars
+        end
+
       end
     end
   end

data/lib/openxml/docx/properties/language.rb

@@ -4,9 +4,11 @@ module OpenXml
       class Language < ComplexProperty
         tag :lang
 
-        attribute :bidi, expects: :valid_language
-        attribute :east_asia, expects: :valid_language
-        attribute :latin, expects: :valid_language, displays_as: :val
+        with_namespace :w do
+          attribute :bidi, expects: :valid_language
+          attribute :east_asia, expects: :valid_language
+          attribute :latin, expects: :valid_language, displays_as: :val
+        end
 
       private
 

data/lib/openxml/docx/properties/latent_styles.rb

@@ -6,12 +6,15 @@ module OpenXml
       class LatentStyles < ContainerProperty
         child_class :latent_styles_exception
 
-        attribute :count, expects: :positive_integer
-        attribute :default_locked_state, expects: :true_or_false, displays_as: :defLockedState
-        attribute :default_qformat, expects: :true_or_false, displays_as: :defQFormat
-        attribute :default_semi_hidden, expects: :true_or_false, displays_as: :defSemiHidden
-        attribute :default_ui_priority, expects: :integer, displays_as: :defUIPriority
-        attribute :default_unhide_when_used, expects: :true_or_false, displays_as: :defUnhideWhenUsed
+        with_namespace :w do
+          attribute :count, expects: :positive_integer
+          attribute :default_locked_state, expects: :true_or_false, displays_as: :defLockedState
+          attribute :default_qformat, expects: :true_or_false, displays_as: :defQFormat
+          attribute :default_semi_hidden, expects: :true_or_false, displays_as: :defSemiHidden
+          attribute :default_ui_priority, expects: :integer, displays_as: :defUIPriority
+          attribute :default_unhide_when_used, expects: :true_or_false, displays_as: :defUnhideWhenUsed
+        end
+
 
         def render?
           true # Output XML even if there are no children