openxml-docx 0.9.0 → 0.10.0

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

@@ -2,17 +2,19 @@ module OpenXml
   module Docx
     module Properties
       class TableBorder < ComplexProperty
-        tag_is_one_of %i(top start bottom end insideH insideV)
+        tag_is_one_of %i(top start bottom end insideH insideV left right)
 
-        attribute :color, expects: :hex_color
-        attribute :frame, expects: :true_or_false
-        attribute :shadow, expects: :true_or_false
-        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 :value, expects: :valid_type, displays_as: :val
-        attribute :width, expects: :positive_integer, displays_as: :sz
+        with_namespace :w do
+          attribute :color, expects: :hex_color
+          attribute :frame, expects: :true_or_false
+          attribute :shadow, expects: :true_or_false
+          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 :value, expects: :valid_type, displays_as: :val
+          attribute :width, expects: :positive_integer, displays_as: :sz
+        end
 
         def initialize(tag, value)
           super tag

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

@@ -2,17 +2,19 @@ module OpenXml
   module Docx
     module Properties
       class TableCellBorder < ComplexProperty
-        tag_is_one_of %i(top start bottom end insideH insideV tl2br tr2bl)
+        tag_is_one_of %i(top start bottom end insideH insideV tl2br tr2bl left right)
 
-        attribute :color, expects: :hex_color
-        attribute :frame, expects: :true_or_false
-        attribute :shadow, expects: :true_or_false
-        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 :value, expects: :valid_type, displays_as: :val
-        attribute :width, expects: :positive_integer, displays_as: :sz
+        with_namespace :w do
+          attribute :color, expects: :hex_color
+          attribute :frame, expects: :true_or_false
+          attribute :shadow, expects: :true_or_false
+          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 :value, expects: :valid_type, displays_as: :val
+          attribute :width, expects: :positive_integer, displays_as: :sz
+        end
 
         def initialize(tag, value)
           super tag

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

@@ -1,11 +1,13 @@
 module OpenXml
   module Docx
     module Properties
-      class TableCellMargin < WidthProperty
-        tag_is_one_of %i(top start bottom end)
+      class TableCellMargin < ComplexProperty
+        tag_is_one_of %i(top start bottom end left right)
 
-        attribute :type, expects: :valid_width_type
-        attribute :width, expects: :positive_integer, displays_as: :w
+        with_namespace :w do
+          attribute :type, one_of: %i(auto dxa nil pct)
+          attribute :width, expects: :positive_integer, displays_as: :w
+        end
 
       end
     end

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

@@ -1,11 +1,13 @@
 module OpenXml
   module Docx
     module Properties
-      class TableCellSpacing < WidthProperty
+      class TableCellSpacing < ComplexProperty
         tag :tblCellSpacing
 
-        attribute :type, expects: :valid_width_type
-        attribute :width, expects: :positive_integer, displays_as: :w
+        with_namespace :w do
+          attribute :type, one_of: %i(auto dxa nil pct)
+          attribute :width, expects: :positive_integer, displays_as: :w
+        end
 
       end
     end

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

@@ -1,11 +1,13 @@
 module OpenXml
   module Docx
     module Properties
-      class TableCellWidth < WidthProperty
+      class TableCellWidth < ComplexProperty
         tag :tcW
 
-        attribute :type, expects: :valid_width_type
-        attribute :width, expects: :positive_integer, displays_as: :w
+        with_namespace :w do
+          attribute :type, one_of: %i(auto dxa nil pct)
+          attribute :width, expects: :positive_integer, displays_as: :w
+        end
 
       end
     end

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

@@ -1,11 +1,13 @@
 module OpenXml
   module Docx
     module Properties
-      class TableIndent < WidthProperty
+      class TableIndent < ComplexProperty
         tag :tblInd
 
-        attribute :type, expects: :valid_width_type
-        attribute :width, expects: :positive_integer, displays_as: :w
+        with_namespace :w do
+          attribute :type, one_of: %i(auto dxa nil pct)
+          attribute :width, expects: :positive_integer, displays_as: :w
+        end
 
       end
     end

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

