ooxml_parser 0.18.0 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6796507c27e69629193c826ff39f2197557636fdf20775bbbccb04e8ed8ac4c3
-  data.tar.gz: a74a3ac6e3a50c57d0937fc50648f27e1dec5598c19b3550121c821cb0a603c5
+  metadata.gz: 6d49ee5c48167b1fec3d73c1f146b1f5039ad13591d91cd01076c2026a4da9d5
+  data.tar.gz: c903db5d14db5c9603c1a42b8c3a96666ea421ceb6264c3de142a23e6b4f4871
 SHA512:
-  metadata.gz: 7e3eb429ee586f7ad1559d43437baf090bd0e22268dc4ed069b99a1701e4310d7b5aaed5ace29cfd3a94f021acd5dbaee13ff31034a750a6f2c415fc8df2fe4a
-  data.tar.gz: 151a0bec140acf446d1ad5b7539fab41cab45bade87b9fa5dd0770808ee896db456174799a366cd49698af71682ffb0091cc7be85811b28b7f211e60757748c7
+  metadata.gz: 7e1a32945ce66a7b668a734526a5cdb3f936a4ef78f0e88dfb3955e10505a21e7fae326cc3f515977bbee0b04e7cdd0d584963243b2c756de41f25c9be93514f
+  data.tar.gz: 1f01fbad38dd7c8ad7271d01fdc93ebb693f71ec0af1483bec680f3afbee8a6f32ded803cd01e889aba7c767de6bab3b6ce732a07ed5d771dff9faf95c023ffd

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

@@ -76,14 +76,29 @@ module OoxmlParser
         @action = :last_slide
       when 'ppaction://hlinksldjump'
         @action = :slide
-        @url = OOXMLDocumentObject.get_link_from_rels(@id).scan(/\d+/).join.to_i
+        parse_url_for_slide_link
       else
-        if @id && !@id.empty?
+        if meaningful_id?
           @action = :external_link
           @url = OOXMLDocumentObject.get_link_from_rels(@id)
         end
       end
       self
     end
+
+    private
+
+    # Check if id parameter has any information in it
+    # @return [Boolean] Can id be used
+    def meaningful_id?
+      @id && !@id.empty?
+    end
+
+    # Parse url for slide link
+    def parse_url_for_slide_link
+      return unless meaningful_id?
+
+      @url = OOXMLDocumentObject.get_link_from_rels(@id).scan(/\d+/).join.to_i
+    end
   end
 end

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

@@ -16,7 +16,7 @@ module OoxmlParser
     # @param [Nokogiri::XML:Node] node with ParagraphSpacing
     # @return [ParagraphSpacing] result of parsing
     def parse(node)
-      node.attributes.each do |key, value|
+      sorted_attributes(node).each do |key, value|
         case key
         when 'before'
           @before = OoxmlSize.new(value.value.to_f)
@@ -34,5 +34,17 @@ module OoxmlParser
       end
       self
     end
+
+    private
+
+    # This is dirty workaround for situations
+    # Then @line_rule parsed after @line so getting
+    # @line value is totally screwed up
+    # @param [Nokogiri::XML:Node] node with ParagraphSpacing
+    # @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
+    end
   end
 end

data/lib/ooxml_parser/pptx_parser/pptx_data/presentation/slide/transition/transition/sound_action/sound.rb

@@ -3,7 +3,8 @@
 module OoxmlParser
   # Class for parsing `snd` tags
   class Sound < OOXMLDocumentObject
-    attr_accessor :name
+    # @return [String] name of sound
+    attr_reader :name
     # @return [FileReference] image structure
     attr_accessor :file_reference
 
@@ -18,7 +19,12 @@ module OoxmlParser
     # @return [Sound] result of parsing
     def parse(node)
       @file_reference = FileReference.new(parent: self).parse(node)
-      @name = node.attribute('name').value
+      node.attributes.each do |key, value|
+        case key
+        when 'name'
+          @name = value.value.to_s
+        end
+      end
       self
     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.18.0'
+    STRING = '0.21.0'
   end
 end

data/lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/sheet.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module OoxmlParser
+  # Class for parsing <sheet> tag
+  class Sheet < OOXMLDocumentObject
+    # @return [String] Name of sheet
+    attr_reader :name
+    # @return [Integer] SheetId of sheet
+    attr_reader :sheet_id
+    # @return [Symbol] Specifies if sheet is hidden
+    attr_reader :state
+    # @return [String] Id of sheet
+    attr_reader :id
+
+    def initialize(parent: nil)
+      @state = :visible
+      super
+    end
+
+    # Parse Sheet data
+    # @param [Nokogiri::XML:Element] node with Sheet data
+    # @return [Sheet] value of Sheet
+    def parse(node)
+      node.attributes.each do |key, value|
+        case key
+        when 'name'
+          @name = value.value.to_s
+        when 'sheetId'
+          @sheet_id = value.value.to_i
+        when 'state'
+          @state = value.value.to_sym
+        when 'id'
+          @id = value.value.to_s
+        end
+      end
+      self
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module OoxmlParser
+  # Class for `selection` data
+  class Selection < OOXMLDocumentObject
+    # @return [Coordinates] Reference to the active cell
+    attr_reader :active_cell
+    # @return [Integer] Id of active cell
+    attr_reader :active_cell_id
+    # @return [String] Selected range
+    attr_reader :reference_sequence
+
+    # Parse Selection object
+    # @param node [Nokogiri::XML:Element] node to parse
+    # @return [Selection] result of parsing
+    def parse(node)
+      node.attributes.each do |key, value|
+        case key
+        when 'activeCell'
+          @active_cell = Coordinates.parse_coordinates_from_string(value.value)
+        when 'activeCellId'
+          @active_cell_id = value.value.to_i
+        when 'sqref'
+          @reference_sequence = value.value.to_s
+        end
+      end
+      self
+    end
+  end
+end

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'sheet_view/pane'
+require_relative 'sheet_view/selection'
 module OoxmlParser
   # Class for `sheetView` data
   class SheetView < OOXMLDocumentObject
