ooxml_parser 0.22.0 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f18fbe0fd1cdc17b4fa15edd44442ab0aab56a6620ba4539635b4e8c2d676b3c
-  data.tar.gz: de14faa95be23f0a4dc6fa9541adf184fed69bc769f837d30a2fd63321f7b765
+  metadata.gz: a21fe67d2c235a37ec324fcd56428e39ff519f9a4f36b7c8257770b135922eec
+  data.tar.gz: c6ce18f4dd16cfc0d484ad0391b8787dbe7ba226b4fd744b5c44d7d4ac2e9f6f
 SHA512:
-  metadata.gz: 65800c4573bb1859c02d5795c0e45b6bd50b07349aaeba24e3c1565e09022f0a25c3ddff43780cb7642b02c76343ad929e3304e4bb4a75d555158c47ff47537e
-  data.tar.gz: b67e977b6af0047b52d2dce951fc57335bb80758bfd0a5188a9afa30a343ac408bcd227d41d14e0481e2ff4c3ae10dda283160dcd72962994f193aa69d8f59f4
+  metadata.gz: d926a20fbd8fd1e855983994f0b7e707c3d5d603247fc3b3c4bcd8e680febb19b4cf3232bc68dd3f4c55852bb342d195a62f9af875ab6ad1a69a9f86668e38d8
+  data.tar.gz: 789f9064bbd3d17a21d6d01a9e39d8203a59f622cb2ce48e09de62dadec00e16e9ca9d38f5ebc56ff53920f7c00874077ce4d5358975844c25c14e494075c0d7

data/lib/ooxml_parser/common_parser/common_data/alternate_content/drawing/graphic/shape/docx_shape/shape_style/{effect_reference.rb → style_matrix_reference.rb}

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
 module OoxmlParser
-  # Class for parsing `a:effectRef` tags
-  class EffectReference < OOXMLDocumentObject
+  # Class for parsing `a:fillRef`, `a:effectRef`, `a:lnRef` tags
+  class StyleMatrixReference < OOXMLDocumentObject
     # @return [Integer] Style Matrix Index
     attr_reader :index
     # @return [Color] scheme color of EffectReference
     attr_reader :scheme_color
 
-    # Parse EffectReference object
+    # Parse StyleMatrixReference object
     # @param node [Nokogiri::XML:Element] node to parse
-    # @return [EffectReference] result of parsing
+    # @return [StyleMatrixReference] result of parsing
     def parse(node)
       node.attributes.each do |key, value|
         case key

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

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
-require_relative 'shape_style/effect_reference'
-require_relative 'shape_style/fill_reference'
+require_relative 'shape_style/style_matrix_reference'
 require_relative 'shape_style/font_reference'
-require_relative 'shape_style/line_reference'
 module OoxmlParser
   # Class for parsing `wps:style` tags
   class ShapeStyle < OOXMLDocumentObject
@@ -23,13 +21,13 @@ module OoxmlParser
       node.xpath('*').each do |node_child|
         case node_child.name
         when 'effectRef'
-          @effect_reference = EffectReference.new(parent: self).parse(node_child)
+          @effect_reference = StyleMatrixReference.new(parent: self).parse(node_child)
         when 'fillRef'
-          @fill_reference = FillReference.new(parent: self).parse(node_child)
+          @fill_reference = StyleMatrixReference.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)
+          @line_reference = StyleMatrixReference.new(parent: self).parse(node_child)
         end
       end
       self

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

@@ -12,23 +12,6 @@ module OoxmlParser
     end
 
     class << self
-      # @param [String] string to parse
-      # @return [Coordinates]
-      def parse_coordinates_from_string(string)
-        coordinates = Coordinates.new
-        begin
-          coordinates.list = string.match(/'\w+'/)[0].delete("''")
-        rescue StandardError
-          'Raise Exception'
-        end
-        string = string.split('!').last
-        if coordinates?(string)
-          coordinates.row = string.scan(/[0-9]/).join.to_i
-          coordinates.column = string.scan(/[A-Z]/).join
-        end
-        coordinates
-      end
-
       # Parse range of coordinates
       # @param arguments_string [String] data to parse
       # @return [Array] result
@@ -109,6 +92,18 @@ module OoxmlParser
       end
     end
 