@@ -1,12 +1,10 @@
 module OpenXml
   module Docx
     module Properties
-      class TableLayout < ValueProperty
+      class TableLayout < ComplexProperty
         tag :tblLayout
 
-        def ok_values
-          %i(autofit fixed)
-        end
+        attribute :type, one_of: %i(autofit fixed), namespace: :w
 
       end
     end

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

@@ -4,12 +4,14 @@ module OpenXml
       class TableLook < ComplexProperty
         tag :tblLook
 
-        attribute :firstColumn, expects: :true_or_false
-        attribute :firstRow, expects: :true_or_false
-        attribute :lastColumn, expects: :true_or_false
-        attribute :lastRow, expects: :true_or_false
-        attribute :noHBand, expects: :true_or_false
-        attribute :noVBand, expects: :true_or_false
+        with_namespace :w do
+          attribute :firstColumn, expects: :true_or_false
+          attribute :firstRow, expects: :true_or_false
+          attribute :lastColumn, expects: :true_or_false
+          attribute :lastRow, expects: :true_or_false
+          attribute :noHBand, expects: :true_or_false
+          attribute :noVBand, expects: :true_or_false
+        end
 
       end
     end

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

@@ -4,37 +4,18 @@ module OpenXml
       class TablePPr < ComplexProperty
         tag :tblpPr
 
-        attribute :bottomFromText, expects: :positive_integer
-        attribute :horizAnchor, expects: :valid_anchor
-        attribute :leftFromText, expects: :positive_integer
-        attribute :rightFromText, expects: :positive_integer
-        attribute :tblpX, expects: :integer
-        attribute :tblpXSpec, expects: :valid_x_spec
-        attribute :tblpY, expects: :integer
-        attribute :tblpYSpec, expects: :valid_y_spec
-        attribute :topFromText, expects: :positive_integer
-        attribute :vertAnchor, expects: :valid_anchor
-
-      private
-
-        def valid_anchor(value)
-          list = %i(margin page text)
-          message = "Invalid #{name}: must be one of #{list.join(", ")} (was #{value.inspect})"
-          raise ArgumentError, message unless list.include? value
-        end
-
-        def valid_x_spec(value)
-          list = %i(center inside left outside right)
-          message = "Invalid #{name}: must be one of #{list.join(", ")} (was #{value.inspect})"
-          raise ArgumentError, message unless list.include? value
+        with_namespace :w do
+          attribute :bottomFromText, expects: :positive_integer
+          attribute :horizAnchor, one_of: %i(margin page text)
+          attribute :leftFromText, expects: :positive_integer
+          attribute :rightFromText, expects: :positive_integer
+          attribute :tblpX, expects: :integer
+          attribute :tblpXSpec, one_of: %i(center inside left outside right)
+          attribute :tblpY, expects: :integer
+          attribute :tblpYSpec, one_of: %i(bottom center inline inside outside top)
+          attribute :topFromText, expects: :positive_integer
+          attribute :vertAnchor, one_of: %i(margin page text)
         end
-
-        def valid_y_spec(value)
-          list = %i(bottom center inline inside outside top)
-          message = "Invalid #{name}: must be one of #{list.join(", ")} (was #{value.inspect})"
-          raise ArgumentError, message unless list.include? value
-        end
-
       end
     end
   end

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

@@ -0,0 +1,13 @@
+module OpenXml
+  module Docx
+    module Properties
+      class TableRowHeight < ComplexProperty
+        tag :trHeight
+
+        attribute :hRule, one_of: %i(auto atLeast exact), namespace: :w
+        attribute :val, expects: :positive_integer, namespace: :w
+
+      end
+    end
+  end
+end

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

@@ -1,11 +1,13 @@
 module OpenXml
   module Docx
     module Properties
