rubyXL 3.2.6 → 3.2.7

data/rubyXL.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: rubyXL 3.2.6 ruby lib
+# stub: rubyXL 3.2.7 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "rubyXL"
-  s.version = "3.2.6"
+  s.version = "3.2.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Vivek Bhagwat"]
-  s.date = "2014-10-29"
+  s.date = "2014-11-10"
   s.description = "rubyXL is a gem which allows the parsing, creation, and manipulation of Microsoft Excel (.xlsx/.xlsm) Documents"
   s.email = "bhagwat.vivek@gmail.com"
   s.extra_rdoc_files = [
@@ -184,6 +184,7 @@ Gem::Specification.new do |s|
     "rdoc/RubyXL/CalculationChainCell.html",
     "rdoc/RubyXL/CalculationProperties.html",
     "rdoc/RubyXL/Cell.html",
+    "rdoc/RubyXL/CellConvenienceMethods.html",
     "rdoc/RubyXL/CellSmartTag.html",
     "rdoc/RubyXL/CellSmartTagProperty.html",
     "rdoc/RubyXL/CellSmartTags.html",
@@ -391,6 +392,7 @@ Gem::Specification.new do |s|
     "rdoc/RubyXL/WorkbookView.html",
     "rdoc/RubyXL/WorkbookViews.html",
     "rdoc/RubyXL/Worksheet.html",
+    "rdoc/RubyXL/WorksheetConvenienceMethods.html",
     "rdoc/RubyXL/WorksheetDimensions.html",
     "rdoc/RubyXL/WorksheetFormatProperties.html",
     "rdoc/RubyXL/WorksheetProperties.html",

data/spec/lib/worksheet_spec.rb

@@ -1552,23 +1552,71 @@ describe RubyXL::Worksheet do
   describe '@column_range' do
     it 'should properly handle range addition and modification' do
       # Ranges should be empty for brand new worskeet
-      expect(@worksheet.cols.column_ranges.size).to eq(0)
+      expect(@worksheet.cols.size).to eq(0)
 
       # Range should be created if the column has not been touched before
       @worksheet.change_column_width(0, 30)
       expect(@worksheet.get_column_width(0)).to eq(30)
-      expect(@worksheet.cols.column_ranges.size).to eq(1)
+      expect(@worksheet.cols.size).to eq(1)
 
-      # Range should be reused if the column has not been touched before
+      # Existing range should be reused
       @worksheet.change_column_width(0, 20)
       expect(@worksheet.get_column_width(0)).to eq(20)
-      expect(@worksheet.cols.column_ranges.size).to eq(1)
+      expect(@worksheet.cols.size).to eq(1)
 
       # Creation of the new range should not affect previously changed columns
-      @worksheet.change_column_width(1, 999)
-      expect(@worksheet.get_column_width(1)).to eq(999)
+      @worksheet.change_column_width(1, 30)
+      expect(@worksheet.get_column_width(1)).to eq(30)
       expect(@worksheet.get_column_width(0)).to eq(20)
-      expect(@worksheet.cols.column_ranges.size).to eq(2)
+      expect(@worksheet.cols.size).to eq(2)
+
+      @worksheet.cols.clear
+      @worksheet.cols << RubyXL::ColumnRange.new(:min => 1, :max => 9, :width => 33) # Note that this is raw width
+
+      r = @worksheet.cols.locate_range(3)
+      expect(r.min).to eq(1)
+      expect(r.max).to eq(9)
+
+      # When a column is modified at the beginning of the range, it should shrink to the right
+      @worksheet.change_column_width(0, 20)
+      expect(@worksheet.cols.size).to eq(2)
+      expect(@worksheet.get_column_width(0)).to eq(20)
+      expect(@worksheet.get_column_width(1)).to eq(32)
+
+      r = @worksheet.cols.locate_range(3)
+      expect(r.min).to eq(2)
+      expect(r.max).to eq(9)
+
+      # When a column is modified at the beginning of the range, it should shrink to the left
+      @worksheet.change_column_width(8, 30)
+      expect(@worksheet.cols.size).to eq(3)
+      expect(@worksheet.get_column_width(8)).to eq(30)
+
+      r = @worksheet.cols.locate_range(3)
+      expect(r.min).to eq(2)
+      expect(r.max).to eq(8)
+
+      # When a column is modified in the middle of the range, it should split into two
+      @worksheet.change_column_width(4, 15)
+      expect(@worksheet.cols.size).to eq(5)
+      expect(@worksheet.get_column_width(3)).to eq(32)
+
+      r = @worksheet.cols.locate_range(2)
+      expect(r.min).to eq(2)
+      expect(r.max).to eq(4)
+
+      expect(@worksheet.get_column_width(4)).to eq(15)
+
+      r = @worksheet.cols.locate_range(4)
+      expect(r.min).to eq(5)
+      expect(r.max).to eq(5)
+
+      expect(@worksheet.get_column_width(5)).to eq(32)
+
+      r = @worksheet.cols.locate_range(6)
+      expect(r.min).to eq(6)
+      expect(r.max).to eq(8)
+
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubyXL
 version: !ruby/object:Gem::Version
-  version: 3.2.6
+  version: 3.2.7
 platform: ruby
 authors:
 - Vivek Bhagwat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-29 00:00:00.000000000 Z
+date: 2014-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -282,6 +282,7 @@ files:
 - rdoc/RubyXL/CalculationChainCell.html
 - rdoc/RubyXL/CalculationProperties.html
 - rdoc/RubyXL/Cell.html
+- rdoc/RubyXL/CellConvenienceMethods.html
 - rdoc/RubyXL/CellSmartTag.html
 - rdoc/RubyXL/CellSmartTagProperty.html
 - rdoc/RubyXL/CellSmartTags.html
@@ -489,6 +490,7 @@ files:
 - rdoc/RubyXL/WorkbookView.html
 - rdoc/RubyXL/WorkbookViews.html
 - rdoc/RubyXL/Worksheet.html
+- rdoc/RubyXL/WorksheetConvenienceMethods.html
 - rdoc/RubyXL/WorksheetDimensions.html
 - rdoc/RubyXL/WorksheetFormatProperties.html
 - rdoc/RubyXL/WorksheetProperties.html