ooxml_parser 0.32.0 → 0.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cf7caeb2bfc8c48e6727c5a35c8514e07cf85fe2f528e742dd96be9473b3318
-  data.tar.gz: 07e1d21315c8dcd83664019f93cc1992926e176024420bd9fcdbc4de0837f9dd
+  metadata.gz: 9a2c8bb2410020cc3dfcb2126b9888ef47530fbd761e6167bd917fffee6a1351
+  data.tar.gz: 8ae388b40aabe9e72995e1bb5fa747e73253cd4464e414a00db0dcd5a87b0b40
 SHA512:
-  metadata.gz: 743b318ed40ff1805d7c6db6f32532dca25c6452be286808fcd52e5992e41bfa0a36de2574fcc828984f4dee095a75ba80cfc2221c49ef923db1880092ff9d83
-  data.tar.gz: 781db58bd859d241763049196327cfed403d3eb2fbb5288e9018a05eabab1f69b4115783e43166817e08e8e13485c25d1ada81db0cede73b82af38d52c4ca493
+  metadata.gz: 3ce96605c0637a4b2865c96088c0c10ddc898e91e7b6d41234bf8da01b598b748416567aff90cfa33b6778b7f16b7bb9397d95e5dde75e551fe524ee6d72dbdb
+  data.tar.gz: eee336b02e4bc827de7771f46ebcf53907957af7505c7da806dad589fe79f5de56b56e89206bc0e2df1d523530a9a7b41cd7a2c22095da97e95bde953e7faaa9

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

@@ -11,6 +11,8 @@ module OoxmlParser
     attr_reader :theme_shade
     # @return [Integer] theme index
     attr_reader :theme
+    # @return [Float] theme tint
+    attr_reader :theme_tint
     # @return [Float] tint
     attr_reader :tint
     # @return [Float] Indexed id
@@ -58,6 +60,8 @@ module OoxmlParser
           @indexed = value.value.to_i
         when 'rgb'
           @rgb = Color.new.parse_hex_string(value.value)
+        when 'themeTint'
+          @theme_tint = value.value.hex.to_f
         end
       end
       self

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

@@ -78,17 +78,15 @@ module OoxmlParser
     # @param node [Nokogiri::XML:Element] node to parse
     # @return [nil]
     def parse_color_tag(node)
-      node.attributes.each do |key, value|
+      color = OoxmlColor.new(parent: self).parse(node)
+      node.attributes.sort.to_h.each do |key, value|
         case key
         when 'val'
           self.font_color = Color.new(parent: self).parse_hex_string(value.value)
         when 'themeColor'
-          if root_object.theme && root_object.theme.color_scheme[value.value.to_sym]
-            break if value.value == 'text2' || value.value == 'background2' || value.value.include?('accent') # Don't know why. Just works
-
-            self.font_color = root_object.theme.color_scheme[value.value.to_sym].color.dup
-          end
+          self.font_color = root_object.theme.color_scheme[value.value.to_sym].color.dup if root_object.theme && root_object.theme.color_scheme[value.value.to_sym]
         when 'themeShade'
+          self.font_color = color.value if font_color.none?
           font_color.calculate_with_shade!(value.value.hex.to_f / 255.0)
         when 'themeTint'
           font_color.calculate_with_tint!(1.0 - (value.value.hex.to_f / 255.0))

data/lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/sdt/sdt_properties/checkbox/checkbox_state.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module OoxmlParser
+  # Class for parsing `checkedState` tag
+  class CheckBoxState < OOXMLDocumentObject
+    # @return [Integer] number of state symbol
+    attr_reader :value
+    # @return [String] font name
+    attr_reader :font
+
+    # Parse CheckBoxState object
+    # @param node [Nokogiri::XML:Element] node to parse
+    # @return [CheckBoxState] result of parsing
+    def parse(node)
+      node.attributes.each do |key, value|
+        case key
+        when 'val'
+          @value = value.value.to_i
+        when 'font'
+          @font = value.value
+        end
+      end
+      self
+    end
+  end
+end

data/lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/sdt/sdt_properties/checkbox.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require_relative 'checkbox/checkbox_state'
+module OoxmlParser
+  # Class for parsing `checkbox` tag
+  class CheckBox < OOXMLDocumentObject
+    # @return [True, False] specifies if checkbox is checked
+    attr_reader :checked
+    # @return [CheckBoxState] options of checked state
+    attr_reader :checked_state
+    # @return [CheckBoxState] options of unchecked state
+    attr_reader :unchecked_state
+    # @return [ValuedChild] group key
+    attr_reader :group_key
+
+    # Parse CheckBox object
+    # @param node [Nokogiri::XML:Element] node to parse
+    # @return [CheckBox] result of parsing
+    def parse(node)
+      node.xpath('*').each do |node_child|
+        case node_child.name
+        when 'checked'
+          @checked = option_enabled?(node_child, 'hidden')
+        when 'checkedState'
+          @checked_state = CheckBoxState.new(parent: self).parse(node_child)
+        when 'uncheckedState'
+          @unchecked_state = CheckBoxState.new(parent: self).parse(node_child)
+        when 'groupKey'
+          @group_key = ValuedChild.new(:string, parent: self).parse(node_child)
+        end
+      end
+      self
+    end
+  end
+end

