ooxml_parser 0.34.0 → 0.34.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e89bbef1bb5d024074a4c344543e90b00a87f12699c65c43fb43b2dbcc9cd55
-  data.tar.gz: 34d0c7a756143e4d9eee8f5276c369f2d55e8776cba0f9c018f6ad7d54d40b2a
+  metadata.gz: eb6ab2462b53e26803ec7441c3f9b4a5217003952535f1f8578824d310c3aa78
+  data.tar.gz: 90610d1f3650f86f70f096060f3a5b20a2b54de950c36bc4cd7ef42bcc55ca77
 SHA512:
-  metadata.gz: 124354363a41cda9a479196831b71d5e0459e3247f8b4968b46da0aebb2e22d9672263fcee5722db253b748232a5120e56fc8bda5a6b33b40d3727de1f1f8fa2
-  data.tar.gz: f7558e9d79eadde76d2609b270579e573490dcb2d36ddaf7be0af06468113ae480c141857bbf0fbd6cfb41df15b549c7520f51b0cb088d75c092f402d4e6aad5
+  metadata.gz: f71b9fd4e5156a6dd60335587a1164cddf107f2e99bdfbd413acaa59e1b55ed696ab63944254ad283860547710fe6a8346f56161fe503c61197388d11d7cff7b
+  data.tar.gz: 263fb808264d65c0ff6dfee7e8d1d3f88f9fe7f49233ac426a8447abbc57902d9fbe73ca29816b1e1e297cdd34e738449535a46fb4a63bfdbb2e32e0396de87e

data/lib/ooxml_parser/common_parser/common_data/paragraph/paragraph_properties/numbering_properties.rb

@@ -10,7 +10,7 @@ module OoxmlParser
     attr_reader :num_id
 
     def initialize(ilvl = 0, parent: nil)
-      @ilvl = ilvl
+      @default_i_level = ilvl
       super(parent: parent)
     end
 
@@ -41,13 +41,15 @@ module OoxmlParser
 
     # @return [Integer] i-level value
     def ilvl
+      return @default_i_level unless @i_level
+
       @i_level.value
     end
 
     # @return [AbstractNumbering] level list of current numbering
     def numbering_level_current
       abstruct_numbering.level_list.each do |current_ilvl|
-        return current_ilvl if current_ilvl.ilvl == @ilvl
+        return current_ilvl if current_ilvl.ilvl == ilvl
       end
       nil
     end

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

@@ -3,8 +3,6 @@
 module OoxmlParser
   # Class for working with any tag contained only value
   class ValuedChild < OOXMLDocumentObject
-    # @return [String] value of tag
-    attr_accessor :value
     # @return [String] type of value
     attr_reader :type
 
@@ -30,6 +28,13 @@ module OoxmlParser
       self
     end
 
+    # @return [Object] value of parameter
+    def value
+      return true if type == :boolean && @value.nil?
+
+      @value
+    end
+
     private
 
     # Handle boolean value

data/lib/ooxml_parser/docx_parser/document_structure/default_style_helper.rb

@@ -6,7 +6,8 @@ module OoxmlParser
     # Parse default style
     # @return [void]
     def parse_default_style
-      parse_default_paragraph_style
+      parse_default_style_paragraph_properties
+      parse_default_style_run_properties
       parse_default_character_style
       DocumentStructure.default_table_paragraph_style = DocumentStructure.default_paragraph_style.dup
       DocumentStructure.default_table_paragraph_style.spacing = Spacing.new(0, 0, 1, :auto)
@@ -33,7 +34,7 @@ module OoxmlParser
                                                                                .paragraph_properties_default
                                                                                .raw_node, 0)
       end
-      if @styles&.document_defaults&.run_properties_default
+      if @styles&.document_defaults&.run_properties_default&.run_properties
         DocumentStructure.default_run_style = DocxParagraphRun.new(parent: self)
                                                               .parse_properties(@styles
                                                                                   .document_defaults
@@ -46,13 +47,17 @@ module OoxmlParser
 
     private
 
-    # Parse default paragraph style
-    def parse_default_paragraph_style
+    def parse_default_style_paragraph_properties
       return unless @styles&.default_style(:paragraph)&.paragraph_properties_node
 
       DocxParagraph.new.parse_paragraph_style(@styles.default_style(:paragraph)
                                                      .paragraph_properties_node,
                                               DocumentStructure.default_run_style)
+    end
+
+    def parse_default_style_run_properties
+      return unless @styles&.default_style(:paragraph)&.run_properties_node
+
       DocumentStructure.default_run_style
                        .parse_properties(@styles.default_style(:paragraph)
                                                 .run_properties_node)

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

@@ -16,7 +16,7 @@ module OoxmlParser
   # Class for data of DocxParagraph
   class DocxParagraph < OOXMLDocumentObject
     include DocxParagraphHelper
-    attr_accessor :number, :align, :spacing, :ind, :numbering,
+    attr_accessor :number, :align, :numbering,
                   :character_style_array, :page_break, :borders, :keep_lines,
                   :contextual_spacing, :sector_properties, :page_numbering, :section_break, :style, :keep_next,
                   :orphan_control
@@ -32,6 +32,8 @@ module OoxmlParser
     attr_accessor :paragraph_id
     # @return [MathParagraph] math paragraph
     attr_reader :math_paragraph
+    # Set spacing value
+    attr_writer :spacing
     # @return [Integer] id of text (for comment)
     attr_accessor :text_id
 
@@ -59,7 +61,7 @@ module OoxmlParser
     def initialize_copy(source)
       super
       @character_style_array = source.character_style_array.clone
-      @spacing = source.spacing.clone
+      @spacing = source.instance_variable_get(:@spacing).clone
     end
 
     # @return [Array<OOXMLDocumentObject>] array of child objects that contains data
@@ -204,7 +206,7 @@ module OoxmlParser
           @paragraph_style_ref = ParagraphStyleRef.new(parent: self).parse(node_child)
           fill_style_data(default_char_style)
         when 'ind'
-          @ind = DocumentStructure.default_paragraph_style.ind.dup.parse(node_child)
+          @ind = DocumentStructure.default_paragraph_style.instance_variable_get(:@ind).dup.parse(node_child)
         when 'numPr'
           @numbering = NumberingProperties.new(parent: self).parse(node_child)
         when 'jc'
@@ -230,6 +232,23 @@ module OoxmlParser
       self
     end
 
+    def spacing
+      style_spacing = root_object.styles&.default_style(:paragraph)&.paragraph_properties&.spacing
+      return Spacing.new.fetch_from_valued_spacing(style_spacing) if style_spacing
+
+      @spacing
+    end
+
+    # @return [Indents] value of indents
+    def ind
+      return @ind if @ind != Indents.new
+
+      indents_from_styles = root_object.styles&.default_style(:paragraph)&.paragraph_properties&.indent
+      return indents_from_styles if indents_from_styles
+
+      Indents.new
+    end
+
     # Fill data from styles
     # @param character_style [DocxParagraphRun] style to parse
     # @return [void]

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.34.0'
+    STRING = '0.34.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ooxml_parser
 version: !ruby/object:Gem::Version
-  version: 0.34.0
+  version: 0.34.2
 platform: ruby
 authors:
 - ONLYOFFICE
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-09 00:00:00.000000000 Z
+date: 2022-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -625,7 +625,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.25
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: OoxmlParser Gem