openxml-docx 0.10.1 → 0.10.2

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

@@ -6,7 +6,7 @@ module OpenXml
         namespace :wps
 
         attribute :description, expects: :string, displays_as: :descr
-        attribute :hidden, expects: :true_or_false
+        attribute :hidden, expects: :boolean
         attribute :id, expects: :positive_integer
         attribute :object_name, expects: :string, displays_as: :name
         attribute :title, expects: :string

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

@@ -4,8 +4,7 @@ module OpenXml
       class WordProcessingShapesShape < Container
         tag :wsp
         namespace :wps
-
-        attribute :normalEastAsianFlow, expects: :true_or_false
+        attribute :normal_east_asian_flow, expects: :boolean, displays_as: :normalEastAsianFlow
       end
     end
   end

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

@@ -5,17 +5,7 @@ module OpenXml
         tag :spPr
         namespace :wps
 
-        attribute :bwMode, expects: :valid_colors
-
-      private
-
-        def valid_colors(value)
-          raise ArgumentError unless ok_values.include? value
-        end
-
-        def ok_values
-          %i(auto black blackGray blackWhite clr gray grayWhite hidden invGray ltGray white)
-        end
+        attribute :bw_mode, displays_as: :bwMode, one_of: %i(auto black blackGray blackWhite clr gray grayWhite hidden invGray ltGray white)
 
       end
     end

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

@@ -0,0 +1,13 @@
+module OpenXml
+  module Docx
+    module Elements
+      class WordProcessingShapesTextualContent < Container
+        tag :txbx
+        namespace :wps
+
+        attribute :id, expects: :positive_integer
+
+      end
+    end
+  end
+end

data/lib/openxml/{drawingml → docx}/elements/wordprocessing_shape_group.rb

@@ -1,5 +1,5 @@
 module OpenXml
-  module DrawingML
+  module Docx
     module Elements
       class WordprocessingShapeGroup < OpenXml::Docx::Elements::Container
         tag :wgp

data/lib/openxml/docx/package.rb

@@ -1,4 +1,5 @@
 require "openxml/package"
+require "open-uri"
 
 module OpenXml
   module Docx
@@ -49,7 +50,7 @@ module OpenXml
       end
 
       def embed_truetype_font(path: nil, name: nil)
-        File.open(path, "rb") do |source_font|
+        open(path, "rb") do |source_font|
           obfuscation_data = obfuscate_font source_font
           data = obfuscation_data[:bytes] << source_font.read
           destination_font_name = "font#{fonts.fonts.count + 1}.odttf"
@@ -70,14 +71,14 @@ module OpenXml
         return if path.nil?
         into_part = document unless into_part.respond_to?(:relationships)
 
-        extension_match = path.match(/\.(?<extension>[^\.]+)$/)
+        extension_match = path.match(/\.(?<extension>[^\.]+?)(?:\?.+)?$/)
         content_type ||= extension_match[:extension] if extension_match
         return if content_type.nil?
 
         content_type = "jpeg" if content_type == "jpg"
         content_type = content_type.to_sym
 
-        File.open(path, "rb") do |source_image|
+        open(path, "rb") do |source_image|
           destination_image_name = "image#{image_names.count + 1}.#{content_type}"
           add_part "word/media/#{destination_image_name}", OpenXml::Parts::UnparsedPart.new(source_image.read)
           image_names << destination_image_name

data/lib/openxml/docx/parts/document.rb

@@ -31,10 +31,15 @@ module OpenXml
           end
         end
 
