sheets 1.1.0 → 1.1.1

data/.travis.yml

@@ -3,4 +3,5 @@ rvm:
  - 1.9.2
  - 1.9.3
  - ree
- - rbx
+ - rbx
+ - jruby

data/lib/sheets/parsers/nokogiri_xlsx_parser.rb

@@ -54,14 +54,13 @@ class Sheets::Parsers::NokogiriXlsxParser < Sheets::Parsers::Base
     @shared_strings ||= Nokogiri::XML( zipfile.read("xl/sharedStrings.xml") ).css('si>t').collect(&:text)
   end
 
-  # returns an array of strings containing the worksheet ids from the workbook
-  def worksheet_ids
-    @sheet_ids ||= workbook.css('sheets>sheet').collect {|sheet| sheet.attribute('sheetId').value }
+  def number_of_worksheets
+    @number_of_worksheets ||= workbook.css("sheets > sheet").size
   end
 
   # returns an array of nokogiri documents for each worksheet
   def worksheets
-    @worksheets ||= worksheet_ids.collect {|sheet_id| Nokogiri::XML( zipfile.read("xl/worksheets/sheet#{sheet_id}.xml") ) }
+    @worksheets ||= (1..number_of_worksheets).collect { |n| Nokogiri::XML(zipfile.read("xl/worksheets/sheet#{n}.xml")) }
   end
 
   # returns a date object representing the start of the serial date system for this sheet
@@ -76,4 +75,4 @@ class Sheets::Parsers::NokogiriXlsxParser < Sheets::Parsers::Base
       end
     end.call
   end
-end
+end

data/lib/sheets/version.rb

@@ -1,3 +1,3 @@
 module Sheets
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/test/parsers/nokogiri_xlsx_parser_test.rb

@@ -0,0 +1,10 @@
+class TestNokogiriXlsxParser < Test::Unit::TestCase
+  def setup
+    file_path = File.expand_path("../../data/reordered_workbooks.xlsx", __FILE__)
+    @sheet = Sheets::Parsers::NokogiriXlsxParser.new(File.read(file_path), :xlsx, file_path)
+  end
+
+  def test_does_not_raise_error_when_second_workbook_has_id_of_3
+    assert_nothing_raised { @sheet.to_array }
+  end
+end

metadata

@@ -1,90 +1,87 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sheets
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 1
-  - 0
-  version: 1.1.0
+version: !ruby/object:Gem::Version
+  version: 1.1.1
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Bradley J. Spaulding
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-29 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 6
-        - 5
-        - 2
-        version: 0.6.5.2
-  requirement: *id001
+date: 2012-10-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: spreadsheet
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.5.2
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 4
-        version: 0.9.4
-  requirement: *id002
-  name: rubyzip
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.5.2
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.4
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        - 3
-        - 1
-        version: 1.4.3.1
-  requirement: *id003
-  name: nokogiri
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.4
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.3.1
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 2
-        version: 0.9.2
-  requirement: *id004
-  name: rake
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.3.1
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.2
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.2
 description: Work with spreadsheets easily in a native ruby format.
-email: 
+email:
 - brad.spaulding@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -106,6 +103,7 @@ files:
 - lib/sheets/version.rb
 - sheets.gemspec
 - test/base_test.rb
+- test/data/reordered_workbooks.xlsx
 - test/data/roo_issue_28885_test.xlsx
 - test/data/simple.csv
 - test/data/simple.ods
@@ -115,44 +113,49 @@ files:
 - test/parseable_test.rb
 - test/parsers/basic_parsers_test.rb
 - test/parsers/csv_parser_test.rb
+- test/parsers/nokogiri_xlsx_parser_test.rb
 - test/renderable_test.rb
 - test/renderers/basic_renderers_test.rb
 - test/renderers/csv_renderer_test.rb
 - test/renderers/excel_renderer_test.rb
 - test/results.json
 - test/test_helper.rb
-has_rdoc: true
 homepage: https://github.com/bspaulding/Sheets
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
+      hash: -333247326234641115
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -333247326234641115
 requirements: []
-
 rubyforge_project: sheets
-rubygems_version: 1.3.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Sheets provides a Facade for importing spreadsheets that gives the application control. Any Spreadsheet can be represented as either (1) a two dimensional array, or (2) an array of hashes. Sheets' goal is to convert any spreadsheet format to one of these native Ruby data structures.
-test_files: 
+summary: Sheets provides a Facade for importing spreadsheets that gives the application
+  control. Any Spreadsheet can be represented as either (1) a two dimensional array,
+  or (2) an array of hashes. Sheets' goal is to convert any spreadsheet format to
+  one of these native Ruby data structures.
+test_files:
 - test/base_test.rb
+- test/data/reordered_workbooks.xlsx
 - test/data/roo_issue_28885_test.xlsx
 - test/data/simple.csv
 - test/data/simple.ods
@@ -162,6 +165,7 @@ test_files:
 - test/parseable_test.rb
 - test/parsers/basic_parsers_test.rb
 - test/parsers/csv_parser_test.rb
+- test/parsers/nokogiri_xlsx_parser_test.rb
 - test/renderable_test.rb
 - test/renderers/basic_renderers_test.rb
 - test/renderers/csv_renderer_test.rb