ooxl 0.0.1.5.1 → 0.0.1.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b4f14b323fab2a3362235d62a449584a6b980482
-  data.tar.gz: 696182e5392827ccc8754300c8e9e9df49fc020b
+SHA256:
+  metadata.gz: 6f5c08486fcbbb5d3df21da5ca0a08dc0e121de0da7232af5795a46144611238
+  data.tar.gz: fbb52109d99ed095afbc98655d4f234c06d3652357cdfd924fc66e8ae95dca56
 SHA512:
-  metadata.gz: 7c4a10ad5b476b807649a94541ce6c7a516a8efbebbd527eceab608a01eb1c0e80edbf1fd535511b521a92725c969b6196cf79b8437391a115fcf04529e853ad
-  data.tar.gz: c1b0926146a8b4cdf68bb55ea1b0307dd4cae502dd11a4fd7fba4b137b16fcc56931b806e651bf2a12e2d2df43c953f0b7c16232b5d5b1e7b59e56b64bade18f
+  metadata.gz: e06f441373a787cef916246cca3fafb8ed88c5e9bbc350956252cdc946e43b924c6ff786645fa10d0106fd97f50a21165a5037066469870bafb9d00a7fe5c573
+  data.tar.gz: 6287c0dc02be92d01e49f0c8fcb934c857219dbf596cf3a3d6c0636cb2cd46160f19193b456608fcd07ddebb046bbe4ca18ba1c4a6d07d41ecfa3e8bc7d794af

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "ooxml_excel"
+require "./lib/ooxl"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +10,5 @@ require "ooxml_excel"
 # require "pry"
 # Pry.start
 
-require "irb"
-IRB.start
+require "pry"
+Pry.start

data/lib/ooxl/ooxl.rb

@@ -3,20 +3,33 @@ class OOXL
   include ListHelper
   attr_reader :filename
   
-  def initialize(spreadsheet_filepath, options={})
+  def initialize(filepath = nil, contents: nil, **options)
     @workbook = nil
     @sheets = {}
     @styles = []
     @comments = {}
-    @relationships = {}
+    @workbook_relationships = nil
+    @sheet_relationships = {}
     @options = options
     @tables = []
-    @filename = File.basename(spreadsheet_filepath)
-    parse_spreadsheet_contents(spreadsheet_filepath)
+
+    @filename = filepath && File.basename(filepath)
+    if contents.present?
+      parse_spreadsheet_contents(contents)
+    elsif filepath.present?
+      parse_spreadsheet_file(filepath)
+    else
+      raise 'no file path or contents were provided'
+    end
   end
 
   def self.open(spreadsheet_filepath, options={})
-    new(spreadsheet_filepath, options)
+    new(spreadsheet_filepath, **options)
+  end
+
+  def self.parse(spreadsheet_contents, options={})
+    spreadsheet_contents.force_encoding('ASCII-8BIT') if spreadsheet_contents.respond_to?(:force_encoding)
+    new(nil, contents: spreadsheet_contents, **options)
   end
 
   def sheets(skip_hidden: false)
@@ -33,9 +46,11 @@ class OOXL
   end
 
   def sheet(sheet_name)
-    sheet_index = @workbook.sheets.index { |sheet| sheet[:name] == sheet_name}
-    raise "No #{sheet_name} in workbook." if sheet_index.nil?
-    sheet = @sheets.fetch((sheet_index+1).to_s)
+    sheet_meta = @workbook.sheets.find { |sheet| sheet[:name] == sheet_name }
+    raise "No #{sheet_name} in workbook." if sheet_meta.nil?
+
+    sheet_index = @workbook_relationships[sheet_meta[:relationship_id]].scan(/\d+/).first
+    sheet = @sheets.fetch(sheet_index)
 
     # shared variables
     sheet.name = sheet_name
@@ -73,38 +88,46 @@ class OOXL
   end
 
   def fetch_comments(sheet_index)