-      class TableWidth < WidthProperty
+      class TableWidth < ComplexProperty
         tag :tblW
 
-        attribute :type, expects: :valid_width_type
-        attribute :width, expects: :positive_integer, displays_as: :w
+        with_namespace :w do
+          attribute :type, one_of: %i(auto dxa nil pct)
+          attribute :width, expects: :positive_integer, displays_as: :w
+        end
 
       end
     end

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

@@ -4,20 +4,21 @@ module OpenXml
       class Underline < ComplexProperty
         tag :u
 
-        VALID_UNDERLINE_TYPES = %i(dash dashDotDotHeavy dashDotHeavy dashedHeavy dashLong dashLongHeavy dotDash dotDotDash dotted dottedHeavy double none single thick wave wavyDouble wavyHeavy words)
+        VALID_UNDERLINE_TYPES =
 
-        attribute :color, expects: :hex_color
-        attribute :theme_color, expects: :valid_theme_color
-        attribute :theme_shade, expects: :hex_digit
-        attribute :theme_tint, expects: :hex_digit
-        attribute :type, expects: :valid_underline_type, displays_as: :val
-
-      private
-
-        def valid_underline_type(value)
-          valid_in? value, VALID_UNDERLINE_TYPES
+        with_namespace :w do
+          attribute :color, expects: :hex_color
+          attribute :theme_color, expects: :valid_theme_color
+          attribute :theme_shade, expects: :hex_digit
+          attribute :theme_tint, expects: :hex_digit
+          attribute :type, displays_as: :val, one_of: %i(dash dashDotDotHeavy
+                                                        dashDotHeavy dashedHeavy
+                                                        dashLong dashLongHeavy
+                                                        dotDash dotDotDash
+                                                        dotted dottedHeavy double
+                                                        none single thick wave
+                                                        wavyDouble wavyHeavy words)
         end
-
       end
     end
   end

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

@@ -1,10 +1,12 @@
 module OpenXml
   module Docx
     module Properties
-      class WAfter < WidthProperty
+      class WAfter < ComplexProperty
 
-        attribute :type, expects: :valid_width_type
-        attribute :width, expects: :positive_integer, displays_as: :w
+        with_namespace :w do
+          attribute :type, one_of: %i(auto dxa nil pct)
+          attribute :width, expects: :positive_integer, displays_as: :w
+        end
 
       end
     end

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

@@ -1,10 +1,12 @@
 module OpenXml
   module Docx
     module Properties
-      class WBefore < WidthProperty
+      class WBefore < ComplexProperty
 
-        attribute :type, expects: :valid_width_type
-        attribute :width, expects: :positive_integer, displays_as: :w
+        with_namespace :w do
+          attribute :type, one_of: %i(auto dxa nil pct)
+          attribute :width, expects: :positive_integer, displays_as: :w
+        end
 
       end
     end

data/lib/openxml/docx/root_namespaces.rb