@@ -9,6 +10,14 @@ module OoxmlParser
     attr_accessor :show_gridlines
     # @return [True, False] Flag indicating whether the sheet should display row and column headings.
     attr_accessor :show_row_column_headers
+    # @return [Coordinates] Reference to the top left cell
+    attr_reader :top_left_cell
+    # @return [Integer] Id of workbook view
+    attr_reader :workbook_view_id
+    # @return [Integer] Zoom scale
+    attr_reader :zoom_scale
+    # @return [Selection] Properties of selection
+    attr_reader :selection
 
     def initialize(parent: nil)
       @show_gridlines = true
@@ -20,12 +29,18 @@ module OoxmlParser
     # @param node [Nokogiri::XML:Element] node to parse
     # @return [SheetView] result of parsing
     def parse(node)
-      node.attributes.each_key do |key|
+      node.attributes.each do |key, value|
         case key
         when 'showGridLines'
-          @show_gridlines = attribute_enabled?(node, key)
+          @show_gridlines = attribute_enabled?(value)
         when 'showRowColHeaders'
-          @show_row_column_headers = attribute_enabled?(node, key)
+          @show_row_column_headers = attribute_enabled?(value)
+        when 'topLeftCell'
+          @top_left_cell = Coordinates.parse_coordinates_from_string(value.value)
+        when 'workbookViewId'
+          @workbook_view_id = value.value.to_i
+        when 'zoomScale'
+          @zoom_scale = value.value.to_i
         end
       end
 
@@ -33,6 +48,8 @@ module OoxmlParser
         case node_child.name
         when 'pane'
           @pane = Pane.new(parent: self).parse(node_child)
+        when 'selection'
+          @selection = Selection.new(parent: self).parse(node_child)
         end
       end
       self

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

@@ -7,12 +7,15 @@ require_relative 'workbook/defined_name'
 require_relative 'workbook/shared_string_table'
 require_relative 'workbook/style_sheet'
 require_relative 'workbook/worksheet'
+require_relative 'workbook/sheet'
 require_relative 'workbook/workbook_helpers'
 module OoxmlParser
   # Class for storing XLSX Workbook
   class XLSXWorkbook < CommonDocumentStructure
     include WorkbookHelpers
     attr_accessor :worksheets
+    # @return [Array<Sheet>] list of sheets
+    attr_reader :sheets
     # @return [PresentationTheme] theme of Workbook
     attr_accessor :theme
     # @return [Relationships] rels of book
@@ -30,6 +33,7 @@ module OoxmlParser
 
     def initialize(params = {})
       @worksheets = []
+      @sheets = []
       @pivot_caches = []
       @pivot_table_definitions = []
       @defined_names = []
@@ -119,10 +123,11 @@ module OoxmlParser
       @theme = PresentationTheme.parse("xl/#{link_to_theme_xml}") if link_to_theme_xml
       @style_sheet = StyleSheet.new(parent: self).parse
       @doc.xpath('xmlns:workbook/xmlns:sheets/xmlns:sheet').each do |sheet|
+        @sheets << Sheet.new(parent: self).parse(sheet)
         file = @relationships.target_by_id(sheet.attribute('id').value)
         if file.start_with?('worksheets')
           @worksheets << Worksheet.new(parent: self).parse(file)
-          @worksheets.last.name = sheet.attribute('name').value
+          @worksheets.last.name = @sheets.last.name
         elsif file.start_with?('chartsheets')
           @worksheets << Chartsheet.new(parent: self).parse(file)
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ooxml_parser
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.21.0
 platform: ruby
 authors:
 - ONLYOFFICE
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-11 00:00:00.000000000 Z
+date: 2021-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -510,6 +510,7 @@ files:
 - lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/pivot_table_definition/pivot_table_style_info.rb
 - lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/shared_string_table.rb
 - lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/shared_string_table/string_index.rb
+- lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/sheet.rb
 - lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/style_sheet.rb
 - lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/style_sheet/cell_xfs.rb
 - lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/style_sheet/cell_xfs/cell_style/alignment.rb
@@ -535,6 +536,7 @@ files:
 - lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/worksheet/sheet_format_properties.rb
 - lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/worksheet/sheet_view.rb
 - lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/worksheet/sheet_view/pane.rb
+- lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/worksheet/sheet_view/selection.rb
 - lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/worksheet/table_part.rb
 - lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/worksheet/table_part/autofilter.rb
 - lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/worksheet/table_part/autofilter/filter_column.rb
@@ -579,6 +581,7 @@ metadata:
   documentation_uri: https://www.rubydoc.info/gems/ooxml_parser
   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:
@@ -594,7 +597,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.29
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: OoxmlParser Gem