ooxml_parser 0.1.2 → 0.2.0

data/lib/ooxml_parser/common_parser/common_data/alternate_content/drawing/graphic/shape/shape_properties/line/line_end.rb

@@ -1,21 +1,22 @@
-require_relative 'line_end/line_size'
 module OoxmlParser
   class LineEnd < OOXMLDocumentObject
     attr_accessor :type, :length, :width
 
-    def self.parse(line_end_node)
-      line_end = LineEnd.new
-      line_end_node.attributes.each do |key, value|
+    # Parse LineEnd object
+    # @param node [Nokogiri::XML:Element] node to parse
+    # @return [LineEnd] result of parsing
+    def parse(node)
+      node.attributes.each do |key, value|
         case key
         when 'type'
-          line_end.type = value.value.to_sym
+          @type = value.value.to_sym
         when 'w'
-          line_end.width = LineSize.parse(value.value)
+          @width = value_to_symbol(value)
         when 'len'
-          line_end.length = LineSize.parse(value.value)
+          @length = value_to_symbol(value)
         end
       end
-      line_end
+      self
     end
   end
 end

data/lib/ooxml_parser/common_parser/common_data/alternate_content/picture/group/old_docx_group.rb

@@ -2,30 +2,32 @@ require_relative 'old_docx_group_properties'
 require_relative 'old_docx_group_element'
 # Fallback DOCX group data
 module OoxmlParser
-  class OldDocxGroup
+  class OldDocxGroup < OOXMLDocumentObject
     attr_accessor :elements, :properties
 
-    def initialize(properties = OldDocxGroupProperties.new, elements = [])
+    def initialize(properties = OldDocxGroupProperties.new, parent: nil)
       @properties = properties
-      @elements = elements
+      @elements = []
+      @parent = parent
     end
 
-    def self.parse(group_node)
-      group = OldDocxGroup.new
-      group_node.xpath('*').each do |group_node_child|
-        case group_node_child.name
+    # Parse OldDocxGroup object
+    # @param node [Nokogiri::XML:Element] node to parse
+    # @return [OldDocxGroup] result of parsing
+    def parse(node)
+      node.xpath('*').each do |node_child|
+        case node_child.name
         when 'shape'
           element = OldDocxGroupElement.new(:shape)
-          element.object = OldDocxShape.parse(group_node_child)
-          group.elements << element
+          element.object = OldDocxShape.new(parent: self).parse(node_child)
+          @elements << element
         when 'wrap'
-          group.properties.wrap = group_node_child.attribute('type').value.to_sym unless group_node_child.attribute('type').nil?
+          @properties.wrap = node_child.attribute('type').value.to_sym unless node_child.attribute('type').nil?
         when 'group'
-          element = parse(group_node_child)
-          group.elements << element
+          @elements << OldDocxGroup.new(parent: self).parse(node_child)
         end
       end
-      group
+      self
     end
   end
 end

data/lib/ooxml_parser/common_parser/common_data/alternate_content/picture/old_docx_picture.rb

@@ -1,26 +1,28 @@
 require_relative 'shape/old_docx_shape'
 require_relative 'shape/old_docx_shape_fill'
 require_relative 'group/old_docx_group'
-# Fallback DOCX Picture
 module OoxmlParser
-  class OldDocxPicture
+  # Fallback DOCX Picture
+  class OldDocxPicture < OOXMLDocumentObject
     attr_accessor :data, :type, :style_number
 
-    def self.parse(picture_node)
-      picture = OldDocxPicture.new
-      picture_node.xpath('*').each do |picture_node_child|
-        case picture_node_child.name
+    # Parse OldDocxPicture object
+    # @param node [Nokogiri::XML:Element] node to parse
+    # @return [OldDocxPicture] result of parsing
+    def parse(node)
+      node.xpath('*').each do |node_child|
+        case node_child.name
         when 'shape'
-          picture.type = :shape
-          picture.data = OldDocxShape.parse(picture_node_child)
+          @type = :shape
+          @data = OldDocxShape.new(parent: self).parse(node_child)
         when 'group'
-          picture.type = :group
-          picture.data = OldDocxGroup.parse(picture_node_child)
+          @type = :group
+          @data = OldDocxGroup.new(parent: self).parse(node_child)
         when 'style'
