rubyXL 1.0.9 → 1.0.10

data/VERSION

@@ -1 +1 @@
-1.0.9
+1.0.10

data/lib/cell.rb

@@ -304,7 +304,10 @@ module RubyXL
     end
 
     def inspect
-      "#{@row},#{@column}: #{@value} = #{@formula}, datatype = #{@datatype}, style_index = #{@style_index}"
+      str = "(#{@row},#{@column}): #{@value}" 
+      str += " =#{@formula}" if @formula
+      str += ", datatype = #{@datatype}, style_index = #{@style_index}"
+      return str
     end
 
     private

data/lib/workbook.rb

@@ -184,6 +184,7 @@ module RubyXL
       if File.exist?(filepath)
         FileUtils.rm_rf(dirpath)
       end
+      return filepath
     end
 
     #gets style object from style array given index

data/lib/worksheet.rb

@@ -393,9 +393,36 @@ class Worksheet < PrivateClass
     return @sheet_data[row][column]
   end
 
+  def delete_row(row_index=0)
+    validate_workbook
+    validate_nonnegative(row_index)
+    
+    if row_index >= @sheet_data.size
+      return nil
+    end
+    
+    deleted = @sheet_data.delete_at(row_index)
+    row_num = row_index+1
+    
+    row_num.upto(@sheet_data.size) do |index|
+      @row_styles[(index-1).to_s] = deep_copy(@row_styles[index.to_s])
+    end
+    @row_styles.delete(@sheet_data.size.to_s)
+    
+    #change row styles
+    # raise row_styles.inspect
+    
+    #change cell row numbers
+    (row_index...(@sheet_data.size-1)).each do |index|
+      @sheet_data[index].map {|c| c.row -= 1 if c}
+    end
+    
+    return deleted
+  end
+
   #inserts row at row_index, pushes down, copies style from below (row previously at that index)
   #USE OF THIS METHOD will break formulas which reference cells which are being "pushed down"
-  def insert_row(row_index)
+  def insert_row(row_index=0)
     validate_workbook
     validate_nonnegative(row_index)
 
@@ -450,9 +477,41 @@ class Worksheet < PrivateClass
     return @sheet_data[row_index]
   end
 
+  def delete_column(col_index=0)
+    validate_workbook
+    validate_nonnegative(col_index)
+    
+    if col_index >= @sheet_data[0].size
+      return nil
+    end
+    
+    #delete column
+    @sheet_data.map {|r| r.delete_at(col_index)}
+
+    #change column numbers for cells to right of deleted column
+    @sheet_data.each_with_index do |row,row_index|
+      (col_index...(row.size)).each do |index|
+        if @sheet_data[row_index][index].is_a?(Cell)
+          @sheet_data[row_index][index].column -= 1
+        end
+      end
+    end
+    
+    #shift column styles
+    #shift col styles 'left'
+    @cols.each do |col|
+      if Integer(col[:attributes][:min]) >= col_index
+        col[:attributes][:min] = (Integer(col[:attributes][:min]) - 1).to_s
+      end
+      if Integer(col[:attributes][:max]) >= col_index
+        col[:attributes][:max] = (Integer(col[:attributes][:max]) - 1).to_s
+      end
+    end
+  end
+
   # inserts column at col_index, pushes everything right, takes styles from column to left
   # USE OF THIS METHOD will break formulas which reference cells which are being "pushed down"
-  def insert_column(col_index)
+  def insert_column(col_index=0)
     validate_workbook
     validate_nonnegative(col_index)
     increase_columns(col_index)

data/rubyXL.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rubyXL}
-  s.version = "1.0.9"
+  s.version = "1.0.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Vivek Bhagwat"]
-  s.date = %q{2011-08-08}
+  s.date = %q{2011-08-10}
   s.description = %q{rubyXL is a gem which allows the parsing, creation, and manipulation of Microsoft Excel (.xlsx/.xlsm) Documents}
   s.email = %q{bhagwat.vivek@gmail.com}
   s.extra_rdoc_files = [

data/spec/lib/worksheet_spec.rb

@@ -953,6 +953,34 @@ describe RubyXL::Worksheet do
     end
   end
 
+  describe '.delete_row' do
+    it 'should delete a row at index specified, "pushing" everything else "up"' do
+      @worksheet.delete_row(0)
+      @worksheet[0][0].value.should == "1:0"
+      @worksheet[0][0].formula.should be_nil
+      @worksheet[0][0].row.should == 0
+      @worksheet[0][0].column.should == 0
+    end
+    
+    it 'should delete a row at index specified, adjusting styles for other rows' do
+      @worksheet.change_row_font_name(1,"Courier")
+      @worksheet.delete_row(0)
+      @worksheet.get_row_font_name(0).should == "Courier"
+    end
+    
+    it 'should preserve (rather than fix) formulas that reference cells in "pushed up" rows' do
+      @worksheet.add_cell(11,0,nil,'SUM(A1:A10)')
+      @worksheet.delete_row(0)
+      @worksheet[10][0].formula.should == 'SUM(A1:A10)'
+    end
+    
+    it 'should cause error if a negative argument is passed in' do
+      lambda {
+        @worksheet.delete_row(-1)
+      }.should raise_error
+    end
+  end
+
   describe '.insert_row' do
     it 'should insert a row at index specified, "pushing" everything else "down"' do
       @worksheet.insert_row(0)
@@ -986,6 +1014,34 @@ describe RubyXL::Worksheet do
     end
   end
 
+  describe '.delete_column' do
+    it 'should delete a column at index specified, "pushing" everything else "left"' do
+      @worksheet.delete_column(0)
+      @worksheet[0][0].value.should == "0:1"
+      @worksheet[0][0].formula.should be_nil
+      @worksheet[0][0].row.should == 0
+      @worksheet[0][0].column.should == 0
+    end
+    
+    it 'should delete a column at index specified, "pushing" styles "left"' do
+      @worksheet.change_column_font_name(1,"Courier")
+      @worksheet.delete_column(0)
+      @worksheet.get_column_font_name(0).should == "Courier"
+    end
+    
+    it 'should preserve (rather than fix) formulas that reference cells in "pushed left" columns' do
+      @worksheet.add_cell(0,4,nil,'SUM(A1:D1)')
+      @worksheet.delete_column(0)
+      @worksheet[0][3].formula.should == 'SUM(A1:D1)'
+    end
+    
+    it 'should cause error if negative argument is passed in' do
+      lambda {
+        @worksheet.delete_column(-1)
+      }.should raise_error
+    end
+  end
+
   describe '.insert_column' do
     it 'should insert a column at index specified, "pushing" everything else "right"' do
       @worksheet.insert_column(0)
@@ -1006,7 +1062,7 @@ describe RubyXL::Worksheet do
       @worksheet.get_column_font_name(0).should == 'Verdana' #not courier
     end
 
-    it 'should preserve (rather than fix) formulas that reference cells in "pushed right" rows' do
+    it 'should preserve (rather than fix) formulas that reference cells in "pushed right" column' do
       @worksheet.add_cell(0,5,nil,'SUM(A1:D1)')
       @worksheet.insert_column(0)
       @worksheet[0][6].formula.should == 'SUM(A1:D1)'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubyXL
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: false
   segments: 
   - 1
   - 0
-  - 9
-  version: 1.0.9
+  - 10
+  version: 1.0.10
 platform: ruby
 authors: 
 - Vivek Bhagwat
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-08 00:00:00 -04:00
+date: 2011-08-10 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency