rubyXL 1.1.1 → 1.1.2

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

data/lib/worksheet.rb

@@ -26,6 +26,11 @@ class Worksheet < PrivateClass
     return @sheet_data[row]
   end
 
+  #returns 2d array of just the cell values (without style or formula information)
+  def extract_data
+    return @sheet_data.map {|row| row.map {|c| if c.is_a?(Cell) then c.value else nil end}}
+  end
+
   def get_table(headers=[])
     validate_workbook
     
@@ -573,6 +578,47 @@ class Worksheet < PrivateClass
       end
     end
   end
+  
+  # by default, only sets cell to nil
+  # if :left is specified, method will shift row contents to the right of the deleted cell to the left
+  # if :up is specified, method will shift column contents below the deleted cell upward
+  def delete_cell(row=0,col=0,shift=nil)
+    validate_workbook
+    validate_nonnegative(row)
+    validate_nonnegative(col)
+    if @sheet_data.size <= row || @sheet_data[row].size <= col
+      return nil
+    end
+    
+    cell = @sheet_data[row][col]
+    @sheet_data[row][col]=nil
+    
+    if shift && shift != :left && shift != :up
+      raise 'invalid shift option'
+    end
+    
+    if shift == :left
+      @sheet_data[row].delete_at(col)
+      @sheet_data[row] << nil
+      (col...(@sheet_data[row].size)).each do |index|
+        if @sheet_data[row][index].is_a?(Cell)
+          @sheet_data[row][index].column -= 1
+        end
+      end
+    elsif shift == :up
+      (row...(@sheet_data.size-1)).each do |index|
+        @sheet_data[index][col] = @sheet_data[index+1][col]
+        if @sheet_data[index][col].is_a?(Cell)
+          @sheet_data[index][col].row -= 1
+        end
+      end
+      if @sheet_data.last[col].is_a?(Cell)
+        @sheet_data.last[col].row -= 1
+      end
+    end
+    
+    return cell
+  end
 
   def get_row_fill(row=0)
     validate_workbook

data/rubyXL.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rubyXL}
-  s.version = "1.1.1"
+  s.version = "1.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Vivek Bhagwat"]

data/spec/lib/worksheet_spec.rb

@@ -17,6 +17,15 @@ describe RubyXL::Worksheet do
     @old_cell_formula = @worksheet[0][0].formula
   end
 
+  describe '.extract_data' do
+    it 'should return a 2d array of just the cell values (without style or formula information)' do
+      data = @worksheet.extract_data()
+      data[0][0].should == '0:0'
+      data.size.should == @worksheet.sheet_data.size
+      data[0].size.should == @worksheet[0].size
+    end
+  end
+
   describe '.get_table' do
     it 'should return nil if table cannot be found with specified string' do
       @worksheet.get_table('TEST').should be_nil
@@ -1081,6 +1090,40 @@ describe RubyXL::Worksheet do
     end
   end
 
+  describe '.delete_cell' do
+    it 'should make a cell nil if no shift argument specified' do
+      deleted = @worksheet.delete_cell(0,0)
+      @worksheet[0][0].should be_nil
+      @old_cell.inspect.should == deleted.inspect
+    end
+    
+    it 'should return nil if a cell which is out of range is specified' do
+      @worksheet.delete_cell(12,12).should be_nil
+    end
+    
+    it 'should cause error if a negative argument is passed in' do
+      lambda {
+        @worksheet.delete_cell(-1,-1)
+      }.should raise_error
+    end
+    
+    it 'should shift cells to the right of the deleted cell left if :left is specified' do
+      @worksheet.delete_cell(0,0,:left)
+      @worksheet[0][0].value.should == '0:1'
+    end
+    
+    it 'should shift cells below the deleted cell up if :up is specified' do
+      @worksheet.delete_cell(0,0,:up)
+      @worksheet[0][0].value.should == '1:0'
+    end
+    
+    it 'should cause en error if an argument other than :left, :up, or nil is specified for shift' do
+      lambda {
+        @worksheet.delete_cell(0,0,:down)
+      }.should raise_error
+    end
+  end
+
   describe '.get_row_fill' do
     it 'should return white (ffffff) if no fill color specified for row' do
       @worksheet.get_row_fill(0).should == 'ffffff'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubyXL
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Vivek Bhagwat