data/lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/sdt/sdt_properties/combobox/list_item.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module OoxmlParser
+  # Class for parsing `listItem` tag
+  class ListItem < OOXMLDocumentObject
+    # @return [String] item text
+    attr_reader :text
+    # @return [String] item value
+    attr_reader :value
+
+    # Parse ListItem object
+    # @param node [Nokogiri::XML:Element] node to parse
+    # @return [ListItem] result of parsing
+    def parse(node)
+      node.attributes.each do |key, value|
+        case key
+        when 'displayText'
+          @text = value.value
+        when 'value'
+          @value = value.value
+        end
+      end
+      self
+    end
+  end
+end

data/lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/sdt/sdt_properties/combobox.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require_relative 'combobox/list_item'
+module OoxmlParser
+  # Class for parsing `comboBox` tag
+  class ComboBox < OOXMLDocumentObject
+    # @return [Array<ListItem>] combobox items
+    attr_reader :list_items
+
+    def initialize(parent: nil)
+      @list_items = []
+      super
+    end
+
+    # Parse ComboBox object
+    # @param node [Nokogiri::XML:Element] node to parse
+    # @return [ComboBox] result of parsing
+    def parse(node)
+      node.xpath('*').each do |node_child|
+        case node_child.name
+        when 'listItem'
+          @list_items << ListItem.new(parent: self).parse(node_child)
+        end
+      end
+      self
+    end
+  end
+end

data/lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/sdt/sdt_properties/dropdown_list.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module OoxmlParser
+  # Class for parsing `dropDownList` tag
+  class DropdownList < OOXMLDocumentObject
+    # @return [Array<ListItem>] dropdown items
+    attr_reader :list_items
+
+    def initialize(parent: nil)
+      @list_items = []
+      super
+    end
+
+    # Parse DropdownList object
+    # @param node [Nokogiri::XML:Element] node to parse
+    # @return [DropdownList] result of parsing
+    def parse(node)
+      node.xpath('*').each do |node_child|
+        case node_child.name
+        when 'listItem'
+          @list_items << ListItem.new(parent: self).parse(node_child)
+        end
+      end
+      self
+    end
+  end
+end

data/lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/sdt/sdt_properties/form_properties.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module OoxmlParser
+  # Class for parsing `formPr` tag
+  class FormProperties < OOXMLDocumentObject
+    # @return [String] field key
+    attr_reader :key
+    # @return [String] text of tooltip
+    attr_reader :help_text
+    # @return [True, False] specifies if field is required
+    attr_reader :required
+    # @return [Shade] shade of field
+    attr_reader :shade
+    # @return [BordersProperties] border of field
+    attr_reader :border
+
+    def initialize(parent: nil)
+      @required = false
+      super
+    end
+
+    # Parse FormProperties object
+    # @param node [Nokogiri::XML:Element] node to parse
+    # @return [FormProperties] result of parsing
+    def parse(node)
+      node.attributes.each do |key, value|
+        case key
+        when 'key'
+          @key = value.value
+        when 'helpText'
+          @help_text = value.value
+        when 'required'
+          @required = option_enabled?(value)
+        end
+      end
+
+      node.xpath('*').each do |node_child|
+        case node_child.name
+        when 'shd'
+          @shade = Shade.new(parent: self).parse(node_child)
+        when 'border'
+          @border = BordersProperties.new(parent: self).parse(node_child)
+        end
+      end
+      self
+    end
+  end
+end

data/lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/sdt/sdt_properties/form_text_properties/form_text_comb.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module OoxmlParser
+  # Class for parsing `comb` tag
+  class FormTextComb < OOXMLDocumentObject
+    # @return [OoxmlSize] field width
+    attr_reader :width
+    # @return [Symbol] width rule
+    attr_reader :width_rule
+
+    # Parse FormTextComb object
+    # @param node [Nokogiri::XML:Element] node to parse
+    # @return [FormTextComb] result of parsing
+    def parse(node)
+      node.attributes.each do |key, value|
+        case key
+        when 'width'
+          @width = OoxmlSize.new(value.value.to_f)
+        when 'wRule'
+          @width_rule = value.value.to_sym
+        end
+      end
+      self
+    end
+  end
+end

data/lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/sdt/sdt_properties/form_text_properties/form_text_format.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module OoxmlParser
+  # Class for parsing `format` tag
+  class FormTextFormat < OOXMLDocumentObject
+    # @return [Symbol] format type
+    attr_reader :type
+    # @return [String] value for custom formats
+    attr_reader :value
+    # @return [String] allowed symbols
+    attr_reader :symbols
+
+    # Parse FormTextFormat object
+    # @param node [Nokogiri::XML:Element] node to parse
+    # @return [FormTextFormat] result of parsing
+    def parse(node)
+      node.attributes.each do |key, value|
+        case key
+        when 'type'
+          @type = value.value.to_sym
+        when 'val'
+          @value = value.value
+        when 'symbols'
+          @symbols = value.value
+        end
+      end
+      self
+    end
+  end
+end

