openxml-docx 0.10.0 → 0.10.1

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

@@ -8,7 +8,7 @@ module OpenXml
         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 :object_name, expects: :string, displays_as: :name
         attribute :title, expects: :string
 
       end

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

@@ -5,18 +5,8 @@ module OpenXml
         tag :positionH
         namespace :wp
 
-        attribute :relativeFrom, expects: :valid_relative_from
+        attribute :relative_from, one_of: %i(character column insideMargin leftMargin margin outsideMargin page rightMargin), displays_as: :relativeFrom
 
-      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

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

@@ -1,9 +1,26 @@
 module OpenXml
   module Docx
     module Elements
-      class WordProcessingDrawingPositionOffset < Container
+      class WordProcessingDrawingPositionOffset < Element
         tag :posOffset
         namespace :wp
+
+        def <<(text)
+          value << text if text.is_a? String
+        end
+
+        def value
+          @value ||= ""
+        end
+
+        def value=(new_value)
+          @value = new_value if new_value.is_a? String
+        end
+
+        def to_xml(xml)
+          xml[namespace.to_s].public_send(tag, value, xml_attributes)
+        end
+
       end
     end
   end

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

@@ -5,18 +5,8 @@ module OpenXml
         tag :positionV
         namespace :wp
 
-        attribute :relativeFrom, expects: :valid_relative_from
+        attribute :relative_from, one_of: %i(bottomMargin insideMargin line margin outsideMargin page paragraph topMargin), displays_as: :relativeFrom
 
-      private
-
-        def valid_relative_from(value)
-          raise ArgumentError unless ok_values.include? value
-        end
-
-        def ok_values
-          %i(bottomMargin insideMargin line margin outsideMargin page
-          paragraph topMargin)
-        end
       end
     end
   end

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

@@ -0,0 +1,26 @@
+module OpenXml
+  module Docx
+    module Elements
+      class WordProcessingDrawingWrapCoordinate < Element
+        namespace :wp
+
+        attr_reader :tag
+
+        attribute :x, expects: :integer
+        attribute :y, expects: :integer
+
+        def initialize(tag)
+          raise ArgumentError, "Tag must be one of #{ok_tags.join(", ")}" unless ok_tags.include? tag
+          @tag = tag
+        end
+
+      private
+
+        def ok_tags
+          %i(start lineTo)
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+module OpenXml
+  module Docx
+    module Elements
+      class WordProcessingDrawingWrapPolygon < Container
+        tag :wrapPolygon
+        namespace :wp
+
+        attribute :edited, expects: :true_or_false
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+module OpenXml
+  module Docx
+    module Elements
+      class WordProcessingDrawingWrapSquare < Element
+        tag :wrapSquare
+        namespace :wp
+
+        attribute :distance_from_bottom, expects: :positive_integer, displays_as: :distB
+        attribute :distance_from_left, expects: :positive_integer, displays_as: :distL
+        attribute :distance_from_right, expects: :positive_integer, displays_as: :distR
+        attribute :distance_from_top, expects: :positive_integer, displays_as: :distT
+        attribute :wrap_text, one_of: %i(bothSides largest left right), displays_as: :wrapText
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+module OpenXml
+  module Docx
+    module Elements
+      class WordProcessingDrawingWrapThrough < Container
+        tag :wrapThrough
+        namespace :wp
+
+        attribute :distance_from_left, expects: :positive_integer, displays_as: :distL
+        attribute :distance_from_right, expects: :positive_integer, displays_as: :distR
+        attribute :wrap_text, one_of: %i(bothSides largest left right), displays_as: :wrapText
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+module OpenXml
+  module Docx
+    module Elements
+      class WordProcessingDrawingWrapTight < Container
+        tag :wrapTight
+        namespace :wp
+
+        attribute :distance_from_left, expects: :positive_integer, displays_as: :distL
+        attribute :distance_from_right, expects: :positive_integer, displays_as: :distR
+        attribute :wrap_text, one_of: %i(bothSides largest left right), displays_as: :wrapText
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+module OpenXml
+  module Docx
+    module Elements
+      class WordProcessingDrawingWrapTopAndBottom < Element
+        tag :wrapTopAndBottom
+        namespace :wp
+
+        attribute :distance_from_bottom, expects: :positive_integer, displays_as: :distB
+        attribute :distance_from_top, expects: :positive_integer, displays_as: :distT
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+module OpenXml
+  module Docx
+    module Elements
+      class WordProcessingGroupsGroupShapeProperties < Container
+        tag :grpSpPr
+        namespace :wpg
+
+        attribute :bw_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/docx/elements/word_processing_groups_nv_shape_drawing_properties.rb

