rubyXL 3.3.21 → 3.4.17

data/spec/lib/rgb_color_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+require 'rubyXL/convenience_methods/color'
+
+describe RubyXL::RgbColor do
+  describe '.to_s' do
+    it 'should properly translate the color to string' do
+      rgb_color = RubyXL::RgbColor.new
+
+      rgb_color.r = 1
+      rgb_color.g = 2
+      rgb_color.b = 255
+
+      expect(rgb_color.to_s).to eq("0102ff")
+    end
+  end
+end

data/spec/lib/text_spec.rb

@@ -16,6 +16,14 @@ describe RubyXL::Text do
       expect(str).to be
     end
 
+    it 'should not escape valid XML extended UNICODE characters' do
+      t = RubyXL::Text.new(:value => "\u{10000}\u{10FFFF}")
+
+      xml = t.write_xml[/<t>[^<]+<\/t>/]
+
+      expect(xml).to eq("<t>\u{10000}\u{10FFFF}</t>")
+    end
+
   end
 
 end

data/spec/lib/workbook_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'rubyXL/convenience_methods/workbook'
 
 describe RubyXL::Workbook do
   before do
@@ -136,7 +137,7 @@ describe RubyXL::Workbook do
     it "It should not be confused by missing sheet_id" do
       workbook = RubyXL::Workbook.new
       workbook[0].sheet_id = 1
-      sheet = workbook.add_worksheet('Sheet2')
+      workbook.add_worksheet('Sheet2')
       workbook.stream
     end
 
@@ -169,6 +170,16 @@ describe RubyXL::Workbook do
     end
   end
 
+  describe 'defined names' do
+    it 'should add and access defined names properly' do
+      wb = RubyXL::Workbook.new
+      wb.define_new_name('TEST', 'Sheet1!$A$2')
 
+      wb2 = RubyXL::Parser.parse_buffer(wb.stream)
+      expect(wb2.get_defined_name('TEST')).to_not be_nil
+      expect(wb2.get_defined_name('TEST').reference).to eq('Sheet1!$A$2')
+      expect(wb2.get_defined_name('TEST2')).to be_nil
+    end
+  end
 
 end

data/spec/lib/worksheet_spec.rb

@@ -1,12 +1,16 @@
 require 'spec_helper'
+require 'rubyXL/convenience_methods/worksheet'
+
+SKIP_ROW_COL = 3
 
 describe RubyXL::Worksheet do
-  before do
+  before(:each) do
     @workbook  = RubyXL::Workbook.new
     @worksheet = @workbook.add_worksheet
 
     (0..10).each do |i|
       (0..10).each do |j|
+        next if i == SKIP_ROW_COL || j == SKIP_ROW_COL # Skip some rows/cells 
         @worksheet.add_cell(i, j, "#{i}:#{j}", "F#{i}:#{j}")
       end
     end
@@ -633,14 +637,111 @@ describe RubyXL::Worksheet do
       }.to raise_error(RuntimeError)
     end
 
-    it 'should properly reindex the cells'  do
+    it 'should properly reindex the cells' do
       @worksheet.sheet_data.rows.each_with_index { |row, r|
-        row.cells.each_with_index { |cell, c|
-          expect(cell.row).to eq(r)
-          expect(cell.column).to eq(c)
-        }
+        if (SKIP_ROW_COL == r) then
+          expect(row).to be_nil
+        else
+          row.cells.each_with_index { |cell, c|
+            if (SKIP_ROW_COL == c) then
+              expect(cell).to be_nil
+            else
+              expect(cell.row).to eq(r)
+              expect(cell.column).to eq(c)
+            end
+          }
+        end
       }
     end
