ooxl 0.0.1.4.21 → 0.0.1.4.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8ba04d000eb29de8d6fab1f279a026bc5a7a675
-  data.tar.gz: 3d4514f48b4c9735e9c19d95d6d13a6ce18f0aa2
+  metadata.gz: 35abcbc0c7fe9cfcb31ed48ae9507966da07fc53
+  data.tar.gz: d2e1e49926bbe037ce865531058b0f0ca592a526
 SHA512:
-  metadata.gz: 3d5477e883777dd2fd4ccad099b0f022e9c130ac1a905f56405d807e5e2f1caabb0600b36a12e73d3b8abab4b73db7322b1fbae675e0867f1de08f4f1d21830c
-  data.tar.gz: 32127221a37c2523ee84a1cd4649971bd5cfd3f7b0ac76f0cee41256e011e1bb3021b3466dd014a8db8b307c5fa89aecabe7b4eaff1c7b5358fdc1cdfaa0ec9d
+  metadata.gz: af462fac6d22aa506790cd95b09a7b90520214881f8f5328197145b000423d3bea23e97ff97c11d2c6d343480ee2f965de5da6b39b059c906e6fc293f17ae664
+  data.tar.gz: 79011afbdd27a63e9683741f4e6a091c5cee437b9b5a2669bea51ed0235cd5c08168e61ced5fe39d3693aec755b848600106b86aa3497146b2e955d8c71c2220

data/lib/ooxl/ooxl.rb

@@ -1,21 +1,24 @@
 class OOXL
   include Enumerable
   include ListHelper
-
-  def initialize(spreadsheet_filepath, options={})
+  attr_reader :filename
+  
+  def initialize(spreadsheet_filepath, options={})
     @workbook = nil
     @sheets = {}
     @styles = []
     @comments = {}
     @relationships = {}
     @options = options
+    @tables = []
+    @filename = File.basename(spreadsheet_filepath)
     parse_spreadsheet_contents(spreadsheet_filepath)
   end
 
   def self.open(spreadsheet_filepath, options={})
     new(spreadsheet_filepath, options)
-  end
-
+  end
+
   def sheets(skip_hidden: false)
     @workbook.sheets.map do |sheet|
       next if sheet[:state] != 'visible' &&  (@options[:skip_hidden_sheets] || skip_hidden)
@@ -48,12 +51,16 @@ class OOXL
     text.include?('!') ? load_cell_range(text) : sheet(text)
   end
 
-  def named_range(name, clean_range: false)
+  def named_range(name, clean_range: false)
     # yes_no => 'Lists'!$A$1:$A$6
-    defined_name = @workbook.defined_names[name]
-    defined_name = defined_name.gsub(/\[.+\]/, '').squish if clean_range
-
-    load_cell_range(defined_name) if defined_name.present?
+    defined_name = @workbook.defined_names[name]
+    defined_name = defined_name.gsub(/\[.+\]/, '').squish if clean_range
+
+    load_cell_range(defined_name) if defined_name.present?
+  end
+
+  def table(name)
+    @tables.find { |tbl| tbl.name == name}
   end
 
   def load_cell_range(range_text)
@@ -88,6 +95,8 @@ class OOXL
           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/

data/lib/ooxl/version.rb

@@ -1,3 +1,3 @@
 class OOXL
-  VERSION = "0.0.1.4.21"
+  VERSION = "0.0.1.4.22"
 end

data/lib/ooxl/xl_objects/sheet.rb

@@ -73,9 +73,9 @@ class OOXL
       columns
     end
 
-    def cell(cell_id)
+    def cell(cell_id, stream: false)
       column_letter, row_index = cell_id.partition(/\d+/)
-      current_row = row(row_index)
+      current_row = row(row_index, stream: stream)
       current_row.cell(column_letter) unless current_row.nil?
     end
 

data/lib/ooxl/xl_objects/table.rb

@@ -0,0 +1,15 @@
+class OOXL
+  class Table
+    def initialize(stream)
+      @table_node = Nokogiri.XML(stream).remove_namespaces!
+    end
+
+    def ref
+      @table_node.at('/table').attributes['ref'].try(:value)
+    end
+
+    def name
+      @table_node.at('/table').attributes['name'].try(:value)
+    end
+  end
+end

data/lib/ooxl.rb

@@ -11,6 +11,7 @@ require "ooxl/list_helper"
 require "ooxl/ooxl"
 require "ooxl/util"
 require "ooxl/xl_objects/workbook"
+require "ooxl/xl_objects/table"
 require "ooxl/xl_objects/relationships"
 require "ooxl/xl_objects/comments"
 require "ooxl/xl_objects/styles"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ooxl
 version: !ruby/object:Gem::Version
-  version: 0.0.1.4.21
+  version: 0.0.1.4.22
 platform: ruby
 authors:
 - James Mones
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-05 00:00:00.000000000 Z
+date: 2017-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -132,6 +132,7 @@ files:
 - lib/ooxl/xl_objects/sheet.rb
 - lib/ooxl/xl_objects/sheet/data_validation.rb
 - lib/ooxl/xl_objects/styles.rb
+- lib/ooxl/xl_objects/table.rb
 - lib/ooxl/xl_objects/workbook.rb
 - ooxml_excel.gemspec
 homepage: https://github.com/halcjames/ooxl