workbook 0.1.1 → 0.1.2

data/lib/workbook/readers/xls_reader.rb

@@ -74,9 +74,19 @@ module Workbook
         
 
       def load_xls file_obj
-        sp = Spreadsheet.open(file_obj, mode='rb')
-        template.add_raw sp
-        parse_xls sp
+        begin
+          sp = Spreadsheet.open(file_obj, mode='rb')
+          template.add_raw sp
+          parse_xls sp
+        rescue Ole::Storage::FormatError => e
+          begin 
+            # Assuming it is a tab separated txt inside .xls
+            open(file_obj.path, 'txt') 
+          rescue
+            raise e
+          end
+        end
+        
       end
       
       

data/lib/workbook/writers/csv_table_writer.rb

@@ -1,4 +1,4 @@
-require 'CSV'
+require 'csv'
 
 module Workbook
   module Writers

data/readme.markdown

@@ -74,7 +74,7 @@ To some extent, sort_by works, it doesn't, however, adhere to the header setting
 	
 ### Comparing tables
 	
-Simply call 
+Simply call on a Workbook::Table
 
 	t1.diff t2
 	
@@ -86,7 +86,7 @@ Currently writing is limited to the following formats. Templating support is sti
 	
 	b.to_xls 					# returns a spreadsheet workbook
 	b.write_to_xls filename 	# writes to filename
-	t.to_csv 					# returns a csv-string
+	t.to_csv 					# returns a csv-string (called on tables)
 	
 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.
 	

data/test/artifacts/excel_different_types.csv

@@ -0,0 +1,4 @@
+a;b;c;d
+22-2-2012;27-12-2014;4,23;42000,22323
+c;222;;27-12-14 5:21
+22-1-2012 11:00;42000;goh, idd;ls

data/test/test_modules_table_diff_sort.rb

@@ -101,20 +101,5 @@ module Modules
       assert_equal("a,b,c,d\n1,2,3,4\n3,2,3,4\n3,3 (was: 2),3,4\n4,2,3,4\n(was: 5),(was: 2),(was: 3),(was: 4)\n",diff_result.sheet.table.to_csv)
       diff_result.write_to_xls({:rewrite_header=>true})
     end
-    
-    
-    
-    def test_diff_xls
-      (1..8).each do |index| 
-        prev = "test/artifacts/compare#{index}_prev.xls"
-        curr = "test/artifacts/compare#{index}_current.xls"
-      
-        wprev=Workbook::Book.open prev
-        wcurr=Workbook::Book.open curr
-
-        diff = wcurr.sheet.table.diff wprev.sheet.table
-        diff.write_to_xls({:filename=>"compare#{index}.xls"})
-      end
-    end
   end
 end

data/test/test_readers_csv_reader.rb

@@ -33,5 +33,21 @@ module Readers
       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(Date.new(2012,6,12),w.sheet.table[5][:c].value)
     end
+    def test_excel_standardized_open
+      w = Workbook::Book.new
+      w.open("test/artifacts/excel_different_types.csv")
+      # reads
+      #   a,b,c,d
+      # 2012-02-22,2014-12-27,2012-11-23,2012-11-12T04:20:00+00:00
+      # c,222.0,,0027-12-14T05:21:00+00:00
+      # 2012-01-22T11:00:00+00:00,42000.0,"goh, idd",ls
+      
+      assert_equal([:a,:b,:c, :d],w.sheet.table.header.to_symbols)
+      assert_equal(Date.new(2012,2,22),w.sheet.table[1][:a].value)
+      assert_equal("c",w.sheet.table[2][:a].value)
+      assert_equal(DateTime.new(2012,1,22,11),w.sheet.table[3][:a].value)
+      assert_equal(42000,w.sheet.table[3][:b].value)
+      assert_equal(nil,w.sheet.table[2][:c].value)
+    end
   end
 end

data/test/test_readers_txt_reader.rb

@@ -7,42 +7,22 @@ module Readers
     #   w.open("test/artifacts/xls_with_txt_extension.txt")
     #   puts w.sheet.table
     # end
-    def test_complex_excel_txt_open
+
+    def test_excel_standardized_open
       w = Workbook::Book.new
-      w.open("test/artifacts/sharepoint_download_excel.txt")
+      w.open("test/artifacts/excel_different_types.txt")
       # reads
