jruby-poi 0.6.1 → 0.7.1

data/lib/poi/workbook/named_range.rb

@@ -8,19 +8,19 @@ module POI
     end
   
     def name
-      @name.getNameName
+      @name.name_name
     end
   
     def sheet
-      @workbook[@name.getSheetName]
+      @workbook.worksheets[@name.sheet_name]
     end
   
     def formula
-      @name.getRefersToFormula
+      @name.refers_to_formula
     end
   
     def cells
-      [@workbook.cell(formula)].flatten
+      @name.is_deleted ? [] : [@workbook.cell(formula)].flatten
     end
   
     def values

data/lib/poi/workbook/row.rb

@@ -5,44 +5,54 @@ module POI
     def initialize(worksheet)
       @worksheet = worksheet
       @poi_worksheet = worksheet.poi_worksheet
+      @rows = {}
     end
 
     def [](index)
-      Row.new(@poi_worksheet.getRow(index))
+      @rows[index] ||= Row.new(@poi_worksheet.row(index) || @poi_worksheet.create_row(index), @worksheet)
     end
 
     def size 
-      @poi_worksheet.getPhysicalNumberOfRows 
+      @poi_worksheet.physical_number_of_rows 
     end
 
     def each
-      it = @poi_worksheet.rowIterator
-      yield Row.new(it.next) while it.hasNext
+      it = @poi_worksheet.row_iterator
+      yield Row.new(it.next, @worksheet) while it.has_next
     end
   end
 
-  class Row
-    def initialize(row)
-      @row = row
+  class Row < Facade(:poi_row, org.apache.poi.ss.usermodel.Row)
+    def initialize(row, worksheet)
+      @row       = row
+      @worksheet = worksheet
     end
     
     def [](index)
       return nil if poi_row.nil?
-      Cell.new(poi_row.getCell(index))
+      cells[index]
     end
 
     def cells
-      Cells.new(self)
+      @cells ||= Cells.new(self)
     end
 
     def index
       return nil if poi_row.nil?
-      poi_row.getRowNum
+      poi_row.row_num
     end    
 
+    def height_in_points= num
+      set_height_in_points num.to_f
+    end
+
     def poi_row
       @row
     end
+    
+    def worksheet
+      @worksheet
+    end
   end
 end
 

data/lib/poi/workbook/workbook.rb

@@ -1,8 +1,18 @@
 require 'tmpdir'
 require 'stringio'
+require 'java'
 
 module POI
-  class Workbook
+  class Workbook < Facade(:poi_workbook, org.apache.poi.ss.usermodel.Workbook)
+    FONT = org.apache.poi.ss.usermodel.Font
+    FONT_CONSTANTS = Hash[*FONT.constants.map{|e| [e.downcase.to_sym, FONT.const_get(e)]}.flatten]
+
+    CELL_STYLE = org.apache.poi.ss.usermodel.CellStyle
+    CELL_STYLE_CONSTANTS = Hash[*CELL_STYLE.constants.map{|e| [e.downcase.to_sym, CELL_STYLE.const_get(e)]}.flatten]
+    
+    INDEXED_COLORS = org.apache.poi.ss.usermodel.IndexedColors
+    INDEXED_COLORS_CONSTANTS = Hash[*INDEXED_COLORS.constants.map{|e| [e.downcase.to_sym, INDEXED_COLORS.const_get(e)]}.flatten]
+    
     def self.open(filename_or_stream)
       name, stream = if filename_or_stream.kind_of?(java.io.InputStream)
         [File.join(Dir.tmpdir, "spreadsheet.xlsx"), filename_or_stream]
@@ -21,11 +31,19 @@ module POI
       instance
     end
     
+    def self.create(filename)
+      self.new(filename, nil)
+    end
+    
     attr_reader :filename
 
     def initialize(filename, io_stream)
       @filename = filename
