creek 1.1 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3950b25e2918e737d3cad09864a3afad4044f775
-  data.tar.gz: b5c9dd6210cdf859ecc74dfe6f06200d2971d4b5
+  metadata.gz: 144f13f0eba1b81962017976302f6b2db2b47b60
+  data.tar.gz: fa8fe5d9aecd0eab818f06027425a0bd28a15808
 SHA512:
-  metadata.gz: 401143686b68b23e43ccb286d6a6cf40f9cb0c0eeb085a5d87e625000358d3fbbc6b0420631da3d62758f0ee512298637df28c909261238df88879ff551c84c8
-  data.tar.gz: 1d7c66afffeeffdea98924e8ae6e1b2c1ee2dc163d22e8f9a395aa5e411b7bf040ae0f08ba66bf38c5fd478981b85df5b1c324587a0a3c48c43da03d7dc1bd88
+  metadata.gz: 6ae590ddf3d095381c2cde2109b90bd1b44637120bcbc24257325fa3283cae6f5fcf35f75778f7b425556bc6c9aeff3c897c018c91f3726e66004d9a56d1b510
+  data.tar.gz: 2f7abb6a3889bbf25fe78165244ed62e265a60b4ea4a3d598a6c0865c8188d4037d281b93c1069f694dcac3ec14c4bcd5765bc0cd1469247adeb714dc6c55e68

data/lib/creek/book.rb

@@ -22,8 +22,11 @@ module Creek
     def sheets
       doc = @files.file.open "xl/workbook.xml"
       xml = Nokogiri::XML::Document.parse doc
-      @sheets = xml.css('sheet').each_with_index.map  do |sheet, i|
-        Sheet.new(self, sheet.attr("name"), sheet.attr("sheetid"),  sheet.attr("state"), sheet.attr("visible"), sheet.attr("r:id"), i+1)
+      rels_doc = @files.file.open "xl/_rels/workbook.xml.rels"
+      rels = Nokogiri::XML::Document.parse(rels_doc).css("Relationship")
+      @sheets = xml.css('sheet').map do |sheet|
+        sheetfile = rels.find { |el| sheet.attr("r:id") == el.attr("Id") }.attr("Target")
+        Sheet.new(self, sheet.attr("name"), sheet.attr("sheetid"),  sheet.attr("state"), sheet.attr("visible"), sheet.attr("r:id"), sheetfile)
       end
     end
 

data/lib/creek/sheet.rb

@@ -13,14 +13,14 @@ module Creek
                 :index
 
 
-    def initialize book, name, sheetid, state, visible, rid, index
+    def initialize book, name, sheetid, state, visible, rid, sheetfile
       @book = book
       @name = name
       @sheetid = sheetid
       @visible = visible
       @rid = rid
       @state = state
-      @index = index
+      @sheetfile = sheetfile
 
       # An XLS file has only 256 columns, however, an XLSX or XLSM file can contain up to 16384 columns.
       # This function creates a hash with all valid XLSX column names and associated indices.
@@ -57,7 +57,7 @@ module Creek
     # Returns a hash per row that includes the cell ids and values.
     # Empty cells will be also included in the hash with a nil value.
     def rows_generator include_meta_data=false
-      path = "xl/worksheets/sheet#{@index}.xml"
+      path = "xl/#{@sheetfile}"
       if @book.files.file.exist?(path)
         # SAX parsing, Each element in the stream comes through as two events:
         # one to open the element and one to close it.

data/lib/creek/version.rb

@@ -1,3 +1,3 @@
 module Creek
-  VERSION = "1.1"
+  VERSION = "1.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: creek
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: 1.1.1
 platform: ruby
 authors:
 - pythonicrubyist
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-06 00:00:00.000000000 Z
+date: 2015-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -149,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A Ruby gem for parsing large Excel(xlsx and xlsm) files.