-          picture.style_number = picture_node_child.attribute('val').value.to_i
+          @style_number = node_child.attribute('val').value.to_i
         end
       end
-      picture
+      self
     end
   end
 end

data/lib/ooxml_parser/common_parser/common_data/alternate_content/picture/shape/old_docx_shape.rb

@@ -1,24 +1,27 @@
 require_relative 'old_docx_shape_properties'
-# Fallback DOCX shape data
 module OoxmlParser
+  # Fallback DOCX shape data
   class OldDocxShape < OOXMLDocumentObject
-    attr_accessor :properties, :text_box, :image, :fill
+    attr_accessor :properties, :text_box, :fill
+    # @return [FileReference] image structure
+    attr_accessor :file_reference
 
-    def self.parse(shape_node)
-      shape = OldDocxShape.new
-      shape.properties = OldDocxShapeProperties.parse(shape_node)
-      shape_node.xpath('*').each do |shape_node_child|
-        case shape_node_child.name
+    # Parse OldDocxShape object
+    # @param node [Nokogiri::XML:Element] node to parse
+    # @return [OldDocxShape] result of parsing
+    def parse(node)
+      @properties = OldDocxShapeProperties.new(parent: self).parse(node)
+      node.xpath('*').each do |node_child|
+        case node_child.name
         when 'textbox'
-          shape.text_box = TextBox.parse_list(shape_node_child)
+          @text_box = TextBox.parse_list(node_child, parent: self)
         when 'imagedata'
-          path_to_image = OOXMLDocumentObject.copy_media_file("#{OOXMLDocumentObject.root_subfolder}/#{get_link_from_rels(shape_node_child.attribute('id').value)}")
-          shape.image = path_to_image
+          @file_reference = FileReference.new(parent: self).parse(node_child)
         when 'fill'
-          shape.fill = OldDocxShapeFill.parse(shape_node_child)
+          @fill = OldDocxShapeFill.new(parent: self).parse(node_child)
         end
       end
-      shape
+      self
     end
   end
 end

data/lib/ooxml_parser/common_parser/common_data/alternate_content/picture/shape/old_docx_shape_fill.rb

@@ -1,26 +1,30 @@
-# Fallback DOCX shape fill properties
 module OoxmlParser
+  # Fallback DOCX shape fill properties
   class OldDocxShapeFill < OOXMLDocumentObject
-    attr_accessor :path_to_image, :stretching_type, :opacity, :title
+    attr_accessor :stretching_type, :opacity, :title
+    # @return [FileReference] image structure
+    attr_accessor :file_reference
 
-    def self.parse(fill_node)
-      fill = OldDocxShapeFill.new
-      fill_node.attributes.each do |key, value|
+    # Parse OldDocxShapeFill object
+    # @param node [Nokogiri::XML:Element] node to parse
+    # @return [OldDocxShapeFill] result of parsing
+    def parse(node)
+      node.attributes.each do |key, value|
         case key
         when 'id'
-          fill.path_to_image = OOXMLDocumentObject.copy_media_file(OOXMLDocumentObject.root_subfolder + get_link_from_rels(value.value))
+          @file_reference = FileReference.new(parent: self).parse(node)
         when 'type'
-          fill.stretching_type = case value.value
-                                 when 'frame'
-                                   :stretch
-                                 else
-                                   value.value.to_sym
-                                 end
+          @stretching_type = case value.value
+                             when 'frame'
+                               :stretch
+                             else
+                               value.value.to_sym
+                             end
         when 'title'
-          fill.title = value.value.to_s
+          @title = value.value.to_s
         end
       end
-      fill
+      self
     end
   end
 end

data/lib/ooxml_parser/common_parser/common_data/alternate_content/picture/shape/old_docx_shape_properties.rb

@@ -1,24 +1,25 @@
-# Fallback DOCX Shape Properties
 module OoxmlParser
-  class OldDocxShapeProperties
+  # Fallback DOCX Shape Properties
+  class OldDocxShapeProperties < OOXMLDocumentObject
     attr_accessor :fill_color, :opacity, :stroke_color, :stroke_weight
 
-    def self.parse(shape_node)
-      properties = OldDocxShapeProperties.new
-      shape_node.attributes.each do |key, value|
+    # Parse OldDocxShapeProperties object
+    # @param node [Nokogiri::XML:Element] node to parse
+    # @return [OldDocxShapeProperties] result of parsing
+    def parse(node)
+      node.attributes.each do |key, value|
         case key
         when 'fillcolor'
