rubyXL 1.2.10 → 2.1.1

data/rubyXL.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{rubyXL}
-  s.version = "1.2.10"
+  s.name = "rubyXL"
+  s.version = "2.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Vivek Bhagwat"]
-  s.date = %q{2012-08-07}
-  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.date = "2014-02-07"
+  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 = [
     "LICENSE.txt",
     "README.rdoc"
@@ -23,69 +23,125 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
-    "lib/.DS_Store",
     "lib/rubyXL.rb",
-    "lib/rubyXL/Hash.rb",
     "lib/rubyXL/cell.rb",
-    "lib/rubyXL/color.rb",
+    "lib/rubyXL/generic_storage.rb",
+    "lib/rubyXL/objects/border.rb",
+    "lib/rubyXL/objects/calculation_chain.rb",
+    "lib/rubyXL/objects/cell_style.rb",
+    "lib/rubyXL/objects/color.rb",
+    "lib/rubyXL/objects/column_range.rb",
+    "lib/rubyXL/objects/container_nodes.rb",
+    "lib/rubyXL/objects/data_validation.rb",
+    "lib/rubyXL/objects/document_properties.rb",
+    "lib/rubyXL/objects/extensions.rb",
+    "lib/rubyXL/objects/fill.rb",
+    "lib/rubyXL/objects/font.rb",
+    "lib/rubyXL/objects/formula.rb",
+    "lib/rubyXL/objects/ooxml_object.rb",
+    "lib/rubyXL/objects/reference.rb",
+    "lib/rubyXL/objects/relationships.rb",
+    "lib/rubyXL/objects/shared_strings.rb",
+    "lib/rubyXL/objects/sheet_data.rb",
+    "lib/rubyXL/objects/sheet_view.rb",
+    "lib/rubyXL/objects/stylesheet.rb",
+    "lib/rubyXL/objects/text.rb",
+    "lib/rubyXL/objects/theme.rb",
+    "lib/rubyXL/objects/workbook.rb",
+    "lib/rubyXL/objects/worksheet.rb",
     "lib/rubyXL/parser.rb",
-    "lib/rubyXL/private_class.rb",
     "lib/rubyXL/workbook.rb",
     "lib/rubyXL/worksheet.rb",
-    "lib/rubyXL/writer/app_writer.rb",
-    "lib/rubyXL/writer/calc_chain_writer.rb",
     "lib/rubyXL/writer/content_types_writer.rb",
     "lib/rubyXL/writer/core_writer.rb",
+    "lib/rubyXL/writer/generic_writer.rb",
     "lib/rubyXL/writer/root_rels_writer.rb",
-    "lib/rubyXL/writer/shared_strings_writer.rb",
     "lib/rubyXL/writer/styles_writer.rb",
     "lib/rubyXL/writer/theme_writer.rb",
-    "lib/rubyXL/writer/workbook_rels_writer.rb",
     "lib/rubyXL/writer/workbook_writer.rb",
     "lib/rubyXL/writer/worksheet_writer.rb",
-    "lib/rubyXL/zip.rb",
+    "rdoc/created.rid",
+    "rdoc/fonts.css",
+    "rdoc/fonts/Lato-Light.ttf",
+    "rdoc/fonts/Lato-LightItalic.ttf",
+    "rdoc/fonts/Lato-Regular.ttf",
+    "rdoc/fonts/Lato-RegularItalic.ttf",
+    "rdoc/fonts/SourceCodePro-Bold.ttf",
+    "rdoc/fonts/SourceCodePro-Regular.ttf",
+    "rdoc/images/add.png",
+    "rdoc/images/arrow_up.png",
+    "rdoc/images/brick.png",
+    "rdoc/images/brick_link.png",
+    "rdoc/images/bug.png",
+    "rdoc/images/bullet_black.png",
+    "rdoc/images/bullet_toggle_minus.png",
+    "rdoc/images/bullet_toggle_plus.png",
+    "rdoc/images/date.png",
+    "rdoc/images/delete.png",
+    "rdoc/images/find.png",
+    "rdoc/images/loadingAnimation.gif",
+    "rdoc/images/macFFBgHack.png",
+    "rdoc/images/package.png",
+    "rdoc/images/page_green.png",
+    "rdoc/images/page_white_text.png",
+    "rdoc/images/page_white_width.png",
+    "rdoc/images/plugin.png",
+    "rdoc/images/ruby.png",
+    "rdoc/images/tag_blue.png",
+    "rdoc/images/tag_green.png",
+    "rdoc/images/transparent.png",
+    "rdoc/images/wrench.png",
+    "rdoc/images/wrench_orange.png",
+    "rdoc/images/zoom.png",
+    "rdoc/js/darkfish.js",
+    "rdoc/js/jquery.js",
+    "rdoc/js/navigation.js",
+    "rdoc/js/search.js",
+    "rdoc/js/search_index.js",
+    "rdoc/js/searcher.js",
+    "rdoc/rdoc.css",
     "rubyXL.gemspec",
     "spec/lib/cell_spec.rb",
     "spec/lib/color_spec.rb",
-    "spec/lib/hash_spec.rb",
     "spec/lib/parser_spec.rb",
+    "spec/lib/reference_spec.rb",
+    "spec/lib/stylesheet_spec.rb",
     "spec/lib/workbook_spec.rb",
     "spec/lib/worksheet_spec.rb"
   ]
