ooxml_parser 0.37.1 → 0.39.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b5004cf92e74087877d05fe22c41a1223c0ebf11d1eec8a92017bfdc606162e
-  data.tar.gz: c8c04f20f9d6703886ceb633210161b1f679a8c33adebbb080cb74d8010aa7a1
+  metadata.gz: 064ea9325ec10b0d22eeaf5774ffc480746f739ab78d5580eda00f05499e7111
+  data.tar.gz: 71aace963676dec9978977537985b8e9d834cca7ad8e6f7a4a5b24736694d287
 SHA512:
-  metadata.gz: 56e73d70a6de513b810056b62427392d94c40c3df607f9d5af733eea84602ebd22e539f8caa5fc957353b91e45be2d8db0571ff0b30271e0bb3c8a28bb7bc780
-  data.tar.gz: 2fe921ac7252e7e53620482147262cfdaf22060bf771cffd2aacc371fe15a8e5e8a482ed6be04bd9687806adad4786d3ed7799be2f0889340ddd8fc9ec1af9aa
+  metadata.gz: e0205f6ce29895ba3597afab6184ce8959515c4997dce7ffcbca329c98c6fc394eec73a5b0f05e66e0c5b240b41eefa4dba7fdc4b06c2dd6f0218cb273792840
+  data.tar.gz: de025b3b50f9dd8cf5151861d6767f799bb993e7de46afe003c60957f79d1a03223488d0e78a13605a29adcde415511c1d780d137924cdf43c4f08c2e12b8a03

data/lib/ooxml_parser/common_parser/common_data/alternate_content/chart/chart_legend.rb

@@ -16,7 +16,7 @@ module OoxmlParser
     # If there is overlay - return :right_overlay
     # @return [Symbol] overlay and position type
     def position_with_overlay
-      return "#{@position}_overlay".to_sym if overlay
+      return :"#{@position}_overlay" if overlay
 
       @position
     end

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

@@ -4,9 +4,9 @@ module OoxmlParser
   # Class for working with coordinates
   class Coordinates
     # @return [Regexp] regexp for row name
-    ROW_REGEXP = /[a-z]/i.freeze
+    ROW_REGEXP = /[a-z]/i
     # @return [Regexp] regexp for column name
-    COLUMN_REGEXP = /\d/.freeze
+    COLUMN_REGEXP = /\d/
 
     attr_accessor :row, :column, :list
 
@@ -28,8 +28,9 @@ module OoxmlParser
         sheet_name = 'Sheet1'
 
         if arguments_string.include?('!')
-          sheet_name = arguments_string.match(/.*!/).to_s
-          arguments_string = arguments_string.sub(sheet_name, '')
+          split_by_exclamation = arguments_string.split('!', 2)
+          sheet_name = "#{split_by_exclamation[0]}!"
+          arguments_string = split_by_exclamation[1]
         end
 
         range = arguments_string.split(':')
@@ -71,12 +72,10 @@ module OoxmlParser
       # @param arguments_string [String] string
       # @return [Array] result
       def parse_coordinates_array(arguments_string)
-        result = []
         coord_array = arguments_string.split(',')
-        coord_array.each do |current_coord|
-          result << parser_coordinates_range(current_coord)
+        coord_array.map do |current_coord|
+          parser_coordinates_range(current_coord)
         end
-        result
       end
 
       # This method check is argument contains coordinate
@@ -113,8 +112,8 @@ module OoxmlParser
     # This method takes @column string
     # 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)))
+      @column.reverse.each_char.with_index.reduce(0) do |result, (char, idx)|
+        result + ((char.downcase.ord - 96) * (26**idx))
       end
     end
 
@@ -134,7 +133,7 @@ module OoxmlParser
 
     # @return [String] result of convert of object to string
     def to_s
-      "#{@column}#{@row} #{@list ? "list: #{@list}" : ''}"
+      "#{@column}#{@row} #{"list: #{@list}" if @list}"
     end
 
     def nil?

data/lib/ooxml_parser/common_parser/common_data/ooxml_document_object/ooxml_document_object_helper.rb

@@ -3,33 +3,7 @@
 module OoxmlParser
   # Module for helper methods for OOXMLDocumentObject
   module OoxmlDocumentObjectHelper