-          properties.fill_color = Color.from_int16(value.value.delete('#'))
+          @fill_color = Color.new(parent: self).parse_hex_string(value.value.delete('#'))
         when 'opacity'
-          properties.opacity = value.value.to_f
+          @opacity = value.value.to_f
         when 'strokecolor'
-          properties.stroke_color = Color.from_int16(value.value.delete('#'))
+          @stroke_color = Color.new(parent: self).parse_hex_string(value.value.delete('#'))
         when 'strokeweight'
-          properties.stroke_weight = value.value.to_f
-        when ''
+          @stroke_weight = value.value.to_f
         end
       end
-      properties
+      self
     end
   end
 end

data/lib/ooxml_parser/common_parser/common_data/borders_properties.rb

@@ -1,26 +1,20 @@
 # Border Properties Data
 module OoxmlParser
-  class BordersProperties
+  class BordersProperties < OOXMLDocumentObject
     attr_accessor :color, :space, :sz, :val, :space, :shadow, :frame, :side
 
-    def initialize(color = :auto, sz = 0, val = :none, space = 0)
+    def initialize(color = :auto, sz = 0, val = :none, space = 0, parent: nil)
       @color = color
       @sz = sz
       @val = val
       @space = space
+      @parent = parent
     end
 
-    def ==(other)
-      instance_variables.each do |current_attributes|
-        unless instance_variable_get(current_attributes) == other.instance_variable_get(current_attributes)
-          return false
-        end
-      end
-      true
-    end
+    alias size sz
 
     def nil?
-      @sz == 0 && val == :none
+      @sz.zero? && val == :none
     end
 
     def to_s
@@ -40,22 +34,24 @@ module OoxmlParser
     # Parse BordersProperties
     # @param [Nokogiri::XML:Element] node with BordersProperties
     # @return [BordersProperties] value of BordersProperties
-    def self.parse(node)
+    def parse(node)
       return nil if node.attribute('val').value == 'nil'
-      border_properties = BordersProperties.new
-      border_properties.val = node.attribute('val').value.to_sym
-      border_properties.sz = node.attribute('sz').value.to_f / 8.0 if node.attribute('sz')
-      border_properties.space = (node.attribute('space').value.to_f / 28.34).round(3) unless node.attribute('space').nil?
-      if node.attribute('color')
-        border_properties.color = node.attribute('color').value
-        unless node.attribute('shadow').nil?
-          border_properties.shadow = node.attribute('shadow').value
-        end
-        if border_properties.color != 'auto'
-          border_properties.color = Color.from_int16(border_properties.color)
+      node.attributes.each do |key, value|
+        case key
+        when 'val'
+          @val = value.value.to_sym
+        when 'sz'
+          @sz = OoxmlSize.new(value.value.to_f, :one_eighth_point)
+        when 'space'
+          @space = OoxmlSize.new(value.value.to_f, :point)
+        when 'color'
+          @color = value.value.to_s
+          @color = Color.new(parent: self).parse_hex_string(@color) if @color != 'auto'
+        when 'shadow'
+          @shadow = value.value
         end
       end
-      border_properties
+      self
     end
   end
 end

data/lib/ooxml_parser/common_parser/common_data/color/color_helper.rb

@@ -0,0 +1,25 @@
+# Helper methods for color
+module ColorHelper
+  # Parse string in hex
+  # @param [String] hex_string with or without alpha-channel
+  def parse_hex_string(hex_string)
+    return self if hex_string == 'auto' || hex_string == 'null'
+
+    char_array = hex_string.split(//)
+    if char_array.length == 3
+      @red = char_array[0].hex
+      @green = char_array[1].hex
+      @blue = char_array[2].hex
+    elsif char_array.length == 6
+      @red = (char_array[0] + char_array[1]).hex
+      @green = (char_array[2] + char_array[3]).hex
+      @blue = (char_array[4] + char_array[5]).hex
+    elsif char_array.length == 8
+      @alpha_channel = (char_array[0] + char_array[1]).hex
+      @red = (char_array[2] + char_array[3]).hex
+      @green = (char_array[4] + char_array[5]).hex
+      @blue = (char_array[6] + char_array[7]).hex
+    end
+    self
+  end
+end