@@ -0,0 +1,74 @@
+module OpenXml
+  module Docx
+    module RootNamespaces
+
+      POSSIBLE_NAMESPACES = {
+        wpc: "http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas".freeze,
+        mo: "http://schemas.microsoft.com/office/mac/office/2008/main".freeze,
+        mv: "urn:schemas-microsoft-com:mac:vml".freeze,
+        o: "urn:schemas-microsoft-com:office:office".freeze,
+        r: "http://schemas.openxmlformats.org/officeDocument/2006/relationships".freeze,
+        m: "http://schemas.openxmlformats.org/officeDocument/2006/math".freeze,
+        v: "urn:schemas-microsoft-com:vml".freeze,
+        wp14: "http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing".freeze,
+        wp: "http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing".freeze,
+        w10: "urn:schemas-microsoft-com:office:word".freeze,
+        w14: "http://schemas.microsoft.com/office/word/2010/wordml".freeze,
+        w15: "http://schemas.microsoft.com/office/word/2012/wordml".freeze,
+        wpg: "http://schemas.microsoft.com/office/word/2010/wordprocessingGroup".freeze,
+        wpi: "http://schemas.microsoft.com/office/word/2010/wordprocessingInk".freeze,
+        wne: "http://schemas.microsoft.com/office/word/2006/wordml".freeze,
+        wps: "http://schemas.microsoft.com/office/word/2010/wordprocessingShape".freeze,
+        w: "http://schemas.openxmlformats.org/wordprocessingml/2006/main".freeze,
+        mc: "http://schemas.openxmlformats.org/markup-compatibility/2006".freeze,
+        a: "http://schemas.openxmlformats.org/drawingml/2006/main".freeze,
+        a14: "http://schemas.microsoft.com/office/drawing/2010/main".freeze,
+        pic: "http://purl.oclc.org/ooxml/drawingml/main".freeze
+      }
+
+      def self.included(base)
+        base.extend ClassMethods
+      end
+
+      module ClassMethods
+
+        def use_namespaces(*args)
+          args.each do |arg|
+            prefix = arg.to_sym
+            raise ArgumentError, "Reference to undefined namespace prefix: #{prefix}" if POSSIBLE_NAMESPACES[prefix].nil?
+            active_namespaces << prefix unless active_namespaces.include?(prefix)
+          end
+        end
+        alias :use_namespace :use_namespaces
+
+        def can_ignore(*args)
+          args.each { |arg| ignorable_namespaces[arg.to_sym] = true }
+        end
+
+        def ignorable_namespaces
+          @ignorable_namespaces ||= {}
+        end
+
+        def active_namespaces
+          @active_namespaces ||= []
+        end
+
+      end
+
+      private
+
+        def root_namespaces
+          namespace_defs = {}
+          unless self.class.ignorable_namespaces.empty?
+            namespace_defs["mc:Ignorable"] = self.class.ignorable_namespaces.keys.join(" ")
+            self.class.use_namespace :mc
+          end
+          self.class.active_namespaces.map do |prefix|
+            namespace_defs["xmlns:#{prefix}"] = POSSIBLE_NAMESPACES[prefix]
+          end
+          namespace_defs
+        end
+
+    end
+  end
+end

data/lib/openxml/docx/section.rb

@@ -7,6 +7,8 @@ module OpenXml
 
       property :columns
       property :document_grid
+      property :footer_reference
+      property :header_reference
       property :line_numbering
       property :page_borders
       property :page_margins

data/lib/openxml/docx/style.rb

@@ -6,10 +6,10 @@ module OpenXml
 
       attr_reader :paragraph, :character, :table, :type
 
-      attribute :custom, expects: :true_or_false, displays_as: :customStyle
-      attribute :default, expects: :true_or_false
-      attribute :id, expects: :string, displays_as: :styleId
-      attribute :type, expects: :valid_style_type
+      attribute :custom, expects: :true_or_false, displays_as: :customStyle, namespace: :w
+      attribute :default, expects: :true_or_false, namespace: :w
+      attribute :id, expects: :string, displays_as: :styleId, namespace: :w
+      attribute :type, expects: :valid_style_type, namespace: :w
 
       value_property :auto_redefine, as: :style_auto_redefinition
       value_property :hidden_style

data/lib/openxml/docx/version.rb

@@ -1,5 +1,5 @@
 module OpenXml
   module Docx
-    VERSION = "0.9.0"
+    VERSION = "0.10.0"
   end
 end

data/lib/openxml/drawingml.rb

@@ -0,0 +1,17 @@
+module OpenXml
+  module DrawingML
+  end
+end
+
+# For now, we'll rely on Docx's basic implementations
+require "openxml/docx/attribute_builder"
+require "openxml/docx/property_builder"
+require "openxml/docx/properties"
+require "openxml/docx/elements"
+require "openxml/docx/package"
+require "openxml/docx/parts"
+require "openxml/docx/section"
+require "openxml/docx/style"
+
+# And then add our own stuff
+require "openxml/drawingml/elements"