data/lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/sdt/sdt_properties/form_text_properties.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require_relative 'form_text_properties/form_text_comb'
+require_relative 'form_text_properties/form_text_format'
+module OoxmlParser
+  # Class for parsing `textFormPr` tag
+  class FormTextProperties < OOXMLDocumentObject
+    # @return [True, False] specifies if field is multiline
+    attr_reader :multiline
+    # @return [True, False] specifies if size of field should be autofit
+    attr_reader :autofit
+    # @return [FormTextComb] parameters of text justification
+    attr_reader :comb
+    # @return [ValuedChild] characters limit
+    attr_reader :maximum_characters
+    # @return [FormTextFormat] text format
+    attr_reader :format
+
+    # Parse FormTextProperties object
+    # @param node [Nokogiri::XML:Element] node to parse
+    # @return [FormTextProperties] result of parsing
+    def parse(node)
+      node.attributes.each do |key, value|
+        case key
+        when 'multiLine'
+          @multiline = option_enabled?(value)
+        when 'autoFit'
+          @autofit = option_enabled?(value)
+        end
+      end
+
+      node.xpath('*').each do |node_child|
+        case node_child.name
+        when 'comb'
+          @comb = FormTextComb.new(parent: self).parse(node_child)
+        when 'maxCharacters'
+          @maximum_characters = ValuedChild.new(:integer, parent: self).parse(node_child)
+        when 'format'
+          @format = FormTextFormat.new(parent: self).parse(node_child)
+        end
+      end
+      self
+    end
+  end
+end

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

@@ -1,5 +1,10 @@
 # frozen_string_literal: true
 
+require_relative 'sdt_properties/form_properties'
+require_relative 'sdt_properties/form_text_properties'
+require_relative 'sdt_properties/combobox'
+require_relative 'sdt_properties/dropdown_list'
+require_relative 'sdt_properties/checkbox'
 module OoxmlParser
   # Class for parsing `w:sdtPr` tags
   class SDTProperties < OOXMLDocumentObject
@@ -9,6 +14,16 @@ module OoxmlParser
     attr_reader :tag
     # @return [ValuedChild] Locking Setting
     attr_reader :lock
+    # @return [ComboBox] combobox
+    attr_reader :combobox
+    # @return [DropdownList] dropdown list
+    attr_reader :dropdown_list
+    # @return [CheckBox] checkbox
+    attr_reader :checkbox
+    # @return [FormProperties] form properties
+    attr_reader :form_properties
+    # @return [FormTextProperties] properties of text in form
+    attr_reader :form_text_properties
 
     # Parse SDTProperties object
     # @param node [Nokogiri::XML:Element] node to parse
@@ -22,6 +37,16 @@ module OoxmlParser
           @tag = ValuedChild.new(:string, parent: self).parse(node_child)
         when 'lock'
           @lock = ValuedChild.new(:symbol, parent: self).parse(node_child)
+        when 'comboBox'
+          @combobox = ComboBox.new(parent: self).parse(node_child)
+        when 'dropDownList'
+          @dropdown_list = DropdownList.new(parent: self).parse(node_child)
+        when 'checkbox'
+          @checkbox = CheckBox.new(parent: self).parse(node_child)
+        when 'formPr'
+          @form_properties = FormProperties.new(parent: self).parse(node_child)
+        when 'textFormPr'
+          @form_text_properties = FormTextProperties.new(parent: self).parse(node_child)
         end
       end
       self

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.32.0'
+    STRING = '0.33.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ooxml_parser
 version: !ruby/object:Gem::Version
-  version: 0.32.0
+  version: 0.33.0
 platform: ruby
 authors:
 - ONLYOFFICE
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-03 00:00:00.000000000 Z
+date: 2022-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -424,6 +424,15 @@ files:
 - lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/inserted.rb
 - lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/sdt/sdt_content.rb
 - lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/sdt/sdt_properties.rb
+- lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/sdt/sdt_properties/checkbox.rb
+- lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/sdt/sdt_properties/checkbox/checkbox_state.rb
+- lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/sdt/sdt_properties/combobox.rb
+- lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/sdt/sdt_properties/combobox/list_item.rb
+- lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/sdt/sdt_properties/dropdown_list.rb
+- lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/sdt/sdt_properties/form_properties.rb
+- lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/sdt/sdt_properties/form_text_properties.rb
+- lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/sdt/sdt_properties/form_text_properties/form_text_comb.rb
+- lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/sdt/sdt_properties/form_text_properties/form_text_format.rb
 - lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/structured_document_tag.rb
 - lib/ooxml_parser/docx_parser/document_structure/header_footer.rb
 - lib/ooxml_parser/docx_parser/document_structure/numbering.rb
@@ -610,7 +619,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.22
+rubygems_version: 3.3.24
 signing_key: 
 specification_version: 4
 summary: OoxmlParser Gem