ooxml_parser 0.15.0 → 0.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d95158b66da173b7cc2b1c80b4780c0893cb840ff47a20bee389285054e3f4e
-  data.tar.gz: ec88614112d6ec0c69e5269dd8d128ead722cd1d338ac0500f7868409e8a5160
+  metadata.gz: fd9cd17bc24141fd5500ae8233240e5a8370fcc7aa8606211dfbdd7638b720af
+  data.tar.gz: a460aaf4e3216c0e627520c133d821b9310307c783712b6fd0f7c2f8879bf164
 SHA512:
-  metadata.gz: ac0bae842196c698f38563be771715d3cb78de1081904528f4557fe6faf0c7b20199945f0b5da952da0eef238e5b38a80e06e3c65a64a76b44824d9a105a24b4
-  data.tar.gz: cec21fd072fc64cc6ec436b86a0f68a0a11fb42356ca6826f20e2e8ccaa3de291e2ba2e8f76bcda5243473a46217f1d3a6b04beedfa0e9b2ac00f11aa9a7983f
+  metadata.gz: 39a1f7298c1c51da2e27f313cd6873924896c8dc71f46fa40760f520e746532cf6c50ba8d70829b4a36873f543e8dec8ceb920013531d1ac1d44c9ea44ce7706
+  data.tar.gz: ea140f577de7d3f47b37dcaf1909c2e1ae90b28356085c380caa6eecb508d205e95dccc198100cbd513918b7fecfb65e34df2877434c184b3b8ece431a695ef8

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/color/color_helper.rb

@@ -45,11 +45,11 @@ module OoxmlParser
         hls_color.h = if max == red && green >= blue
                         60.0 * (green - blue) / delta
                       elsif max == red && green < blue
-                        60.0 * (green - blue) / delta + 360.0
+                        (60.0 * (green - blue) / delta) + 360.0
                       elsif max == green
-                        60.0 * (blue - red) / delta + 120.0
+                        (60.0 * (blue - red) / delta) + 120.0
                       else
-                        60.0 * (red - green) / delta + 240.0
+                        (60.0 * (red - green) / delta) + 240.0
                       end
       end
 

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

@@ -48,7 +48,7 @@ module OoxmlParser
 
     # @return [String] result of convert of object to string
     def to_s
-      if @red == VALUE_FOR_NONE_COLOR && @green == VALUE_FOR_NONE_COLOR && @blue == VALUE_FOR_NONE_COLOR
+      if primary_colors_none?
         'none'
       else
         "RGB (#{@red}, #{@green}, #{@blue})"
@@ -69,8 +69,8 @@ module OoxmlParser
 
     # @return [True, False] is color default
     def none?
-      (@red == VALUE_FOR_NONE_COLOR) && (@green == VALUE_FOR_NONE_COLOR) && (@blue == VALUE_FOR_NONE_COLOR) ||
-        (style == :nil)
+      primary_colors_none? ||
+        style == :nil
     end
 
     # @return [True, False] is color not default
@@ -83,6 +83,14 @@ module OoxmlParser
       (@red == 255) && (@green == 255) && (@blue == 255)
     end
 
+    # Check if all three primary colors are none
+    # @return [Boolean]
+    def primary_colors_none?
+      @red == VALUE_FOR_NONE_COLOR &&
+        @green == VALUE_FOR_NONE_COLOR &&
+        @blue == VALUE_FOR_NONE_COLOR
+    end
+
     # Method to copy object
     # @return [Color] copied object
     def copy

data/lib/ooxml_parser/common_parser/common_data/colors/hsl_color.rb

@@ -22,9 +22,9 @@ module OoxmlParser
     # Chroma - The "colorfulness relative to the brightness of a similarly illuminated white".
     # @return [Color] result
     def to_rgb
-      chroma = (1 - (2 * @l - 1).abs) * @s
-      x = chroma * (1 - ((@h / 60.0) % 2.0 - 1).abs)
-      m = @l - chroma / 2.0
+      chroma = (1 - ((2 * @l) - 1).abs) * @s
+      x = chroma * (1 - (((@h / 60.0) % 2.0) - 1).abs)
+      m = @l - (chroma / 2.0)
 
       rgb = if @h.zero?
               Color.new(0, 0, 0)
@@ -52,7 +52,7 @@ module OoxmlParser
       if tint.nil?
         lum
       else
-        tint.negative? ? lum * (1.0 + tint) : lum * (1.0 - tint) + (255 - 255 * (1.0 - tint))
+        tint.negative? ? lum * (1.0 + tint) : (lum * (1.0 - tint)) + (255 - (255 * (1.0 - tint)))
       end
     end
 

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

@@ -114,7 +114,7 @@ module OoxmlParser
     # 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))
+        result + ((char.downcase.ord - 96) * (26**@column.reverse.index(char)))
       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/spacing.rb

@@ -96,5 +96,17 @@ module OoxmlParser
         end
       end
     end