@@ -0,0 +1,11 @@
+module OpenXml
+  module Docx
+    module Elements
+      class WordProcessingGroupsNvShapeDrawingProperties < Container
+        tag :cNvGrpSpPr
+        namespace :wpg
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+module OpenXml
+  module Docx
+    module Elements
+      class WordProcessingShapesNvDrawingProperties < Container
+        tag :cNvPr
+        namespace :wps
+
+        attribute :description, expects: :string, displays_as: :descr
+        attribute :hidden, expects: :true_or_false
+        attribute :id, expects: :positive_integer
+        attribute :object_name, expects: :string, displays_as: :name
+        attribute :title, expects: :string
+
+      end
+    end
+  end
+end

data/lib/openxml/docx/package.rb

@@ -4,17 +4,21 @@ module OpenXml
   module Docx
     class Package < OpenXml::Package
       attr_reader :document,
-                  :doc_rels,
-                  :font_rels,
                   :settings,
                   :headers,
                   :footers,
                   :styles,
-                  :fonts
+                  :fonts,
+                  :image_names
 
       content_types do
         default "xml", TYPE_XML
         default "odttf", TYPE_OBSCURED_FONT
+        default "jpeg", TYPE_IMAGE[:jpeg]
+        default "png", TYPE_IMAGE[:png]
+        default "gif", TYPE_IMAGE[:gif]
+        default "bmp", TYPE_IMAGE[:bmp]
+        default "tiff", TYPE_IMAGE[:tiff]
         override "/word/styles.xml", TYPE_STYLES
         override "/word/settings.xml", TYPE_SETTINGS
         override "/word/fontTable.xml", TYPE_FONT_TABLE
@@ -24,21 +28,20 @@ module OpenXml
         super
 
         rels.add_relationship REL_DOCUMENT, "/word/document.xml"
-        @doc_rels = OpenXml::Parts::Rels.new
-        @font_rels = OpenXml::Parts::Rels.new
         @settings = OpenXml::Docx::Parts::Settings.new
         @styles = OpenXml::Docx::Parts::Styles.new
         @fonts = OpenXml::Docx::Parts::Fonts.new
         @document = OpenXml::Docx::Parts::Document.new
         @headers = []
         @footers = []
+        @image_names = []
 
-        doc_rels.add_relationship REL_STYLES, "styles.xml"
-        doc_rels.add_relationship REL_SETTINGS, "settings.xml"
-        doc_rels.add_relationship REL_FONT_TABLE, "fontTable.xml"
+        document.relationships.add_relationship REL_STYLES, "styles.xml"
+        document.relationships.add_relationship REL_SETTINGS, "settings.xml"
+        document.relationships.add_relationship REL_FONT_TABLE, "fontTable.xml"
 
-        add_part "word/_rels/document.xml.rels", doc_rels
-        add_part "word/_rels/fontTable.xml.rels", font_rels
+        add_part "word/_rels/document.xml.rels", document.relationships
+        add_part "word/_rels/fontTable.xml.rels", fonts.relationships
         add_part "word/document.xml", document
         add_part "word/settings.xml", settings
         add_part "word/styles.xml", styles
@@ -51,7 +54,7 @@ module OpenXml
           data = obfuscation_data[:bytes] << source_font.read
           destination_font_name = "font#{fonts.fonts.count + 1}.odttf"
           add_part "word/fonts/#{destination_font_name}", OpenXml::Parts::UnparsedPart.new(data)
-          font_relationship = font_rels.add_relationship REL_FONT, "fonts/#{destination_font_name}"
+          font_relationship = fonts.relationships.add_relationship REL_FONT, "fonts/#{destination_font_name}"
 
           font_description = OpenXml::Docx::Elements::Font.new
           font_description.font_name = name
@@ -63,12 +66,34 @@ module OpenXml
         end
       end
 
