workbook 0.2.1 → 0.3.0

data/.gitignore

@@ -2,4 +2,5 @@ untitled document.xls
 test.xls
 compare*.xls
 sharepoint_download_excel.*
-*.gem
+*.gem
+bin

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 1.8.7
+  - jruby-18mode
+#  - jruby-19mode

data/Gemfile.lock

@@ -1,20 +1,24 @@
 PATH
   remote: .
   specs:
-    workbook (0.2.1)
-      fastercsv
+    workbook (0.2.2)
+      nokogiri
+      rake
       rchardet (~> 1.3)
       rubyXL
+      rubyzip
       spreadsheet (>= 0.7.5)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    fastercsv (1.5.5)
+    nokogiri (1.5.6)
+    rake (10.0.3)
     rchardet (1.3.1)
     ruby-ole (1.2.11.6)
     rubyXL (1.2.10)
-    spreadsheet (0.7.5)
+    rubyzip (0.9.9)
+    spreadsheet (0.8.1)
       ruby-ole (>= 1.0)
 
 PLATFORMS

data/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (c) 2013 Maarten Brouwers
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -116,6 +116,10 @@ Currently writing is limited to the following formats. Templating support is sti
 	
 In case you want to display the table in HTML, some conversion is offered to convert text/background properties to css-entities. Internally the hash storing style elements tries to map to CSS where possible.
 	