-      @workbook = org.apache.poi.ss.usermodel.WorkbookFactory.create(io_stream)
+      @workbook = io_stream ? org.apache.poi.ss.usermodel.WorkbookFactory.create(io_stream) : org.apache.poi.xssf.usermodel.XSSFWorkbook.new
+    end
+    
+    def formula_evaluator
+      @formula_evaluator ||= @workbook.creation_helper.create_formula_evaluator
     end
 
     def save
@@ -48,32 +66,102 @@ module POI
     def close
       #noop
     end
+    
+    def create_sheet name='New Sheet'
+      # @workbook.createSheet name
+      worksheets[name]
+    end
+    
+    def create_style options={}
+      font = @workbook.createFont
+      set_value( font, :font_height_in_points, options ) do | value |
+        value.to_i
+      end
+      set_value font, :bold_weight, options, FONT_CONSTANTS
+      set_value font, :color, options, INDEXED_COLORS_CONSTANTS do | value |
+        value.index
+      end
+
+      style = @workbook.createCellStyle
+      [:alignment, :vertical_alignment, :fill_pattern, :border_right, :border_left, :border_top, :border_bottom].each do | sym |
+        set_value style, sym, options, CELL_STYLE_CONSTANTS do | value |
+          value.to_i
+        end
+      end
+      [:right_border_color, :left_border_color, :top_border_color, :bottom_border_color, :fill_foreground_color, :fill_background_color].each do | sym |
+        set_value( style, sym, options, INDEXED_COLORS_CONSTANTS ) do | value |
+          value.index
+        end
+      end
+      [:hidden, :locked, :wrap_text].each do | sym |
+        set_value style, sym, options
+      end
+      [:rotation, :indentation].each do | sym |
+        set_value( style, sym, options ) do | value |
+          value.to_i
+        end
+      end
+      set_value( style, :data_format, options ) do |value|
+        @workbook.create_data_format.getFormat(value)
+      end
+      style.font = font
+      style
+    end
+    
+    def set_value on, value_sym, from, using=nil
+      return on unless from.has_key?(value_sym)
+      value = if using
+        using[from[value_sym]]
+      else
+        from[value_sym]
+      end
+      value = yield value if block_given?
+      on.send("set_#{value_sym}", value)
+      on
+    end
 
     def worksheets
       @worksheets ||= Worksheets.new(self)
     end
     
     def named_ranges
-      @named_ranges ||= (0...@workbook.getNumberOfNames).collect do | idx |
-        NamedRange.new @workbook.getNameAt(idx), self
+      @named_ranges ||= (0...@workbook.number_of_names).collect do | idx |
+        NamedRange.new @workbook.name_at(idx), self
       end
     end
 
-    # sheet_index can be a Fixnum, referring to the 0-based sheet or
+    # reference can be a Fixnum, referring to the 0-based sheet or
     # a String which is the sheet name or a cell reference.
     # 
     # If a cell reference is passed the value of that cell is returned.
+    #
+    # If the reference refers to a contiguous range of cells an Array of values will be returned.
+    #
+    # If the reference refers to a multiple columns a Hash of values will be returned by column name.
     def [](reference)
-      begin
-        cell = cell(reference)
-        Array === cell ? cell.collect{|e| e.value} : cell.value
-      rescue
-        answer = worksheets[reference]
-        answer.poi_worksheet.nil? ? nil : answer
+      if Fixnum === reference
+        return worksheets[reference]
+      end
+      
+      if sheet = worksheets.detect{|e| e.name == reference}
+        return sheet.poi_worksheet.nil? ? nil : sheet
+      end
+
+      cell = cell(reference)
+      if Array === cell
+        cell.collect{|e| e.value}
+      elsif Hash === cell
+        values = {}
+        cell.each_pair{|column_name, cells| values[column_name] = cells.collect{|e| e.value}}
+        values
+      else
+        cell.value
       end
     end
 
     # takes a String in the form of a 3D cell reference and returns the Cell (eg. "Sheet 1!A1")
