ooxml_parser 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 707812f11e8f53f5f19473a465a41a4b91a5e01792eb6c32463199930e5efb10
-  data.tar.gz: b37d6875b9f5fded50a7ab16a81b50243d9f6533d23744fd27c865f148b7a3b3
+  metadata.gz: af046e45d945d773885e2c8c9c8becef406a7e0c50a1f71161e1252b73295441
+  data.tar.gz: 16e54721a7a8c6f066693343ad8950c88d136531b9f6a3a53d7d7154c199c699
 SHA512:
-  metadata.gz: dcc58ccf69813588db3a3d1a7d8606d8e433c7754c7854a72e98fd3e75e24aa52567ccd3a10b98668b20357eee584ae2182bcfea8aa4159ba1d13da2f0fb8eee
-  data.tar.gz: f4ce9b755786df2a9f9f1c6ba8d986660d875c8f5539486e7898be8512b2e69666c0908a3cfefa7ecd62e9285883ac6e897df6edc79fa42198dbb056d48f1e0c
+  metadata.gz: 216969571d18f07e04e10c7499628dc59d131a531a7cf1f8abdaf390bba04f04912b5f4f3bc268cd06b45d4853eb9fe3347a1ef136cfa56f2e8f6b88fccde7ab
+  data.tar.gz: a14b99b7e06bfd36c38fe2e52774e617cc60f94193314b5bad6200fe5d973cc854a8774aa7a43bdcd556bfec6a2f53c0dee59ff978442f49663bd8e3c43a5d2d

data/lib/ooxml_parser/common_parser/common_data/alternate_content/alternate_content/choice.rb

@@ -6,6 +6,7 @@ module OoxmlParser
   # graphic data
   class Choice < OOXMLDocumentObject
     attr_accessor :math_text
+
     # Parse Choice object
     # @param node [Nokogiri::XML:Element] node to parse
     # @return [Choice] result of parsing

data/lib/ooxml_parser/common_parser/common_data/alternate_content/alternate_content/choice/math_text.rb

@@ -5,6 +5,7 @@ module OoxmlParser
   # Class for storing math text
   class MathText < OOXMLDocumentObject
     attr_accessor :math_paragraph
+
     # Parse MathText object
     # @param node [Nokogiri::XML:Element] node to parse
     # @return [MathText] result of parsing

data/lib/ooxml_parser/common_parser/common_data/alternate_content/alternate_content/choice/math_text/math_paragraph.rb

@@ -4,6 +4,7 @@ module OoxmlParser
   # Class for storing math paragraph
   class MathParagraph < OOXMLDocumentObject
     attr_accessor :math
+
     # Parse MathParagraph object
     # @param node [Nokogiri::XML:Element] node to parse
     # @return [MathParagraph] result of parsing

data/lib/ooxml_parser/common_parser/common_data/alternate_content/drawing/graphic/shape/docx_shape.rb

@@ -2,6 +2,7 @@
 
 require_relative 'docx_shape/ooxml_text_box'
 require_relative 'docx_shape/non_visual_shape_properties'
+require_relative 'docx_shape/shape_style'
 require_relative 'docx_shape/text_body'
 require_relative 'shape_properties/docx_shape_properties'
 require_relative 'shape_body_properties/ooxml_shape_body_properties'
@@ -32,6 +33,8 @@ module OoxmlParser
           @non_visual_properties = NonVisualShapeProperties.new(parent: self).parse(node_child)
         when 'spPr'
           @properties = DocxShapeProperties.new(parent: self).parse(node_child)
+        when 'style'
+          @style = ShapeStyle.new(parent: self).parse(node_child)
         when 'txbx'
           @text_body = OOXMLTextBox.new(parent: self).parse(node_child)
         when 'txBody'

data/lib/ooxml_parser/common_parser/common_data/alternate_content/drawing/graphic/shape/docx_shape/shape_style.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require_relative 'shape_style/effect_reference'
+require_relative 'shape_style/fill_reference'
+require_relative 'shape_style/font_reference'
+require_relative 'shape_style/line_reference'
+module OoxmlParser
+  # Class for parsing `wps:style` tags
+  class ShapeStyle < OOXMLDocumentObject
+    # @return [FillReference] effect reference
+    attr_reader :effect_reference
+    # @return [FillReference] fill reference
+    attr_reader :fill_reference
+    # @return [FontReference] font reference
+    attr_reader :font_reference
+    # @return [LineReference] line reference
+    attr_reader :line_reference
+
+    def initialize(parent: nil)
+      @parent = parent
+    end
+
+    # Parse ShapeStyle object
+    # @param node [Nokogiri::XML:Element] node to parse
+    # @return [ShapeStyle] result of parsing
+    def parse(node)
+      node.xpath('*').each do |node_child|
+        case node_child.name
+        when 'effectRef'
+          @effect_reference = EffectReference.new(parent: self).parse(node_child)
+        when 'fillRef'
+          @fill_reference = FillReference.new(parent: self).parse(node_child)
+        when 'fontRef'
+          @font_reference = FontReference.new(parent: self).parse(node_child)
+        when 'lnRef'
+          @line_reference = LineReference.new(parent: self).parse(node_child)
+        end
+      end
+      self
+    end
+  end
+end