+
+    describe 'merged_cells updating' do
+      context 'merged cells in the row' do
+        # | A1 | B1 | C1 | D1 | E1 |
+        # | A2 |    MERGED    | E2 |
+        # | A3 | B3 | C3 | D3 | E3 |
+        before do
+          @worksheet.merge_cells(1, 1, 1, 3)
+          expect(@worksheet.merged_cells.size).to eq 1
+          expect(@worksheet.merged_cells.first.ref.to_s).to eq "B2:D2"
+        end
+        it 'should delete merged cell' do
+          @worksheet.delete_row(1)
+          expect(@worksheet.merged_cells.size).to eq 0
+        end
+      end
+      context 'merged vertical two cells' do
+        # | A1 | B1     | C1 |
+        # | A2 | MERGED | C2 |
+        # | A3 |        | C3 |
+        # | A4 | B4     | C4 |
+        before do
+          @worksheet.merge_cells(1, 1, 2, 1)
+          expect(@worksheet.merged_cells.size).to eq 1
+          expect(@worksheet.merged_cells.first.ref.to_s).to eq "B2:B3"
+        end
+        it 'should delete merged cell' do
+          @worksheet.delete_row(1)
+          expect(@worksheet.merged_cells.size).to eq 0
+        end
+      end
+      context 'merged three or more rows' do
+        # | A1 | B1 | C1 | D1 | E1 |
+        # | A2 |              | E2 |
+        # | A3 |    MERGED    | E3 |
+        # | A4 |              | E4 |
+        # | A5 | B5 | C5 | D5 | E5 |
+        before do
+          @worksheet.merge_cells(1, 1, 3, 3)
+          expect(@worksheet.merged_cells.size).to eq 1
+          expect(@worksheet.merged_cells.first.ref.to_s).to eq "B2:D4"
+        end
+        # | A2 |              | E2 |
+        # | A3 |    MERGED    | E3 |
+        # | A4 |              | E4 |
+        # | A5 | B5 | C5 | D5 | E5 |
+        it 'should updates merged cell when delete above the cell' do
+          @worksheet.delete_row(0)
+          expect(@worksheet.merged_cells.size).to eq 1
+          expect(@worksheet.merged_cells.first.ref.to_s).to eq "B1:D3"
+        end
+        # | A1 | B1 | C1 | D1 | E1 |
+        # | A3 |    MERGED    | E3 |
+        # | A4 |              | E4 |
+        # | A5 | B5 | C5 | D5 | E5 |
+        it 'should updates merged cell when delete top of the cell' do
+          @worksheet.delete_row(1)
+          expect(@worksheet.merged_cells.size).to eq 1
+          expect(@worksheet.merged_cells.first.ref.to_s).to eq "B2:D3"
+        end
+        # | A1 | B1 | C1 | D1 | E1 |
+        # | A2 |    MERGED    | E2 |
+        # | A4 |              | E4 |
+        # | A5 | B5 | C5 | D5 | E5 |
+        it 'should updates merged cell when delete middle of the cell' do
+          @worksheet.delete_row(2)
+          expect(@worksheet.merged_cells.size).to eq 1
+          expect(@worksheet.merged_cells.first.ref.to_s).to eq "B2:D3"
+        end
+        # | A1 | B1 | C1 | D1 | E1 |
+        # | A2 |    MERGED    | E2 |
+        # | A3 |              | E3 |
+        # | A5 | B5 | C5 | D5 | E5 |
+        it 'should updates merged cell when delete bottom of the cell' do
+          @worksheet.delete_row(3)
+          expect(@worksheet.merged_cells.size).to eq 1
+          expect(@worksheet.merged_cells.first.ref.to_s).to eq "B2:D3"
+        end
+        # | A1 | B1 | C1 | D1 | E1 |
+        # | A2 |              | E2 |
+        # | A3 |    MERGED    | E3 |
+        # | A4 |              | E4 |
+        it 'should not updates merged cell when ldelete below the cell' do
+          @worksheet.delete_row(4)
+          expect(@worksheet.merged_cells.size).to eq 1
+          expect(@worksheet.merged_cells.first.ref.to_s).to eq "B2:D4"
+        end
+      end
+    end
   end
 
   describe '.insert_row' do
@@ -650,8 +751,8 @@ describe RubyXL::Worksheet do
       expect(@worksheet[1][0].value).to eq(@old_cell_value)
       expect(@worksheet[1][0].formula.expression.to_s).to eq(@old_cell_formula)
 
-      @worksheet.insert_row(5)
-      expect(@worksheet[5][0].is_underlined).to be_nil
+      @worksheet.insert_row(7)
+      expect(@worksheet[7][0].is_underlined).to be_nil
     end
 
     it 'should insert a row skipping nil rows that might exist' do