+    #
+    # If the reference refers to a contiguous range of cells an array of Cells will be returned
     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}
@@ -85,32 +173,90 @@ module POI
         end
       end
       
+      # check if the named_range is a full column reference
+      if column_reference?(named_range)
+        return all_cells_in_column named_range.formula
+      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?
+      if column_reference?(reference)
+        return all_cells_in_column reference
+      end
+
+      ref = POI::CELL_REF.new(reference)
+      single_cell ref
+    end
+    
+    # ref is a POI::CELL_REF instance
+    def single_cell ref
+      if ref.sheet_name.nil?
         raise 'cell references at the workbook level must include a sheet reference (eg. Sheet1!A1)'
       else
-        worksheets[ref.getSheetName][ref.getRow][ref.getCol]
+        worksheets[ref.sheet_name][ref.row][ref.col]
       end
     end
     
     def cells_in_area reference
       area = Area.new(reference)
-      if area.single_cell_reference?
-        []
-      else
-        area.in(self).compact
-      end
+      area.in(self)
     end
 
     def poi_workbook
       @workbook
     end
+    
+    def on_update cell
+      #clear_all_formula_results
+      #formula_evaluator.notify_update_cell cell.poi_cell
+    end
+    
+    def on_formula_update cell
+      #clear_all_formula_results
+      formula_evaluator.notify_set_formula cell.poi_cell
+      formula_evaluator.evaluate_formula_cell(cell.poi_cell)
+    end
+    
+    def on_delete cell
+      #clear_all_formula_results
+      formula_evaluator.notify_delete_cell cell.poi_cell
+    end
+    
+    def clear_all_formula_results
+      formula_evaluator.clear_all_cached_result_values
+    end
+    
+    def all_cells_in_column reference
+      sheet_parts = reference.split('!')
+      area_parts  = sheet_parts.last.split(':')
+      area_start  = "#{sheet_parts.first}!#{area_parts.first}"
+      area_end    = area_parts.last
+      
+      area = org.apache.poi.ss.util.AreaReference.getWholeColumn(area_start, area_end)
+      full_ref = "#{area.first_cell.format_as_string}:#{area.last_cell.format_as_string}"
+      Area.new(full_ref).in(self)
+      # cell_reference = org.apache.poi.ss.util.CellReference.new( reference + "1" )
+      # column         = cell_reference.get_col
+      # sheet          = cell_reference.get_sheet_name
+      # worksheets[sheet].rows.collect{|row| row[column]}
+    end
+    
+    private
+      def column_reference? named_range_or_reference
+        return false if named_range_or_reference.nil?
+        
+        reference = named_range_or_reference
+        if NamedRange === named_range_or_reference
+          reference = named_range_or_reference.formula
+        end
+        cell_reference = reference.split('!', 2).last
+        beginning, ending = cell_reference.split(':')
+        !(beginning =~ /\d/ || (ending.nil? ? false : ending =~ /\d/))
+      end
   end
 end
 

data/lib/poi/workbook/worksheet.rb

@@ -7,54 +7,72 @@ module POI
       @poi_workbook = workbook.poi_workbook
     end
 
-    def [](index)
+    def [](index_or_name)
       worksheet = case
-        when index.kind_of?(Numeric)
-          @poi_workbook.getSheetAt(index)
+        when index_or_name.kind_of?(Numeric)
+          @poi_workbook.sheet_at(index_or_name) || @poi_workbook.create_sheet
         else 
-          @poi_workbook.getSheet(index)
+          @poi_workbook.get_sheet(index_or_name) || @poi_workbook.create_sheet(index_or_name)
       end
-      Worksheet.new(worksheet)
+      Worksheet.new(worksheet, @workbook)
     end
 
     def size
-      @poi_workbook.getNumberOfSheets
+      @poi_workbook.number_of_sheets
     end
 
     def each
-      (0...size).each { |i| yield Worksheet.new(@poi_workbook.getSheetAt(i)) }
+      (0...size).each { |i| yield Worksheet.new(@poi_workbook.sheet_at(i), @workbook) }
     end
   end
 
