jruby-poi 0.8.2 → 0.9.0

data/.travis.yml

@@ -1,2 +1,4 @@
-rvm:
-  - jruby
+language: ruby
+rvm:
+  - jruby-18mode
+  - jruby-19mode

data/Gemfile

@@ -3,7 +3,7 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rspec", ">= 2.5.0"
-  gem "jeweler", ">= 1.6.0"
-  gem "rcov", ">= 0"
+  gem "rspec", ">= 2.11.0"
+  gem "jeweler", ">= 1.8.4"
+  gem "jruby-openssl"
 end

data/Gemfile.lock

@@ -1,29 +1,35 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    diff-lcs (1.1.2)
+    bouncy-castle-java (1.5.0146.1)
+    diff-lcs (1.1.3)
     git (1.2.5)
-    jeweler (1.6.0)
-      bundler (~> 1.0.0)
+    jeweler (1.8.4)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    rake (0.9.0)
-    rcov (0.9.9)
-    rcov (0.9.9-java)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.2)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
+      rdoc
+    jruby-openssl (0.7.7)
+      bouncy-castle-java (>= 1.5.0146.1)
+    json (1.7.3)
+    json (1.7.3-java)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.1)
 
 PLATFORMS
   java
   ruby
 
 DEPENDENCIES
-  jeweler (>= 1.6.0)
-  rcov
-  rspec (>= 2.5.0)
+  jeweler (>= 1.8.4)
+  jruby-openssl
+  rspec (>= 2.11.0)

data/README.markdown

