ooxml_parser 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 152de470eb7ecac05ca2d886b7c7113edb6a2c388fe29491b5b0c4341e771237
-  data.tar.gz: cf0aa14cc429393d88a2e3a39961242ab740c96a878d149ec74cdaade6fd2587
+  metadata.gz: 87857f8a432b1217218ea6780f6a836aa1dc92508623b2f5475b7baac9c488ad
+  data.tar.gz: d4f19dd557b08a1f11141d38c13833eee7fa767c5a86e95bd743fe12aaef8982
 SHA512:
-  metadata.gz: 34869710a5435a3d26c6b70dd42b1290cd80a1b7dff16582f3d4abaaa765877b69c58a9af5543b86cdbad78c27dd3849daf14f09e8bf0c8e5c4c5bfd3fdb0b8f
-  data.tar.gz: 538f12d23be8b548ef8bbcfd476f93f4c0926cfbe9c71d7101a97ccf040e8c238dece97f7c04d49bef6dd524e296795c3f1ada9b368016bf6864f9262cfd1dcc
+  metadata.gz: f5708ce9c0fb1825dc929c876780a83d96b5b99d8b21df16506eb589a2d6807111e747064bcaa5f5a300fedb6ec8c502bd912ba846ac6d5cd62c35eee23d7870
+  data.tar.gz: 564d9a0a2fa4501fb177bf8aeb9e498f7763dd57c30dea0647c5789259877ed7f8fc7d9b2c873e2f3c6ff209f7f7d3ff082f3daf1fb09033c3ea2525b690569e

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

@@ -94,13 +94,9 @@ module OoxmlParser
     # @return [True, False] result of comparision
     def ==(other)
       if other.is_a?(Color)
-        if ((@red == other.red) && (@green == other.green) && (@blue == other.blue)) ||
-           (none? && other.white?) ||
-           (white? && other.none?)
-          true
-        else
-          false
-        end
+        ((@red == other.red) && (@green == other.green) && (@blue == other.blue)) ||
+          (none? && other.white?) ||
+          (white? && other.none?)
       else
         false
       end
@@ -125,7 +121,7 @@ module OoxmlParser
       red = color_to_check.red
       green = color_to_check.green
       blue = color_to_check.blue
-      (self.red - red).abs < delta && (self.green - green).abs < delta && (self.blue - blue).abs < delta ? true : false
+      (self.red - red).abs < delta && (self.green - green).abs < delta && (self.blue - blue).abs < delta
     end
 
     # Apply tint to color

data/lib/ooxml_parser/common_parser/common_data/paragraph/paragraph_properties.rb

@@ -30,6 +30,8 @@ module OoxmlParser
     attr_accessor :contextual_spacing
     # @return [Symbol] The alignment or justification to be applied to a paragraph
     attr_accessor :justification
+    # @return [Shade] Shade property
+    attr_accessor :shade
 
     def initialize(numbering = NumberingProperties.new, parent: nil)
       @numbering = numbering
@@ -86,6 +88,8 @@ module OoxmlParser
           @keep_next = true
         when 'sectPr'
           @section_properties = PageProperties.new(parent: self).parse(node_child, @parent, DocxParagraphRun.new)
+        when 'shd'
+          @shade = Shade.new(parent: self).parse(node_child)
         when 'spacing'
           @spacing = ParagraphSpacing.new(parent: self).parse(node_child)
         when 'jc'

data/lib/ooxml_parser/common_parser/common_data/paragraph/paragraph_run/run_properties/shade.rb

@@ -43,5 +43,18 @@ module OoxmlParser
       end
       self
     end
+
+    # Helper method to get background color
+    # @return [OoxmlParser::Color]
+    def to_background_color
+      return nil unless fill
+
+      background_color = fill
+      background_color.set_style(value) if value
+      background_color
+    end
+
+    extend Gem::Deprecate
+    deprecate :to_background_color, 'use shade direct methods', 2077, 1
   end
 end

data/lib/ooxml_parser/common_parser/common_data/paragraph/paragrpah_properties/spacing.rb

@@ -33,14 +33,10 @@ module OoxmlParser
       other.line_rule = :multiple if other.line_rule == :auto
       self.line_rule = line_rule.to_sym if line_rule.instance_of?(String)
 
-      if @before == other.before &&
-         @after == other.after &&
-         @line == other.line &&
-         @line_rule.to_s == other.line_rule.to_s
-        true
-      else
-        false
-      end
+      @before == other.before &&
+        @after == other.after &&
+        @line == other.line &&
+        @line_rule.to_s == other.line_rule.to_s
     end
 
     # @return [String] result of convert of object to string

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

@@ -18,7 +18,7 @@ module OoxmlParser
   # Class for data of DocxParagraph
   class DocxParagraph < OOXMLDocumentObject
     include DocxParagraphHelper
-    attr_accessor :number, :bookmark_start, :bookmark_end, :align, :spacing, :background_color, :ind, :numbering,
+    attr_accessor :number, :bookmark_start, :bookmark_end, :align, :spacing, :ind, :numbering,
                   :character_style_array, :page_break, :borders, :keep_lines,
                   :contextual_spacing, :sector_properties, :page_numbering, :section_break, :style, :keep_next,
                   :orphan_control
@@ -129,8 +129,8 @@ module OoxmlParser
         when 'bookmarkEnd'
           character_styles_array << BookmarkEnd.new(parent: self).parse(node_child)
         when 'pPr'
-          parse_paragraph_style(node_child, custom_character_style)
           @paragraph_properties = ParagraphProperties.new(parent: self).parse(node_child)
+          parse_paragraph_style(node_child, custom_character_style)
         when 'commentRangeStart'
           character_styles_array << CommentRangeStart.new(parent: self).parse(node_child)
         when 'commentRangeEnd'
@@ -206,10 +206,6 @@ module OoxmlParser
           @keep_next = true
         when 'contextualSpacing'
           @contextual_spacing = true
-        when 'shd'
-          background_color_string = node_child.attribute('fill').value
-          @background_color = Color.new(parent: self).parse_hex_string(background_color_string)
-          @background_color.set_style(node_child.attribute('val').value.to_sym) unless node_child.attribute('val').nil?
         when 'pStyle'
           parse_paragraph_style_xml(node_child.attribute('val').value, default_char_style)
         when 'ind'

data/lib/ooxml_parser/docx_parser/docx_data/document_structure/docx_paragraph/docx_paragraph_helper.rb

@@ -9,5 +9,12 @@ module OoxmlParser
 
       root_object.comments_extended.by_id(@paragraph_id)
     end
+
+    # Temp method to return background color
+    # Need to be compatible with older versions
+    # @return [OoxmlParser::Color]
+    def background_color
+      paragraph_properties.shade.to_background_color
+    end
   end
 end

data/lib/ooxml_parser/version.rb

@@ -4,6 +4,6 @@ module OoxmlParser
   # This module holds the RuboCop version information.
   module Version
     # [String] Version of Gem
-    STRING = '0.11.0'
+    STRING = '0.12.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ooxml_parser
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - ONLYOFFICE
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-10 00:00:00.000000000 Z
+date: 2021-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -572,7 +572,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.9
 signing_key: 
 specification_version: 4
 summary: OoxmlParser Gem