-    final_sheet_index = sheet_index+1
-    relationship = @relationships[final_sheet_index.to_s]
+    relationship = @sheet_relationships[sheet_index]
     @comments[relationship.comment_id] if relationship.present?
   end
 
-  def parse_spreadsheet_contents(spreadsheet)
+  def parse_spreadsheet_file(file_path)
+    Zip::File.open(file_path) { |zip| parse_zip(zip) }
+  end
+
+  def parse_spreadsheet_contents(file_contents)
+    # open_buffer works for strings and IO streams
+    Zip::File.open_buffer(file_contents) { |zip| parse_zip(zip) }
+  end
+
+  def parse_zip(spreadsheet_zip)
     shared_strings = []
-    Zip::File.open(spreadsheet) do |spreadsheet_zip|
-      spreadsheet_zip.each do |entry|
-        case entry.name
-        when /xl\/worksheets\/sheet(\d+)?\.xml/
-          sheet_id = entry.name.scan(/xl\/worksheets\/sheet(\d+)?\.xml/).flatten.first
-          @sheets[sheet_id] = OOXL::Sheet.new(entry.get_input_stream.read, shared_strings, @options)
-        when /xl\/styles\.xml/
-          @styles = OOXL::Styles.load_from_stream(entry.get_input_stream.read)
-        when /xl\/comments(\d+)?\.xml/
-          comment_id = entry.name.scan(/xl\/comments(\d+)\.xml/).flatten.first
-          @comments[comment_id] = OOXL::Comments.load_from_stream(entry.get_input_stream.read)
-        when "xl/sharedStrings.xml"
-          Nokogiri.XML(entry.get_input_stream.read).remove_namespaces!.xpath('sst/si').each do |shared_string_node|
-            shared_strings << shared_string_node.xpath('r/t|t').map { |value_node| value_node.text}.join('')
-          end
-        when /xl\/tables\/.*?/i
-          @tables << OOXL::Table.new(entry.get_input_stream.read)
-        when "xl/workbook.xml"
-          @workbook = OOXL::Workbook.load_from_stream(entry.get_input_stream.read)
-        when /xl\/worksheets\/_rels\/sheet\d+\.xml\.rels/
-          sheet_id = entry.name.scan(/sheet(\d+)/).flatten.first
-          @relationships[sheet_id] = Relationships.new(entry.get_input_stream.read)
-        else
-          # unsupported for now..
+    spreadsheet_zip.each do |entry|
+      case entry.name
+      when /xl\/worksheets\/sheet(\d+)?\.xml/
+        sheet_id = entry.name.scan(/xl\/worksheets\/sheet(\d+)?\.xml/).flatten.first
+        @sheets[sheet_id] = OOXL::Sheet.new(entry.get_input_stream.read, shared_strings, @options)
+      when /xl\/styles\.xml/
+        @styles = OOXL::Styles.load_from_stream(entry.get_input_stream.read)
+      when /xl\/comments(\d+)?\.xml/
+        comment_id = entry.name.scan(/xl\/comments(\d+)\.xml/).flatten.first
+        @comments[comment_id] = OOXL::Comments.load_from_stream(entry.get_input_stream.read)
+      when "xl/sharedStrings.xml"
+        Nokogiri.XML(entry.get_input_stream.read).remove_namespaces!.xpath('sst/si').each do |shared_string_node|
+          shared_strings << shared_string_node.xpath('r/t|t').map { |value_node| value_node.text}.join('')
         end
+      when /xl\/tables\/.*?/i
+        @tables << OOXL::Table.new(entry.get_input_stream.read)
+      when "xl/workbook.xml"
+        @workbook = OOXL::Workbook.load_from_stream(entry.get_input_stream.read)
+      when /xl\/worksheets\/_rels\/sheet\d+\.xml\.rels/
+        sheet_id = entry.name.scan(/sheet(\d+)/).flatten.first
+        @sheet_relationships[sheet_id] = Relationships.new(entry.get_input_stream.read)
+      when /xl\/_rels\/workbook\.xml\.rels/
+        @workbook_relationships = Relationships.new(entry.get_input_stream.read)
+      else
+        # unsupported for now..
       end
     end
   end

