rubyXL 3.4.15 → 3.4.20

data/rubyXL.gemspec

@@ -1,17 +1,17 @@
-# Generated by jeweler
+# Generated by juwelier
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: rubyXL 3.4.15 ruby lib
+# stub: rubyXL 3.4.20 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "rubyXL".freeze
-  s.version = "3.4.15"
+  s.version = "3.4.20"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Vivek Bhagwat".freeze, "Wesha".freeze]
-  s.date = "2020-08-04"
+  s.date = "2022-01-13"
   s.description = "rubyXL is a gem which allows the parsing, creation, and manipulation of Microsoft Excel (.xlsx/.xlsm) Documents".freeze
   s.email = "bhagwat.vivek@gmail.com".freeze
   s.extra_rdoc_files = [
@@ -341,6 +341,9 @@ Gem::Specification.new do |s|
     "rdoc/RubyXL/OdbcOleDbProperties.html",
     "rdoc/RubyXL/Offset.html",
     "rdoc/RubyXL/OlapProperties.html",
+    "rdoc/RubyXL/OleItem.html",
+    "rdoc/RubyXL/OleItems.html",
+    "rdoc/RubyXL/OleLink.html",
     "rdoc/RubyXL/OutlineProperties.html",
     "rdoc/RubyXL/PageMargins.html",
     "rdoc/RubyXL/PageSetup.html",
@@ -512,7 +515,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/gilt/rubyXL".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "3.1.2".freeze
+  s.rubygems_version = "3.1.6".freeze
   s.summary = "rubyXL is a gem which allows the parsing, creation, and manipulation of Microsoft Excel (.xlsx/.xlsm) Documents".freeze
 
   if s.respond_to? :specification_version then
@@ -524,7 +527,7 @@ Gem::Specification.new do |s|
     s.add_runtime_dependency(%q<rubyzip>.freeze, [">= 1.3.0"])
     s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
     s.add_development_dependency(%q<rake>.freeze, [">= 0"])
-    s.add_development_dependency(%q<jeweler>.freeze, [">= 0"])
+    s.add_development_dependency(%q<juwelier>.freeze, [">= 0"])
     s.add_development_dependency(%q<rspec>.freeze, [">= 0"])
     s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
     s.add_development_dependency(%q<ruby-prof>.freeze, [">= 0"])
@@ -534,7 +537,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rubyzip>.freeze, [">= 1.3.0"])
     s.add_dependency(%q<bundler>.freeze, [">= 0"])
     s.add_dependency(%q<rake>.freeze, [">= 0"])
-    s.add_dependency(%q<jeweler>.freeze, [">= 0"])
+    s.add_dependency(%q<juwelier>.freeze, [">= 0"])
     s.add_dependency(%q<rspec>.freeze, [">= 0"])
     s.add_dependency(%q<simplecov>.freeze, [">= 0"])
     s.add_dependency(%q<ruby-prof>.freeze, [">= 0"])

data/spec/lib/cell_spec.rb

@@ -54,6 +54,18 @@ describe RubyXL::Cell do
 
       # Due to rounding errors, we allow microsecond precision on Time.
       expect(cell.value - tm.to_datetime).to be_within(1.0/86400e6).of(0)
+
+      expected_date = "2020-10-15T14:00:00Z"
+      expected_datetime = Time.parse(expected_date).utc
+      raw_value = "44119.583333333328" # Obtained from parsing a xlsx file with the expected date
+      cell = @worksheet.add_cell(r, c, Time.now) # Force a date cell type
+      cell.set_number_format('ddd mmm dd, yyyy HH:MM:SS')
+      cell.raw_value = raw_value
+      expect(cell.raw_value).to eq(raw_value), "Wrong raw value"
+      cell.set_number_format('ddd mmm dd, yyyy HH:MM:SS')
+
+      # We expect exactly the same date
+      expect(cell.value.to_time.utc.iso8601).to eq(expected_datetime.iso8601)
     end
   end
 
@@ -364,6 +376,12 @@ describe RubyXL::Cell do
       end
     end
 
+    context 'with RichText' do
+      it 'returns the value of the RichText' do
+        cell = RubyXL::Cell.new(is: RubyXL::RichText.new(t: RubyXL::Text.new(value: 'test')))
+        expect(cell.value).to eq('test')
+      end
+    end
   end
 
   describe '.change_contents' do

data/spec/lib/worksheet_spec.rb

@@ -653,6 +653,107 @@ describe RubyXL::Worksheet do
         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
+
+    it 'should not make empty merged_cells when a worksheet does not have a merged cell' do
+      # If a worksheet has empty merged_cells, the xlsx file has an XML error and has to repair.
+      @worksheet.delete_row(0)
+      expect(@worksheet.merged_cells).to be_nil
+    end
   end
 
   describe '.insert_row' do
@@ -713,6 +814,57 @@ describe RubyXL::Worksheet do
         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
+
+    it 'should not make empty merged_cells when a worksheet does not have a merged cell' do
+      # If a worksheet has empty merged_cells, the xlsx file has an XML error and has to repair.
+      @worksheet.insert_row(0)
+      expect(@worksheet.merged_cells).to be_nil
+    end
   end
 
   describe '.delete_column' do
@@ -776,6 +928,107 @@ describe RubyXL::Worksheet do
         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
+
+    it 'should not make empty merged_cells when a worksheet does not have a merged cell' do
+      # If a worksheet has empty merged_cells, the xlsx file has an XML error and has to repair.
+      @worksheet.delete_column(0)
+      expect(@worksheet.merged_cells).to be_nil
+    end
   end
 
   describe '.insert_column' do
@@ -834,6 +1087,54 @@ describe RubyXL::Worksheet do
         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
+
+    it 'should not make empty merged_cells when a worksheet does not have a merged cell' do
+      # If a worksheet has empty merged_cells, the xlsx file has an XML error and has to repair.
+      @worksheet.insert_column(0)
+      expect(@worksheet.merged_cells).to be_nil
+    end
   end
 
   describe '.insert_cell' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubyXL
 version: !ruby/object:Gem::Version
-  version: 3.4.15
+  version: 3.4.20
 platform: ruby
 authors:
 - Vivek Bhagwat
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-04 00:00:00.000000000 Z
+date: 2022-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -68,7 +68,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: juwelier
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -468,6 +468,9 @@ files:
 - rdoc/RubyXL/OdbcOleDbProperties.html
 - rdoc/RubyXL/Offset.html
 - rdoc/RubyXL/OlapProperties.html
+- rdoc/RubyXL/OleItem.html
+- rdoc/RubyXL/OleItems.html
+- rdoc/RubyXL/OleLink.html
 - rdoc/RubyXL/OutlineProperties.html
 - rdoc/RubyXL/PageMargins.html
 - rdoc/RubyXL/PageSetup.html
@@ -655,7 +658,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: rubyXL is a gem which allows the parsing, creation, and manipulation of Microsoft