ooxml_parser 0.21.0 → 0.24.0

data/lib/ooxml_parser/xlsx_parser/workbook/worksheet/xlsx_drawing/client_data.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module OoxmlParser
+  # Class for parsing <clientData> tag
+  class ClientData < OOXMLDocumentObject
+    # @return [True, False] Specifies if drawing is locked when sheet is protected
+    attr_reader :locks_with_sheet
+
+    def initialize(parent: nil)
+      @locks_with_sheet = true
+      super
+    end
+
+    # Parse ClientData data
+    # @param [Nokogiri::XML:Element] node with ClientData data
+    # @return [Sheet] value of ClientData
+    def parse(node)
+      node.attributes.each do |key, value|
+        case key
+        when 'fLocksWithSheet'
+          @locks_with_sheet = attribute_enabled?(value)
+        end
+      end
+      self
+    end
+  end
+end

data/lib/ooxml_parser/xlsx_parser/{xlsx_data/view_model/workbook → workbook}/worksheet/xlsx_drawing.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'xlsx_drawing/xlsx_drawing_position_parameters'
+require_relative 'xlsx_drawing/client_data'
 module OoxmlParser
   # Data of spreadsheet drawing
   class XlsxDrawing < OOXMLDocumentObject
@@ -11,6 +12,8 @@ module OoxmlParser
     attr_accessor :to
     # @return [GraphicFrame] graphic frame
     attr_accessor :graphic_frame
+    # @return [ClientData] client data
+    attr_accessor :client_data
 
     # Parse XlsxDrawing object
     # @param node [Nokogiri::XML:Element] node to parse
@@ -32,6 +35,8 @@ module OoxmlParser
           @graphic_frame = GraphicFrame.new(parent: self).parse(child_node)
         when 'cxnSp'
           @shape = ConnectionShape.new(parent: self).parse(child_node)
+        when 'clientData'
+          @client_data = ClientData.new(parent: self).parse(child_node)
         end
       end
       self

data/lib/ooxml_parser/xlsx_parser/{xlsx_data/view_model/workbook → workbook}/worksheet/xlsx_row.rb

@@ -34,7 +34,7 @@ module OoxmlParser
       node.xpath('*').each do |node_child|
         case node_child.name
         when 'c'
-          @cells[Coordinates.parse_coordinates_from_string(node_child.attribute('r').value.to_s).column_number.to_i - 1] = XlsxCell.new(parent: self).parse(node_child)
+          @cells[Coordinates.new.parse_string(node_child.attribute('r').value.to_s).column_number.to_i - 1] = XlsxCell.new(parent: self).parse(node_child)
         end
       end
       self

data/lib/ooxml_parser/xlsx_parser/{xlsx_data/view_model/workbook → workbook}/worksheet.rb

@@ -11,6 +11,8 @@ require_relative 'worksheet/xlsx_column_properties'
 require_relative 'worksheet/xlsx_drawing'
 require_relative 'worksheet/xlsx_row'
 require_relative 'worksheet/xlsx_header_footer'
+require_relative 'worksheet/sheet_protection'
+require_relative 'worksheet/protected_range'
 module OoxmlParser
   # Properties of worksheet
   class Worksheet < OOXMLDocumentObject
@@ -33,6 +35,10 @@ module OoxmlParser
     attr_reader :header_footer
     # @return [Array<ConditionalFormatting>] list of conditional formattings
     attr_reader :conditional_formattings
+    # @return [SheetProtection] protection of sheet
+    attr_reader :sheet_protection
+    # @return [Array<ProtectedRange>] list of protected ranges
+    attr_reader :protected_ranges
 
     def initialize(parent: nil)
       @columns = []
@@ -45,6 +51,7 @@ module OoxmlParser
       @sheet_views = []
       @table_parts = []
       @conditional_formattings = []
+      @protected_ranges = []
       super
     end
 
@@ -134,6 +141,12 @@ module OoxmlParser
           @header_footer = XlsxHeaderFooter.new(parent: self).parse(worksheet_node_child)
         when 'conditionalFormatting'
           @conditional_formattings << ConditionalFormatting.new(parent: self).parse(worksheet_node_child)