+    # Parse string to coordinates
+    # @param [String] string to parse
+    # @return [Coordinates] result
+    def parse_string(string)
+      string = extract_list_from_string(string) if list_name_in_string?(string)
+      if Coordinates.coordinates?(string)
+        @row = string.scan(/\d/).join.to_i
+        @column = string.scan(/[A-Z]/).join
+      end
+      self
+    end
+
     # @return [Integer] number of column
     # This method takes @column string
     # and converts into integer
@@ -118,10 +113,6 @@ module OoxmlParser
       end
     end
 
-    alias get_column_number column_number
-    extend Gem::Deprecate
-    deprecate :get_column_number, 'column_number', 2020, 1
-
     # Compares rows of two cells
     # @param [Coordinates] other_cell other cell coordinates
     # @return [true, false] true, if row greater, than other row
@@ -151,5 +142,23 @@ module OoxmlParser
     def ==(other)
       other.is_a?(Coordinates) ? (@row == other.row && @column == other.column) : false
     end
+
+    private
+
+    # Check if there is list name in string
+    # @param [String] string to check
+    # @return [Boolean] result
+    def list_name_in_string?(string)
+      string.include?('!')
+    end
+
+    # Extract list name and leave coordinates
+    # @param [String] string to parse
+    # @return [String] coordinates string without list
+    def extract_list_from_string(string)
+      split = string.split('!')
+      @list = split[0...-1].join('!')
+      split[-1]
+    end
   end
 end

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

@@ -43,14 +43,14 @@ module OoxmlParser
       node.attributes.each do |key, value|
         case key
         when 'location'
-          @url = Coordinates.parse_coordinates_from_string(value.value)
+          @url = Coordinates.new.parse_string(value.value)
         when 'id'
           @id = value.value
           @url = OOXMLDocumentObject.get_link_from_rels(@id) unless @id.empty?
         when 'tooltip'
           @tooltip = value.value
         when 'ref'
-          @coordinates = Coordinates.parse_coordinates_from_string(value.value)
+          @coordinates = Coordinates.new.parse_string(value.value)
         when 'action'
           @action_link = value.value
         when 'highlightClick'

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'filemagic' unless Gem.win_platform?
 require 'securerandom'
 require 'nokogiri'
 require 'zip'
@@ -59,28 +58,6 @@ module OoxmlParser
       # @return [String] path to root folder
       attr_accessor :path_to_folder
 
-      # @param path_to_file [String] file
-      # @param ignore_system [True, False] should host system be ignored, since
-      #   this method is OS-dependent
-      # @return [True, False] Check if file is protected by password on open
-      def encrypted_file?(path_to_file, ignore_system: false)
-        if Gem.win_platform? || ignore_system
-          warn 'FileMagic and checking file for encryption is not supported on Windows'
-          return false
-        end
-        file_result = FileMagic.new(:mime).file(path_to_file)
-        # Support of Encrtypted status in `file` util was introduced in file v5.20
-        # but LTS version of ubuntu before 16.04 uses older `file` and it return `Composite Document`
-        # https://github.com/file/file/blob/master/ChangeLog#L217
-        if file_result.include?('encrypted') ||
-           file_result.include?('Composite Document File V2 Document, No summary info') ||
-           file_result.include?('application/CDFV2-corrupt')
-          warn("File #{path_to_file} is encrypted. Can't parse it")
-          return true
-        end
-        false
-      end
-
       # Copy this file and rename to zip
       # @param path [String] path to file
       # @return [String] path to result zip

data/lib/ooxml_parser/common_parser/parser/encryption_checker.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module OoxmlParser
+  # Check if file is encrypted
+  class EncryptionChecker
+    def initialize(file_path, ignore_system: false)
+      @file_path = file_path
+      @ignore_system = ignore_system
+    end
+
+    # @return [Boolean] is file encrypted
+    def encrypted?
+      return false unless compatible_system?
+
+      # Support of Encrypted status in `file` util was introduced in file v5.20
+      # but LTS version of ubuntu before 16.04 uses older `file` and it return `Composite Document`
+      # https://github.com/file/file/blob/0eb7c1b83341cc954620b45d2e2d65ee7df1a4e7/ChangeLog#L623
+      if mime_type.include?('encrypted') ||
+         mime_type.include?('Composite Document File V2 Document, No summary info') ||
+         mime_type.include?('application/CDFV2-corrupt')
+        warn("File #{@file_path} is encrypted. Can't parse it")
+        return true
+      end
+      false
+    end
+
+    private
+
+    # Check if system is compatible with `file` utility
+    # @return [Boolean] Result of check
+    def compatible_system?
+      return true if !Gem.win_platform? && !@ignore_system
+
+      warn 'Checking file for encryption is not supported on Windows'
+      false
+    end
+
+    # @return [String] mime type of file
+    def mime_type
+      @mime_type ||= `file -b --mime "#{@file_path}"`
+    end
+  end
+end