data/lib/ooxml_parser/common_parser/common_data/alternate_content/drawing/graphic/shape/docx_shape/shape_style/effect_reference.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module OoxmlParser
+  # Class for parsing `a:effectRef` tags
+  class EffectReference < OOXMLDocumentObject
+    # @return [Integer] Style Matrix Index
+    attr_reader :index
+    # @return [Color] scheme color of EffectReference
+    attr_reader :scheme_color
+
+    def initialize(parent: nil)
+      @parent = parent
+    end
+
+    # Parse EffectReference object
+    # @param node [Nokogiri::XML:Element] node to parse
+    # @return [EffectReference] result of parsing
+    def parse(node)
+      node.attributes.each do |key, value|
+        case key
+        when 'idx'
+          @index = value.value.to_f
+        end
+      end
+
+      node.xpath('*').each do |node_child|
+        case node_child.name
+        when 'schemeClr'
+          @scheme_color = Color.new(parent: self).parse_scheme_color(node_child)
+        end
+      end
+      self
+    end
+  end
+end

data/lib/ooxml_parser/common_parser/common_data/alternate_content/drawing/graphic/shape/docx_shape/shape_style/fill_reference.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module OoxmlParser
+  # Class for parsing `a:fillRef` tags
+  class FillReference < OOXMLDocumentObject
+    # @return [Integer] Style Matrix Index
+    attr_reader :index
+    # @return [Color] scheme color of FillReference
+    attr_reader :scheme_color
+
+    def initialize(parent: nil)
+      @parent = parent
+    end
+
+    # Parse FillReference object
+    # @param node [Nokogiri::XML:Element] node to parse
+    # @return [FillReference] result of parsing
+    def parse(node)
+      node.attributes.each do |key, value|
+        case key
+        when 'idx'
+          @index = value.value.to_f
+        end
+      end
+
+      node.xpath('*').each do |node_child|
+        case node_child.name
+        when 'schemeClr'
+          @scheme_color = Color.new(parent: self).parse_scheme_color(node_child)
+        end
+      end
+      self
+    end
+  end
+end

data/lib/ooxml_parser/common_parser/common_data/alternate_content/drawing/graphic/shape/docx_shape/shape_style/font_reference.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module OoxmlParser
+  # Class for parsing `a:fontRef` tags
+  class FontReference < OOXMLDocumentObject
+    # @return [String] Font Collection Index
+    attr_reader :index
+    # @return [Color] scheme color of FontReference
+    attr_reader :scheme_color
+
+    def initialize(parent: nil)
+      @parent = parent
+    end
+
+    # Parse FontReference object
+    # @param node [Nokogiri::XML:Element] node to parse
+    # @return [FontReference] result of parsing
+    def parse(node)
+      node.attributes.each do |key, value|
+        case key
+        when 'idx'
+          @index = value.value.to_s
+        end
+      end
+
+      node.xpath('*').each do |node_child|
+        case node_child.name
+        when 'schemeClr'
+          @scheme_color = Color.new(parent: self).parse_scheme_color(node_child)
+        end
+      end
+      self
+    end
+  end
+end

data/lib/ooxml_parser/common_parser/common_data/alternate_content/drawing/graphic/shape/docx_shape/shape_style/line_reference.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module OoxmlParser
+  # Class for parsing `a:lnRef` tags
+  class LineReference < OOXMLDocumentObject
+    # @return [Integer] Style Matrix Index
+    attr_reader :index
+    # @return [Color] scheme color of LineReference
+    attr_reader :scheme_color
+
+    def initialize(parent: nil)
+      @parent = parent
+    end
+
+    # Parse LineReference object
+    # @param node [Nokogiri::XML:Element] node to parse
+    # @return [LineReference] result of parsing
+    def parse(node)
+      node.attributes.each do |key, value|
+        case key
+        when 'idx'
+          @index = value.value.to_f
+        end
+      end
+
+      node.xpath('*').each do |node_child|
+        case node_child.name
+        when 'schemeClr'
+          @scheme_color = Color.new(parent: self).parse_scheme_color(node_child)
+        end
+      end
+      self
+    end
+  end
+end

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

