ooxml_parser 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d95158b66da173b7cc2b1c80b4780c0893cb840ff47a20bee389285054e3f4e
-  data.tar.gz: ec88614112d6ec0c69e5269dd8d128ead722cd1d338ac0500f7868409e8a5160
+  metadata.gz: 93d49b878e6b9a06afef0feb2bc87343ce8ee65010b40cf97d4df4be73fc32d9
+  data.tar.gz: 90466124985a9d35ee740930b459f8d03a72bd4ed84534d8e90427c58cf3e881
 SHA512:
-  metadata.gz: ac0bae842196c698f38563be771715d3cb78de1081904528f4557fe6faf0c7b20199945f0b5da952da0eef238e5b38a80e06e3c65a64a76b44824d9a105a24b4
-  data.tar.gz: cec21fd072fc64cc6ec436b86a0f68a0a11fb42356ca6826f20e2e8ccaa3de291e2ba2e8f76bcda5243473a46217f1d3a6b04beedfa0e9b2ac00f11aa9a7983f
+  metadata.gz: fba03885d36dbea193b6cd4616062e9d7ed5c6cfee9ac35d1767a3715736ab96b63d6a2a0015227aad188bef73e7ad8196a347667d38173de1c1d4c0773235f1
+  data.tar.gz: 0db3346a2caf864675cc3bfa0a0bce44bbf6dcda1423941c2c2fd95cce8d90cb4721bb2127a0493fd206b43b61a94eb8780f586ab499137bbd252689709839f7

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

@@ -45,11 +45,11 @@ module OoxmlParser
         hls_color.h = if max == red && green >= blue
                         60.0 * (green - blue) / delta
                       elsif max == red && green < blue
-                        60.0 * (green - blue) / delta + 360.0
+                        (60.0 * (green - blue) / delta) + 360.0
                       elsif max == green
-                        60.0 * (blue - red) / delta + 120.0
+                        (60.0 * (blue - red) / delta) + 120.0
                       else
-                        60.0 * (red - green) / delta + 240.0
+                        (60.0 * (red - green) / delta) + 240.0
                       end
       end
 

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

@@ -48,7 +48,7 @@ module OoxmlParser
 
     # @return [String] result of convert of object to string
     def to_s
-      if @red == VALUE_FOR_NONE_COLOR && @green == VALUE_FOR_NONE_COLOR && @blue == VALUE_FOR_NONE_COLOR
+      if primary_colors_none?
         'none'
       else
         "RGB (#{@red}, #{@green}, #{@blue})"
@@ -69,8 +69,8 @@ module OoxmlParser
 
     # @return [True, False] is color default
     def none?
-      (@red == VALUE_FOR_NONE_COLOR) && (@green == VALUE_FOR_NONE_COLOR) && (@blue == VALUE_FOR_NONE_COLOR) ||
-        (style == :nil)
+      primary_colors_none? ||
+        style == :nil
     end
 
     # @return [True, False] is color not default
@@ -83,6 +83,14 @@ module OoxmlParser
       (@red == 255) && (@green == 255) && (@blue == 255)
     end
 
+    # Check if all three primary colors are none
+    # @return [Boolean]
+    def primary_colors_none?
+      @red == VALUE_FOR_NONE_COLOR &&
+        @green == VALUE_FOR_NONE_COLOR &&
+        @blue == VALUE_FOR_NONE_COLOR
+    end
+
     # Method to copy object
     # @return [Color] copied object
     def copy

data/lib/ooxml_parser/common_parser/common_data/colors/hsl_color.rb

@@ -22,9 +22,9 @@ module OoxmlParser
     # Chroma - The "colorfulness relative to the brightness of a similarly illuminated white".
     # @return [Color] result
     def to_rgb
-      chroma = (1 - (2 * @l - 1).abs) * @s
-      x = chroma * (1 - ((@h / 60.0) % 2.0 - 1).abs)
-      m = @l - chroma / 2.0
+      chroma = (1 - ((2 * @l) - 1).abs) * @s
+      x = chroma * (1 - (((@h / 60.0) % 2.0) - 1).abs)
+      m = @l - (chroma / 2.0)
 
       rgb = if @h.zero?
               Color.new(0, 0, 0)
@@ -52,7 +52,7 @@ module OoxmlParser
       if tint.nil?
         lum
       else
-        tint.negative? ? lum * (1.0 + tint) : lum * (1.0 - tint) + (255 - 255 * (1.0 - tint))
+        tint.negative? ? lum * (1.0 + tint) : (lum * (1.0 - tint)) + (255 - (255 * (1.0 - tint)))
       end
     end
 

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

@@ -114,7 +114,7 @@ module OoxmlParser
     # and converts into integer
     def column_number
       @column.reverse.each_char.reduce(0) do |result, char|