+## Compatibility
+
+Workbook should be compatible with ruby 1.8.7 and 1.9.3. Check [Travis for Workbook's current build status](https://travis-ci.org/murb/workbook) [![Build Status](https://travis-ci.org/murb/workbook.png?branch=master)](https://travis-ci.org/murb/workbook). 
+
 ## Alternatives
 
 The [ruby toolbox lists plenty of alternatives](https://www.ruby-toolbox.com/search?utf8=%E2%9C%93&q=spreadsheet), that just didn't suit my needs.

data/Rakefile

@@ -1,7 +1,9 @@
 require 'rake'
 require 'rake/testtask'
 require 'bundler'
-Bundler::GemHelper.install_tasks
+require "bundler/gem_tasks"
+
+#Bundler::GemHelper.install_tasks
 
 task :default => [:test]
 

data/doc/file.README.html

@@ -220,7 +220,7 @@ On my wishlist: In the future I hope to return the cell value directly, without
 <ul>
   <li><a href="https://github.com/zdavatz/spreadsheet">Spreadsheet</a> Used for reading and writing old style .xls files (Copyright (c) 2010 ywesee GmbH (mhatakeyama@ywesee.com, zdavatz@ywesee.com); GPL3 (License required for closed implementations))</li>
   <li><a href="http://code.google.com/p/ruby-ole/">ruby-ole</a> Used in the Spreadsheet Gem (Copyright (c) 2007-2010 Charles Lowe; MIT)</li>
-  <li><a href="http://fastercsv.rubyforge.org/">FasterCSV</a> Used for reading CSV (comma separated text) and TXT (tab separated text) files (Copyright (c) James Edward Gray II; GPL2 &amp; Ruby License)</li>
+  <li><a href="http://fastercsv.rubyforge.org/">FasterCSV</a> Used for reading CSV (comma separated text) and TXT (tab separated text) files (Copyright (c) James Edward Gray II; GPL2 &amp; Ruby License) (not actively included for ruby 1.9 installs)</li>
   <li><a href="http://rubyforge.org/projects/rchardet">rchardet</a> Used for detecting encoding in CSV and TXT importers (Copyright (c) JMHodges; LGPL)</li>
   <li><a href="https://github.com/gilt/rubyXL">RubyXL</a> Used for reading the newer .xlsx files (Copyright (c) 2011 Vivek Bhagwat; MIT-Licensed)</li>
 </ul>

data/lib/workbook.rb

@@ -1,4 +1,5 @@
-$KCODE="u"
+# -*- encoding : utf-8 -*-
+$KCODE="u" if RUBY_VERSION < "1.9"
 require 'workbook/book'
 require 'workbook/sheet'
 require 'workbook/table'
@@ -6,9 +7,10 @@ require 'workbook/row'
 require 'workbook/cell'
 require 'workbook/format'
 require 'workbook/template'
+require 'workbook/version'
 
 module Workbook
   class << self
 
   end
-end
+end

data/lib/workbook/book.rb

@@ -1,10 +1,10 @@
+# -*- encoding : utf-8 -*-
 require 'workbook/writers/xls_writer'
 require 'workbook/readers/xls_reader'
 require 'workbook/readers/xls_shared'
 require 'workbook/readers/xlsx_reader'
 require 'workbook/readers/csv_reader'
 require 'workbook/readers/txt_reader'
-require 'rchardet'
 
 module Workbook
   # The Book class is the container of sheets. It can be inialized by either the standard initalizer or the open method. The 
@@ -104,11 +104,33 @@ module Workbook
       extension = file_extension(filename) unless extension
       f = File.open(filename,'r')
       t = f.read
-      detected_encoding = CharDet.detect(t)['encoding']
-      t = Iconv.conv("UTF-8//TRANSLIT//IGNORE",detected_encoding,t)
+      t = text_to_utf8(t)
       send("load_#{extension}".to_sym,t)
     end
     
+    
+    # Helper method to convert text in a file to UTF-8
+    # 
+    # @param [String] text a string to convert
+    def text_to_utf8 text
+      if RUBY_VERSION < '1.9'
+        require 'rchardet' 
+        require 'iconv'
+        detected_encoding = CharDet.detect(text)
+        detected_encoding = detected_encoding['encoding']
+        text = Iconv.conv("UTF-8//TRANSLIT//IGNORE",detected_encoding,text)
+        text = text.gsub("\xEF\xBB\xBF", '') # removing the BOM...
+      else
+        unless text.valid_encoding? and text.encoding == "UTF-8"
+          # TODO: had some ruby 1.9 problems with rchardet ... but ideally it or a similar functionality will be reintroduced
+          source_encoding = text.valid_encoding? ? text.encoding : "US-ASCII"
+          text = text.encode('UTF-8', source_encoding, {:invalid=>:replace, :undef=>:replace, :replace=>""})
+          text = text.gsub("\u0000","") # TODO: this cleanup of nil values isn't supposed to be needed...
+        end
+      end
+      return text
+    end
+    
     # @param [String] filename   The full filename, or path
     #
     # @return [String] The file extension

data/lib/workbook/cell.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# -*- encoding : utf-8 -*-
 
 require 'workbook/modules/type_parser'
 
@@ -108,8 +108,14 @@ module Workbook
             v = v.gsub(s, rep)
           end
         end
-        
-        v = v.gsub(/[^\x00-\x7F]/n,'').downcase.to_sym
+        if RUBY_VERSION < '1.9'
+          v = v.gsub(/[^\x00-\x7F]/n,'')
+        else
+          # See String#encode
+          encoding_options = {:invalid => :replace, :undef => :replace, :replace => ''}
+          v = v.encode(Encoding.find('ASCII'), encoding_options)
+        end
+        v = v.downcase.to_sym
       end
       v
     end

data/lib/workbook/format.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'workbook/modules/raw_objects_storage'
 
 module Workbook

data/lib/workbook/modules/raw_objects_storage.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module Workbook
 	module Modules
     # Adds support for storing raw objects, used in e.g. Format and Template
@@ -33,4 +34,4 @@ module Workbook
 	    end
 		end
 	end
-end
+end

data/lib/workbook/modules/table_diff_sort.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module Workbook
 	module Modules
     # Adds diffing and sorting functions

data/lib/workbook/modules/type_parser.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module Workbook
   module Modules
     # Adds type parsing capabilities to e.g. a Cell.
@@ -59,14 +60,14 @@ module Workbook
       
       def string_nil_converter
         proc do |v|
-          return v == "" ? nil : v
+          (v == "" ? nil : v)
         end
       end
       
       def string_integer_converter
         proc do |v|
           if v.to_i.to_s == v
-            return v.to_i
+            v.to_i
           else
             v
           end
@@ -78,8 +79,11 @@ module Workbook
           rv = v
           starts_with_nr = v.chars.first.to_i.to_s == v.chars.first #it should at least start with a number...
           no_spaced_dash = v.to_s.match(" - ") ? false : true
+          min_two_dashes = v.to_s.scan("-").count > 1 ? true : false
+          min_two_dashes = v.to_s.scan("/").count > 1 ? true : false if min_two_dashes == false
+          
           normal_date_length = v.to_s.length <= 25
-          if no_spaced_dash and starts_with_nr and normal_date_length
+          if no_spaced_dash and starts_with_nr and normal_date_length and min_two_dashes
             begin
               rv = (v.length > 10) ? DateTime.parse(v) : Date.parse(v) 
             rescue ArgumentError

data/lib/workbook/readers/csv_reader.rb

@@ -1,4 +1,4 @@
-require 'faster_csv'
+# -*- encoding : utf-8 -*-
 
 module Workbook
   module Readers
@@ -8,18 +8,28 @@ module Workbook
         parse_csv csv
       end
       
+      def csv_lib
+        if RUBY_VERSION < '1.9'
+          require 'faster_csv'
+          return FasterCSV
+        else
+          return CSV
+        end
+      end
+      
       def parse_csv csv_raw
         custom_date_converter = Workbook::Cell.new.string_optimistic_date_converter
         converters = [:float,:integer,:date,:date_time,custom_date_converter]
         csv=nil
-        begin
-          csv = FasterCSV.parse(csv_raw,{:converters=>converters})
-        rescue
+        #begin
+        csv = csv_lib.parse(csv_raw,{:converters=>converters})
+
+          #rescue
           # we're going to have another shot at it...
-        end
+          #end
         
         if csv==nil or csv[0].count == 1 
-          csv_excel = FasterCSV.parse(csv_raw,{:converters=>converters,:col_sep=>';'})
+          csv_excel = csv_lib.parse(csv_raw,{:converters=>converters,:col_sep=>';'})
           csv = csv_excel if csv_excel[0].count > 1
         end
 

data/lib/workbook/readers/txt_reader.rb

@@ -1,4 +1,4 @@
-require 'faster_csv'
+# -*- encoding : utf-8 -*-
 module Workbook
   module Readers
     module TxtReader
@@ -9,9 +9,9 @@ module Workbook
       
       def parse_txt csv_raw
         csv = []
-        csv_raw.split("\n").each {|l| csv << FasterCSV.parse_line(l,{:col_sep=>"\t"});nil}
+        csv_raw.split("\n").each {|l| csv << csv_lib.parse_line(l,{:col_sep=>"\t"});nil}
         self[0]=Workbook::Sheet.new(csv,self,{:parse_cells_on_batch_creation=>true, :cell_parse_options=>{:detect_date=>true}}) unless sheet.has_contents?
       end
     end
   end
-end
+end

data/lib/workbook/readers/xls_reader.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'spreadsheet'
 
 module Workbook
@@ -99,4 +100,4 @@ module Workbook
       end
     end
   end
-end
+end

data/lib/workbook/readers/xls_shared.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module Workbook
   module Readers
     module XlsShared

data/lib/workbook/readers/xlsx_reader.rb

@@ -1,8 +1,11 @@
+# -*- encoding : utf-8 -*-
 require 'rubyXL'
 
-#monkeypatching rubyXL, pull request submitted: https://github.com/gilt/rubyXL/pull/47
+# Monkeypatching rubyXL, pull request submitted: https://github.com/gilt/rubyXL/pull/47
 module RubyXL
   class Workbook
+    
+    # Improves upon date format detection
     def is_date_format?(num_fmt)
       num_fmt.downcase!
       skip_chars = ['$', '-', '+', '/', '(', ')', ':', ' ']

data/lib/workbook/row.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module Workbook
   class Row < Array
     alias_method :compare_without_header, :<=>

data/lib/workbook/sheet.rb

@@ -1,7 +1,9 @@
+# -*- encoding : utf-8 -*-
 module Workbook
   class Sheet < Array
     # A Sheet is a container of tables
     attr_accessor :book
+    attr_accessor :name
     
     # Initialize a new sheet
     #
@@ -44,5 +46,23 @@ module Workbook
         return @book
       end
     end
+    
+    # Removes all lines from this table
+    #
+    # @return [Workbook::Table] (self)
+    def delete_all
+      self.delete_if{|b| true}
+    end
+    
+    # clones itself *and* the tables it contains
+    #
+    # @return [Workbook::Sheet] The cloned sheet
+    def clone
+      s = self
+      c = super
+      c.delete_all
+      s.each{|t| c << t.clone}
+      return c
+    end
   end
-end
+end

data/lib/workbook/table.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'workbook/modules/table_diff_sort'
 require 'workbook/writers/csv_table_writer'
 
@@ -71,11 +72,18 @@ module Workbook
       self.clone.remove_empty_lines!.count != 0
     end
     
+    # Returns true if the row exists in this table
+    #
+    # @param [Workbook::Row] row to test for
+    # @return [Boolean] whether the row exist in this table 
     def contains_row? row
       raise ArgumentError, "table should be a Workbook::Row (you passed a #{t.class})" unless row.is_a?(Workbook::Row)
       self.collect{|r| r.object_id}.include? row.object_id
     end
     
+    # Returns the sheet this table belongs to, creates a new sheet if none exists
+    #
+    # @return [Workbook::Sheet] The sheet this table belongs to
     def sheet
       if @sheet
         return @sheet
@@ -85,5 +93,25 @@ module Workbook
       end
     end
     
+    # Removes all lines from this table
+    #
+    # @return [Workbook::Table] (self)
+    def delete_all
+      self.delete_if{|b| true}
+    end
+    
+    # clones itself *and* the rows it contains
+    #
+    # @return [Workbook::Table] The cloned table
+    def clone
+      t = self
+      c = super
+      header_row_index = t.index(t.header)
+      c.delete_all
+      t.each{|r| c << r.clone}
+      c.header = c[header_row_index] if header_row_index
+      return c
+    end
+    
   end
 end

data/lib/workbook/template.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'workbook/modules/raw_objects_storage'
 
 module Workbook
@@ -50,4 +51,4 @@ module Workbook
       return @formats[name][variant]
     end
 	end
-end
+end

data/lib/workbook/version.rb

@@ -0,0 +1,4 @@
+# -*- encoding : utf-8 -*-
+module Workbook
+  VERSION = '0.3.0'
+end

data/lib/workbook/writers/csv_table_writer.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'csv'
 
 module Workbook
@@ -20,4 +21,4 @@ module Workbook
       
     end
   end
-end
+end

data/lib/workbook/writers/xls_writer.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'spreadsheet'
 
 module Workbook
@@ -109,4 +110,4 @@ module Workbook
       end
     end
   end
-end
+end

data/test/artifacts/simple_csv.csv

@@ -1,4 +1,4 @@
 a,b,c,d
 1,2,3,4
 5,3,2,1
-"asdf",123,12,2001-02-02
+asdf,123,12,2001-02-02

data/test/artifacts/simple_excel_csv.csv

@@ -3,4 +3,4 @@ a;b;c
 asdf;23;asd
 23;asdf;sadf
 12;23;12-02-2011 12:23
-12 asdf;"6/12 ovk getekend terugontv.+>acq ter tekening. 13/12 ovk getekend terugontv.+>Fred ter tekening.";6/12
+12 asdf;6/12 ovk getekend terugontv.+>acq ter tekening. 13/12 ovk getekend terugontv.+>Fred ter tekening.;6/12

data/test/helper.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'test/unit'
 require 'rubygems'
 require File.join(File.dirname(__FILE__), '../lib/workbook')

data/test/test_book.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require File.join(File.dirname(__FILE__), 'helper')
 
 class TestWorkbook < Test::Unit::TestCase
@@ -51,6 +52,13 @@ class TestWorkbook < Test::Unit::TestCase
     assert_equal(b,b.first.table.sheet.book)
     assert_equal(Workbook::Row, b.first.table.header.class)
     assert_equal(b,b.first.table.header.table.sheet.book)
-    
+  end
+  
+  def test_text_to_utf8
+    f = File.open("test/artifacts/excel_different_types.txt",'r')
+    t = f.read
+    w = Workbook::Book.new
+    t = w.text_to_utf8(t)
+    assert_equal("a\tb\tc\td", t.split(/(\n|\r)/).first)
   end
 end

data/test/test_cell.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require File.join(File.dirname(__FILE__), 'helper')
 
 class TestCell < Test::Unit::TestCase

data/test/test_format.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require File.join(File.dirname(__FILE__), 'helper')
 
 class TestFormat < Test::Unit::TestCase

data/test/test_functional.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require File.join(File.dirname(__FILE__), 'helper')
 
 class TestFunctional < Test::Unit::TestCase

data/test/test_modules_table_diff_sort.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require File.join(File.dirname(__FILE__), 'helper')
 module Modules
   class TestTableDiffSort < Test::Unit::TestCase

data/test/test_modules_type_parser.rb

@@ -1,9 +1,10 @@
+# -*- encoding : utf-8 -*-
 require File.join(File.dirname(__FILE__), 'helper')
 module Modules
   class TestTypeParser < Test::Unit::TestCase
     def examples
       {"2312"=>2312,
-     #  "12-12-2012"=>Date.new(2012,12,12),
+       "12-12-2012"=>Date.new(2012,12,12),
        "12-12-2012 12:24"=>DateTime.new(2012,12,12,12,24),
        "2012-12-12 12:24"=>DateTime.new(2012,12,12,12,24),
        "2011-05-19T15_37_49 - 52349.xml"=>"2011-05-19T15_37_49 - 52349.xml",
@@ -15,7 +16,8 @@ module Modules
        "12 bomenasdfasdfsadf"=>"12 bomenasdfasdfsadf",
        ""=>nil,
        " "=>nil,
-       "mailto:sadf@asdf.as"=>"sadf@asdf.as"
+       "mailto:sadf@asdf.as"=>"sadf@asdf.as",
+       "012-3456789"=>"012-3456789"
        }
     end
     

data/test/test_readers_csv_reader.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require File.join(File.dirname(__FILE__), 'helper')
 module Readers
   class TestCsvWriter < Test::Unit::TestCase
@@ -24,6 +25,7 @@ module Readers
       #   asdf;23;asd
       #   23;asdf;sadf
       #   12;23;12-02-2011 12:23
+      #   12 asadf; 6/12 ovk getekend teru...; 6/12
       #y w.sheet.table
       assert_equal([:a,:b,:c],w.sheet.table.header.to_symbols)
       assert_equal(23,w.sheet.table[2][:b].value)
@@ -31,7 +33,7 @@ module Readers
       assert_equal(Date.new(2001,1,1),w.sheet.table[1][:a].value)
       assert_equal(DateTime.new(2011,2,12,12,23),w.sheet.table[4][:c].value)
       assert_equal("6/12 ovk getekend terugontv.+>acq ter tekening. 13/12 ovk getekend terugontv.+>Fred ter tekening.", w.sheet.table[5][:b].value)
-      assert_equal(DateTime.new(Time.now.year,6,12),w.sheet.table[5][:c].value)
+      assert_equal("6/12",w.sheet.table[5][:c].value)
     end
     def test_excel_standardized_open
       w = Workbook::Book.new

data/test/test_readers_txt_reader.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require File.join(File.dirname(__FILE__), 'helper')
 module Readers
   class TestTxtReader < Test::Unit::TestCase

data/test/test_readers_xls_reader.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require File.join(File.dirname(__FILE__), 'helper')
 module Readers
   class TestXlsWriter < Test::Unit::TestCase
@@ -58,4 +59,4 @@ module Readers
       assert_equal(true,failed_properly)
     end
   end
-end
+end

data/test/test_readers_xlsx_reader.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require File.join(File.dirname(__FILE__), 'helper')
 module Readers
   class TestXlsxWriter < Test::Unit::TestCase
@@ -21,8 +22,8 @@ module Readers
       assert_equal("Callnr.",w.sheet.table[0][:callnr].value)
       assert_equal("2475617.00",w.sheet.table[3][:callnr].value)
       assert_equal("2012-12-03T12:30:00+00:00",w.sheet.table[7][:datum_gemeld].value.to_s)
-      assert_equal("2012-12-03T09:48:59+00:00",w.sheet.table[6][:datum_gemeld].value.to_s)
+      assert_equal("2012-12-03T09:4",w.sheet.table[6][:datum_gemeld].value.to_s[0..14])
     end
 
   end
-end
+end

data/test/test_row.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require File.join(File.dirname(__FILE__), 'helper')
 
 class TestRow < Test::Unit::TestCase

data/test/test_sheet.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require File.join(File.dirname(__FILE__), 'helper')
 
 class TestWorkbook < Test::Unit::TestCase
@@ -30,5 +31,15 @@ class TestWorkbook < Test::Unit::TestCase
     assert_equal(s, b.sheet)
     assert_equal(s.book.sheet, b.sheet.table.sheet)
   end
+  
+  def test_clone
+    w = Workbook::Book.new [["a","b"],[1,2],[3,4]]
+    s = w.sheet
+    assert_equal(3,s.table[2][:a])
+    s2 = s.clone
+    s2.table[2][:a] = 5
+    assert_equal(3,s.table[2][:a])
+    assert_equal(5,s2.table[2][:a])
+  end
  
 end

data/test/test_table.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require File.join(File.dirname(__FILE__), 'helper')
 
 class TestTable< Test::Unit::TestCase
@@ -58,5 +59,34 @@ class TestTable< Test::Unit::TestCase
     assert_equal(t, s.table)
     assert_equal(t.sheet, s)
   end
+  
+  def test_delete_all
+    w = Workbook::Book.new [["a","b"],[1,2],[3,4]]
+    t = w.sheet.table
+    t.delete_all
+    assert_equal(Workbook::Table,t.class)
+    assert_equal(0,t.count)
+  end
+
+  def test_clone
+    w = Workbook::Book.new [["a","b"],[1,2],[3,4]]
+    t = w.sheet.table
+    assert_equal(3,t[2][:a])
+    t2 = t.clone
+    t2[2][:a] = 5
+    assert_equal(3,t[2][:a])
+    assert_equal(5,t2[2][:a])
+  end
+  
+  def test_clone_custom_header
+    w = Workbook::Book.new [[nil, nil],["a","b"],[1,2],[3,4]]
+    t = w.sheet.table
+    t.header=t[1]
+    assert_equal(3,t[3][:a])
+    t2 = t.clone
+    t2[3][:a] = 5
+    assert_equal(3,t[3][:a])
+    assert_equal(5,t2[3][:a])
+  end
 
 end

data/test/test_template.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require File.join(File.dirname(__FILE__), 'helper')
 
 class TestTemplate < Test::Unit::TestCase

data/test/test_writers_xls_writer.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require File.join(File.dirname(__FILE__), 'helper')
 
 module Writers
@@ -46,4 +47,4 @@ module Writers
       assert_equal(nil, Workbook::Book.new.strftime_to_ms_format(nil))
     end
   end
-end
+end

data/workbook.gemspec

@@ -1,23 +1,28 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "workbook"
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+require "workbook/version"
 
 Gem::Specification.new do |s|
   s.name        = 'workbook'
   s.rubyforge_project = 'workbook'
-  s.version     = '0.2.1'
+  s.version     = Workbook::VERSION
   s.date        = '2013-01-10'
   s.summary     = "Workbook is a datastructure to contain books of tables (an anlogy used in e.g. Excel)"
   s.description = "Workbook contains workbooks, as in a table, contains rows, contains cells, reads/writes excels and csv's and tab separated, and offers basic diffing and sorting capabilities."
   s.authors     = ["Maarten Brouwers"]
   s.add_dependency('spreadsheet', '>= 0.7.5')
-  s.add_dependency('fastercsv')
+  s.add_dependency('fastercsv') if RUBY_VERSION < "1.9"
   s.add_dependency("rchardet", "~> 1.3")
+  s.add_dependency("rake")
   s.add_dependency('rubyXL')
+  s.add_dependency('nokogiri')
+  s.add_dependency('rubyzip')
   s.platform    = Gem::Platform::RUBY
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.files         = `git ls-files`.split($/)
+  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
+  s.executables   = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   s.email       = ['gem@murb.nl']
   s.homepage    =

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: workbook
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Maarten Brouwers
@@ -21,9 +22,11 @@ dependencies:
   name: spreadsheet
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 9
         segments: 
         - 0
         - 7
@@ -35,9 +38,11 @@ dependencies:
   name: fastercsv
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -47,9 +52,11 @@ dependencies:
   name: rchardet
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 9
         segments: 
         - 1
         - 3
@@ -57,17 +64,61 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rubyXL
+  name: rake
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rubyXL
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rubyzip
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id007
 description: Workbook contains workbooks, as in a table, contains rows, contains cells, reads/writes excels and csv's and tab separated, and offers basic diffing and sorting capabilities.
 email: 
 - gem@murb.nl
@@ -79,12 +130,14 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .travis.yml
 - .yardoc/checksums
 - .yardoc/object_types
 - .yardoc/objects/root.dat
 - .yardoc/proxy_types
 - Gemfile
 - Gemfile.lock
+- LICENSE.txt
 - README.md
 - Rakefile
 - doc/RubyXL.html
@@ -141,6 +194,7 @@ files:
 - lib/workbook/sheet.rb
 - lib/workbook/table.rb
 - lib/workbook/template.rb
+- lib/workbook/version.rb
 - lib/workbook/writers/csv_table_writer.rb
 - lib/workbook/writers/xls_writer.rb
 - test/artifacts/book_with_tabs_and_colours.xls
@@ -151,6 +205,7 @@ files:
 - test/artifacts/excel_different_types.xls
 - test/artifacts/excel_different_types.xlsx
 - test/artifacts/native_xlsx.xlsx
+- test/artifacts/sheetduplication.xls
 - test/artifacts/simple_csv.csv
 - test/artifacts/simple_excel_csv.csv
 - test/artifacts/simple_sheet.xls
@@ -184,23 +239,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: workbook
-rubygems_version: 1.3.6
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Workbook is a datastructure to contain books of tables (an anlogy used in e.g. Excel)
@@ -213,6 +272,7 @@ test_files:
 - test/artifacts/excel_different_types.xls
 - test/artifacts/excel_different_types.xlsx
 - test/artifacts/native_xlsx.xlsx
+- test/artifacts/sheetduplication.xls
 - test/artifacts/simple_csv.csv
 - test/artifacts/simple_excel_csv.csv
 - test/artifacts/simple_sheet.xls