+      def embed_image(path: nil, content_type: nil, into_part: nil)
+        return if path.nil?
+        into_part = document unless into_part.respond_to?(:relationships)
+
+        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|
+          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
+
+          image_relationship = into_part.relationships.add_relationship REL_IMAGE, "media/#{destination_image_name}"
+          image_relationship.id
+        end
+      end
+
       def add_header(header)
         headers << header
         header_name = "header#{headers.count}.xml"
         Package.content_types { override "/word/#{header_name}", TYPE_HEADER }
         add_part "word/#{header_name}", header
-        relationship = doc_rels.add_relationship REL_HEADER, header_name
+        add_part "word/_rels/#{header_name}.rels", header.relationships
+        relationship = document.relationships.add_relationship REL_HEADER, header_name
         relationship.id
       end
 
@@ -77,7 +102,8 @@ module OpenXml
         footer_name = "footer#{footers.count}.xml"
         Package.content_types { override "/word/#{footer_name}", TYPE_FOOTER }
         add_part "word/#{footer_name}", footer
-        relationship = doc_rels.add_relationship REL_FOOTER, footer_name
+        add_part "word/_rels/#{footer_name}.rels", footer.relationships
+        relationship = document.relationships.add_relationship REL_FOOTER, footer_name
         relationship.id
       end
 

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

@@ -4,13 +4,14 @@ module OpenXml
       class Document < OpenXml::Part
         include RootNamespaces
 
-        attr_reader :children, :current_section
+        attr_reader :children, :current_section, :relationships
 
-        use_namespaces :wpc, :mo, :mv, :o, :r, :m, :v, :wp14, :wp, :w10, :w14, :wpg, :wpi, :wne, :wps, :w, :mc, :a14, :pic
+        use_namespaces :wpc, :mo, :mv, :o, :r, :m, :v, :wp14, :wp, :w10, :w14, :wpg, :wpi, :wne, :wps, :w, :mc, :a, :a14, :pic
         can_ignore :w14, :wp14, :a14
 
         def initialize
           @children = []
+          @relationships = OpenXml::Parts::Rels.new
         end
 
         def <<(child)

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

@@ -4,12 +4,13 @@ module OpenXml
       class Fonts < OpenXml::Part
         include RootNamespaces
 
-        attr_reader :fonts
+        attr_reader :fonts, :relationships
 
         use_namespaces :r, :w
 
         def initialize
           @fonts = []
+          @relationships = OpenXml::Parts::Rels.new
         end
 
         def <<(font)

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

@@ -7,10 +7,11 @@ module OpenXml
         use_namespaces :wpc, :mo, :mv, :o, :r, :m, :v, :wp14, :wp, :w10, :w14, :w15, :wpg, :wpi, :wne, :wps, :w, :mc, :a, :a14
         can_ignore :w14, :w15, :wp14, :a14
 
-        attr_reader :children
+        attr_reader :children, :relationships
 
         def initialize
           @children = []
+          @relationships = OpenXml::Parts::Rels.new
         end
 
         def <<(child)

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

@@ -7,10 +7,11 @@ module OpenXml
         use_namespaces :wpc, :mo, :mv, :o, :r, :m, :v, :wp14, :wp, :w10, :w14, :w15, :wpg, :wpi, :wne, :wps, :w, :mc, :a, :a14
         can_ignore :w14, :w15, :wp14, :a14
 
-        attr_reader :children
+        attr_reader :children, :relationships
 
         def initialize
           @children = []
+          @relationships = OpenXml::Parts::Rels.new
         end
 
         def <<(child)

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

@@ -12,10 +12,15 @@ module OpenXml
           @settings = []
         end
 
+        def <<(child)
+          settings << child
+        end
+
         def to_xml
           build_standalone_xml do |xml|
             xml.settings(root_namespaces) {
               xml.parent.namespace = :w
+              settings.each { |setting| setting.to_xml(xml) }
             }
           end
         end

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

@@ -1,3 +1,5 @@
+require "openxml/docx/properties/tab"
+
 module OpenXml
   module Docx
     module Properties

data/lib/openxml/docx/root_namespaces.rb

@@ -23,7 +23,7 @@ module OpenXml
         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
+        pic: "http://schemas.openxmlformats.org/drawingml/2006/picture".freeze
       }
 
       def self.included(base)

data/lib/openxml/docx/version.rb

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