@@ -93,12 +93,14 @@ module OoxmlParser
     attr_accessor :blue
     # @return [String] Value of Color Style
     attr_accessor :style
+
     alias set_style style=
     # @return [String] color scheme of color
     attr_accessor :scheme
 
     # @return [Integer] Value of alpha-channel
     attr_accessor :alpha_channel
+
     alias set_alpha_channel alpha_channel=
 
     attr_accessor :position
@@ -154,9 +156,7 @@ module OoxmlParser
 
     def ==(other)
       if other.is_a?(Color)
-        if nil?
-          false
-        elsif (@red == other.red) && (@green == other.green) && (@blue == other.blue)
+        if (@red == other.red) && (@green == other.green) && (@blue == other.blue)
           true
         elsif (none? && other.white?) || (white? && other.none?)
           true

data/lib/ooxml_parser/common_parser/common_data/table/properties/table_style_properties.rb

@@ -16,6 +16,7 @@ module OoxmlParser
     attr_reader :table_row_properties
     # @return [ParagraphProperties] properties of paragraph
     attr_accessor :paragraph_properties
+
     alias cell_properties table_cell_properties
 
     def initialize(type: nil, parent: nil)

data/lib/ooxml_parser/docx_parser/docx_data/document_structure/document_style.rb

@@ -35,6 +35,7 @@ module OoxmlParser
     # Used to determine if current style is visible in style list in editors
     # According to http://www.wordarticles.com/Articles/WordStyles/LatentStyles.php
     attr_accessor :q_format
+
     alias visible? q_format
 
     def initialize(parent: nil)

data/lib/ooxml_parser/docx_parser/docx_data/document_structure/page_properties/columns.rb

@@ -6,6 +6,7 @@ module OoxmlParser
   class Columns < OOXMLDocumentObject
     attr_accessor :count
     attr_accessor :equal_width
+
     alias equal_width? equal_width
     attr_accessor :column_array
     # @return [Boolean] Draw Line Between Columns

data/lib/ooxml_parser/version.rb

@@ -3,6 +3,6 @@
 module OoxmlParser
   # This module holds the RuboCop version information.
   module Version
-    STRING = '0.5.1'
+    STRING = '0.6.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ooxml_parser
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - ONLYOFFICE
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-24 00:00:00.000000000 Z
+date: 2020-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -129,6 +129,11 @@ files:
 - lib/ooxml_parser/common_parser/common_data/alternate_content/drawing/graphic/shape/docx_shape/non_visual_shape_properties/non_visual_properties.rb
 - lib/ooxml_parser/common_parser/common_data/alternate_content/drawing/graphic/shape/docx_shape/non_visual_shape_properties/non_visual_properties/shape_placeholder.rb
 - lib/ooxml_parser/common_parser/common_data/alternate_content/drawing/graphic/shape/docx_shape/ooxml_text_box.rb
+- lib/ooxml_parser/common_parser/common_data/alternate_content/drawing/graphic/shape/docx_shape/shape_style.rb
+- lib/ooxml_parser/common_parser/common_data/alternate_content/drawing/graphic/shape/docx_shape/shape_style/effect_reference.rb
+- lib/ooxml_parser/common_parser/common_data/alternate_content/drawing/graphic/shape/docx_shape/shape_style/fill_reference.rb
+- lib/ooxml_parser/common_parser/common_data/alternate_content/drawing/graphic/shape/docx_shape/shape_style/font_reference.rb
+- lib/ooxml_parser/common_parser/common_data/alternate_content/drawing/graphic/shape/docx_shape/shape_style/line_reference.rb
 - lib/ooxml_parser/common_parser/common_data/alternate_content/drawing/graphic/shape/docx_shape/text_body.rb
 - lib/ooxml_parser/common_parser/common_data/alternate_content/drawing/graphic/shape/shape_body_properties/ooxml_shape_body_properties.rb
 - lib/ooxml_parser/common_parser/common_data/alternate_content/drawing/graphic/shape/shape_body_properties/ooxml_shape_body_properties/preset_text_warp.rb
@@ -431,7 +436,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: OoxmlParser Gem