+        def background
+          @background ||= OpenXml::Docx::Elements::Background.new
+        end
+
         def to_xml
           build_xml do |xml|
             xml.document(root_namespaces) {
               xml.parent.namespace = :w
+              background.to_xml(xml) unless @background.nil?
               xml["w"].body {
                 children.each { |child| child.to_xml(xml) }
                 current_section.to_xml(xml) unless current_section.nil?

data/lib/openxml/docx/parts/header.rb

@@ -4,7 +4,7 @@ module OpenXml
       class Header < OpenXml::Part
         include RootNamespaces
 
-        use_namespaces :wpc, :mo, :mv, :o, :r, :m, :v, :wp14, :wp, :w10, :w14, :w15, :wpg, :wpi, :wne, :wps, :w, :mc, :a, :a14
+        use_namespaces :wpc, :mo, :mv, :o, :r, :m, :v, :wp14, :wp, :w10, :w14, :w15, :wpg, :wpi, :wne, :wps, :w, :mc, :a, :a14, :pic
         can_ignore :w14, :w15, :wp14, :a14
 
         attr_reader :children, :relationships

data/lib/openxml/docx/properties.rb

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

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

@@ -6,8 +6,8 @@ module OpenXml
 
         with_namespace :w do
           attribute :color, expects: :hex_color
-          attribute :frame, expects: :true_or_false
-          attribute :shadow, expects: :true_or_false
+          attribute :frame, expects: :boolean
+          attribute :shadow, expects: :boolean
           attribute :size, expects: :positive_integer, displays_as: :sz
           attribute :space, expects: :positive_integer
           attribute :theme_color, expects: :valid_theme_color

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

@@ -8,11 +8,17 @@ module OpenXml
         child_class :column
 
         with_namespace :w do
-          attribute :equal_width, expects: :true_or_false
+          attribute :equal_width, expects: :boolean
           attribute :number, expects: :integer, displays_as: :num
-          attribute :separator, expects: :true_or_false, displays_as: :sep
+          attribute :separator, expects: :boolean, displays_as: :sep
           attribute :space, expects: :integer
         end
+
+        def render?
+          return true if %i(equal_width number separator space).any? { |attribute| !public_send(attribute).nil? }
+          super
+        end
+
       end
     end
   end

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

@@ -5,18 +5,18 @@ module OpenXml
         tag :cnfStyle
 
         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
+          attribute :even_horizontal_band, expects: :boolean, displays_as: :evenHBand
+          attribute :even_vertical_band, expects: :boolean, displays_as: :evenVBand
+          attribute :first_column, expects: :boolean
+          attribute :first_row, expects: :boolean
+          attribute :first_row_first_column, expects: :boolean
+          attribute :first_row_last_column, expects: :boolean
+          attribute :last_column, expects: :boolean
+          attribute :last_row, expects: :boolean
+          attribute :last_row_first_column, expects: :boolean
+          attribute :last_row_last_column, expects: :boolean
+          attribute :odd_horizontal_band, expects: :boolean, displays_as: :oddHBand
+          attribute :odd_vertical_band, expects: :boolean, displays_as: :oddVBand
         end
 
       end

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

@@ -7,14 +7,14 @@ module OpenXml
 
         class << self
           def child_class(*args)
-            if args.any?
-              prop_name = args.first.to_s.split(/_/).map(&:capitalize).join # LazyCamelCase
-              child_class_obj = OpenXml::Docx::Properties.const_get prop_name
-              @child_class = OpenXml::Docx::Properties.const_get prop_name
-            end
+            @child_classes = args.map do |arg|
+              prop_name = arg.to_s.split(/_/).map(&:capitalize).join # LazyCamelCase
+              OpenXml::Docx::Properties.const_get prop_name
+            end unless args.empty?
 
-            @child_class
+            @child_classes
           end
+          alias :child_classes :child_class
         end
 
         def initialize
@@ -48,15 +48,15 @@ module OpenXml
 
         def invalid_child_message
           class_name = self.class.to_s.split(/::/).last
-          "#{class_name} must be instances of OpenXml::Docx::Properties::#{child_class}"
+          "#{class_name} must be instances of one of the following: #{child_classes}"
         end
 
         def valid_child?(child)
-          child.is_a?(child_class)
+          child_classes.any? {|child_class| child.is_a?(child_class) }
         end
 
-        def child_class
-          self.class.child_class
+        def child_classes
+          self.class.child_classes
         end
 
       end

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

@@ -0,0 +1,12 @@
+require "openxml/docx/properties/footer_reference"
+
+module OpenXml
+  module Docx
+    module Properties
+      class FooterReferences < TransparentContainerProperty
+        child_class :footer_reference
+
+      end
+    end
+  end
+end

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

@@ -5,7 +5,7 @@ module OpenXml
         tag :framePr
 
         with_namespace :w do
-          attribute :anchor_lock, expects: :true_or_false
+          attribute :anchor_lock, expects: :boolean
           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

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

@@ -0,0 +1,12 @@
+require "openxml/docx/properties/header_reference"
+
+module OpenXml
+  module Docx
+    module Properties
+      class HeaderReferences < TransparentContainerProperty
+        child_class :header_reference
+
+      end
+    end
+  end
+end

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

@@ -9,8 +9,12 @@ module OpenXml
           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, expects: :integer, displays_as: :firstLine
           attribute :first_line_characters, expects: :integer, displays_as: :firstLineChars
+          attribute :left, expects: :integer, deprecated: true
+          attribute :left_characters, expects: :integer, displays_as: :leftChars, deprecated: true
+          attribute :right, expects: :integer, deprecated: true
+          attribute :right_characters, expects: :integer, displays_as: :rightChars, deprecated: true
           attribute :start, expects: :integer
           attribute :start_characters, expects: :integer, displays_as: :startChars
         end

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

@@ -8,11 +8,11 @@ module OpenXml
 
         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_locked_state, expects: :boolean, displays_as: :defLockedState
+          attribute :default_qformat, expects: :boolean, displays_as: :defQFormat
+          attribute :default_semi_hidden, expects: :boolean, displays_as: :defSemiHidden
           attribute :default_ui_priority, expects: :integer, displays_as: :defUIPriority
-          attribute :default_unhide_when_used, expects: :true_or_false, displays_as: :defUnhideWhenUsed
+          attribute :default_unhide_when_used, expects: :boolean, displays_as: :defUnhideWhenUsed
         end
 
 

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

@@ -5,12 +5,12 @@ module OpenXml
         tag :lsdException
 
         with_namespace :w do
-          attribute :locked, expects: :true_or_false
+          attribute :locked, expects: :boolean
           attribute :style_name, expects: :string, displays_as: :name
-          attribute :qFormat, expects: :true_or_false
-          attribute :semi_hidden, expects: :true_or_false, displays_as: :semiHidden
+          attribute :qFormat, expects: :boolean
+          attribute :semi_hidden, expects: :boolean, displays_as: :semiHidden
           attribute :ui_priority, expects: :integer, displays_as: :uiPriority
-          attribute :unhide_when_used, expects: :true_or_false, displays_as: :unhideWhenUsed
+          attribute :unhide_when_used, expects: :boolean, displays_as: :unhideWhenUsed
         end
 
 

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

@@ -0,0 +1,15 @@
+require "openxml/docx/properties/columns"
+require "openxml/docx/properties/page_margins"
+require "openxml/docx/properties/page_size"
+require "openxml/docx/properties/header_reference"
+
+module OpenXml
+  module Docx
+    module Properties
+      class Section < ContainerProperty
+        tag :sectPr
+        child_classes :page_size, :page_margins, :columns, :header_reference
+      end
+    end
+  end
+end

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

@@ -6,8 +6,8 @@ module OpenXml
 
         with_namespace :w do
           attribute :color, expects: :hex_color
-          attribute :frame, expects: :true_or_false
-          attribute :shadow, expects: :true_or_false
+          attribute :frame, expects: :boolean
+          attribute :shadow, expects: :boolean
           attribute :space, expects: :positive_integer
           attribute :theme_color, expects: :valid_theme_color
           attribute :theme_shade, expects: :hex_digit

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

@@ -6,8 +6,8 @@ module OpenXml
 
         with_namespace :w do
           attribute :color, expects: :hex_color
-          attribute :frame, expects: :true_or_false
-          attribute :shadow, expects: :true_or_false
+          attribute :frame, expects: :boolean
+          attribute :shadow, expects: :boolean
           attribute :space, expects: :positive_integer
           attribute :theme_color, expects: :valid_theme_color
           attribute :theme_shade, expects: :hex_digit

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

@@ -5,12 +5,13 @@ module OpenXml
         tag :tblLook
 
         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
+          attribute :firstColumn, expects: :boolean
+          attribute :firstRow, expects: :boolean
+          attribute :lastColumn, expects: :boolean
+          attribute :lastRow, expects: :boolean
+          attribute :noHBand, expects: :boolean
+          attribute :noVBand, expects: :boolean
+          attribute :value, expects: :hex_digit_4, displays_as: :val, deprecated: true
         end
 
       end

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

@@ -4,7 +4,7 @@ module OpenXml
       class TextDirection < ValueProperty
 
         def ok_values
-          %i(lr lrV rl rlV tb tbV)
+          %i(lr lrV rl rlV tb tbV btLr)
         end
 
       end

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

@@ -0,0 +1,14 @@
+module OpenXml
+  module Docx
+    module Properties
+      class TransparentContainerProperty < ContainerProperty
+
+        def to_xml(xml)
+          return unless render?
+          each { |child| child.to_xml(xml) }
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+module OpenXml
+  module Docx
+    module Properties
+      class VerticalMerge < ValueProperty
+        tag :vMerge
+
+        def ok_values
+          %i(restart continue)
+        end
+
+      end
+    end
+  end
+end

data/lib/openxml/docx/section.rb

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

data/lib/openxml/docx/style.rb

@@ -6,8 +6,8 @@ module OpenXml
 
       attr_reader :paragraph, :character, :table, :type
 
-      attribute :custom, expects: :true_or_false, displays_as: :customStyle, namespace: :w
-      attribute :default, expects: :true_or_false, namespace: :w
+      attribute :custom, expects: :boolean, displays_as: :customStyle, namespace: :w
+      attribute :default, expects: :boolean, namespace: :w
       attribute :id, expects: :string, displays_as: :styleId, namespace: :w
       attribute :type, expects: :valid_style_type, namespace: :w
 
@@ -57,13 +57,17 @@ module OpenXml
         type == :character
       end
 
+      def table_style?
+        type == :table
+      end
+
       VALID_STYLE_TYPES = %i(character paragraph table)
 
     private
 
       def install_paragraph_properties
-        @character = nil
         @table = nil
+        @character = OpenXml::Docx::Elements::Run.new
         @paragraph = OpenXml::Docx::Elements::Paragraph.new
       end
 
@@ -80,9 +84,17 @@ module OpenXml
       end
 
       def property_xml(xml)
-        return paragraph.property_xml(xml) if paragraph_style?
-        return character.property_xml(xml) if character_style?
-        table.property_xml(xml)
+        style_property_xml(xml)
+
+        return table.property_xml(xml) if table_style?
+        character.property_xml(xml)
+        paragraph.property_xml(xml) if paragraph_style?
+      end
+
+      def style_property_xml(xml)
+        props = properties.keys.map(&method(:send)).compact
+        return if props.none?(&:render?)
+        props.each { |prop| prop.to_xml(xml) }
       end
 
       def valid_style_type(value)