-      #   a;b;c
-      #   1-1-2001;23;1
-      #   asdf;23;asd
-      #   23;asdf;sadf
-      #   12;23;12-02-2011 12:23
-      #y w.sheet.table
-      assert_equal([:id,
- :naam,
- :locatie_naam,
- :locatie_rayon,
- :datum_gesprek,
- :algehele_indruk,
- :gemaakt_door,
- :gemaakt,
- :titel,
- :toelichting,
- :gewenste_migratie_maand,
- :plek_ing_balie,
- :plek_tnt_balie,
- :alternatieve_locaties,
- :datum_introductie_gesprek,
- :geen_aanbod_voor_isp,
- :oplevering_geslaagd_op,
- :nazorgpunten,
- :locatie],w.sheet.table.header.to_symbols)
-      assert_equal(Date.new(2011,11,01),w.sheet.table[29][:gewenste_migratie_maand].value)
-      assert_equal("Belt , G (Gerrit)",w.sheet.table[1][:gemaakt_door].value)
-      assert_equal(false,w.sheet.table[1][:geen_aanbod_voor_isp].value)
-      assert_equal(DateTime.new(2011,7,25,11,02),w.sheet.table[4][:gemaakt].value)
-      assert_equal("Roggeveen , PC (Peter)",w.sheet.table[4][:gemaakt_door].value)
-      assert_equal("Groeneveld, R (René)",w.sheet.table[400][:gemaakt_door].value)
-      assert_equal(24208,w.sheet.table[7][:locatie].value)
+      #   a,b,c,d
+      # 2012-02-22,2014-12-27,2012-11-23,2012-11-12T04:20:00+00:00
+      # c,222.0,,0027-12-14T05:21:00+00:00
+      # 2012-01-22T11:00:00+00:00,42000.0,"goh, idd",ls
+      
+      assert_equal([:a,:b,:c, :d],w.sheet.table.header.to_symbols)
+      assert_equal(Date.new(2012,2,22),w.sheet.table[1][:a].value)
+      assert_equal("c",w.sheet.table[2][:a].value)
+      assert_equal(DateTime.new(2012,1,22,11),w.sheet.table[3][:a].value)
+      assert_equal(42000,w.sheet.table[3][:b].value)
+      assert_equal(nil,w.sheet.table[2][:c].value)
     end
     
   end

data/test/test_readers_xls_reader.rb

@@ -4,12 +4,12 @@ module Readers
     def test_open
       w = Workbook::Book.new
       w.open 'test/artifacts/book_with_tabs_and_colours.xls'
-      assert_equal([:vestiging_id,:pirnr_ing,:ing_kantoornaam,:installatiedag_ispapparatuur,:mo_openingsdatum_ing],w.sheet.table.header.to_symbols)
-      assert_equal(90588,w.sheet.table[2][:pirnr_ing].value)
-      assert_equal("#CCFFCC",w.sheet.table[3][:ing_kantoornaam].format[:background_color])
-      assert_equal(8.13671875,w.sheet.table.first[:pirnr_ing].format[:width])
-      assert_equal(3.85546875,w.sheet.table.first[:vestiging_id].format[:width])
-      assert_equal(25.14453125,w.sheet.table.first[:ing_kantoornaam].format[:width])
+      assert_equal([:a, :b, :c, :d, :e],w.sheet.table.header.to_symbols)
+      assert_equal(90588,w.sheet.table[2][:b].value)
+      assert_equal("#CCFFCC",w.sheet.table[3][:c].format[:background_color])
+      assert_equal(8.13671875,w.sheet.table.first[:b].format[:width])
+      assert_equal(3.85546875,w.sheet.table.first[:a].format[:width])
+      assert_equal(25.14453125,w.sheet.table.first[:c].format[:width])
       
       
     end
@@ -22,5 +22,40 @@ module Readers
       assert_equal("sadfasdfsd", w.sheet.table[4][2].value)
       assert_equal(1.2, w.sheet.table[3][1].value)
     end