@@ -687,12 +788,62 @@ describe RubyXL::Worksheet do
 
     it 'should properly reindex the cells'  do
       @worksheet.sheet_data.rows.each_with_index { |row, r|
-        row.cells.each_with_index { |cell, c|
-          expect(cell.row).to eq(r)
-          expect(cell.column).to eq(c)
-        }
+        if (SKIP_ROW_COL == r) then
+          expect(row).to be_nil
+        else
+          row.cells.each_with_index { |cell, c|
+            if (SKIP_ROW_COL == c) then
+              expect(cell).to be_nil
+            else
+              expect(cell.row).to eq(r)
+              expect(cell.column).to eq(c)
+            end
+          }
+        end
       }
     end
+
+    describe 'merged_cells updating' do
+      # | A1 | B1 | C1 | D1 |
+      # | A2 | MERGED  | D2 |
+      # | A3 |         | D3 |
+      # | A4 | B4 | C4 | D4 |
+      before do
+        @worksheet.merge_cells(1, 1, 2, 2)
+        expect(@worksheet.merged_cells.size).to eq 1
+        expect(@worksheet.merged_cells.first.ref.to_s).to eq "B2:C3"
+      end
+      # | A1 | B1 | C1 | D1 |
+      # |    |    |    |    |
+      # | A2 | MERGED  | D2 |
+      # | A3 |         | D3 |
+      # | A4 | B4 | C4 | D4 |
+      it 'should updates merged cell when insert above the cell' do
+        @worksheet.insert_row(1)
+        expect(@worksheet.merged_cells.size).to eq 1
+        expect(@worksheet.merged_cells.first.ref.to_s).to eq "B3:C4"
+      end
+      # | A1 | B1 | C1 | D1 |
+      # | A2 |         | D2 |
+      # |    | MERGED  |    |
+      # | A3 |         | D3 |
+      # | A4 | B4 | C4 | D4 |
+      it 'should updates merged cell when insert into the cell' do
+        @worksheet.insert_row(2)
+        expect(@worksheet.merged_cells.size).to eq 1
+        expect(@worksheet.merged_cells.first.ref.to_s).to eq "B2:C4"
+      end
+      # | A1 | B1 | C1 | D1 |
+      # | A2 | MERGED  | D2 |
+      # | A3 |         | D3 |
+      # |    |    |    |    |
+      # | A4 | B4 | C4 | D4 |
+      it 'should not updates merged cell when insert below the cell' do
+        @worksheet.insert_row(3)
+        expect(@worksheet.merged_cells.size).to eq 1
+        expect(@worksheet.merged_cells.first.ref.to_s).to eq "B2:C3"
+      end
+    end
   end
 
   describe '.delete_column' do
@@ -717,8 +868,20 @@ describe RubyXL::Worksheet do
 
     it 'should update cell indices after deleting the column' do
       @worksheet.delete_column(2)