-        result + (char.downcase.ord - 96) * (26**@column.reverse.index(char))
+        result + ((char.downcase.ord - 96) * (26**@column.reverse.index(char)))
       end
     end
 

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

@@ -96,5 +96,17 @@ module OoxmlParser
         end
       end
     end
+
+    # Fetch data from `ParagraphSpacing`
+    # Which have values with parameters
+    # @param valued_spacing [ParagraphSpacing] spacing to get params
+    # @return [Spacing]
+    def fetch_from_valued_spacing(valued_spacing)
+      @before = valued_spacing.before.to_unit(:centimeter).value if valued_spacing.before
+      @after = valued_spacing.after.to_unit(:centimeter).value if valued_spacing.after
+      @line = valued_spacing.line.to_unit(:centimeter).value if valued_spacing.line
+      @line_rule = valued_spacing.line_rule if valued_spacing.line_rule
+      self
+    end
   end
 end

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

@@ -33,7 +33,7 @@ module OoxmlParser
         when 'effect'
           self.effect = node_child.attribute('val').value
         when 'position'
-          self.position = (node_child.attribute('val').value.to_f / (28.0 + 1.0 / 3.0) / 2.0).round(1)
+          self.position = (node_child.attribute('val').value.to_f / (28.0 + (1.0 / 3.0)) / 2.0).round(1)
         when 'em'
           self.em = node_child.attribute('val').value
         when 'spacing'

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

@@ -216,12 +216,8 @@ module OoxmlParser
           @align = node_child.attribute('val').value.to_sym unless node_child.attribute('val').nil?
           @align = :justify if node_child.attribute('val').value == 'both'
         when 'spacing'
-          @spacing.before = (node_child.attribute('before').value.to_f / 566.9).round(2) unless node_child.attribute('before').nil?
-          @spacing.after = (node_child.attribute('after').value.to_f / 566.9).round(2) unless node_child.attribute('after').nil?
-          @spacing.line_rule = node_child.attribute('lineRule').value.sub('atLeast', 'at_least').to_sym unless node_child.attribute('lineRule').nil?
-          unless node_child.attribute('line').nil?
-            @spacing.line = (@spacing.line_rule == :auto ? (node_child.attribute('line').value.to_f / 240.0).round(2) : (node_child.attribute('line').value.to_f / 566.9).round(2))
-          end
+          @valued_spacing = ParagraphSpacing.new(parent: self).parse(node_child)
+          @spacing = @spacing.fetch_from_valued_spacing(@valued_spacing)
         when 'sectPr'
           @sector_properties = PageProperties.new(parent: self).parse(node_child, self, default_char_style)
           @section_break = case @sector_properties.type

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

@@ -19,8 +19,8 @@ module OoxmlParser
 
     # @return [True, False] compare dimensions of size, ignoring orientation
     def same_dimensions?(other)
-      (@height == other.height) && (@width == other.width) ||
-        (@height == other.width) && (@width == other.height)
+      ((@height == other.height) && (@width == other.width)) ||
+        ((@height == other.width) && (@width == other.height))
     end
 
     # @return [String] get human format name

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.15.0'
+    STRING = '0.16.0'
   end
 end

data/lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/worksheet/table_part/extension_list/extension/conditional_formattings/conditional_formatting/conditional_formatting_rule.rb

@@ -19,15 +19,19 @@ module OoxmlParser
     attr_reader :stop_if_true
     # @return [Symbol] Relational operator in value rule
     attr_reader :operator
+    # @return [Symbol] Specifies whether top/bottom rule highlights bottom values
+    attr_reader :bottom
     # @return [Symbol] Specifies whether percent is used in top/bottom rule
     attr_reader :percent
     # @return [Integer] Number of items in top/bottom rule
     attr_reader :rank
     # @return [Integer] Number of standard deviations in above/below average rule
     attr_reader :standard_deviation
-    # @return [String] text value in text rule
+    # @return [String] Text value in text rule
     attr_reader :text
-    # @return [Array, Formula] Formulas to determine condition
+    # @return [Symbol] Time period in date rule
+    attr_reader :time_period
+    # @return [Array<Formula>] Formulas to determine condition
     attr_reader :formulas
     # @return [DifferentialFormattingRecord] Format
     attr_reader :rule_format
@@ -61,6 +65,8 @@ module OoxmlParser
           @stop_if_true = attribute_enabled?(value)
         when 'operator'
           @operator = value.value.to_sym
+        when 'bottom'
+          @bottom = attribute_enabled?(value)
         when 'percent'
           @percent = attribute_enabled?(value)
         when 'rank'
@@ -69,6 +75,8 @@ module OoxmlParser
           @standard_deviation = value.value.to_i
         when 'text'
           @text = value.text.to_s
+        when 'timePeriod'
+          @time_period = value.value.to_sym
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ooxml_parser
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - ONLYOFFICE
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-13 00:00:00.000000000 Z
+date: 2021-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri