ooxml_parser 0.17.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0237d3a93d29a2948634cd1e3f4c9c414347ee39176aad7d3c7e75e55b2a8314
-  data.tar.gz: e423b10a5309aac333a95be460b863cc2cbea1449b866817dafbe427c092bf34
+  metadata.gz: ed12c90b346ab55a8a41932a3fb957bfbddccf71fdedf15ec6f7b140b1be88eb
+  data.tar.gz: 24bff23c9c3f29cfac0e6db68def27199d984366c07b951fe5adb0f88e54468d
 SHA512:
-  metadata.gz: 22783602daacb4933c941023d39757fd4dddef2adc64dcd58e6ef70ad6141b764b300e65745b50691cf138e2b212ccbd8ed542d0cbbe8b62dc0cc905d47760ed
-  data.tar.gz: 4a1843d681f5253234eeb4bf33c240db9ea46f2ab43f219a0a391297475a4f1716ba4b7915599bcb06ad41605071190e4788f6516ce43983c5d3f0846ea78dc8
+  metadata.gz: '09bad9d23a5157e19fecf0989ac7c812a0b300920c5978f9f6c8ea9241e311dd4e3f3c68f965b52955eba1791c46b46ef22f47728148583e7a0a703d7aaadff0'
+  data.tar.gz: c31c20c9a9ca7e4ade83b93653d8d04eed3117a822d9a81d4b9f10f1d7323bb164c281e0f4b75a5c061acb430ee8d08e424a9a8c723c3346dbc74fddd0ed4685

data/lib/ooxml_parser/common_parser/common_data/alternate_content/drawing/graphic/picture/docx_blip/file_reference.rb

@@ -35,7 +35,7 @@ module OoxmlParser
 
       full_path_to_file = OOXMLDocumentObject.path_to_folder + OOXMLDocumentObject.root_subfolder + @path.gsub('..', '')
       if File.exist?(full_path_to_file)
-        @content = IO.binread(full_path_to_file)
+        @content = File.binread(full_path_to_file)
       else
         warn "Couldn't find #{full_path_to_file} file on filesystem. Possible problem in original document"
       end

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/ooxml_document_object/nokogiri_parsing_exception.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module OoxmlParser
+  # Exception for Nokogiri parsing error
+  class NokogiriParsingException < StandardError; end
+end

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

@@ -4,6 +4,7 @@ require 'filemagic' unless Gem.win_platform?
 require 'securerandom'
 require 'nokogiri'
 require 'zip'
+require_relative 'ooxml_document_object/nokogiri_parsing_exception'
 require_relative 'ooxml_document_object/ooxml_document_object_helper'
 require_relative 'ooxml_document_object/ooxml_object_attribute_helper'
 
@@ -39,7 +40,12 @@ module OoxmlParser
 
     # @return [Nokogiri::XML::Document] result of parsing xml via nokogiri
     def parse_xml(xml_path)
-      Nokogiri::XML(File.open(xml_path), &:strict)
+      xml = Nokogiri::XML(File.open(xml_path), &:strict)
+      unless xml.errors.empty?
+        raise NokogiriParsingException,
+              "Nokogiri found errors in file: #{xml_path}. Errors: #{xml.errors}"
+      end
+      xml
     end
 
     class << self

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

@@ -15,10 +15,6 @@ module OoxmlParser
     attr_reader :font_color
     # @return [OoxmlSize] space size
     attr_reader :space
-    # @return [string] name of font
-    attr_reader :font_name
-    # @return [Float] font size
-    attr_reader :font_size
     # @return [Symbol] baseline of run
     attr_reader :baseline
     # @return [Hyperlink] hyperlink of run
@@ -79,14 +75,7 @@ module OoxmlParser
         when 'strike'
           @font_style.strike = value_to_symbol(value)
         when 'baseline'
-          case value.value.to_i
-          when -25_000, -30_000
-            @baseline = :subscript
-          when 30_000
-            @baseline = :superscript
-          when 0
-            @baseline = :baseline
-          end
+          @baseline = parse_baseline(value)
         when 'cap'
           @caps = value.value.to_sym
         end
@@ -107,8 +96,6 @@ module OoxmlParser
           @spacing = RunSpacing.new(parent: self).parse(node_child)
         when 'color'
           @color = OoxmlColor.new(parent: self).parse(node_child)
-        when 'solidFill'
-          @font_color = Color.new(parent: self).parse_color(node_child.xpath('*').first)
         when 'latin'
           @font_name = node_child.attribute('typeface').value
         when 'b'
@@ -140,9 +127,34 @@ module OoxmlParser
         end
       end
       @font_color = DocxColorScheme.new(parent: self).parse(node)
-      @font_name = root_object.default_font_typeface if @font_name.empty?
-      @font_size ||= root_object.default_font_size
       self
     end
+
+    # @return [Float] font size
+    def font_size
+      @font_size ||= root_object.default_font_size
+    end
+
+    # @return [String] name of font
+    def font_name
+      return @font_name unless @font_name.empty?
+
+      root_object.default_font_typeface
+    end
+
+    private
+
+    # @param value [Nokogiri::XML::Attr] nokogiri parameter to parse
+    # @return [Symbol] baseline value depending of type
+    def parse_baseline(value)
+      case value.value.to_i
+      when -25_000, -30_000
+        :subscript
+      when 30_000
+        :superscript
+      when 0
+        :baseline
+      end
+    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/pptx_parser/pptx_data/presentation/slide_layout_file.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module OoxmlParser
+  # Class for parsing SlideLayout files
+  class SlideLayoutFile < OOXMLDocumentObject
+    # @return [CommonSlideData] common slide data
+    attr_reader :common_slide_data
+
+    # Parse SlideLayoutFile
+    # @param file [String] path to file to parse
+    # @return [SlideLayoutFile] result of parsing
+    def parse(file)
+      OOXMLDocumentObject.add_to_xmls_stack(file.gsub(OOXMLDocumentObject.path_to_folder, ''))
+      doc = parse_xml(file)
+      doc.xpath('p:sldLayout/*').each do |node_child|
+        case node_child.name
+        when 'cSld'
+          @common_slide_data = CommonSlideData.new(parent: self).parse(node_child)
+        end
+      end
+      OOXMLDocumentObject.xmls_stack.pop
+      self
+    end
+  end
+end

data/lib/ooxml_parser/pptx_parser/pptx_data/presentation/slide_layouts_helper.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module OoxmlParser
+  # method to help to work with SlideLayouts
+  module SlideLayoutsHelper
+    # @return [Array<String>] list of slide layouts files
+    def slide_layouts_files
+      Dir["#{OOXMLDocumentObject.path_to_folder}ppt/slideLayouts/*.xml"]
+    end
+
+    private
+
+    # Parse slide layouts file
+    def parse_slide_layouts
+      slide_layouts_files.each do |file|
+        @slide_layouts << SlideLayoutFile.new(parent: self).parse(file)
+      end
+    end
+  end
+end

data/lib/ooxml_parser/pptx_parser/pptx_data/presentation/slide_master_file.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module OoxmlParser
+  # Class for parsing SlideMaster files
+  class SlideMasterFile < OOXMLDocumentObject
+    # @return [CommonSlideData] common slide data
+    attr_reader :common_slide_data
+
+    # Parse SlideMaster
+    # @param file [String] path to file to parse
+    # @return [SlideMasterFile] result of parsing
+    def parse(file)
+      OOXMLDocumentObject.add_to_xmls_stack(file.gsub(OOXMLDocumentObject.path_to_folder, ''))
+      doc = parse_xml(file)
+      doc.xpath('p:sldMaster/*').each do |node_child|
+        case node_child.name
+        when 'cSld'
+          @common_slide_data = CommonSlideData.new(parent: self).parse(node_child)
+        end
+      end
+      OOXMLDocumentObject.xmls_stack.pop
+      self
+    end
+  end
+end

data/lib/ooxml_parser/pptx_parser/pptx_data/presentation/slide_masters_helper.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module OoxmlParser
+  # method to help to work with SlideMasters
+  module SlideMastersHelper
+    # @return [Array<String>] list of slide masters files
+    def slide_masters_files
+      Dir["#{OOXMLDocumentObject.path_to_folder}ppt/slideMasters/*.xml"]
+    end
+
+    private
+
+    # Parse slide masters file
+    def parse_slide_masters
+      slide_masters_files.each do |file|
+        @slide_masters << SlideMasterFile.new(parent: self).parse(file)
+      end
+    end
+  end
+end