-      @worksheet[0].cells.each_with_index { |cell, i|
-        expect(cell.column).to eq(i)
+
+      @worksheet.sheet_data.rows.each_with_index { |row, r|
+        if (SKIP_ROW_COL == r) then
+          expect(row).to be_nil
+        else
+          row.cells.each_with_index { |cell, c|
+            if (SKIP_ROW_COL - 1 == c) then
+              expect(cell).to be_nil
+            else
+              expect(cell.row).to eq(r)
+              expect(cell.column).to eq(c)
+            end
+          }
+        end
       }
     end
 
@@ -730,12 +893,115 @@ describe RubyXL::Worksheet do
 
     it 'should properly reindex the cells'  do
       @worksheet.sheet_data.rows.each_with_index { |row, r|
-        row.cells.each_with_index { |cell, c|
-          expect(cell.row).to eq(r)
-          expect(cell.column).to eq(c)
-        }
+        if (SKIP_ROW_COL == r) then
+          expect(row).to be_nil
+        else
+          row.cells.each_with_index { |cell, c|
+            if (SKIP_ROW_COL == c) then
+              expect(cell).to be_nil
+            else
+              expect(cell.row).to eq(r)
+              expect(cell.column).to eq(c)
+            end
+          }
+        end
       }
     end
+
+    describe 'merged_cells updating' do
+      context 'merged cells in the column' do
+        # | A1 | B1     | C1 |
+        # | A2 |        | C2 |
+        # | A3 | MERGED | C3 |
+        # | A4 |        | C4 |
+        # | A5 | B5     | C5 |
+        before do
+          @worksheet.merge_cells(1, 1, 3, 1)
+          expect(@worksheet.merged_cells.size).to eq 1
+          expect(@worksheet.merged_cells.first.ref.to_s).to eq "B2:B4"
+        end
+        it 'should delete merged cell' do
+          @worksheet.delete_column(1)
+          expect(@worksheet.merged_cells.size).to eq 0
+        end
+      end
+      context 'merged horizontal two cells' do
+        # | A1 | B1 | C1 | D1 |
+        # | A2 | MERGED  | D2 |
+        # | A3 | B3 | C3 | D3 |
+        before do
+          @worksheet.merge_cells(1, 1, 1, 2)
+          expect(@worksheet.merged_cells.size).to eq 1
+          expect(@worksheet.merged_cells.first.ref.to_s).to eq "B2:C2"
+        end
+        it 'should delete merged cell' do
+          @worksheet.delete_column(1)
+          expect(@worksheet.merged_cells.size).to eq 0
+        end
+      end
+      context 'merged three or more columns' do
+        # | A1 | B1 | C1 | D1 | E1 |
+        # | A2 |              | E2 |
+        # | A3 |    MERGED    | E3 |
+        # | A4 |              | E4 |
+        # | A5 | B5 | C5 | D5 | E5 |
+        before do
+          @worksheet.merge_cells(1, 1, 3, 3)
+          expect(@worksheet.merged_cells.size).to eq 1
+          expect(@worksheet.merged_cells.first.ref.to_s).to eq "B2:D4"
+        end
+        # | B1 | C1 | D1 | E1 |
+        # |              | E2 |
+        # |    MERGED    | E3 |
+        # |              | E4 |
+        # | B5 | C5 | D5 | E5 |
+        it 'should updates merged cell when delete before the cell' do
+          @worksheet.delete_column(0)
+          expect(@worksheet.merged_cells.size).to eq 1
+          expect(@worksheet.merged_cells.first.ref.to_s).to eq "A2:C4"
+        end
+        # | A1 | C1 | D1 | E1 |
+        # | A2 |         | E2 |
+        # | A3 | MERGED  | E3 |
+        # | A4 |         | E4 |
+        # | A5 | C5 | D5 | E5 |
+        it 'should updates merged cell when delete left of the cell' do
+          @worksheet.delete_column(1)
+          expect(@worksheet.merged_cells.size).to eq 1
+          expect(@worksheet.merged_cells.first.ref.to_s).to eq "B2:C4"
+        end
+        # | A1 | B1 | D1 | E1 |
+        # | A2 |         | E2 |
+        # | A3 | MERGED  | E3 |
+        # | A4 |         | E4 |
+        # | A5 | B5 | D5 | E5 |
+        it 'should updates merged cell when delete center of the cell' do
+          @worksheet.delete_column(2)
+          expect(@worksheet.merged_cells.size).to eq 1
+          expect(@worksheet.merged_cells.first.ref.to_s).to eq "B2:C4"
+        end
+        # | A1 | B1 | C1 | E1 |
+        # | A2 |         | E2 |
+        # | A3 | MERGED  | E3 |
+        # | A4 |         | E4 |
+        # | A5 | B5 | C5 | E5 |
+        it 'should updates merged cell when delete right of the cell' do
+          @worksheet.delete_column(3)
+          expect(@worksheet.merged_cells.size).to eq 1
+          expect(@worksheet.merged_cells.first.ref.to_s).to eq "B2:C4"
+        end
+        # | A1 | B1 | C1 | D1 |
+        # | A2 |              |
+        # | A3 |    MERGED    |
+        # | A4 |              |
+        # | A5 | B5 | C5 | D5 |
+        it 'should not updates merged cell when delete after the cell' do
+          @worksheet.delete_column(4)
+          expect(@worksheet.merged_cells.size).to eq 1
+          expect(@worksheet.merged_cells.first.ref.to_s).to eq "B2:D4"
+        end
+      end
+    end
   end
 
   describe '.insert_column' do
@@ -780,12 +1046,59 @@ describe RubyXL::Worksheet do
 
     it 'should properly reindex the cells'  do
       @worksheet.sheet_data.rows.each_with_index { |row, r|
-        row.cells.each_with_index { |cell, c|
-          expect(cell.row).to eq(r)
-          expect(cell.column).to eq(c)
-        }
+        if (SKIP_ROW_COL == r) then
+          expect(row).to be_nil
+        else
+          row.cells.each_with_index { |cell, c|
+            if (SKIP_ROW_COL == c) then
+              expect(cell).to be_nil
+            else
+              expect(cell.row).to eq(r)
+              expect(cell.column).to eq(c)
+            end
+          }
+        end
       }
     end
+
+    describe 'merged_cells updating' do
+      # | A1 | B1 | C1 | D1 |
+      # | A2 | MERGED  | D2 |
+      # | A3 |         | D3 |
+      # | A4 | B4 | C4 | D4 |
+      before do
+        @worksheet.merge_cells(1, 1, 2, 2)
+        expect(@worksheet.merged_cells.size).to eq 1
+        expect(@worksheet.merged_cells.first.ref.to_s).to eq "B2:C3"
+      end
+      # | A1 |    | B1 | C1 | D1 |
+      # | A2 |    | MERGED  | D2 |
+      # | A3 |    |         | D3 |
+      # | A4 |    | B4 | C4 | D4 |
+      it 'should updates merged cell when insert before the cell' do
+        @worksheet.insert_column(1)
+        expect(@worksheet.merged_cells.size).to eq 1
+        expect(@worksheet.merged_cells.first.ref.to_s).to eq "C2:D3"
+      end
+      # | A1 | B1 |    | C1 | D1 |
+      # | A2 |    MERGED    | D2 |
+      # | A3 |              | D3 |
+      # | A4 | B4 |    | C4 | D4 |
+      it 'should updates merged cell when insert into the cell' do
+        @worksheet.insert_column(2)
+        expect(@worksheet.merged_cells.size).to eq 1
+        expect(@worksheet.merged_cells.first.ref.to_s).to eq "B2:D3"
+      end
+      # | A1 | B1 | C1 |    | D1 |
+      # | A2 | MERGED  |    | D2 |
+      # | A3 |         |    | D3 |
+      # | A4 | B4 | C4 |    | D4 |
+      it 'should not updates merged cell when insert after the cell' do
+        @worksheet.insert_column(3)
+        expect(@worksheet.merged_cells.size).to eq 1
+        expect(@worksheet.merged_cells.first.ref.to_s).to eq "B2:C3"
+      end
+    end
   end
 
   describe '.insert_cell' do
@@ -805,8 +1118,19 @@ describe RubyXL::Worksheet do
 
     it 'should update cell indices after inserting the cell' do
       @worksheet.insert_cell(0, 0, 'test', nil, :right)
-      @worksheet[0].cells.each_with_index { |cell, i|
-        expect(cell.column).to eq(i)
+      @worksheet.sheet_data.rows.each_with_index { |row, r|
+        if (SKIP_ROW_COL == r) then
+          expect(row).to be_nil
+        else
+          row.cells.each_with_index { |cell, c|
+            if ((r == 0) && (SKIP_ROW_COL + 1 == c)) || ((r != 0) && (SKIP_ROW_COL == c)) then
+              expect(cell).to be_nil
+            else
+              expect(cell.row).to eq(r)
+              expect(cell.column).to eq(c)
+            end
+          }
+        end
       }
     end
 
@@ -855,7 +1179,11 @@ describe RubyXL::Worksheet do
     it 'should update cell indices after deleting the cell' do
       @worksheet.delete_cell(4, 0, :left)
       @worksheet[0].cells.each_with_index { |cell, i|
-        expect(cell.column).to eq(i)
+        if SKIP_ROW_COL == i then
+          expect(cell).to be_nil
+        else
+          expect(cell.column).to eq(i)
+        end
       }
     end
 
@@ -985,12 +1313,6 @@ describe RubyXL::Worksheet do
   end
 
   describe '.get_row_alignment' do
-    it 'should cause error if a negative argument is passed in' do
-      expect {
-        @worksheet.get_row_alignment(-1, true)
-      }.to raise_error(RuntimeError)
-    end
-
     it 'should return nil if no horizontal alignment specified for row' do
       expect(@worksheet.get_row_alignment(0, true)).to be_nil
     end
@@ -1028,12 +1350,6 @@ describe RubyXL::Worksheet do
       expect(@worksheet.get_row_border(0, :top)).to eq('thin')
     end
 
-    it 'should cause error if a negative argument is passed in' do
-      expect {
-        @worksheet.get_row_border(-1, :top)
-      }.to raise_error(RuntimeError)
-    end
-
     it 'should return nil if a row which does not exist is passed in' do
       expect(@worksheet.get_row_border(11, :top)).to be_nil
     end