ooxml_parser 0.24.0 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7709109a298642b27297b3646d9b94c2dd73dd5ba6d52468dfe7c90c221d4809
-  data.tar.gz: '09db15c81f7f0c31d2a0bd7f5afcb7606c8455baa7140b1d0a340234ec34e74f'
+  metadata.gz: 409ce77d24b38512604d5215a2bd6a54f887685db71cd9942c81935ef678f3b0
+  data.tar.gz: 4f7edddf4bab2d5d6ab9485754b333a2943d2df96fdcc933d671e820cd9dc70d
 SHA512:
-  metadata.gz: 515a28a6d616cb0bd272645ab0ec4d8c5365fcbb96f58141552a70eec3a34dd3e22ff207f997f1baa4624216b3452a351e803f5b93c6edbb73f12ad344b07448
-  data.tar.gz: e81fc4ad01b4fc326eea90a3a8758b95b9f7fe56cb4c6c46d53c2b50d0ba472007ee6c7412d0510d9550632c1ff6ff52202b6519ea8f92adb66c443137bef52c
+  metadata.gz: aad06b0a4dd775d5efe4411d43b87ebda68fe05a5a15924fb6773d77169141284baaf8047eee042634a2e6145649ac0fce2e9aa143d401587434598eeff5f73d
+  data.tar.gz: c2ab404a2ab3f559a312da5953da7a668b4ae1c359ff790bc4b4d577ccbd453e4314844125cc64e144c884f9e187389586c98f085c4d27ca5837d8a1b9e61f9d

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

@@ -22,8 +22,8 @@ module OoxmlParser
 
     # @return [String] text representation
     def to_s
-      "Value: `#{value}`, "\
-        "Color: `#{color}`, "\
+      "Value: `#{value}`, " \
+        "Color: `#{color}`, " \
         "Fill: `#{fill}`"
     end
 

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

@@ -38,8 +38,8 @@ module OoxmlParser
     private
 
     # This is dirty workaround for situations
-    # Then @line_rule parsed after @line so getting
-    # @line value is totally screwed up
+    # 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

data/lib/ooxml_parser/common_parser/common_data/table/properties/table_position.rb

@@ -8,11 +8,11 @@ module OoxmlParser
 
     # @return [String] result of convert of object to string
     def to_s
-      "Table position left: #{left}, "\
-        "right: #{right}, "\
-        "top: #{top}, "\
-        "bottom #{bottom}, "\
-        "position x: #{position_x}, "\
+      "Table position left: #{left}, " \
+        "right: #{right}, " \
+        "top: #{top}, " \
+        "bottom #{bottom}, " \
+        "position x: #{position_x}, " \
         "position y: #{position_y}"
     end
 

data/lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/docx_paragraph_run/instruction_text.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module OoxmlParser
+  # Class for parsing `w:instrText` object
+  class InstructionText < TextValue
+    # @return [Boolean] is current object for hyperlink
+    def hyperlink?
+      value.include?('HYPERLINK')
+    end
+
+    # @return [Boolean] is current object for page number
+    def page_number?
+      value.match?(/PAGE\s+\\\*/)
+    end
+
+    # @return [Hyperlink] convert InstructionText to Hyperlink
+    def to_hyperlink
+      Hyperlink.new(value.sub('HYPERLINK ', '').split(' \\o ').first,
+                    value.sub('HYPERLINK', '').split(' \\o ').last)
+    end
+  end
+end

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

@@ -2,6 +2,7 @@
 
 # noinspection RubyTooManyInstanceVariablesInspection
 require_relative 'docx_paragraph_run/docx_paragraph_run_helpers'
+require_relative 'docx_paragraph_run/instruction_text'
 require_relative 'docx_paragraph_run/object'
 require_relative 'docx_paragraph_run/text_outline'
 require_relative 'docx_paragraph_run/text_fill'
@@ -15,9 +16,9 @@ module OoxmlParser
                   :link, :highlight, :effect, :caps, :w,
                   :position, :em, :spacing, :break, :touch, :shape, :footnote, :endnote, :fld_char, :style,
                   :comments, :alternate_content, :page_number, :text_outline, :text_fill