data/lib/ooxml_parser/pptx_parser/pptx_data/presentation.rb

@@ -5,12 +5,18 @@ require_relative 'presentation/presentation_comments'
 require_relative 'presentation/presentation_helpers'
 require_relative 'presentation/presentation_theme'
 require_relative 'presentation/slide'
+require_relative 'presentation/slide_master_file'
+require_relative 'presentation/slide_masters_helper'
+require_relative 'presentation/slide_layout_file'
+require_relative 'presentation/slide_layouts_helper'
 require_relative 'presentation/slide_size'
 require_relative 'presentation/table_styles'
 module OoxmlParser
   # Basic class for all parsed pptx data
   class Presentation < CommonDocumentStructure
     include PresentationHelpers
+    include SlideLayoutsHelper
+    include SlideMastersHelper
     attr_accessor :slides, :theme, :slide_size
     # @return [Relationships] relationships of presentation
     attr_accessor :relationships
@@ -20,10 +26,16 @@ module OoxmlParser
     attr_reader :comment_authors
     # @return [PresentationComments] comments of presentation
     attr_reader :comments
+    # @return [Array<SlideMasterFile>] list of slide master
+    attr_reader :slide_masters
+    # @return [Array<SlideLayout>] list of slide layouts
+    attr_reader :slide_layouts
 
     def initialize(params = {})
       @slides = []
       @comments = []
+      @slide_masters = []
+      @slide_layouts = []
       super
     end
 
@@ -56,6 +68,8 @@ module OoxmlParser
       end
       OOXMLDocumentObject.xmls_stack.pop
       @relationships = Relationships.new(parent: self).parse_file("#{OOXMLDocumentObject.path_to_folder}/ppt/_rels/presentation.xml.rels")
+      parse_slide_layouts
+      parse_slide_masters
       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.17.0'
+    STRING = '0.20.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ooxml_parser
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.20.0
 platform: ruby
 authors:
 - ONLYOFFICE
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-15 00:00:00.000000000 Z
+date: 2021-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -305,6 +305,7 @@ files:
 - lib/ooxml_parser/common_parser/common_data/font_style.rb
 - lib/ooxml_parser/common_parser/common_data/hyperlink.rb
 - lib/ooxml_parser/common_parser/common_data/ooxml_document_object.rb
+- lib/ooxml_parser/common_parser/common_data/ooxml_document_object/nokogiri_parsing_exception.rb
 - lib/ooxml_parser/common_parser/common_data/ooxml_document_object/ooxml_document_object_helper.rb
 - lib/ooxml_parser/common_parser/common_data/ooxml_document_object/ooxml_object_attribute_helper.rb
 - lib/ooxml_parser/common_parser/common_data/paragraph.rb
@@ -480,6 +481,10 @@ files:
 - lib/ooxml_parser/pptx_parser/pptx_data/presentation/slide/transition/transition/sound_action/sound.rb
 - lib/ooxml_parser/pptx_parser/pptx_data/presentation/slide/transition/transition_properties/transition_properties.rb
 - lib/ooxml_parser/pptx_parser/pptx_data/presentation/slide/transition/transition_properties/transition_properties/wheel.rb
+- lib/ooxml_parser/pptx_parser/pptx_data/presentation/slide_layout_file.rb
+- lib/ooxml_parser/pptx_parser/pptx_data/presentation/slide_layouts_helper.rb
+- lib/ooxml_parser/pptx_parser/pptx_data/presentation/slide_master_file.rb
+- lib/ooxml_parser/pptx_parser/pptx_data/presentation/slide_masters_helper.rb
 - lib/ooxml_parser/pptx_parser/pptx_data/presentation/slide_size.rb
 - lib/ooxml_parser/pptx_parser/pptx_data/presentation/table_styles.rb
 - lib/ooxml_parser/pptx_parser/pptx_parser.rb
@@ -574,6 +579,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:
@@ -589,7 +595,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.27
+rubygems_version: 3.2.29
 signing_key: 
 specification_version: 4
 summary: OoxmlParser Gem