-  class Worksheet
-    def initialize(worksheet = nil)
+  class Worksheet < Facade(:poi_worksheet, org.apache.poi.ss.usermodel.Sheet)
+
+    def initialize(worksheet, workbook)
       @worksheet = worksheet
+      @workbook  = workbook
     end
-
+    
     def name
-      @worksheet.getSheetName
+      @worksheet.sheet_name
+    end
+
+    def first_row
+      @worksheet.first_row_num
+    end
+
+    def last_row
+      @worksheet.last_row_num
     end
 
     def rows
-      Rows.new(self)
+      @rows ||= Rows.new(self)
     end
     
     # Accepts a Fixnum or a String as the row_index
     #
-    # row_index as Fixnum - returns the 0-based row
-    # row_index as String - assumes a cell reference within this sheet and returns the cell value for that reference
+    # row_index as Fixnum: returns the 0-based row
+    #
+    # row_index as String: assumes a cell reference within this sheet
+    #    if the value of the reference is non-nil the value is returned,
+    #    otherwise the referenced cell is returned
     def [](row_index)
       if Fixnum === row_index
         rows[row_index]
       else
         ref = org.apache.poi.ss.util.CellReference.new(row_index)
-        rows[ref.getRow][ref.getCol].value
+        cell = rows[ref.row][ref.col]
+        cell && cell.value ? cell.value : cell
       end
     end
 
     def poi_worksheet
       @worksheet
     end
+    
+    def workbook
+      @workbook
+    end
   end
 end
 

data/spec_debug.sh

@@ -1,13 +1,24 @@
 #!/bin/sh
 #set -x
 RUBY_DIR=$(dirname $(which ruby))/..
-RUBYGEMS_DIR=${RUBY_DIR}/lib/ruby/gems/1.8/gems
+if [[ ${RUBY_DIR} == *1.6.* ]]
+then
+	RUBYGEMS_DIR=${RUBY_DIR}/lib/ruby/gems/jruby/gems
+else
+	RUBYGEMS_DIR=${RUBY_DIR}/lib/ruby/gems/1.8/gems
+fi
 
 GEM_COLUMNIZE=$(ls -1d $RUBYGEMS_DIR/columnize*/lib | head -1 | /usr/bin/ruby -e 'print File.expand_path($stdin.read)')
 GEM_RUBY_DEBUG_BASE=$(ls -1d $RUBYGEMS_DIR/ruby-debug-base-*/lib | head -1 | /usr/bin/ruby -e 'print File.expand_path($stdin.read)')
 GEM_RUBY_DEBUG_CLI=$(ls -1d $RUBYGEMS_DIR/ruby-debug-*/cli | head -1 | /usr/bin/ruby -e 'print File.expand_path($stdin.read)')
 GEM_SOURCES=$(ls -1d $RUBYGEMS_DIR/sources-*/lib | head -1 | /usr/bin/ruby -e 'print File.expand_path($stdin.read)')
 
+echo "RUBYGEMS_DIR:        ${RUBYGEMS_DIR}"
+echo "GEM_SOURCES:         ${GEM_SOURCES}"
+echo "GEM_COLUMNIZE:       ${GEM_COLUMNIZE}"
+echo "GEM_RUBY_DEBUG_CLI:  ${GEM_RUBY_DEBUG_CLI}"
+echo "GEM_RUBY_DEBUG_BASE: ${GEM_RUBY_DEBUG_BASE}"
+
 runner="ruby --client \
 -I${GEM_COLUMNIZE} \
 -I${GEM_RUBY_DEBUG_BASE} \
@@ -15,7 +26,7 @@ runner="ruby --client \
 -I${GEM_SOURCES} \
 -rubygems -S"
 
-cmd="spec -c --debugger $*"
+cmd="bundle exec rdebug rspec -c $*"
 #cmd="irb"
 
 $runner $cmd