rubyXL 3.1.0 → 3.1.2

data/rubyXL.gemspec

@@ -2,16 +2,14 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: rubyXL 3.1.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "rubyXL"
-  s.version = "3.1.0"
+  s.version = "3.1.2"
 
   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-06-30"
+  s.date = "2014-07-02"
   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 = [
@@ -339,6 +337,7 @@ Gem::Specification.new do |s|
     "rdoc/RubyXL/Reference.html",
     "rdoc/RubyXL/Relationship.html",
     "rdoc/RubyXL/RelationshipSupport.html",
+    "rdoc/RubyXL/RelationshipSupport/ClassMehods.html",
     "rdoc/RubyXL/RichText.html",
     "rdoc/RubyXL/RichTextRun.html",
     "rdoc/RubyXL/RootRelationships.html",
@@ -459,15 +458,16 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/gilt/rubyXL"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.2"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.23"
   s.summary = "rubyXL is a gem which allows the parsing, creation, and manipulation of Microsoft Excel (.xlsx/.xlsm) Documents"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 4
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<nokogiri>, [">= 1.4.4"])
-      s.add_runtime_dependency(%q<rubyzip>, [">= 1.0.0"])
+      s.add_runtime_dependency(%q<rubyzip>, [">= 1.1.6"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
@@ -475,7 +475,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec>, [">= 1.3.4"])
     else
       s.add_dependency(%q<nokogiri>, [">= 1.4.4"])
-      s.add_dependency(%q<rubyzip>, [">= 1.0.0"])
+      s.add_dependency(%q<rubyzip>, [">= 1.1.6"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
@@ -484,7 +484,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<nokogiri>, [">= 1.4.4"])
-    s.add_dependency(%q<rubyzip>, [">= 1.0.0"])
+    s.add_dependency(%q<rubyzip>, [">= 1.1.6"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])

data/spec/lib/cell_spec.rb

@@ -136,37 +136,29 @@ describe RubyXL::Cell do
      end
   end
 
-  describe '.change_border_top' do
+  describe '.change_border' do
     it 'should cause cell to have border at top with specified weight' do
-      @cell.change_border_top('thin')
+      @cell.change_border(:top, 'thin')
       expect(@cell.border_top).to eq('thin')
     end
-  end
-
-  describe '.change_border_left' do
-    it 'should cause cell to have border at left with specified weight' do
-      @cell.change_border_left('thin')
-      expect(@cell.border_left).to eq('thin')
-    end
-  end
 
-  describe '.change_border_right' do
     it 'should cause cell to have border at right with specified weight' do
-      @cell.change_border_right('thin')
+      @cell.change_border(:right, 'thin')
       expect(@cell.border_right).to eq('thin')
     end
-  end
 
-  describe '.change_border_bottom' do
+    it 'should cause cell to have border at left with specified weight' do
+      @cell.change_border(:left, 'thin')
+      expect(@cell.border_left).to eq('thin')
+    end
+
     it 'should cause cell to have border at bottom with specified weight' do
-      @cell.change_border_bottom('thin')
+      @cell.change_border(:bottom, 'thin')
       expect(@cell.border_bottom).to eq('thin')
     end
-  end
 
-  describe '.change_border_diagonal' do
     it 'should cause cell to have border at diagonal with specified weight' do
-      @cell.change_border_diagonal('thin')
+      @cell.change_border(:diagonal, 'thin')
       expect(@cell.border_diagonal).to eq('thin')
     end
   end
@@ -313,7 +305,7 @@ describe RubyXL::Cell do
 
   describe '.border_top' do
     it 'should correctly return the weight of the border on top for this cell' do
-      @cell.change_border_top('thin')
+      @cell.change_border(:top, 'thin')
       expect(@cell.border_top).to eq('thin')
     end
 
@@ -324,7 +316,7 @@ describe RubyXL::Cell do
 
   describe '.border_left' do
     it 'should correctly return the weight of the border on left for this cell' do
-      @cell.change_border_left('thin')
+      @cell.change_border(:left, 'thin')
       expect(@cell.border_left).to eq('thin')
     end
 
@@ -335,7 +327,7 @@ describe RubyXL::Cell do
 
   describe '.border_right' do
     it 'should correctly return the weight of the border on right for this cell' do
-      @cell.change_border_right('thin')
+      @cell.change_border(:right, 'thin')
       expect(@cell.border_right).to eq('thin')
     end
 
@@ -346,7 +338,7 @@ describe RubyXL::Cell do
 
   describe '.border_bottom' do
     it 'should correctly return the weight of the border on bottom for this cell' do
-      @cell.change_border_bottom('thin')
+      @cell.change_border(:bottom, 'thin')
       expect(@cell.border_bottom).to eq('thin')
     end
 
@@ -357,7 +349,7 @@ describe RubyXL::Cell do
 
   describe '.border_diagonal' do
     it 'should correctly return the weight of the diagonal border for this cell' do
-      @cell.change_border_diagonal('thin')
+      @cell.change_border(:diagonal, 'thin')
       expect(@cell.border_diagonal).to eq('thin')
     end
 

data/spec/lib/worksheet_spec.rb

@@ -251,19 +251,13 @@ describe RubyXL::Worksheet do
     end
 
     it 'should make row height a number equivalent of the string passed if it is a string which is a number' do
-      @worksheet.change_row_height(0,'30.0002')
+      @worksheet.change_row_height(0, 30.0002)
       expect(@worksheet.get_row_height(0)).to eq(30.0002)
     end
 
-    it 'should cause error if a string which is not a number' do
-      expect {
-        @worksheet.change_row_height(0,'TEST')
-      }.to raise_error
-    end
-
     it 'should cause error if a negative argument is passed in' do
       expect {
-        @worksheet.change_row_height(-1,30)
+        @worksheet.change_row_height(-1, 30)
       }.to raise_error
     end
 
@@ -318,109 +312,50 @@ describe RubyXL::Worksheet do
     end
   end
 
-  describe '.change_row_border_top' do
-    it 'should cause row and cells to have border at top of specified weight' do
-      @worksheet.change_row_border_top(0, 'thin')
-      expect(@worksheet.get_row_border_top(0)).to eq('thin')
-      expect(@worksheet[0][5].border_top).to eq('thin')
-    end
+  describe '.change_row_border' do
 
     it 'should cause error if a negative argument is passed in' do
       expect {
-        @worksheet.change_row_border_top(-1,'thin')
+        @worksheet.change_row_border(-1, :left, 'thin')
       }.to raise_error
     end
 
-    it 'should expand matrix to fit argument if nonnegative' do
+    it 'should expand matrix to fit argument if nonnegative'  do
       expect(@worksheet.sheet_data.size).to eq(11)
-      @worksheet.change_row_border_top(11,'thin')
-      expect(@worksheet.get_row_border_top(11)).to eq('thin')
+      @worksheet.change_row_border(11, :left, 'thin')
+      expect(@worksheet.get_row_border_left(11)).to eq('thin')
       expect(@worksheet.sheet_data.size).to eq(12)
     end
-  end
 
-  describe '.change_row_border_left' do
+    it 'should cause row and cells to have border at top of specified weight' do
+      @worksheet.change_row_border(0, :top, 'thin')
+      expect(@worksheet.get_row_border_top(0)).to eq('thin')
+      expect(@worksheet[0][5].border_top).to eq('thin')
+    end
+
     it 'should cause row and cells to have border at left of specified weight' do
-      @worksheet.change_row_border_left(0, 'thin')
+      @worksheet.change_row_border(0, :left, 'thin')
       expect(@worksheet.get_row_border_left(0)).to eq('thin')
       expect(@worksheet[0][5].border_left).to eq('thin')
     end
 
-    it 'should cause error if a negative argument is passed in' do
-      expect {
-        @worksheet.change_row_border_left(-1,'thin')
-      }.to raise_error
-    end
-
-    it 'should expand matrix to fit argument if nonnegative'  do
-      expect(@worksheet.sheet_data.size).to eq(11)
-      @worksheet.change_row_border_left(11,'thin')
-      expect(@worksheet.get_row_border_left(11)).to eq('thin')
-      expect(@worksheet.sheet_data.size).to eq(12)
-    end
-  end
-
-  describe '.change_row_border_right' do
     it 'should cause row and cells to have border at right of specified weight' do
-      @worksheet.change_row_border_right(0, 'thin')
+      @worksheet.change_row_border(0, :right, 'thin')
       expect(@worksheet.get_row_border_right(0)).to eq('thin')
       expect(@worksheet[0][5].border_right).to eq('thin')
     end
 
-    it 'should cause error if a negative argument is passed in' do
-      expect {
-        @worksheet.change_row_border_right(-1,'thin')
-      }.to raise_error
-    end
-
-    it 'should expand matrix to fit argument if nonnegative' do
-      expect(@worksheet.sheet_data.size).to eq(11)
-      @worksheet.change_row_border_right(11,'thin')
-      expect(@worksheet.get_row_border_right(11)).to eq('thin')
-      expect(@worksheet.sheet_data.size).to eq(12)
-    end
-  end
-
-  describe '.change_row_border_bottom' do
     it 'should cause row to have border at bottom of specified weight' do
-      @worksheet.change_row_border_bottom(0, 'thin')
+      @worksheet.change_row_border(0, :bottom, 'thin')
       expect(@worksheet.get_row_border_bottom(0)).to eq('thin')
       expect(@worksheet[0][5].border_bottom).to eq('thin')
     end
 
-    it 'should cause error if a negative argument is passed in' do
-      expect {
-        @worksheet.change_row_border_bottom(-1,'thin')
-      }.to raise_error
-    end
-
-    it 'should expand matrix to fit argument if nonnegative' do
-      expect(@worksheet.sheet_data.size).to eq(11)
-      @worksheet.change_row_border_bottom(11,'thin')
-      expect(@worksheet.get_row_border_bottom(11)).to eq('thin')
-      expect(@worksheet.sheet_data.size).to eq(12)
-    end
-  end
-
-  describe '.change_row_border_diagonal' do
     it 'should cause row to have border at diagonal of specified weight' do
-      @worksheet.change_row_border_diagonal(0, 'thin')
+      @worksheet.change_row_border(0, :diagonal, 'thin')
       expect(@worksheet.get_row_border_diagonal(0)).to eq('thin')
       expect(@worksheet[0][5].border_diagonal).to eq('thin')
     end
-
-    it 'should cause error if a negative argument is passed in' do
-      expect {
-        @worksheet.change_row_border_diagonal(-1,'thin')
-      }.to raise_error
-    end
-
-    it 'should expand matrix to fit argument if nonnegative' do
-      expect(@worksheet.sheet_data.size).to eq(11)
-      @worksheet.change_row_border_diagonal(11,'thin')
-      expect(@worksheet.get_row_border_diagonal(11)).to eq('thin')
-      expect(@worksheet.sheet_data.size).to eq(12)
-    end
   end
 
   describe '.change_column_font_name' do
@@ -694,109 +629,50 @@ describe RubyXL::Worksheet do
     end
   end
 
-  describe '.change_column_border_top' do
-    it 'should cause column and cells within to have border at top of specified weight' do
-      @worksheet.change_column_border_top(0, 'thin')
-      expect(@worksheet.get_column_border_top(0)).to eq('thin')
-      expect(@worksheet[5][0].border_top).to eq('thin')
-    end
-
+  describe '.change_column_border' do
     it 'should cause error if a negative argument is passed in' do
       expect {
-        @worksheet.change_column_border_top(-1,'thin')
+        @worksheet.change_column_border(-1, :top, 'thin')
       }.to raise_error
     end
 
     it 'should expand matrix to fit argument if nonnegative'do
       expect(@worksheet.sheet_data[0].size).to eq(11)
-      @worksheet.change_column_border_top(11,'thin')
+      @worksheet.change_column_border(11, :top, 'thin')
       expect(@worksheet.get_column_border_top(11)).to eq('thin')
       expect(@worksheet.sheet_data[0].size).to eq(12)
     end
-  end
 
-  describe '.change_column_border_left' do
+    it 'should cause column and cells within to have border at top of specified weight' do
+      @worksheet.change_column_border(0, :top, 'thin')
+      expect(@worksheet.get_column_border_top(0)).to eq('thin')
+      expect(@worksheet[5][0].border_top).to eq('thin')
+    end
+
     it 'should cause column and cells within to have border at left of specified weight' do
-      @worksheet.change_column_border_left(0, 'thin')
+      @worksheet.change_column_border(0, :left, 'thin')
       expect(@worksheet.get_column_border_left(0)).to eq('thin')
       expect(@worksheet[5][0].border_left).to eq('thin')
     end
 
-    it 'should cause error if a negative argument is passed in' do
-      expect {
-        @worksheet.change_column_border_left(-1,'thin')
-      }.to raise_error
-    end
-
-    it 'should expand matrix to fit argument if nonnegative' do
-      expect(@worksheet.sheet_data[0].size).to eq(11)
-      @worksheet.change_column_border_left(11,'thin')
-      expect(@worksheet.get_column_border_left(11)).to eq('thin')
-      expect(@worksheet.sheet_data[0].size).to eq(12)
-    end
-  end
-
-  describe '.change_column_border_right' do
     it 'should cause column and cells within to have border at right of specified weight' do
-      @worksheet.change_column_border_right(0, 'thin')
+      @worksheet.change_column_border(0, :right, 'thin')
       expect(@worksheet.get_column_border_right(0)).to eq('thin')
       expect(@worksheet[5][0].border_right).to eq('thin')
     end
 
-    it 'should cause error if a negative argument is passed in' do
-      expect {
-        @worksheet.change_column_border_right(-1,'thin')
-      }.to raise_error
-    end
-
-    it 'should expand matrix to fit argument if nonnegative'do
-      expect(@worksheet.sheet_data[0].size).to eq(11)
-      @worksheet.change_column_border_right(11,'thin')
-      expect(@worksheet.get_column_border_right(11)).to eq('thin')
-      expect(@worksheet.sheet_data[0].size).to eq(12)
-    end
-  end
-
-  describe '.change_column_border_bottom' do
     it 'should cause column and cells within to have border at bottom of specified weight' do
-      @worksheet.change_column_border_bottom(0, 'thin')
+      @worksheet.change_column_border(0, :bottom, 'thin')
       expect(@worksheet.get_column_border_bottom(0)).to eq('thin')
       expect(@worksheet[5][0].border_bottom).to eq('thin')
     end
 
-    it 'should cause error if a negative argument is passed in' do
-      expect {
-        @worksheet.change_column_border_bottom(-1,'thin')
-      }.to raise_error
-    end
-
-    it 'should expand matrix to fit argument if nonnegative'do
-      expect(@worksheet.sheet_data[0].size).to eq(11)
-      @worksheet.change_column_border_bottom(11,'thin')
-      expect(@worksheet.get_column_border_bottom(11)).to eq('thin')
-      expect(@worksheet.sheet_data[0].size).to eq(12)
-    end
-  end
-
-  describe '.change_column_border_diagonal' do
     it 'should cause column and cells within to have border at diagonal of specified weight' do
-      @worksheet.change_column_border_diagonal(0, 'thin')
+      @worksheet.change_column_border(0, :diagonal, 'thin')
       expect(@worksheet.get_column_border_diagonal(0)).to eq('thin')
       expect(@worksheet[5][0].border_diagonal).to eq('thin')
     end
 
-    it 'should cause error if a negative argument is passed in' do
-      expect {
-        @worksheet.change_column_border_diagonal(-1,'thin')
-      }.to raise_error
-    end
-
-    it 'should expand matrix to fit argument if nonnegative' do
-      expect(@worksheet.sheet_data[0].size).to eq(11)
-      @worksheet.change_column_border_diagonal(11,'thin')
-      expect(@worksheet.get_column_border_diagonal(11)).to eq('thin')
-      expect(@worksheet.sheet_data[0].size).to eq(12)
-    end
   end
 
   describe '.merge_cells' do
@@ -1239,7 +1115,7 @@ describe RubyXL::Worksheet do
     end
 
     it 'should return type of border that this row has on top' do
-      @worksheet.change_row_border_top(0,'thin')
+      @worksheet.change_row_border(0, :top, 'thin')
       expect(@worksheet.get_row_border_top(0)).to eq('thin')
     end
 
@@ -1260,7 +1136,7 @@ describe RubyXL::Worksheet do
     end
 
     it 'should return type of border that this row has on left' do
-      @worksheet.change_row_border_left(0,'thin')
+      @worksheet.change_row_border(0, :left, 'thin')
       expect(@worksheet.get_row_border_left(0)).to eq('thin')
     end
 
@@ -1281,7 +1157,7 @@ describe RubyXL::Worksheet do
     end
 
     it 'should return type of border that this row has on right' do
-      @worksheet.change_row_border_right(0,'thin')
+      @worksheet.change_row_border(0, :right, 'thin')
       expect(@worksheet.get_row_border_right(0)).to eq('thin')
     end
 
@@ -1303,7 +1179,7 @@ describe RubyXL::Worksheet do
     end
 
     it 'should return type of border that this row has on bottom' do
-      @worksheet.change_row_border_bottom(0,'thin')
+      @worksheet.change_row_border(0, :bottom, 'thin')
       expect(@worksheet.get_row_border_bottom(0)).to eq('thin')
     end
 
@@ -1324,7 +1200,7 @@ describe RubyXL::Worksheet do
     end
 
     it 'should return type of border that this row has on diagonal' do
-      @worksheet.change_row_border_diagonal(0,'thin')
+      @worksheet.change_row_border(0, :diagonal, 'thin')
       expect(@worksheet.get_row_border_diagonal(0)).to eq('thin')
     end
 
@@ -1573,7 +1449,7 @@ describe RubyXL::Worksheet do
     end
 
     it 'should return type of border that this column has on top' do
-      @worksheet.change_column_border_top(0,'thin')
+      @worksheet.change_column_border(0, :top, 'thin')
      expect(@worksheet.get_column_border_top(0)).to eq('thin')
     end
 
@@ -1594,7 +1470,7 @@ describe RubyXL::Worksheet do
     end
 
     it 'should return type of border that this column has on left' do
-      @worksheet.change_column_border_left(0,'thin')
+      @worksheet.change_column_border(0, :left, 'thin')
      expect(@worksheet.get_column_border_left(0)).to eq('thin')
     end
 
@@ -1615,7 +1491,7 @@ describe RubyXL::Worksheet do
     end
 
     it 'should return type of border that this column has on right' do
-      @worksheet.change_column_border_right(0,'thin')
+      @worksheet.change_column_border(0, :right, 'thin')
      expect(@worksheet.get_column_border_right(0)).to eq('thin')
     end
 
@@ -1636,7 +1512,7 @@ describe RubyXL::Worksheet do
     end
 
     it 'should return type of border that this column has on bottom' do
-      @worksheet.change_column_border_bottom(0,'thin')
+      @worksheet.change_column_border(0, :bottom, 'thin')
      expect(@worksheet.get_column_border_bottom(0)).to eq('thin')
     end
 
@@ -1657,7 +1533,7 @@ describe RubyXL::Worksheet do
     end
 
     it 'should return type of border that this column has on diagonal' do
-      @worksheet.change_column_border_diagonal(0,'thin')
+      @worksheet.change_column_border(0, :diagonal, 'thin')
      expect(@worksheet.get_column_border_diagonal(0)).to eq('thin')
     end