-    # Convert object to hash
-    # @return [Hash]
-    def to_hash
-      result_hash = {}
-      instance_variables.each do |current_attribute|
-        next if current_attribute == :@parent
-
-        attribute_value = instance_variable_get(current_attribute)
-        next unless attribute_value
-
-        if attribute_value.is_a?(Array)
-          attribute_value.each_with_index do |object_element, index|
-            result_hash["#{current_attribute}_#{index}".to_sym] = object_element.to_hash
-          end
-        else
-          result_hash[current_attribute.to_sym] = if attribute_value.respond_to?(:to_hash)
-                                                    attribute_value.to_hash
-                                                  else
-                                                    attribute_value.to_s
-                                                  end
-        end
-      end
-      result_hash
-    end
-
-    private
-
+    # @return [Hash] Hash to Convert value to human readable symbol
     VALUE_TO_SYMBOL_HASH = { l: :left,
                              ctr: :center,
                              r: :right,
@@ -98,6 +72,33 @@ module OoxmlParser
                              rnd: :round,
                              sq: :square }.freeze
 
+    # Convert object to hash
+    # @return [Hash]
+    def to_hash
+      result_hash = {}
+      instance_variables.each do |current_attribute|
+        next if current_attribute == :@parent
+
+        attribute_value = instance_variable_get(current_attribute)
+        next unless attribute_value
+
+        if attribute_value.is_a?(Array)
+          attribute_value.each_with_index do |object_element, index|
+            result_hash[:"#{current_attribute}_#{index}"] = object_element.to_hash
+          end
+        else
+          result_hash[current_attribute.to_sym] = if attribute_value.respond_to?(:to_hash)
+                                                    attribute_value.to_hash
+                                                  else
+                                                    attribute_value.to_s
+                                                  end
+        end
+      end
+      result_hash
+    end
+
+    private
+
     # Convert value to human readable symbol
     # @param [String] value to convert
     # @return [Symbol]

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

@@ -46,10 +46,11 @@ module OoxmlParser
       @i_level.value
     end
 
+    # @param [Integer] i_level to find, current one by default
     # @return [AbstractNumbering] level list of current numbering
-    def numbering_level_current
+    def numbering_level_current(i_level = ilvl)
       abstruct_numbering.level_list.each do |current_ilvl|
-        return current_ilvl if current_ilvl.ilvl == ilvl
+        return current_ilvl if current_ilvl.ilvl == i_level
       end
       nil
     end

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

@@ -19,11 +19,11 @@ module OoxmlParser
     # @return [Symbol] type of border in visual editor
     def border_visual_type
       result = []
-      result << :left if @left.val == :single
-      result << :right if @right.val == :single
-      result << :top if @top.val == :single
-      result << :bottom if @bottom.val == :single
-      result << :inner if @between.val == :single
+      result << :left if @left && @left.val == :single
+      result << :right if @right && @right.val == :single
+      result << :top if @top && @top.val == :single
+      result << :bottom if @bottom && @bottom.val == :single
+      result << :inner if @between && @between.val == :single
       return :none if result == []
       return :all if result == %i[left right top bottom inner]
       return :outer if result == %i[left right top bottom]

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

@@ -44,7 +44,7 @@ module OoxmlParser
     # @return [Hash] hash with sorted values
     # TODO: Totally redone parsing of spacing to remove this workaround
     def sorted_attributes(node)
-      node.attributes.sort.reverse.to_h
+      node.attributes.sort.reverse!.to_h
     end
   end
 end

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

@@ -20,9 +20,17 @@ module OoxmlParser
 
     TABLE_STYLES_NAMES_HASH.each do |key, value|
       define_method(key) do
+        found = nil
         @table_style_properties_list.each do |table_style|
-          return table_style if table_style.type == value
+          # Cannot just use return in block
+          # because of TruffleRuby bug (cause LocalJumpError)
+          # https://github.com/oracle/truffleruby/issues/2438
+          if table_style.type == value
+            found = table_style
+            break
+          end
         end
+        found
       end
     end
 

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

@@ -44,7 +44,8 @@ module OoxmlParser
       return true if value == '1'
       return true if value == 'true'
       return false if value == '0'
-      return false if value == 'false'
+
+      false if value == 'false'
     end
   end
 end