-    # @return [String] type of instruction used for upper level of run
-    # http://officeopenxml.com/WPfieldInstructions.php
-    attr_accessor :instruction
+    # @return [InstructionText] text of instruction
+    #   See ECMA-376, 17.16.23 instrText (Field Code)
+    attr_reader :instruction_text
     # @return [RunProperties] properties of run
     attr_accessor :run_properties
     # @return [RunObject] object of run
@@ -96,10 +97,10 @@ module OoxmlParser
           parse_properties(node_child)
           @run_properties = RunProperties.new(parent: self).parse(node_child)
         when 'instrText'
-          if node_child.text.include?('HYPERLINK')
-            hyperlink = Hyperlink.new(node_child.text.sub('HYPERLINK ', '').split(' \\o ').first, node_child.text.sub('HYPERLINK', '').split(' \\o ').last)
-            @link = hyperlink
-          elsif node_child.text[/PAGE\s+\\\*/]
+          @instruction_text = InstructionText.new(parent: self).parse(node_child)
+          if @instruction_text.hyperlink?
+            @link = @instruction_text.to_hyperlink
+          elsif @instruction_text.page_number?
             @text = '*PAGE NUMBER*'
           end
         when 'fldChar'

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

@@ -25,7 +25,7 @@ module OoxmlParser
     # Convert to string
     # @return [String] result of conversion
     def to_s
-      "first line indent: #{@first_line_indent}, left indent: #{@left_indent}, "\
+      "first line indent: #{@first_line_indent}, left indent: #{@left_indent}, " \
         "right indent: #{@right_indent}, hanging indent: #{@hanging_indent}"
     end
 

data/lib/ooxml_parser/docx_parser/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, :ind, :numbering,
+    attr_accessor :number, :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
@@ -39,8 +39,6 @@ module OoxmlParser
 
     def initialize(parent: nil)
       @number = 0
-      @bookmark_start = []
-      @bookmark_end = []
       @align = :left
       @spacing = Spacing.new
       @ind = Indents.new
@@ -62,8 +60,6 @@ module OoxmlParser
     # @return [void]
     def initialize_copy(source)
       super
-      @bookmark_start = source.bookmark_start.clone
-      @bookmark_end = source.bookmark_end.clone
       @character_style_array = source.character_style_array.clone
       @spacing = source.spacing.clone
     end

data/lib/ooxml_parser/pptx_parser/presentation.rb

@@ -58,10 +58,9 @@ module OoxmlParser
           @slide_size = SlideSize.new(parent: self).parse(presentation_node_child)
         when 'sldIdLst'
           presentation_node_child.xpath('p:sldId').each do |silde_id_node|
-            id = nil
-            silde_id_node.attribute_nodes.select { |node| id = node.to_s if node.namespace && node.namespace.prefix == 'r' }
+            slide_id = silde_id_node.attr('r:id')
             @slides << Slide.new(parent: self,
-                                 xml_path: "#{OOXMLDocumentObject.root_subfolder}/#{OOXMLDocumentObject.get_link_from_rels(id)}")
+                                 xml_path: "#{OOXMLDocumentObject.root_subfolder}/#{OOXMLDocumentObject.get_link_from_rels(slide_id)}")
                             .parse
           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.24.0'
+    STRING = '0.25.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ooxml_parser
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.25.0
 platform: ruby
 authors:
 - ONLYOFFICE
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-10 00:00:00.000000000 Z
+date: 2022-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -403,6 +403,7 @@ files:
 - lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/docx_paragraph_helper.rb
 - lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/docx_paragraph_run.rb
 - lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/docx_paragraph_run/docx_paragraph_run_helpers.rb
+- lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/docx_paragraph_run/instruction_text.rb
 - lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/docx_paragraph_run/object.rb
 - lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/docx_paragraph_run/object/ole_object.rb
 - lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/docx_paragraph_run/shape.rb
@@ -604,7 +605,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.19
 signing_key: 
 specification_version: 4
 summary: OoxmlParser Gem