+    
+    def test_excel_standardized_open
+      w = Workbook::Book.new
+      w.open("test/artifacts/excel_different_types.xls")
+      # reads
+      #   a,b,c,d
+      # 2012-02-22,2014-12-27,2012-11-23,2012-11-12T04:20:00+00:00
+      # c,222.0,,0027-12-14T05:21:00+00:00
+      # 2012-01-22T11:00:00+00:00,42000.0,"goh, idd",ls
+      
+      assert_equal([:a,:b,:c, :d],w.sheet.table.header.to_symbols)
+      assert_equal(Date.new(2012,2,22),w.sheet.table[1][:a].value)
+      assert_equal("c",w.sheet.table[2][:a].value)
+      assert_equal(DateTime.new(2012,1,22,11),w.sheet.table[3][:a].value)
+      assert_equal(42000,w.sheet.table[3][:b].value)
+      assert_equal(nil,w.sheet.table[2][:c].value)
+    end
+    
+    def test_txt_in_xls_open
+      w = Workbook::Book.new
+      w.open("test/artifacts/txt_in_xls.xls")
+      assert_equal([:naam,:nummer,:ilt,:corporate_key,:naam_medewerker, nil, nil, :telefoon, :openingsdatum],w.sheet.table.header.to_symbols)
+      assert_equal(["dddd",2222,"i9000","asd","Anita",nil,"Betera",DateTime.new(2012,1,12),Date.new(2011,10,5)],w.sheet.table[1].collect{|a| a.value})
+    end
+    def test_zip_in_xls_open
+      w = Workbook::Book.new
+      failed_properly = false
+      begin
+        w.open("test/artifacts/zip_in_xls.xls")
+        w.sheet.table.to_csv
+      rescue Ole::Storage::FormatError
+        failed_properly = true
+      end
+      assert_equal(true,failed_properly)
+    end
   end
 end

data/test/test_writers_xls_writer.rb

@@ -15,11 +15,10 @@ module Writers
     
     def test_roundtrip
       b = Workbook::Book.open('test/artifacts/simple_sheet.xls')
-      assert_equal(3.85546875,b.sheet.table.first[:vestiging_id].format[:width])
+      assert_equal(3.85546875,b.sheet.table.first[:a].format[:width])
       filename = b.write_to_xls
       b = Workbook::Book.open filename
-      assert_equal(3.85546875,b.sheet.table.first[:vestiging_id].format[:width])
-      
+      assert_equal(3.85546875,b.sheet.table.first[:a].format[:width])
     end
     
     def test_init_spreadsheet_template

data/workbook.gemspec

@@ -5,8 +5,8 @@ require "workbook"
 Gem::Specification.new do |s|
   s.name        = 'workbook'
   s.rubyforge_project = 'workbook'
-  s.version     = '0.1.1'
-  s.date        = '2012-09-11'
+  s.version     = '0.1.2'
+  s.date        = '2012-11-12'
   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"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Maarten Brouwers
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-11 00:00:00 +02:00
+date: 2012-11-12 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -89,11 +89,16 @@ files:
 - readme.markdown
 - test/artifacts/book_with_tabs_and_colours.xls
 - test/artifacts/complex_types.xls
-- test/artifacts/medewerkers.xls
+- test/artifacts/excel_different_types.csv
+- test/artifacts/excel_different_types.txt
+- test/artifacts/excel_different_types.xls
+- test/artifacts/excel_different_types.xlsx
 - test/artifacts/simple_csv.csv
 - test/artifacts/simple_excel_csv.csv
 - test/artifacts/simple_sheet.xls
+- test/artifacts/txt_in_xls.xls
 - test/artifacts/xls_with_txt_extension.txt
+- test/artifacts/zip_in_xls.xls
 - test/helper.rb
 - test/test_book.rb
 - test/test_cell.rb
@@ -143,11 +148,16 @@ summary: Workbook is a datastructure to contain books of tables (an anlogy used
 test_files: 
 - test/artifacts/book_with_tabs_and_colours.xls
 - test/artifacts/complex_types.xls
-- test/artifacts/medewerkers.xls
+- test/artifacts/excel_different_types.csv
+- test/artifacts/excel_different_types.txt
+- test/artifacts/excel_different_types.xls
+- test/artifacts/excel_different_types.xlsx
 - test/artifacts/simple_csv.csv
 - test/artifacts/simple_excel_csv.csv
 - test/artifacts/simple_sheet.xls
+- test/artifacts/txt_in_xls.xls
 - test/artifacts/xls_with_txt_extension.txt
+- test/artifacts/zip_in_xls.xls
 - test/helper.rb
 - test/test_book.rb
 - test/test_cell.rb