+        when 'sheetProtection'
+          @sheet_protection = SheetProtection.new(parent: self).parse(worksheet_node_child)
+        when 'protectedRanges'
+          worksheet_node_child.xpath('*').each do |protected_range_node|
+            @protected_ranges << ProtectedRange.new(parent: self).parse(protected_range_node)
+          end
         end
       end
       parse_comments

data/lib/ooxml_parser/xlsx_parser/{xlsx_data/view_model/workbook.rb → workbook.rb}

@@ -4,6 +4,7 @@ require_relative 'workbook/chartsheet'
 require_relative 'workbook/pivot_cache'
 require_relative 'workbook/pivot_table_definition'
 require_relative 'workbook/defined_name'
+require_relative 'workbook/workbook_protection'
 require_relative 'workbook/shared_string_table'
 require_relative 'workbook/style_sheet'
 require_relative 'workbook/worksheet'
@@ -30,6 +31,8 @@ module OoxmlParser
     attr_accessor :pivot_table_definitions
     # @return [Array<DefinedName>] list of defined names
     attr_reader :defined_names
+    # @return [WorkbookProtection] protection of workbook structure
+    attr_reader :workbook_protection
 
     def initialize(params = {})
       @worksheets = []
@@ -135,6 +138,7 @@ module OoxmlParser
       parse_pivot_cache
       parse_pivot_table
       parse_defined_names
+      parse_workbook_protection
       OOXMLDocumentObject.xmls_stack.pop
       self
     end
@@ -166,5 +170,13 @@ module OoxmlParser
         @defined_names << DefinedName.new(parent: self).parse(defined_name)
       end
     end
+
+    # Perform parsing of workbook protection
+    def parse_workbook_protection
+      workbook_protection = @doc.search('//xmlns:workbookProtection').first
+      return nil unless workbook_protection
+
+      @workbook_protection = WorkbookProtection.new(parent: self).parse(workbook_protection)
+    end
   end
 end

data/lib/ooxml_parser/{xlsx_parser/xlsx_parser.rb → xlsx_parser.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'xlsx_data/view_model/workbook'
+require_relative 'xlsx_parser/workbook'
 
 module OoxmlParser
   # Basic class for parsing xlsx

data/lib/ooxml_parser.rb

@@ -1,23 +1,11 @@
 # frozen_string_literal: true
 
-require_relative 'ooxml_parser/common_parser/common_data/ooxml_document_object'
-require_relative 'ooxml_parser/common_parser/common_data/color'
-require_relative 'ooxml_parser/common_parser/common_data/coordinates'
-require_relative 'ooxml_parser/common_parser/common_data/font_style'
-require_relative 'ooxml_parser/common_parser/common_data/borders_properties'
-require_relative 'ooxml_parser/common_parser/common_data/hyperlink'
-require_relative 'ooxml_parser/common_parser/common_data/paragraph'
-require_relative 'ooxml_parser/common_parser/common_data/alternate_content/alternate_content'
-require_relative 'ooxml_parser/common_parser/common_data/colors/presentation_fill'
-require_relative 'ooxml_parser/common_parser/common_data/table'
-require_relative 'ooxml_parser/common_parser/common_data/relationships'
-require_relative 'ooxml_parser/common_parser/parser'
-require_relative 'ooxml_parser/common_parser/common_document_structure'
+require_relative 'ooxml_parser/common_parser'
 require_relative 'ooxml_parser/configuration'
 require_relative 'ooxml_parser/helpers/string_helper'
-require_relative 'ooxml_parser/docx_parser/docx_parser'
-require_relative 'ooxml_parser/xlsx_parser/xlsx_parser'
-require_relative 'ooxml_parser/pptx_parser/pptx_parser'
+require_relative 'ooxml_parser/docx_parser'
+require_relative 'ooxml_parser/xlsx_parser'
+require_relative 'ooxml_parser/pptx_parser'
 
 # Basic class for all parser stuff
 module OoxmlParser