data/lib/ooxl/version.rb

@@ -1,3 +1,3 @@
 class OOXL
-  VERSION = "0.0.1.5.1"
+  VERSION = "0.0.1.5.6"
 end

data/lib/ooxl/xl_objects/comments.rb

@@ -14,7 +14,7 @@ class OOXL
       comment_xml =Nokogiri.XML(comment_xml).remove_namespaces!
 
       comments = comment_xml.xpath("//comments/commentList/comment").map do |comment_node|
-        comment_text_node = comment_node.xpath('./text/r/t')
+        comment_text_node = comment_node.xpath('./text/r/t').presence || comment_node.xpath('./text/t')
 
         value = if comment_text_node.is_a?(Array)
           comment_text_node.map { |comment_text_node| comment_text_node.text }.join('')

data/lib/ooxl/xl_objects/relationships.rb

@@ -1,29 +1,41 @@
 class OOXL
   class Relationships
     SUPPORTED_TYPES = ['http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments']
+
     def initialize(relationships_node)
-      @types = {}
+      @relationships = []
       parse_relationships(relationships_node)
     end
 
     def comment_id
-      @types['comments']
+      comment_target = by_type('comments').first
+      comment_target && extract_file_reference(comment_target)
+    end
+
+    def [](id)
+      @relationships.find { |rel| rel.id == id }&.target
+    end
+
+    def by_type(type)
+      @relationships.select { |rel| rel.type == type }.map(&:target)
     end
 
     private
+
     def parse_relationships(relationships_node)
       relationships_node = Nokogiri.XML(relationships_node).remove_namespaces!
       relationships_node.xpath('//Relationship').each do |relationship_node|
         relationship_type = relationship_node.attributes["Type"].value
         target = relationship_node.attributes["Target"].value
-        if supported_type?(relationship_type)
-          @types[extract_type(relationship_type)] = extract_file_reference(target)
-        end
+        id = extract_number(relationship_node.attributes["Id"].value)
+        type = extract_type(relationship_type)
+        target = relationship_node.attributes["Target"].value
+        @relationships << Relationship.new(id, type, target)
       end
     end
 
-    def supported_type?(type)
-      SUPPORTED_TYPES.include?(type)
+    def extract_number(str)
+      str.scan(/(\d+)/).flatten.first
     end
 
     def extract_type(type)
@@ -34,6 +46,7 @@ class OOXL
       file.scan(/(\d+)\.[\w]/).flatten.first
     end
 
+    Relationship = Struct.new(:id, :type, :target)
   end
 end
 

data/lib/ooxl/xl_objects/row_cache.rb

@@ -117,7 +117,7 @@ class OOXL
     end
 
     def row_nodes
-      @row_nodes ||= @sheet_xml.xpath('//sheetData/row')
+      @row_nodes ||= @sheet_xml.xpath('//sheetData/row')&.to_a
     end
 
     def parse_row(row_node)

data/ooxml_excel.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.add_dependency 'activesupport'
   spec.add_dependency 'nokogiri', '~> 1'
-  spec.add_dependency 'rubyzip', '~> 1.0', '< 2.0.0'
+  spec.add_dependency 'rubyzip', '~> 1.3.0', '< 2.0.0'
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "pry-byebug"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ooxl
 version: !ruby/object:Gem::Version
-  version: 0.0.1.5.1
+  version: 0.0.1.5.6
 platform: ruby
 authors:
 - James Mones
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-10-19 00:00:00.000000000 Z
+date: 2022-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,7 +44,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.3.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -54,7 +54,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.3.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -153,7 +153,7 @@ files:
 homepage: https://github.com/halcjames/ooxl
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -168,9 +168,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: OOXL Excel - Parse Excel Spreadsheets (xlsx, xlsm).
 test_files: []