-  s.homepage = %q{http://github.com/gilt/rubyXL}
+  s.homepage = "http://github.com/gilt/rubyXL"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{rubyXL is a gem which allows the parsing, creation, and manipulation of Microsoft Excel (.xlsx/.xlsm) Documents}
+  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
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     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_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.0"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_development_dependency(%q<nokogiri>, [">= 1.4.4"])
-      s.add_development_dependency(%q<rubyzip>, [">= 0.9.4"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 1.3.4"])
     else
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
-      s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<nokogiri>, [">= 1.4.4"])
-      s.add_dependency(%q<rubyzip>, [">= 0.9.4"])
+      s.add_dependency(%q<rubyzip>, [">= 1.0.0"])
+      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 1.3.4"])
     end
   else
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
-    s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<nokogiri>, [">= 1.4.4"])
-    s.add_dependency(%q<rubyzip>, [">= 0.9.4"])
+    s.add_dependency(%q<rubyzip>, [">= 1.0.0"])
+    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 1.3.4"])
   end
 end

data/spec/lib/cell_spec.rb

@@ -5,7 +5,7 @@ describe RubyXL::Cell do
 
   before do
     @workbook  = RubyXL::Workbook.new
-    @worksheet = RubyXL::Worksheet.new(@workbook)
+    @worksheet = @workbook.add_worksheet('Test Worksheet')
     @workbook.worksheets << @worksheet
     (0..10).each do |i|
       (0..10).each do |j|
@@ -106,12 +106,6 @@ describe RubyXL::Cell do
        @cell.change_horizontal_alignment('center')
        @cell.horizontal_alignment.should == 'center'
      end
-
-     it 'should cause error if nil, "center", "justify", "left", "right", or "distributed" is not passed' do
-       lambda {
-         @cell.change_horizontal_alignment('TEST')
-       }.should raise_error
-     end
   end
 
   describe '.change_vertical_alignment' do
@@ -119,11 +113,12 @@ describe RubyXL::Cell do
        @cell.change_vertical_alignment('center')
        @cell.vertical_alignment.should == 'center'
      end
+  end
 
-     it 'should cause error if nil, "center", "justify", "left", "right", or "distributed" is not passed' do
-       lambda {
-         @cell.change_vertical_alignment('TEST')
-       }.should raise_error
+  describe '.change_wrap' do
+    it 'should cause cell to wrap align as specified by the passed in value' do
+       @cell.change_text_wrap(true)
+       @cell.text_wrap.should == true
      end
   end
 
@@ -132,12 +127,6 @@ describe RubyXL::Cell do
       @cell.change_border_top('thin')
       @cell.border_top.should == 'thin'
     end
-
-    it 'should cause error if nil, "thin", "thick", "hairline", or "medium" is not passed' do
-      lambda {
-        @cell.change_border_top('TEST')
-      }.should raise_error
-    end
   end
 
   describe '.change_border_left' do
@@ -145,12 +134,6 @@ describe RubyXL::Cell do
       @cell.change_border_left('thin')
       @cell.border_left.should == 'thin'
     end
-
-    it 'should cause error if nil, "thin", "thick", "hairline", or "medium" is not passed' do
-      lambda {
-        @cell.change_border_left('TEST')
-      }.should raise_error
-    end
   end
 
   describe '.change_border_right' do
@@ -158,12 +141,6 @@ describe RubyXL::Cell do
       @cell.change_border_right('thin')
       @cell.border_right.should == 'thin'
     end
-
-    it 'should cause error if nil, "thin", "thick", "hairline", or "medium" is not passed' do
-      lambda {
-        @cell.change_border_right('TEST')
-      }.should raise_error
-    end
   end
 
   describe '.change_border_bottom' do
@@ -171,12 +148,6 @@ describe RubyXL::Cell do
       @cell.change_border_bottom('thin')
       @cell.border_bottom.should == 'thin'
     end
-
-    it 'should cause error if nil, "thin", "thick", "hairline", or "medium" is not passed' do
-      lambda {
-        @cell.change_border_bottom('TEST')
-      }.should raise_error
-    end
   end
 
   describe '.change_border_diagonal' do
@@ -184,29 +155,37 @@ describe RubyXL::Cell do
       @cell.change_border_diagonal('thin')
       @cell.border_diagonal.should == 'thin'
     end
-
-    it 'should cause error if nil, "thin", "thick", "hairline", or "medium" is not passed' do
-      lambda {
-        @cell.change_border_diagonal('TEST')
-      }.should raise_error
-    end
   end
 
   describe '.value' do
     it 'should return the value of a date' do
       date = Date.parse('January 1, 2011')
       @cell.change_contents(date)
-      @cell.should_receive(:is_date?).any_number_of_times.and_return(true)
+      @cell.should_receive(:is_date?).at_least(1).and_return(true)
       @cell.value.should == date
     end
 
-    it 'should convert date numbers correctly' do
-      date = 41019
-      @cell.change_contents(date)
-      @cell.should_receive(:is_date?).any_number_of_times.and_return(true)
-      puts @cell.value
-      puts Date.parse('April 20, 2012')
-      @cell.value.should == Date.parse('April 20, 2012')
+    context '1900-based dates' do
+      before(:each) { @workbook.date1904 = false }
+      it 'should convert date numbers correctly' do
+        date = 41019
+        @cell.change_contents(date)
+        @cell.should_receive(:is_date?).at_least(1).and_return(true)
+        @cell.value.should == Date.parse('April 20, 2012')
+        @cell.change_contents(35981)
+        @cell.value.should == Date.parse('July 5, 1998')
+      end
+    end
+    context '1904-based dates' do
+      before(:each) { @workbook.date1904 = true }
+      it 'should convert date numbers correctly' do
+        date = 39557
+        @cell.change_contents(date)
+        @cell.should_receive(:is_date?).at_least(1).and_return(true)
+        @cell.value.should == Date.parse('April 20, 2012')
+        @cell.change_contents(34519)
+        @cell.value.should == Date.parse('July 5, 1998')
+      end
     end
   end
 
@@ -220,7 +199,7 @@ describe RubyXL::Cell do
     it 'should cause cell value to match a date that is passed in' do
       date = Date.parse('January 1, 2011')
       @cell.change_contents(date)
-      @cell.should_receive(:is_date?).any_number_of_times.and_return(true)
+      @cell.should_receive(:is_date?).at_least(1).and_return(true)
       @cell.value.should == date
       @cell.formula.should == nil
     end
@@ -373,13 +352,4 @@ describe RubyXL::Cell do
     end
   end
 
-  describe '.convert_to_cell' do
-    it 'should correctly return the "Excel Style" description of cells when given a row/column number' do
-      RubyXL::Cell.convert_to_cell(0,26).should == 'AA1'
-    end
-
-    it 'should cause an error if a negative argument is given' do
-      lambda {RubyXL::Cell.convert_to_cell(-1,0)}.should raise_error
-    end
-  end
 end

data/spec/lib/parser_spec.rb

@@ -2,21 +2,23 @@ require 'rubygems'
 require 'rubyXL'
 
 describe RubyXL::Parser do
+
   before do
-    @workbook = (RubyXL::Workbook.new)
-    @time_str = Time.now.to_s
-    @file = @time_str + '.xlsx'
-    @workbook.write(@file)
-  end
+    @workbook = RubyXL::Workbook.new
+    @workbook.add_worksheet("Test Worksheet")
 
-  describe '.convert_to_index' do
-    it 'should convert a well-formed Excel index into a pair of array indices' do
-      RubyXL::Parser.convert_to_index('AA1').should == [0, 26]
-    end
+    ws = @workbook.add_worksheet("Escape Test")
+    ws.add_cell(0,0, "&")
+    ws.add_cell(0,1, "<")
+    ws.add_cell(0,2, ">")
 
-    it 'should return [-1, -1] if the Excel index is not well-formed' do
-      RubyXL::Parser.convert_to_index('A1B').should == [-1, -1]
-    end
+    ws.add_cell(1,0, "&")#TODO#.datatype = RubyXL::Cell::SHARED_STRING
+    ws.add_cell(1,1, "<")#TODO#.datatype = RubyXL::Cell::SHARED_STRING
+    ws.add_cell(1,2, ">")#TODO#.datatype = RubyXL::Cell::SHARED_STRING
+
+    @time_str = Time.now.to_s
+    @file = "#{@time_str}.xlsx"
+    @workbook.write(@file)
   end
 
   describe '.parse' do
@@ -24,12 +26,13 @@ describe RubyXL::Parser do
       @workbook2 = RubyXL::Parser.parse(@file)
 
       @workbook2.worksheets.size.should == @workbook.worksheets.size
-      @workbook2[0].sheet_data.should == @workbook[0].sheet_data
-      @workbook2[0].sheet_name.should == @workbook[0].sheet_name
+      @workbook2.worksheets.each_index { |i|
+        @workbook2[i].extract_data.should == @workbook[i].extract_data
+      }
     end
 
     it 'should cause an error if an xlsx or xlsm workbook is not passed' do
-      lambda {@workbook2 = RubyXL::Parser.parse(@time_str+".xls")}.should raise_error
+      lambda {@workbook2 = RubyXL::Parser.parse("nonexistent_file.tmp")}.should raise_error
     end
 
     it 'should not cause an error if an xlsx or xlsm workbook is not passed but the skip_filename_check option is used' do
@@ -46,16 +49,29 @@ describe RubyXL::Parser do
       @workbook2 = RubyXL::Parser.parse(@file, :data_only => true)
 
       @workbook2.worksheets.size.should == @workbook.worksheets.size
-      @workbook2[0].sheet_data.should == @workbook[0].sheet_data
-      @workbook2[0].sheet_name.should == @workbook[0].sheet_name
+      @workbook2[0].extract_data.should == @workbook[0].extract_data
+      @workbook2[0].extract_data.should == @workbook[0].extract_data
     end
 
+=begin
     it 'should construct consistent number formats' do
       @workbook2 = RubyXL::Parser.parse(@file)
+      @workbook2.num_fmts.should be_an(Array)
+      @workbook2.num_fmts.size.should == @workbook2.num_fmts[:attributes][:count]
+    end
+=end
+
+    it 'should unescape HTML entities properly' do
+      @workbook2 = RubyXL::Parser.parse(@file)
+      @workbook2["Escape Test"][0][0].value.should == "&"
+      @workbook2["Escape Test"][0][1].value.should == "<"
+      @workbook2["Escape Test"][0][2].value.should == ">"
 
-      @workbook2.num_fmts[:numFmt].should be_an(Array)
-      @workbook2.num_fmts[:numFmt].length.should == @workbook2.num_fmts[:attributes][:count]
+      @workbook2["Escape Test"][1][0].value.should == "&"
+      @workbook2["Escape Test"][1][1].value.should == "<"
+      @workbook2["Escape Test"][1][2].value.should == ">"
     end
+
   end
 
   after do

data/spec/lib/reference_spec.rb

@@ -0,0 +1,29 @@
+require 'rubygems'
+require 'rubyXL'
+
+describe RubyXL::Reference do
+
+  describe '.ind2ref + .ref2ind' do
+    it 'should correctly return the "Excel Style" description of cells when given a row/column number' do
+      RubyXL::Reference.ind2ref(0, 26).should == 'AA1'
+      RubyXL::Reference.ind2ref(99, 0).should == 'A100'
+      RubyXL::Reference.ind2ref(0, 26).should == 'AA1'
+      RubyXL::Reference.ind2ref(0, 51).should == 'AZ1'
+      RubyXL::Reference.ind2ref(0, 52).should == 'BA1'
+      RubyXL::Reference.ind2ref(0, 77).should == 'BZ1'
+      RubyXL::Reference.ind2ref(0, 78).should == 'CA1'
+      RubyXL::Reference.ind2ref(0, 16383).should == 'XFD1'
+    end
+
+    it 'should correctly convert back and forth between "Excel Style" and index style cell references' do
+      0.upto(16383) do |n|
+        RubyXL::Reference.ref2ind(RubyXL::Reference.ind2ref(n, 16383 - n)).should == [ n, 16383 - n ]
+      end
+    end
+
+    it 'should return [-1, -1] if the Excel index is not well-formed' do
+      RubyXL::Reference.ref2ind('A1B').should == [-1, -1]
+    end
+  end
+
+end