data/lib/ooxml_parser/docx_parser/document_structure/comments/comment.rb

@@ -3,8 +3,14 @@
 module OoxmlParser
   # Comment Data
   class Comment < OOXMLDocumentObject
+    # @return [String] name of the author
+    attr_reader :author
+    # @return [String] date of the comment, in string, not parsed
+    attr_reader :date_string
     # @return [Integer] id of comment
     attr_reader :id
+    # @return [String] initials of the author
+    attr_reader :initials
     # @return [Array<DocxParagraph>] array of paragraphs
     attr_reader :paragraphs
 
@@ -20,8 +26,14 @@ module OoxmlParser
     def parse(node)
       node.attributes.each do |key, value|
         case key
+        when 'author'
+          @author = value.value.to_s
+        when 'date'
+          @date_string = value.value.to_s
         when 'id'
           @id = value.value.to_i
+        when 'initials'
+          @initials = value.value.to_s
         end
       end
 

data/lib/ooxml_parser/docx_parser/document_structure/comments_extended/comment_extended.rb

@@ -5,6 +5,8 @@ module OoxmlParser
   class CommentExtended < OOXMLDocumentObject
     # @return [Integer] id of paragraph
     attr_accessor :paragraph_id
+    # @return [Integer] id of parent paragraph
+    attr_reader :parent_paragraph_id
     # @return [True, False] is done?
     attr_accessor :done
 
@@ -16,6 +18,8 @@ module OoxmlParser
         case key
         when 'paraId'
           @paragraph_id = value.value.to_i
+        when 'paraIdParent'
+          @parent_paragraph_id = value.value.to_i
         when 'done'
           @done = attribute_enabled?(value.value)
         end

data/lib/ooxml_parser/pptx_parser/presentation/slide/slide/timing/time_node_list/time_node/common_timing.rb

@@ -10,7 +10,7 @@ module OoxmlParser
       @children = []
       @start_conditions = []
       @end_conditions = []
-      super(parent: parent)
+      super
     end
 
     # Parse CommonTiming object

data/lib/ooxml_parser/pptx_parser/presentation/slide/slide_helper.rb

@@ -37,7 +37,7 @@ module OoxmlParser
       transform = transform_of_object(object)
       return :left if transform.offset.x.zero?
       return :center if OoxmlSize.new((slide_size.width.value / 2) - (transform.extents.x.value / 2)) == OoxmlSize.new(transform.offset.x.value)
-      return :right if OoxmlSize.new((slide_size.width.value - transform.extents.x.value)) == OoxmlSize.new(transform.offset.x.value)
+      return :right if OoxmlSize.new(slide_size.width.value - transform.extents.x.value) == OoxmlSize.new(transform.offset.x.value)
 
       :unknown
     end
@@ -62,7 +62,8 @@ module OoxmlParser
     def content_distribute(object, slide_size)
       return %i[horizontally vertically] if content_horizontal_align(object, slide_size) == :center && content_vertical_align(object, slide_size) == :middle
       return [:horizontally] if content_horizontal_align(object, slide_size) == :center
-      return [:vertically] if content_vertical_align(object, slide_size) == :middle
+
+      [:vertically] if content_vertical_align(object, slide_size) == :middle
     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.37.1'
+    STRING = '0.39.0'
   end
 end

data/lib/ooxml_parser/xlsx_parser/workbook/worksheet/table_part/extension_list/extension/user_protected_ranges.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module OoxmlParser
+  # Class for `UserProtectedRanges` data
+  class UserProtectedRanges < OOXMLDocumentObject
+    # @return [Array<ProtectedRange>] list of UserProtectedRange grodateup
+    attr_reader :user_protected_ranges
+
+    def initialize(parent: nil)
+      @user_protected_ranges = []
+      super
+    end
+
+    # @return [UserProtectedRange] accessor
+    def [](key)
+      user_protected_ranges[key]
+    end
+
+    # Parse UserProtectedRanges data
+    # @param [Nokogiri::XML:Element] node with UserProtectedRanges data
+    # @return [UserProtectedRange] value of UserProtectedRanges data
+    def parse(node)
+      node.xpath('*').each do |range_node|
+        case range_node.name
+        when 'userProtectedRange'
+          @user_protected_ranges << ProtectedRange.new(parent: self).parse(range_node)
+        end
+      end
+      self
+    end
+  end
+end