data/lib/ooxml_parser/common_parser/parser.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative 'parser/encryption_checker'
+
 module OoxmlParser
   # Basic class for OoxmlParser
   class Parser
@@ -7,7 +9,7 @@ module OoxmlParser
     # @param path_to_file [String] file
     # @return [CommonDocumentStructure] structure of doc
     def self.parse_format(path_to_file)
-      return nil if OOXMLDocumentObject.encrypted_file?(path_to_file)
+      return nil if EncryptionChecker.new(path_to_file).encrypted?
 
       path_to_zip_file = OOXMLDocumentObject.copy_file_and_rename_to_zip(path_to_file)
       OOXMLDocumentObject.path_to_folder = path_to_zip_file.sub(File.basename(path_to_zip_file), '')

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.22.0'
+    STRING = '0.23.0'
   end
 end

data/lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/worksheet/sheet_view/pane.rb

@@ -14,7 +14,7 @@ module OoxmlParser
         when 'state'
           @state = value.value.to_sym
         when 'topLeftCell'
-          @top_left_cell = Coordinates.parse_coordinates_from_string(value.value)
+          @top_left_cell = Coordinates.new.parse_string(value.value)
         when 'xSplit'
           @x_split = value.value
         when 'ySplit'

data/lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/worksheet/sheet_view/selection.rb

@@ -17,7 +17,7 @@ module OoxmlParser
       node.attributes.each do |key, value|
         case key
         when 'activeCell'
-          @active_cell = Coordinates.parse_coordinates_from_string(value.value)
+          @active_cell = Coordinates.new.parse_string(value.value)
         when 'activeCellId'
           @active_cell_id = value.value.to_i
         when 'sqref'

data/lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/worksheet/sheet_view.rb

@@ -36,7 +36,7 @@ module OoxmlParser
         when 'showRowColHeaders'
           @show_row_column_headers = attribute_enabled?(value)
         when 'topLeftCell'
-          @top_left_cell = Coordinates.parse_coordinates_from_string(value.value)
+          @top_left_cell = Coordinates.new.parse_string(value.value)
         when 'workbookViewId'
           @workbook_view_id = value.value.to_i
         when 'zoomScale'

data/lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/worksheet/xlsx_row.rb

@@ -34,7 +34,7 @@ module OoxmlParser
       node.xpath('*').each do |node_child|
         case node_child.name
         when 'c'
-          @cells[Coordinates.parse_coordinates_from_string(node_child.attribute('r').value.to_s).column_number.to_i - 1] = XlsxCell.new(parent: self).parse(node_child)
+          @cells[Coordinates.new.parse_string(node_child.attribute('r').value.to_s).column_number.to_i - 1] = XlsxCell.new(parent: self).parse(node_child)
         end
       end
       self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ooxml_parser
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.23.0
 platform: ruby
 authors:
 - ONLYOFFICE
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-10 00:00:00.000000000 Z
+date: 2022-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -40,20 +40,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
-- !ruby/object:Gem::Dependency
-  name: ruby-filemagic
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -264,10 +250,8 @@ files:
 - 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/shape_style/style_matrix_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
@@ -374,6 +358,7 @@ files:
 - lib/ooxml_parser/common_parser/common_data/valued_child.rb
 - lib/ooxml_parser/common_parser/common_document_structure.rb
 - lib/ooxml_parser/common_parser/parser.rb
+- lib/ooxml_parser/common_parser/parser/encryption_checker.rb
 - lib/ooxml_parser/configuration.rb
 - lib/ooxml_parser/docx_parser/docx_data/document_structure.rb
 - lib/ooxml_parser/docx_parser/docx_data/document_structure/comments.rb
@@ -609,14 +594,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.4
+rubygems_version: 3.3.12
 signing_key: 
 specification_version: 4
 summary: OoxmlParser Gem

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

@@ -1,31 +0,0 @@
-# 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
-
-    # 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/line_reference.rb

@@ -1,31 +0,0 @@
-# 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
-
-    # 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