jruby-poi 0.6.0 → 0.6.1

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.6.1

data/jruby-poi.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jruby-poi}
-  s.version = "0.6.0"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Scott Deming", "Jason Rogers"]
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
      "lib/poi-scratchpad-3.6-20091214.jar",
      "lib/poi.rb",
      "lib/poi/workbook.rb",
+     "lib/poi/workbook/area.rb",
      "lib/poi/workbook/cell.rb",
      "lib/poi/workbook/named_range.rb",
      "lib/poi/workbook/row.rb",

data/lib/poi/workbook/area.rb

@@ -0,0 +1,24 @@
+module POI
+  class Area
+    def initialize reference
+      @ref = reference
+    end
+    
+    def in workbook
+      begin
+        area.getAllReferencedCells.collect{|c| workbook.cell c.formatAsString}
+      rescue
+        []
+      end
+    end
+    
+    def single_cell_reference?
+      @ref == area.getFirstCell.formatAsString
+    end
+    
+    private
+      def area
+        @area ||= org.apache.poi.ss.util.AreaReference.new(@ref)
+      end
+  end
+end

data/lib/poi/workbook/named_range.rb

@@ -1,45 +1,30 @@
-class NamedRange
+module POI
+  class NamedRange
   
-  # takes an instance of org.apache.poi.ss.usermodel.Name, and a POI::Workbook
-  def initialize name, workbook
-    @name = name
-    @workbook = workbook
-  end
-  
-  def name
-    @name.getNameName
-  end
-  
-  def sheet
-    @workbook[@name.getSheetName]
-  end
-  
-  def formula
-    @name.getRefersToFormula
-  end
+    # takes an instance of org.apache.poi.ss.usermodel.Name, and a POI::Workbook
+    def initialize name, workbook
+      @name = name
+      @workbook = workbook
+    end
   
-  def cells
-    area_range? ? all_cells_from_area : @workbook.cell(formula)
-  end
+    def name
+      @name.getNameName
+    end
   
-  def values
-    cells.collect{|c| c.value}
-  end
+    def sheet
+      @workbook[@name.getSheetName]
+    end
   
-  private
-    def area_range?
-      area.nil? == false
+    def formula
+      @name.getRefersToFormula
     end
-    
-    def area
-      @area ||= begin
-        org.apache.poi.ss.util.AreaReference.new formula
-      rescue
-        nil
-      end
+  
+    def cells
+      [@workbook.cell(formula)].flatten
     end
-    
-    def all_cells_from_area
-      area.getAllReferencedCells.collect{|c| @workbook.cell c.formatAsString}
+  
+    def values
+      cells.collect{|c| c.value}
     end
+  end
 end

data/lib/poi/workbook/workbook.rb

@@ -63,18 +63,19 @@ module POI
     # a String which is the sheet name or a cell reference.
     # 
     # If a cell reference is passed the value of that cell is returned.
-    def [](sheet_index)
+    def [](reference)
       begin
-        cell = cell(sheet_index)
+        cell = cell(reference)
         Array === cell ? cell.collect{|e| e.value} : cell.value
       rescue
-        answer = worksheets[sheet_index]
+        answer = worksheets[reference]
         answer.poi_worksheet.nil? ? nil : answer
       end
     end
 
     # takes a String in the form of a 3D cell reference and returns the Cell (eg. "Sheet 1!A1")
     def cell reference
+      # if the reference is to a named range of cells, get that range and return it
       if named_range = named_ranges.detect{|e| e.name == reference}
         cells = named_range.cells.compact
         if cells.empty?
@@ -83,7 +84,13 @@ module POI
           return cells.length == 1 ? cells.first : cells
         end
       end
-
+      
+      # if the reference is to an area of cells, get all the cells in that area and return them
+      cells = cells_in_area(reference)
+      unless cells.empty?
+        return cells.length == 1 ? cells.first : cells
+      end
+      
       ref = org.apache.poi.ss.util.CellReference.new(reference)
       if ref.getSheetName.nil?
         raise 'cell references at the workbook level must include a sheet reference (eg. Sheet1!A1)'
@@ -91,6 +98,15 @@ module POI
         worksheets[ref.getSheetName][ref.getRow][ref.getCol]
       end
     end
+    
+    def cells_in_area reference
+      area = Area.new(reference)
+      if area.single_cell_reference?
+        []
+      else
+        area.in(self).compact
+      end
+    end
 
     def poi_workbook
       @workbook

data/lib/poi/workbook.rb

@@ -1,3 +1,4 @@
+require File.join(JRUBY_POI_LIB_PATH, 'poi', 'workbook', 'area')
 require File.join(JRUBY_POI_LIB_PATH, 'poi', 'workbook', 'named_range')
 require File.join(JRUBY_POI_LIB_PATH, 'poi', 'workbook', 'workbook')
 require File.join(JRUBY_POI_LIB_PATH, 'poi', 'workbook', 'worksheet')

data/specs/workbook_spec.rb

@@ -71,6 +71,12 @@ describe POI::Workbook do
     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)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 6
-    - 0
-  version: 0.6.0
+    - 1
+  version: 0.6.1
 platform: ruby
 authors: 
   - Scott Deming
@@ -49,6 +49,7 @@ files:
   - lib/poi-scratchpad-3.6-20091214.jar
   - lib/poi.rb
   - lib/poi/workbook.rb
+  - lib/poi/workbook/area.rb
   - lib/poi/workbook/cell.rb
   - lib/poi/workbook/named_range.rb
   - lib/poi/workbook/row.rb