@@ -1,6 +1,8 @@
 [jruby-poi](http://github.com/kameeoze/jruby-poi)
 =========
 
+[![Build Status](https://secure.travis-ci.org/kameeoze/jruby-poi.png)](http://travis-ci.org/kameeoze/jruby-poi)
+
 This little gem provides an alternative interface to the Apache POI java library, for JRuby. For now the API is targeted at wrapping spreadsheets. We may expand this in the future.
 
 INSTALL
@@ -62,6 +64,8 @@ TODO
 * fix reading ODS files -- we have a broken spec for this in io_spec.rb
 * add APIs for updating cells in a spreadsheet
 * create API for non-spreadsheet files
+* rdocs
+* tutorials, and/or better samples
 
 Contributors
 ============

data/VERSION

@@ -1 +1 @@
-0.8.2
+0.9.0

data/jruby-poi.gemspec

@@ -4,15 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{jruby-poi}
-  s.version = "0.8.2"
+  s.name = "jruby-poi"
+  s.version = "0.9.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Scott Deming", "Jason Rogers"]
-  s.date = %q{2011-05-22}
-  s.description = %q{A rubyesque library for manipulating spreadsheets and other document types for jruby, using Apache POI.}
+  s.date = "2012-10-15"
+  s.description = "A rubyesque library for manipulating spreadsheets and other document types for jruby, using Apache POI."
   s.email = ["sdeming@makefile.com", "jacaetevha@gmail.com"]
-  s.executables = ["autospec", "htmldiff", "ldiff", "rdebug", "rspec"]
   s.extra_rdoc_files = [
     "LICENSE",
     "README.markdown"
@@ -26,20 +25,16 @@ Gem::Specification.new do |s|
     "README.markdown",
     "Rakefile",
     "VERSION",
-    "bin/autospec",
-    "bin/htmldiff",
-    "bin/ldiff",
-    "bin/rdebug",
-    "bin/rspec",
     "jruby-poi.gemspec",
     "lib/ooxml-lib/dom4j-1.6.1.jar",
-    "lib/ooxml-lib/geronimo-stax-api_1.0_spec-1.0.jar",
+    "lib/ooxml-lib/stax-api-1.0.1.jar",
     "lib/ooxml-lib/xmlbeans-2.3.0.jar",
-    "lib/poi-3.7-20101029.jar",
-    "lib/poi-examples-3.7-20101029.jar",
-    "lib/poi-ooxml-3.7-20101029.jar",
-    "lib/poi-ooxml-schemas-3.7-20101029.jar",
-    "lib/poi-scratchpad-3.7-20101029.jar",
+    "lib/poi-3.8-20120326.jar",
+    "lib/poi-examples-3.8-20120326.jar",
+    "lib/poi-excelant-3.8-20120326.jar",
+    "lib/poi-ooxml-3.8-20120326.jar",
+    "lib/poi-ooxml-schemas-3.8-20120326.jar",
+    "lib/poi-scratchpad-3.8-20120326.jar",
     "lib/poi.rb",
     "lib/poi/workbook.rb",
     "lib/poi/workbook/area.rb",
@@ -63,28 +58,28 @@ Gem::Specification.new do |s|
     "spec/writing_spec.rb",
     "spec_debug.sh"
   ]
-  s.homepage = %q{http://github.com/kameeoze/jruby-poi}
+  s.homepage = "http://github.com/kameeoze/jruby-poi"
   s.licenses = ["Apache"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.1}
-  s.summary = %q{Apache POI class library for jruby}
+  s.rubygems_version = "1.8.24"
+  s.summary = "Apache POI class library for jruby"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 2.5.0"])
-      s.add_development_dependency(%q<jeweler>, [">= 1.6.0"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 2.11.0"])
+      s.add_development_dependency(%q<jeweler>, [">= 1.8.4"])
+      s.add_development_dependency(%q<jruby-openssl>, [">= 0"])
     else
-      s.add_dependency(%q<rspec>, [">= 2.5.0"])
-      s.add_dependency(%q<jeweler>, [">= 1.6.0"])
-      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 2.11.0"])
+      s.add_dependency(%q<jeweler>, [">= 1.8.4"])
+      s.add_dependency(%q<jruby-openssl>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rspec>, [">= 2.5.0"])
-    s.add_dependency(%q<jeweler>, [">= 1.6.0"])
-    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 2.11.0"])
+    s.add_dependency(%q<jeweler>, [">= 1.8.4"])
+    s.add_dependency(%q<jruby-openssl>, [">= 0"])
   end
 end
 

data/lib/poi.rb

@@ -2,14 +2,13 @@ JRUBY_POI_LIB_PATH=File.expand_path(File.dirname(__FILE__))
 
 # Java
 require 'java'
-require File.join(JRUBY_POI_LIB_PATH, 'poi-3.7-20101029.jar')
-require File.join(JRUBY_POI_LIB_PATH, 'poi-ooxml-3.7-20101029.jar')
-require File.join(JRUBY_POI_LIB_PATH, 'poi-ooxml-schemas-3.7-20101029.jar')
-require File.join(JRUBY_POI_LIB_PATH, 'poi-scratchpad-3.7-20101029.jar')
+require File.join(JRUBY_POI_LIB_PATH, 'poi-3.8-20120326.jar')
+require File.join(JRUBY_POI_LIB_PATH, 'poi-ooxml-3.8-20120326.jar')
+require File.join(JRUBY_POI_LIB_PATH, 'poi-ooxml-schemas-3.8-20120326.jar')
+require File.join(JRUBY_POI_LIB_PATH, 'poi-scratchpad-3.8-20120326.jar')
 require File.join(JRUBY_POI_LIB_PATH, 'ooxml-lib', 'xmlbeans-2.3.0.jar')
 require File.join(JRUBY_POI_LIB_PATH, 'ooxml-lib', 'dom4j-1.6.1.jar')
-require File.join(JRUBY_POI_LIB_PATH, 'ooxml-lib', 'geronimo-stax-api_1.0_spec-1.0.jar')
-
+require File.join(JRUBY_POI_LIB_PATH, 'ooxml-lib', 'stax-api-1.0.1.jar')
 
 # Ruby
 require File.join(JRUBY_POI_LIB_PATH, 'poi', 'workbook')

data/lib/poi/workbook/area.rb

@@ -1,81 +1,81 @@
-module POI
-  class Area
-    def initialize reference
-      @ref = reference
-    end
-    
-    def in workbook
-      if single_cell_reference?
-        ref = area.all_referenced_cells.first
-        return [workbook.single_cell ref]
-      end
-      
-      begin
-        by_column = {}
-        # refs = area.all_referenced_cells
-        # slices = refs.enum_slice(refs.length/15)
-        # slices.collect do |cell_refs|
-        #   Thread.start do
-        #     cell_refs.each do |cell_ref|
-        #       first = workbook.worksheets[cell_ref.sheet_name].first_row
-        #       last  = workbook.worksheets[cell_ref.sheet_name].last_row
-        #       next unless cell_ref.row >= first && cell_ref.row <= last
-        # 
-        #       # ref = POI::CELL_REF.new(c.format_as_string)
-        #       cell = workbook.single_cell cell_ref
-        #       (by_column[cell_ref.cell_ref_parts.collect.last] ||= []) << cell
-        #     end
-        #   end
-        # end.each {|t| t.join}
-
-        area.all_referenced_cells.each do |cell_ref|
-          first = workbook.worksheets[cell_ref.sheet_name].first_row
-          last  = workbook.worksheets[cell_ref.sheet_name].last_row
-          next unless cell_ref.row >= first && cell_ref.row <= last
-        
-          # ref = POI::CELL_REF.new(c.format_as_string)
-          cell = workbook.single_cell cell_ref
-          (by_column[cell_ref.cell_ref_parts.collect.last] ||= []) << cell
-        end
-                
-        by_column.each do |key, cells|
-          by_column[key] = cells.compact
-        end
-        
-        if by_column.length == 1
-          by_column.values.flatten
-        else
-          by_column
-        end
-      rescue
-        []
-      end
-    end
-    
-    def single_cell_reference?
-      area.single_cell? #@ref == getFirstCell.formatAsString rescue false
-    end
-    
-    private
-      def area
-        @area ||= new_area_reference
-      end
-      
-      def new_area_reference
-        begin
-          return POI::AREA_REF.new(@ref)
-        rescue
-          # not a valid reference, so proceed through to see if it's a column-based reference
-        end
-        sheet_parts = @ref.split('!')
-        area_parts  = sheet_parts.last.split(':')
-        area_start  = "#{sheet_parts.first}!#{area_parts.first}"
-        area_end    = area_parts.last
-        begin
-          POI::AREA_REF.getWholeColumn(area_start, area_end)
-        rescue
-          raise "could not determine area reference for #{@ref}: #{$!.message}"
-        end
-      end
-  end
-end
+module POI
+  class Area
+    def initialize reference
+      @ref = reference
+    end
+    
+    def in workbook
+      if single_cell_reference?
+        ref = area.all_referenced_cells.first
+        return [workbook.single_cell(ref)]
+      end
+      
+      begin
+        by_column = {}
+        # refs = area.all_referenced_cells
+        # slices = refs.enum_slice(refs.length/15)
+        # slices.collect do |cell_refs|
+        #   Thread.start do
+        #     cell_refs.each do |cell_ref|
+        #       first = workbook.worksheets[cell_ref.sheet_name].first_row
+        #       last  = workbook.worksheets[cell_ref.sheet_name].last_row
+        #       next unless cell_ref.row >= first && cell_ref.row <= last
+        # 
+        #       # ref = POI::CELL_REF.new(c.format_as_string)
+        #       cell = workbook.single_cell cell_ref
+        #       (by_column[cell_ref.cell_ref_parts.collect.last] ||= []) << cell
+        #     end
+        #   end
+        # end.each {|t| t.join}
+
+        area.all_referenced_cells.each do |cell_ref|
+          first = workbook.worksheets[cell_ref.sheet_name].first_row
+          last  = workbook.worksheets[cell_ref.sheet_name].last_row
+          next unless cell_ref.row >= first && cell_ref.row <= last
+        
+          # ref = POI::CELL_REF.new(c.format_as_string)
+          cell = workbook.single_cell cell_ref
+          (by_column[cell_ref.cell_ref_parts.to_a.last] ||= []) << cell
+        end
+                
+        by_column.each do |key, cells|
+          by_column[key] = cells.compact
+        end
+        
+        if by_column.length == 1
+          by_column.values.flatten
+        else
+          by_column
+        end
+      rescue
+        []
+      end
+    end
+    
+    def single_cell_reference?
+      area.single_cell? #@ref == getFirstCell.formatAsString rescue false
+    end
+    
+    private
+      def area
+        @area ||= new_area_reference
+      end
+      
+      def new_area_reference
+        begin
+          return POI::AREA_REF.new(@ref)
+        rescue
+          # not a valid reference, so proceed through to see if it's a column-based reference
+        end
+        sheet_parts = @ref.split('!')
+        area_parts  = sheet_parts.last.split(':')
+        area_start  = "#{sheet_parts.first}!#{area_parts.first}"
+        area_end    = area_parts.last
+        begin
+          POI::AREA_REF.getWholeColumn(area_start, area_end)
+        rescue
+          raise "could not determine area reference for #{@ref}: #{$!.message}"
+        end
+      end
+  end
+end

data/lib/poi/workbook/cell.rb

@@ -128,11 +128,11 @@ module POI
         return nil if cell_value.nil?
         
         case cell_value.cell_type
-        when CELL_TYPE_BLANK: nil
-        when CELL_TYPE_BOOLEAN: cell_value.boolean_value
-        when CELL_TYPE_ERROR: error_value_from(cell_value.error_value)
-        when CELL_TYPE_NUMERIC: numeric_value_from(cell_value)
-        when CELL_TYPE_STRING: cell_value.string_value
+        when CELL_TYPE_BLANK   then nil
+        when CELL_TYPE_BOOLEAN then cell_value.boolean_value
+        when CELL_TYPE_ERROR   then error_value_from(cell_value.error_value)
+        when CELL_TYPE_NUMERIC then numeric_value_from(cell_value)
+        when CELL_TYPE_STRING  then cell_value.string_value
         else
           raise "unhandled cell type[#{cell_value.cell_type}]"
         end
@@ -142,11 +142,11 @@ module POI
         return nil if cell_type.nil?
         begin
           case cell_type
-          when CELL_TYPE_BLANK: nil
-          when CELL_TYPE_BOOLEAN: CELL_VALUE.value_of(poi_cell.boolean_cell_value)
-          when CELL_TYPE_FORMULA: cell_value_for_type(poi_cell.cached_formula_result_type)
-          when CELL_TYPE_STRING: CELL_VALUE.new(poi_cell.string_cell_value)
-          when CELL_TYPE_ERROR, CELL_TYPE_NUMERIC: CELL_VALUE.new(poi_cell.numeric_cell_value)
+          when CELL_TYPE_BLANK   then nil
+          when CELL_TYPE_BOOLEAN then CELL_VALUE.value_of(poi_cell.boolean_cell_value)
+          when CELL_TYPE_FORMULA then cell_value_for_type(poi_cell.cached_formula_result_type)
+          when CELL_TYPE_STRING  then CELL_VALUE.new(poi_cell.string_cell_value)
+          when CELL_TYPE_ERROR, CELL_TYPE_NUMERIC then CELL_VALUE.new(poi_cell.numeric_cell_value)
           else
             raise "unhandled cell type[#{poi_cell.cell_type}]"
           end

data/lib/poi/workbook/workbook.rb

@@ -31,15 +31,21 @@ module POI
       instance
     end
     
-    def self.create(filename)
-      self.new(filename, nil)
+    def self.create(filename, options={})
+      self.new(filename, nil, options)
     end
     
     attr_reader :filename
 
-    def initialize(filename, io_stream)
+    def initialize(filename, io_stream, options={})
       @filename = filename
-      @workbook = io_stream ? org.apache.poi.ss.usermodel.WorkbookFactory.create(io_stream) : org.apache.poi.xssf.usermodel.XSSFWorkbook.new
+      @workbook = if io_stream
+        org.apache.poi.ss.usermodel.WorkbookFactory.create(io_stream)
+      elsif options[:format] == :hssf
+        org.apache.poi.hssf.usermodel.HSSFWorkbook.new
+      else
+        org.apache.poi.xssf.usermodel.XSSFWorkbook.new
+      end
     end
     
     def formula_evaluator

data/spec/workbook_spec.rb

@@ -1,370 +1,385 @@
-require 'spec_helper'
-
-require 'date'
-require 'stringio'
-
-describe POI::Workbook do
-  it "should open a workbook and allow access to its worksheets" do
-    name = TestDataFile.expand_path("various_samples.xlsx")
-    book = POI::Workbook.open(name)
-    book.worksheets.size.should == 5
-    book.filename.should == name
-  end
-
-  it "should be able to create a Workbook from an IO object" do
-    content = StringIO.new(open(TestDataFile.expand_path("various_samples.xlsx"), 'rb'){|f| f.read})
-    book = POI::Workbook.open(content)
-    book.worksheets.size.should == 5
-    book.filename.should =~ /spreadsheet.xlsx$/
-  end
-
-  it "should be able to create a Workbook from a Java input stream" do
-    content = java.io.FileInputStream.new(TestDataFile.expand_path("various_samples.xlsx"))
-    book = POI::Workbook.open(content)
-    book.worksheets.size.should == 5
-    book.filename.should =~ /spreadsheet.xlsx$/
-  end
-  
-  it "should return a column of cells by reference" do
-    name = TestDataFile.expand_path("various_samples.xlsx")
-    book = POI::Workbook.open(name)
-    book["numbers!$A"].should == book['numbers'].rows.collect{|e| e[0].value}
-    book["numbers!A"].should == book['numbers'].rows.collect{|e| e[0].value}
-    book["numbers!C"].should == book['numbers'].rows.collect{|e| e[2].value}
-    book["numbers!$D:$D"].should == book['numbers'].rows.collect{|e| e[3].value}
-    book["numbers!$c:$D"].should == {"C" => book['numbers'].rows.collect{|e| e[2].value}, "D" => book['numbers'].rows.collect{|e| e[3].value}}
-  end
-  
-  it "should return cells by reference" do
-    name = TestDataFile.expand_path("various_samples.xlsx")
-    book = POI::Workbook.open(name)
-    book.cell("numbers!A1").value.should == 'NUM'
-    book.cell("numbers!A2").to_s.should == '1.0'
-    book.cell("numbers!A3").to_s.should == '2.0'
-    book.cell("numbers!A4").to_s.should == '3.0'
-    
-    book.cell("numbers!A10").to_s.should == '9.0'
-    book.cell("numbers!B10").to_s.should == '81.0'
-    book.cell("numbers!C10").to_s.should == '729.0'
-    book.cell("numbers!D10").to_s.should == '3.0'
-
-    book.cell("text & pic!A10").value.should == 'This is an Excel XLSX workbook.'
-    book.cell("bools & errors!B3").value.should == true
-    book.cell("high refs!AM619").value.should == 'This is some text'
-    book.cell("high refs!AO624").value.should == 24.0
-    book.cell("high refs!AP631").value.should == 13.0
-
-    book.cell(%Q{'text & pic'!A10}).value.should == 'This is an Excel XLSX workbook.'
-    book.cell(%Q{'bools & errors'!B3}).value.should == true
-    book.cell(%Q{'high refs'!AM619}).value.should == 'This is some text'
-    book.cell(%Q{'high refs'!AO624}).value.should == 24.0
-    book.cell(%Q{'high refs'!AP631}).value.should == 13.0
-  end
-  
-  it "should handle named cell ranges" do
-    name = TestDataFile.expand_path("various_samples.xlsx")
-    book = POI::Workbook.open(name)
-
-    book.named_ranges.length.should == 3
-    book.named_ranges.collect{|e| e.name}.should == %w{four_times_six NAMES nums}
-    book.named_ranges.collect{|e| e.sheet.name}.should == ['high refs', 'bools & errors', 'high refs']
-    book.named_ranges.collect{|e| e.formula}.should == ["'high refs'!$AO$624", "'bools & errors'!$D$2:$D$11", "'high refs'!$AP$619:$AP$631"]
-    book['four_times_six'].should == 24.0
-    book['nums'].should == (1..13).collect{|e| e * 1.0}
-    
-    # NAMES is a range of empty cells
-    book['NAMES'].should == [nil, nil, nil, nil, nil, nil, nil, nil, nil, nil]
-    book.cell('NAMES').each do | cell |
-      cell.value.should be_nil
-      cell.poi_cell.should_not be_nil
-      cell.to_s.should be_empty
-    end
-  end
-  
-  it "should return an array of cell values by reference" do
-    name = TestDataFile.expand_path("various_samples.xlsx")
-    book = POI::Workbook.open(name)
-    book['dates!A2:A16'].should == (Date.parse('2010-02-28')..Date.parse('2010-03-14')).to_a
-  end
-  
-  it "should return cell values by reference" do
-    name = TestDataFile.expand_path("various_samples.xlsx")
-    book = POI::Workbook.open(name)
-
-    book['text & pic!A10'].should == 'This is an Excel XLSX workbook.'
-    book['bools & errors!B3'].should == true
-    book['high refs!AM619'].should == 'This is some text'
-    book['high refs!AO624'].should == 24.0
-    book['high refs!AP631'].should == 13.0
-  end
-end
-
-describe POI::Worksheets do
-  it "should allow indexing worksheets by ordinal" do
-    name = TestDataFile.expand_path("various_samples.xlsx")
-    book = POI::Workbook.open(name)
-
-    book.worksheets[0].name.should == "text & pic"
-    book.worksheets[1].name.should == "numbers"
-    book.worksheets[2].name.should == "dates"
-    book.worksheets[3].name.should == "bools & errors"
-  end
-
-  it "should allow indexing worksheets by name" do
-    name = TestDataFile.expand_path("various_samples.xlsx")
-    book = POI::Workbook.open(name)
-
-    book.worksheets["text & pic"].name.should == "text & pic"
-    book.worksheets["numbers"].name.should == "numbers"
-    book.worksheets["dates"].name.should == "dates"
-  end
-
-  it "should be enumerable" do
-    name = TestDataFile.expand_path("various_samples.xlsx")
-    book = POI::Workbook.open(name)
-    book.worksheets.should be_kind_of Enumerable
-
-    book.worksheets.each do |sheet|
-      sheet.should be_kind_of POI::Worksheet
-    end
-
-    book.worksheets.size.should == 5
-    book.worksheets.collect.size.should == 5
-  end
-  
-  it "returns cells when passing a cell reference" do
-    name = TestDataFile.expand_path("various_samples.xlsx")
-    book = POI::Workbook.open(name)
-    book['dates']['A2'].to_s.should == '2010-02-28'
-    book['dates']['a2'].to_s.should == '2010-02-28'
-    book['dates']['B2'].to_s.should == '2010-03-14'
-    book['dates']['b2'].to_s.should == '2010-03-14'
-    book['dates']['C2'].to_s.should == '2010-03-28'
-    book['dates']['c2'].to_s.should == '2010-03-28'
-  end
-end
-
-describe POI::Rows do
-  it "should be enumerable" do
-    name = TestDataFile.expand_path("various_samples.xlsx")
-    book = POI::Workbook.open(name)
-    sheet = book.worksheets["text & pic"]
-    sheet.rows.should be_kind_of Enumerable
-    
-    sheet.rows.each do |row|
-      row.should be_kind_of POI::Row
-    end
-
-    sheet.rows.size.should == 7
-    sheet.rows.collect.size.should == 7
-  end
-end
-
-describe POI::Cells do
-  before :each do
-    @name = TestDataFile.expand_path("various_samples.xlsx")
-    @book = POI::Workbook.open(@name)
-  end
-
-  def book
-    @book
-  end
-
-  def name
-    @name
-  end
-  
-  it "should be enumerable" do
-    sheet = book.worksheets["text & pic"]
-    rows = sheet.rows
-    cells = rows[0].cells
-
-    cells.should be_kind_of Enumerable
-    cells.size.should == 1
-    cells.collect.size.should == 1
-  end
-end
-
-describe POI::Cell do
-  before :each do
-    @name = TestDataFile.expand_path("various_samples.xlsx")
-    @book = POI::Workbook.open(@name)
-  end
-
-  def book
-    @book
-  end
-
-  def name
-    @name
-  end
-
-  it "should provide dates for date cells" do
-    sheet = book.worksheets["dates"]
-    rows = sheet.rows
-    
-    dates_by_column = [
-      (Date.parse('2010-02-28')..Date.parse('2010-03-14')),
-      (Date.parse('2010-03-14')..Date.parse('2010-03-28')),
-      (Date.parse('2010-03-28')..Date.parse('2010-04-11'))]
-    (0..2).each do |col|
-      dates_by_column[col].each_with_index do |date, index|
-        row = index + 1
-        rows[row][col].value.should equal_at_cell(date, row, col)
-      end
-    end
-  end
-
-  it "should provide numbers for numeric cells" do
-    sheet = book.worksheets["numbers"]
-    rows = sheet.rows
-    
-    (1..15).each do |number|
-      row = number
-      rows[row][0].value.should equal_at_cell(number,            row, 0)
-      rows[row][1].value.should equal_at_cell(number ** 2,       row, 1)
-      rows[row][2].value.should equal_at_cell(number ** 3,       row, 2)
-      rows[row][3].value.should equal_at_cell(Math.sqrt(number), row, 3)
-    end
-    
-    rows[9][0].to_s.should == '9.0'
-    rows[9][1].to_s.should == '81.0'
-    rows[9][2].to_s.should == '729.0'
-    rows[9][3].to_s.should == '3.0'
-  end
-
-  it "should handle array access from the workbook down to cells" do
-    book[1][9][0].to_s.should == '9.0'
-    book[1][9][1].to_s.should == '81.0'
-    book[1][9][2].to_s.should == '729.0'
-    book[1][9][3].to_s.should == '3.0'
-
-    book["numbers"][9][0].to_s.should == '9.0'
-    book["numbers"][9][1].to_s.should == '81.0'
-    book["numbers"][9][2].to_s.should == '729.0'
-    book["numbers"][9][3].to_s.should == '3.0'
-  end
-
-  it "should provide error text for error cells" do
-    sheet = book.worksheets["bools & errors"]
-    rows = sheet.rows
-
-    rows[6][0].value.should == 0.0 #'~CIRCULAR~REF~'
-    rows[6][0].error_value.should be_nil
-
-    rows[7][0].value.should be_nil
-    rows[7][0].error_value.should == '#DIV/0!'
-
-    rows[8][0].value.should be_nil
-    rows[8][0].error_value.should == '#N/A'
-
-    rows[9][0].value.should be_nil
-    rows[9][0].error_value.should == '#NAME?'
-
-    rows[10][0].value.should be_nil
-    rows[10][0].error_value.should == '#NULL!'
-
-    rows[11][0].value.should be_nil
-    rows[11][0].error_value.should == '#NUM!'
-
-    rows[12][0].value.should be_nil
-    rows[12][0].error_value.should == '#REF!'
-
-    rows[13][0].value.should be_nil
-    rows[13][0].error_value.should == '#VALUE!'
-
-    lambda{ rows[14][0].value }.should_not raise_error(Java::java.lang.RuntimeException)
-    
-    rows[6][0].to_s.should == '0.0' #'~CIRCULAR~REF~'
-    rows[7][0].to_s.should == '' #'#DIV/0!'
-    rows[8][0].to_s.should == '' #'#N/A'
-    rows[9][0].to_s.should == '' #'#NAME?'
-    rows[10][0].to_s.should == '' #'#NULL!'
-    rows[11][0].to_s.should == '' #'#NUM!'
-    rows[12][0].to_s.should == '' #'#REF!'
-    rows[13][0].to_s.should == '' #'#VALUE!'
-    rows[14][0].to_s.should == ''
-  end
-
-  it "should provide booleans for boolean cells" do
-    sheet = book.worksheets["bools & errors"]
-    rows = sheet.rows
-    rows[1][0].value.should == false
-    rows[1][0].to_s.should == 'false'
-    
-    rows[1][1].value.should == false
-    rows[1][1].to_s.should == 'false'
-    
-    rows[2][0].value.should == true
-    rows[2][0].to_s.should == 'true'
-    
-    rows[2][1].value.should == true
-    rows[2][1].to_s.should == 'true'
-  end
-
-  it "should provide the cell value as a string" do
-    sheet = book.worksheets["text & pic"]
-    rows = sheet.rows
-
-    rows[0][0].value.should == "This"
-    rows[1][0].value.should == "is"
-    rows[2][0].value.should == "an"
-    rows[3][0].value.should == "Excel"
-    rows[4][0].value.should == "XLSX"
-    rows[5][0].value.should == "workbook"
-    rows[9][0].value.should == 'This is an Excel XLSX workbook.'
-    
-
-    rows[0][0].to_s.should == "This"
-    rows[1][0].to_s.should == "is"
-    rows[2][0].to_s.should == "an"
-    rows[3][0].to_s.should == "Excel"
-    rows[4][0].to_s.should == "XLSX"
-    rows[5][0].to_s.should == "workbook"
-    rows[9][0].to_s.should == 'This is an Excel XLSX workbook.'
-  end
-  
-  it "should provide formulas instead of string-ified values" do
-    sheet = book.worksheets["numbers"]
-    rows = sheet.rows
-
-    (1..15).each do |number|
-      row = number
-      rows[row][0].to_s(false).should == "#{number}.0"
-      rows[row][1].to_s(false).should == "A#{row + 1}*A#{row + 1}"
-      rows[row][2].to_s(false).should == "B#{row + 1}*A#{row + 1}"
-      rows[row][3].to_s(false).should == "SQRT(A#{row + 1})"
-    end
-
-    sheet = book.worksheets["bools & errors"]
-    rows = sheet.rows
-    rows[1][0].to_s(false).should == '1=2'
-    rows[1][1].to_s(false).should == 'FALSE'
-    rows[2][0].to_s(false).should == '1=1'
-    rows[2][1].to_s(false).should == 'TRUE'
-    rows[14][0].to_s(false).should == 'foobar(1)'
-    
-    sheet = book.worksheets["text & pic"]
-    sheet.rows[9][0].to_s(false).should == 'CONCATENATE(A1," ", A2," ", A3," ", A4," ", A5," ", A6,".")'
-  end
-  
-  it "should handle getting values out of 'non-existent' cells" do
-    sheet = book.worksheets["bools & errors"]
-    sheet.rows[14][2].value.should be_nil
-  end
-
-  it "should notify the workbook that I have been updated" do
-    book['dates!A10'].to_s.should == '2010-03-08'
-    book['dates!A16'].to_s.should == '2010-03-14'
-    book['dates!B2'].to_s.should == '2010-03-14'
-
-    cell = book.cell('dates!B2')
-    cell.formula.should == 'A16'
-    
-    cell.formula = 'A10 + 1'
-    book.cell('dates!B2').poi_cell.should === cell.poi_cell
-    book.cell('dates!B2').formula.should == 'A10 + 1'
-
-    book['dates!B2'].to_s.should == '2010-03-09'
-  end
-end
+require 'spec_helper'
+
+require 'date'
+require 'stringio'
+
+describe POI::Workbook do
+  it "should open a workbook and allow access to its worksheets" do
+    name = TestDataFile.expand_path("various_samples.xlsx")
+    book = POI::Workbook.open(name)
+    book.worksheets.size.should == 5
+    book.filename.should == name
+  end
+
+  it "should be able to create a Workbook from an IO object" do
+    content = StringIO.new(open(TestDataFile.expand_path("various_samples.xlsx"), 'rb'){|f| f.read})
+    book = POI::Workbook.open(content)
+    book.worksheets.size.should == 5
+    book.filename.should =~ /spreadsheet.xlsx$/
+  end
+
+  it "should be able to create a Workbook from a Java input stream" do
+    content = java.io.FileInputStream.new(TestDataFile.expand_path("various_samples.xlsx"))
+    book = POI::Workbook.open(content)
+    book.worksheets.size.should == 5
+    book.filename.should =~ /spreadsheet.xlsx$/
+  end
+
+  it "should create an HSSFWorkbook when passed a :format => :hssf option" do
+    book = POI::Workbook.create('test.xls', :format => :hssf)
+    book.poi_workbook.should be_kind_of(org.apache.poi.hssf.usermodel.HSSFWorkbook)
+  end
+
+  it "should create an XSSFWorkbook when passed a :format => :xssf option" do
+    book = POI::Workbook.create('test.xlsx', :format => :xssf)
+    book.poi_workbook.should be_kind_of(org.apache.poi.xssf.usermodel.XSSFWorkbook)
+  end
+
+  it "should create an XSSFWorkbook by default" do
+    book = POI::Workbook.create('test.xlsx')
+    book.poi_workbook.should be_kind_of(org.apache.poi.xssf.usermodel.XSSFWorkbook)
+  end
+
+  it "should return a column of cells by reference" do
+    name = TestDataFile.expand_path("various_samples.xlsx")
+    book = POI::Workbook.open(name)
+    book["numbers!$A"].should == book['numbers'].rows.collect{|e| e[0].value}
+    book["numbers!A"].should == book['numbers'].rows.collect{|e| e[0].value}
+    book["numbers!C"].should == book['numbers'].rows.collect{|e| e[2].value}
+    book["numbers!$D:$D"].should == book['numbers'].rows.collect{|e| e[3].value}
+    book["numbers!$c:$D"].should == {"C" => book['numbers'].rows.collect{|e| e[2].value}, "D" => book['numbers'].rows.collect{|e| e[3].value}}
+  end
+  
+  it "should return cells by reference" do
+    name = TestDataFile.expand_path("various_samples.xlsx")
+    book = POI::Workbook.open(name)
+    book.cell("numbers!A1").value.should == 'NUM'
+    book.cell("numbers!A2").to_s.should == '1.0'
+    book.cell("numbers!A3").to_s.should == '2.0'
+    book.cell("numbers!A4").to_s.should == '3.0'
+    
+    book.cell("numbers!A10").to_s.should == '9.0'
+    book.cell("numbers!B10").to_s.should == '81.0'
+    book.cell("numbers!C10").to_s.should == '729.0'
+    book.cell("numbers!D10").to_s.should == '3.0'
+
+    book.cell("text & pic!A10").value.should == 'This is an Excel XLSX workbook.'
+    book.cell("bools & errors!B3").value.should == true
+    book.cell("high refs!AM619").value.should == 'This is some text'
+    book.cell("high refs!AO624").value.should == 24.0
+    book.cell("high refs!AP631").value.should == 13.0
+
+    book.cell(%Q{'text & pic'!A10}).value.should == 'This is an Excel XLSX workbook.'
+    book.cell(%Q{'bools & errors'!B3}).value.should == true
+    book.cell(%Q{'high refs'!AM619}).value.should == 'This is some text'
+    book.cell(%Q{'high refs'!AO624}).value.should == 24.0
+    book.cell(%Q{'high refs'!AP631}).value.should == 13.0
+  end
+  
+  it "should handle named cell ranges" do
+    name = TestDataFile.expand_path("various_samples.xlsx")
+    book = POI::Workbook.open(name)
+
+    book.named_ranges.length.should == 3
+    book.named_ranges.collect{|e| e.name}.should == %w{four_times_six NAMES nums}
+    book.named_ranges.collect{|e| e.sheet.name}.should == ['high refs', 'bools & errors', 'high refs']
+    book.named_ranges.collect{|e| e.formula}.should == ["'high refs'!$AO$624", "'bools & errors'!$D$2:$D$11", "'high refs'!$AP$619:$AP$631"]
+    book['four_times_six'].should == 24.0
+    book['nums'].should == (1..13).collect{|e| e * 1.0}
+    
+    # NAMES is a range of empty cells
+    book['NAMES'].should == [nil, nil, nil, nil, nil, nil, nil, nil, nil, nil]
+    book.cell('NAMES').each do | cell |
+      cell.value.should be_nil
+      cell.poi_cell.should_not be_nil
+      cell.to_s.should be_empty
+    end
+  end
+  
+  it "should return an array of cell values by reference" do
+    name = TestDataFile.expand_path("various_samples.xlsx")
+    book = POI::Workbook.open(name)
+    book['dates!A2:A16'].should == (Date.parse('2010-02-28')..Date.parse('2010-03-14')).to_a
+  end
+  
+  it "should return cell values by reference" do
+    name = TestDataFile.expand_path("various_samples.xlsx")
+    book = POI::Workbook.open(name)
+
+    book['text & pic!A10'].should == 'This is an Excel XLSX workbook.'
+    book['bools & errors!B3'].should == true
+    book['high refs!AM619'].should == 'This is some text'
+    book['high refs!AO624'].should == 24.0
+    book['high refs!AP631'].should == 13.0
+  end
+end
+
+describe POI::Worksheets do
+  it "should allow indexing worksheets by ordinal" do
+    name = TestDataFile.expand_path("various_samples.xlsx")
+    book = POI::Workbook.open(name)
+
+    book.worksheets[0].name.should == "text & pic"
+    book.worksheets[1].name.should == "numbers"
+    book.worksheets[2].name.should == "dates"
+    book.worksheets[3].name.should == "bools & errors"
+  end
+
+  it "should allow indexing worksheets by name" do
+    name = TestDataFile.expand_path("various_samples.xlsx")
+    book = POI::Workbook.open(name)
+
+    book.worksheets["text & pic"].name.should == "text & pic"
+    book.worksheets["numbers"].name.should == "numbers"
+    book.worksheets["dates"].name.should == "dates"
+  end
+
+  it "should be enumerable" do
+    name = TestDataFile.expand_path("various_samples.xlsx")
+    book = POI::Workbook.open(name)
+    book.worksheets.should be_kind_of Enumerable
+
+    book.worksheets.each do |sheet|
+      sheet.should be_kind_of POI::Worksheet
+    end
+
+    book.worksheets.count.should == 5
+    book.worksheets.collect.count.should == 5
+  end
+  
+  it "returns cells when passing a cell reference" do
+    name = TestDataFile.expand_path("various_samples.xlsx")
+    book = POI::Workbook.open(name)
+    book['dates']['A2'].to_s.should == '2010-02-28'
+    book['dates']['a2'].to_s.should == '2010-02-28'
+    book['dates']['B2'].to_s.should == '2010-03-14'
+    book['dates']['b2'].to_s.should == '2010-03-14'
+    book['dates']['C2'].to_s.should == '2010-03-28'
+    book['dates']['c2'].to_s.should == '2010-03-28'
+  end
+end
+
+describe POI::Rows do
+  it "should be enumerable" do
+    name = TestDataFile.expand_path("various_samples.xlsx")
+    book = POI::Workbook.open(name)
+    sheet = book.worksheets["text & pic"]
+    sheet.rows.should be_kind_of Enumerable
+    
+    sheet.rows.each do |row|
+      row.should be_kind_of POI::Row
+    end
+
+    sheet.rows.count.should == 7
+    sheet.rows.collect.count.should == 7
+  end
+end
+
+describe POI::Cells do
+  before :each do
+    @name = TestDataFile.expand_path("various_samples.xlsx")
+    @book = POI::Workbook.open(@name)
+  end
+
+  def book
+    @book
+  end
+
+  def name
+    @name
+  end
+  
+  it "should be enumerable" do
+    sheet = book.worksheets["text & pic"]
+    rows = sheet.rows
+    cells = rows[0].cells
+
+    cells.should be_kind_of Enumerable
+    cells.count.should == 1
+    cells.collect.count.should == 1
+  end
+end
+
+describe POI::Cell do
+  before :each do
+    @name = TestDataFile.expand_path("various_samples.xlsx")
+    @book = POI::Workbook.open(@name)
+  end
+
+  def book
+    @book
+  end
+
+  def name
+    @name
+  end
+
+  it "should provide dates for date cells" do
+    sheet = book.worksheets["dates"]
+    rows = sheet.rows
+    
+    dates_by_column = [
+      (Date.parse('2010-02-28')..Date.parse('2010-03-14')),
+      (Date.parse('2010-03-14')..Date.parse('2010-03-28')),
+      (Date.parse('2010-03-28')..Date.parse('2010-04-11'))]
+    (0..2).each do |col|
+      dates_by_column[col].each_with_index do |date, index|
+        row = index + 1
+        rows[row][col].value.should equal_at_cell(date, row, col)
+      end
+    end
+  end
+
+  it "should provide numbers for numeric cells" do
+    sheet = book.worksheets["numbers"]
+    rows = sheet.rows
+    
+    (1..15).each do |number|
+      row = number
+      rows[row][0].value.should equal_at_cell(number,            row, 0)
+      rows[row][1].value.should equal_at_cell(number ** 2,       row, 1)
+      rows[row][2].value.should equal_at_cell(number ** 3,       row, 2)
+      rows[row][3].value.should equal_at_cell(Math.sqrt(number), row, 3)
+    end
+    
+    rows[9][0].to_s.should == '9.0'
+    rows[9][1].to_s.should == '81.0'
+    rows[9][2].to_s.should == '729.0'
+    rows[9][3].to_s.should == '3.0'
+  end
+
+  it "should handle array access from the workbook down to cells" do
+    book[1][9][0].to_s.should == '9.0'
+    book[1][9][1].to_s.should == '81.0'
+    book[1][9][2].to_s.should == '729.0'
+    book[1][9][3].to_s.should == '3.0'
+
+    book["numbers"][9][0].to_s.should == '9.0'
+    book["numbers"][9][1].to_s.should == '81.0'
+    book["numbers"][9][2].to_s.should == '729.0'
+    book["numbers"][9][3].to_s.should == '3.0'
+  end
+
+  it "should provide error text for error cells" do
+    sheet = book.worksheets["bools & errors"]
+    rows = sheet.rows
+
+    rows[6][0].value.should == 0.0 #'~CIRCULAR~REF~'
+    rows[6][0].error_value.should be_nil
+
+    rows[7][0].value.should be_nil
+    rows[7][0].error_value.should == '#DIV/0!'
+
+    rows[8][0].value.should be_nil
+    rows[8][0].error_value.should == '#N/A'
+
+    rows[9][0].value.should be_nil
+    rows[9][0].error_value.should == '#NAME?'
+
+    rows[10][0].value.should be_nil
+    rows[10][0].error_value.should == '#NULL!'
+
+    rows[11][0].value.should be_nil
+    rows[11][0].error_value.should == '#NUM!'
+
+    rows[12][0].value.should be_nil
+    rows[12][0].error_value.should == '#REF!'
+
+    rows[13][0].value.should be_nil
+    rows[13][0].error_value.should == '#VALUE!'
+
+    lambda{ rows[14][0].value }.should_not raise_error(Java::java.lang.RuntimeException)
+    
+    rows[6][0].to_s.should == '0.0' #'~CIRCULAR~REF~'
+    rows[7][0].to_s.should == '' #'#DIV/0!'
+    rows[8][0].to_s.should == '' #'#N/A'
+    rows[9][0].to_s.should == '' #'#NAME?'
+    rows[10][0].to_s.should == '' #'#NULL!'
+    rows[11][0].to_s.should == '' #'#NUM!'
+    rows[12][0].to_s.should == '' #'#REF!'
+    rows[13][0].to_s.should == '' #'#VALUE!'
+    rows[14][0].to_s.should == ''
+  end
+
+  it "should provide booleans for boolean cells" do
+    sheet = book.worksheets["bools & errors"]
+    rows = sheet.rows
+    rows[1][0].value.should == false
+    rows[1][0].to_s.should == 'false'
+    
+    rows[1][1].value.should == false
+    rows[1][1].to_s.should == 'false'
+    
+    rows[2][0].value.should == true
+    rows[2][0].to_s.should == 'true'
+    
+    rows[2][1].value.should == true
+    rows[2][1].to_s.should == 'true'
+  end
+
+  it "should provide the cell value as a string" do
+    sheet = book.worksheets["text & pic"]
+    rows = sheet.rows
+
+    rows[0][0].value.should == "This"
+    rows[1][0].value.should == "is"
+    rows[2][0].value.should == "an"
+    rows[3][0].value.should == "Excel"
+    rows[4][0].value.should == "XLSX"
+    rows[5][0].value.should == "workbook"
+    rows[9][0].value.should == 'This is an Excel XLSX workbook.'
+    
+
+    rows[0][0].to_s.should == "This"
+    rows[1][0].to_s.should == "is"
+    rows[2][0].to_s.should == "an"
+    rows[3][0].to_s.should == "Excel"
+    rows[4][0].to_s.should == "XLSX"
+    rows[5][0].to_s.should == "workbook"
+    rows[9][0].to_s.should == 'This is an Excel XLSX workbook.'
+  end
+  
+  it "should provide formulas instead of string-ified values" do
+    sheet = book.worksheets["numbers"]
+    rows = sheet.rows
+
+    (1..15).each do |number|
+      row = number
+      rows[row][0].to_s(false).should == "#{number}.0"
+      rows[row][1].to_s(false).should == "A#{row + 1}*A#{row + 1}"
+      rows[row][2].to_s(false).should == "B#{row + 1}*A#{row + 1}"
+      rows[row][3].to_s(false).should == "SQRT(A#{row + 1})"
+    end
+
+    sheet = book.worksheets["bools & errors"]
+    rows = sheet.rows
+    rows[1][0].to_s(false).should == '1=2'
+    rows[1][1].to_s(false).should == 'FALSE'
+    rows[2][0].to_s(false).should == '1=1'
+    rows[2][1].to_s(false).should == 'TRUE'
+    rows[14][0].to_s(false).should == 'foobar(1)'
+    
+    sheet = book.worksheets["text & pic"]
+    sheet.rows[9][0].to_s(false).should == 'CONCATENATE(A1," ", A2," ", A3," ", A4," ", A5," ", A6,".")'
+  end
+  
+  it "should handle getting values out of 'non-existent' cells" do
+    sheet = book.worksheets["bools & errors"]
+    sheet.rows[14][2].value.should be_nil
+  end
+
+  it "should notify the workbook that I have been updated" do
+    book['dates!A10'].to_s.should == '2010-03-08'
+    book['dates!A16'].to_s.should == '2010-03-14'
+    book['dates!B2'].to_s.should == '2010-03-14'
+
+    cell = book.cell('dates!B2')
+    cell.formula.should == 'A16'
+    
+    cell.formula = 'A10 + 1'
+    book.cell('dates!B2').poi_cell.should === cell.poi_cell
+    book.cell('dates!B2').formula.should == 'A10 + 1'
+
+    book['dates!B2'].to_s.should == '2010-03-09'
+  end
+end