data/lib/ooxml_parser/xlsx_parser/workbook/worksheet/table_part/extension_list/extension.rb

@@ -5,6 +5,7 @@ require_relative 'extension/sparkline_groups'
 require_relative 'extension/x14_table'
 require_relative 'extension/conditional_formattings'
 require_relative 'extension/x14_data_field'
+require_relative 'extension/user_protected_ranges'
 module OoxmlParser
   # Class for `ext` data
   class Extension < OOXMLDocumentObject
@@ -18,6 +19,8 @@ module OoxmlParser
     attr_reader :sparkline_groups
     # @return [X14DataField] pivot data field in x14 namespace
     attr_accessor :data_field
+    # @return [UserProtectedRanges] list of user protected ranges
+    attr_reader :user_protected_ranges
 
     # Parse Extension data
     # @param [Nokogiri::XML:Element] node with Extension data
@@ -35,6 +38,8 @@ module OoxmlParser
           @sparkline_groups = SparklineGroups.new(parent: self).parse(column_node)
         when 'dataField'
           @data_field = X14DataField.new(parent: self).parse(column_node)
+        when 'userProtectedRanges'
+          @user_protected_ranges = UserProtectedRanges.new(parent: self).parse(column_node)
         end
       end
       self

data/lib/ooxml_parser.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require_relative 'truffleruby_patch'
 require_relative 'ooxml_parser/common_parser'
 require_relative 'ooxml_parser/configuration'
 require_relative 'ooxml_parser/helpers/string_helper'

data/lib/truffleruby_patch.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+# Monkey patch around
+# https://github.com/oracle/truffleruby/commit/cc76155bf509587e1b2954e9de77c558c7c857f4
+# Remove it as soon as TruffleRuby with fix is released
+if defined?(Truffle)
+  # MonkeyPatch File stdlib class
+  class File < IO
+    # Monkey patch constant missing on TruffleRuby
+    SHARE_DELETE = 0
+  end
+end

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ooxml_parser
 version: !ruby/object:Gem::Version
-  version: 0.37.1
+  version: 0.39.0
 platform: ruby
 authors:
 - ONLYOFFICE
 - Pavel Lobashov
 - Roman Zagudaev
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-06 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -453,6 +452,7 @@ files:
 - lib/ooxml_parser/xlsx_parser/workbook/worksheet/table_part/extension_list/extension/sparkline_groups/sparkline_group.rb
 - lib/ooxml_parser/xlsx_parser/workbook/worksheet/table_part/extension_list/extension/sparkline_groups/sparkline_group/sparklines.rb
 - lib/ooxml_parser/xlsx_parser/workbook/worksheet/table_part/extension_list/extension/sparkline_groups/sparkline_group/sparklines/sparkline.rb
+- lib/ooxml_parser/xlsx_parser/workbook/worksheet/table_part/extension_list/extension/user_protected_ranges.rb
 - lib/ooxml_parser/xlsx_parser/workbook/worksheet/table_part/extension_list/extension/x14_data_field.rb
 - lib/ooxml_parser/xlsx_parser/workbook/worksheet/table_part/extension_list/extension/x14_table.rb
 - lib/ooxml_parser/xlsx_parser/workbook/worksheet/table_part/table_columns.rb
@@ -469,6 +469,7 @@ files:
 - lib/ooxml_parser/xlsx_parser/workbook/worksheet/xlsx_row.rb
 - lib/ooxml_parser/xlsx_parser/workbook/worksheet/xlsx_row/xlsx_cell.rb
 - lib/ooxml_parser/xlsx_parser/workbook/worksheet/xlsx_row/xlsx_cell/formula.rb
+- lib/truffleruby_patch.rb
 homepage: https://github.com/onlyoffice/ooxml_parser
 licenses:
 - AGPL-3.0
@@ -479,7 +480,6 @@ metadata:
   homepage_uri: https://github.com/onlyoffice/ooxml_parser
   source_code_uri: https://github.com/onlyoffice/ooxml_parser
   rubygems_mfa_required: 'true'
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -487,15 +487,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.15
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: OoxmlParser Gem
 test_files: []