+
+    # Fetch data from `ParagraphSpacing`
+    # Which have values with parameters
+    # @param valued_spacing [ParagraphSpacing] spacing to get params
+    # @return [Spacing]
+    def fetch_from_valued_spacing(valued_spacing)
+      @before = valued_spacing.before.to_unit(:centimeter).value if valued_spacing.before
+      @after = valued_spacing.after.to_unit(:centimeter).value if valued_spacing.after
+      @line = valued_spacing.line.to_unit(:centimeter).value if valued_spacing.line
+      @line_rule = valued_spacing.line_rule if valued_spacing.line_rule
+      self
+    end
   end
 end

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

@@ -33,7 +33,7 @@ module OoxmlParser
         when 'effect'
           self.effect = node_child.attribute('val').value
         when 'position'
-          self.position = (node_child.attribute('val').value.to_f / (28.0 + 1.0 / 3.0) / 2.0).round(1)
+          self.position = (node_child.attribute('val').value.to_f / (28.0 + (1.0 / 3.0)) / 2.0).round(1)
         when 'em'
           self.em = node_child.attribute('val').value
         when 'spacing'

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

@@ -216,12 +216,8 @@ module OoxmlParser
           @align = node_child.attribute('val').value.to_sym unless node_child.attribute('val').nil?
           @align = :justify if node_child.attribute('val').value == 'both'
         when 'spacing'
-          @spacing.before = (node_child.attribute('before').value.to_f / 566.9).round(2) unless node_child.attribute('before').nil?
-          @spacing.after = (node_child.attribute('after').value.to_f / 566.9).round(2) unless node_child.attribute('after').nil?
-          @spacing.line_rule = node_child.attribute('lineRule').value.sub('atLeast', 'at_least').to_sym unless node_child.attribute('lineRule').nil?
-          unless node_child.attribute('line').nil?
-            @spacing.line = (@spacing.line_rule == :auto ? (node_child.attribute('line').value.to_f / 240.0).round(2) : (node_child.attribute('line').value.to_f / 566.9).round(2))
-          end
+          @valued_spacing = ParagraphSpacing.new(parent: self).parse(node_child)
+          @spacing = @spacing.fetch_from_valued_spacing(@valued_spacing)
         when 'sectPr'
           @sector_properties = PageProperties.new(parent: self).parse(node_child, self, default_char_style)
           @section_break = case @sector_properties.type

data/lib/ooxml_parser/docx_parser/docx_data/document_structure/page_properties/page_size.rb

@@ -19,8 +19,8 @@ module OoxmlParser
 
     # @return [True, False] compare dimensions of size, ignoring orientation
     def same_dimensions?(other)
-      (@height == other.height) && (@width == other.width) ||
-        (@height == other.width) && (@width == other.height)
+      ((@height == other.height) && (@width == other.width)) ||
+        ((@height == other.width) && (@width == other.height))
     end
 
     # @return [String] get human format name

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.15.0'
+    STRING = '0.18.1'
   end
 end

data/lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/worksheet/table_part/extension_list/extension/conditional_formattings/conditional_formatting/conditional_formatting_rule.rb

@@ -19,15 +19,23 @@ module OoxmlParser
     attr_reader :stop_if_true
     # @return [Symbol] Relational operator in value rule
     attr_reader :operator
+    # @return [Symbol] Specifies whether top/bottom rule highlights bottom values
+    attr_reader :bottom
     # @return [Symbol] Specifies whether percent is used in top/bottom rule
     attr_reader :percent
     # @return [Integer] Number of items in top/bottom rule
     attr_reader :rank
+    # @return [Boolean] Specifies whether rule highlights values above average
+    attr_reader :above_average
+    # @return [Boolean] Specifies whether rule highlights values equal to average
+    attr_reader :equal_average
     # @return [Integer] Number of standard deviations in above/below average rule
     attr_reader :standard_deviation
-    # @return [String] text value in text rule
+    # @return [String] Text value in text rule
     attr_reader :text
-    # @return [Array, Formula] Formulas to determine condition
+    # @return [Symbol] Time period in date rule
+    attr_reader :time_period
+    # @return [Array<Formula>] Formulas to determine condition
     attr_reader :formulas
     # @return [DifferentialFormattingRecord] Format
     attr_reader :rule_format
@@ -39,6 +47,7 @@ module OoxmlParser
     attr_reader :icon_set
 
     def initialize(parent: nil)
+      @above_average = true
       @formulas = []
       super
     end
@@ -61,14 +70,22 @@ module OoxmlParser
           @stop_if_true = attribute_enabled?(value)
         when 'operator'
           @operator = value.value.to_sym
+        when 'bottom'
+          @bottom = attribute_enabled?(value)
         when 'percent'
           @percent = attribute_enabled?(value)
         when 'rank'
           @rank = value.value.to_i
+        when 'aboveAverage'
+          @above_average = attribute_enabled?(value)
+        when 'equalAverage'
+          @equal_average = attribute_enabled?(value)
         when 'stdDev'
           @standard_deviation = value.value.to_i
         when 'text'
           @text = value.text.to_s
+        when 'timePeriod'
+          @time_period = value.value.to_sym
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ooxml_parser
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.18.1
 platform: ruby
 authors:
 - ONLYOFFICE
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-13 00:00:00.000000000 Z
+date: 2021-11-11 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
@@ -589,7 +594,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