workbook 0.5 → 0.6

data/lib/workbook/row.rb

@@ -12,7 +12,7 @@ module Workbook
     #
     # @param [Workbook::Row, Array<Workbook::Cell>, Array] cells list of cells to initialize the row with, default is empty
     # @param [Workbook::Table] table a row normally belongs to a table, reference it here
-    # @param [Hash] options  Supprted options: parse_cells_on_batch_creation (parse cell values during row-initalization, default: false), cell_parse_options (default {}, see Workbook::Modules::TypeParser)
+    # @param [Hash] options  Supported options: parse_cells_on_batch_creation (parse cell values during row-initalization, default: false), cell_parse_options (default {}, see Workbook::Modules::TypeParser)
     def initialize cells=[], table=nil, options={}
       options=options ? {:parse_cells_on_batch_creation=>false,:cell_parse_options=>{},:clone_cells=>false}.merge(options) : {}
       cells = [] if cells==nil
@@ -38,7 +38,7 @@ module Workbook
     #
     # @return [Workbook::Table] the table this row belongs to
     def table
-      @table
+      @table if defined?(@table)
     end
 
     # Set reference to the table this row belongs to without adding the row to the table

data/lib/workbook/sheet.rb

@@ -1,8 +1,7 @@
 # -*- encoding : utf-8 -*-
 module Workbook
+  # A Sheet is a container of tables
   class Sheet < Array
-    # A Sheet is a container of tables
-    attr_accessor :name
 
     # Initialize a new sheet
     #
@@ -41,6 +40,14 @@ module Workbook
       @name ||= "Sheet #{book.index(self)+1}"
     end
 
+    # Set the name of this sheet
+    #
+    # @param [String] the new name of the sheet
+    # @return [String] the given name
+    def name= name
+      @name = name
+    end
+
     # Set the first table of this sheet with a table or array of cells/values
     # @param [Workbook::Table, Array<Array>] table   The new first table of this sheet
     # @param [Hash] options                          are forwarded to Workbook::Table.new

data/lib/workbook/table.rb

@@ -13,9 +13,7 @@ module Workbook
     include Workbook::Writers::JsonTableWriter
     include Workbook::Writers::HtmlTableWriter
 
-    attr_accessor :sheet
     attr_accessor :name
-    attr_accessor :columns
 
     def initialize row_cel_values=[], sheet=nil, options={}
       row_cel_values = [] if row_cel_values == nil
@@ -137,12 +135,16 @@ module Workbook
     #
     # @return [Workbook::Sheet] The sheet this table belongs to
     def sheet
-      if @sheet
-        return @sheet
-      else
-        self.sheet = Workbook::Sheet.new(self)
-        return @sheet
-      end
+      return @sheet if defined?(@sheet) and !@sheet.nil?
+      self.sheet= Workbook::Sheet.new(self)
+    end
+
+    # Returns the sheet this table belongs to, creates a new sheet if none exists
+    #
+    # @param [Workbook::Sheet] sheet this table belongs to
+    # @return [Workbook::Sheet] The sheet this table belongs to
+    def sheet= sheet
+      @sheet = sheet
     end
 
     # Removes all lines from this table
@@ -257,11 +259,21 @@ module Workbook
       [width,height]
     end
 
+    # Returns an array of Column-classes describing the columns of this table
+    # @return [Array<Column>] columns
     def columns
       @columns ||= header.collect do |header_cell|
         Column.new(self)
       end
     end
 
+    # Returns an array of Column-classes describing the columns of this table
+    # @param [Array<Column>] columns
+    # @return [Array<Column>] columns
+    def columns= columns
+      columns.each{|c| c.table=self}
+      @columns = columns
+    end
+
   end
 end

data/lib/workbook/template.rb

@@ -21,7 +21,11 @@ module Workbook
     # @param [Workbook::Format] format (of a cell) to add to the template
     def add_format format
       if format.is_a? Workbook::Format
-        @formats[format.name]=format
+        if format.name
+          @formats[format.name]=format
+        else
+          @formats[@formats.keys.count]=format
+        end
       else
         raise ArgumentError, "format should be a Workboot::Format"
       end

data/lib/workbook/types/date.rb

@@ -12,7 +12,7 @@ module Workbook
       end
 
       def value= a
-        throw "#value= is no longer available"
+        puts "#value= is deprecated"
       end
     end
   end

data/lib/workbook/version.rb

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

data/lib/workbook/writers/xlsx_writer.rb

@@ -25,10 +25,10 @@ module Workbook
               xlsx_row.add_cell(c.value) unless xlsx_row_a[ci]
               xlsx_cell = xlsx_row_a[ci]
               xlsx_cell.value = c.value
-              if c.format?
-                format_to_xlsx_format(c.format) unless c.format.raws[Fixnum]
-                xlsx_cell.style = c.format.raws[Fixnum]
-              end
+              # if c.format?
+                # format_to_xlsx_format(c.format) unless c.format.raws[Fixnum]
+                # xlsx_cell.style = c.format.raws[Fixnum]
+              # end
             end
             xlsx_sheet.send(:update_column_info, xlsx_row.cells, [])
           end
@@ -76,7 +76,7 @@ module Workbook
         else
           t = Axlsx::Package.new
           template.add_raw t
-          template.set_default_formats!
+          # template.set_default_formats!
           return t
         end
       end
@@ -90,7 +90,7 @@ module Workbook
       end
 
       def make_sure_f_is_a_workbook_format f
-        f.is_a?(Workbook::Format) ? f : Workbook::Format.new(f)
+        f.is_a?(Workbook::Format) ? f : Workbook::Format.new({}, f)
       end
 
       def format_to_xlsx_format f
@@ -104,7 +104,7 @@ module Workbook
         xlsfmt[:bg_color] = f[:background_color] if f[:background_color]
         xlsfmt[:format_code] = strftime_to_ms_format(f[:number_format]) if f[:number_format]
         xlsfmt[:font_name] = f[:font_family].split.first if f[:font_family]
-        xlsfmt[:family] = parse_font_family(f) if f[:font_family]
+        # xlsfmt[:family] = parse_font_family(f) if f[:font_family]
 
         f.add_raw init_xlsx_spreadsheet_template.workbook.styles.add_style(xlsfmt)
         f.add_raw xlsfmt

data/test/test_book.rb

@@ -5,19 +5,19 @@ class TestWorkbook < Minitest::Test
   def test_sheets
     w = Workbook::Book.new nil
     w.push
-    assert_equal(2, w.count)
+    assert_equal(1, w.count)
   end
 
   def test_push
     w = Workbook::Book.new nil
-    assert_equal(w.count,1)
-    assert_equal([[[]]],w)
+    assert_equal(0, w.count)
+    assert_equal([],w)
     w = Workbook::Book.new
     w.push
     assert_equal(w.first.class,Workbook::Sheet)
     w.push
     assert_equal(w,w.last.book)
-    assert_equal(w.count,3)
+    assert_equal(2, w.count)
     s = Workbook::Sheet.new
     w.push s
     assert_equal(w,w.last.book)
@@ -34,10 +34,11 @@ class TestWorkbook < Minitest::Test
     refute_equal(w.sheet, s)
     w = Workbook::Book.new s
     assert_equal(w.sheet, s)
+    w = Workbook::Book.new
+    s = w.sheet
+    assert_equal([[]], s)
   end
 
-
-
   def test_template
     b = Workbook::Book.new
     raw = "asdf"

data/test/test_format.rb

@@ -19,6 +19,16 @@ class TestFormat < Minitest::Test
 
   end
 
+  def test_derived_type
+    f = Workbook::Format.new {}
+    assert_nil(f.derived_type)
+    f = Workbook::Format.new numberformat: "%m/%e/%y h:%m"
+    assert_equal(:time,f.derived_type)
+    f = Workbook::Format.new numberformat: "%m/%e/%y"
+    assert_equal(:date,f.derived_type)
+
+  end
+
   def test_available_raws
     deet = Time.now
     f = Workbook::Format.new {}

data/test/test_functional.rb

@@ -22,9 +22,9 @@ class TestFunctional < Minitest::Test
   end
 
   def test_chapter_Sorting
-    b = Workbook::Book.new
-    s = b.sheet[0] = Workbook::Sheet.new([['a','b'],[1,2],[3,4],[5,6]])
-    t = s.table
+    # b = Workbook::Book.new
+    # s = b.sheet[0] = Workbook::Sheet.new([['a','b'],[1,2],[3,4],[5,6]])
+    # t = s.table
     #t.sort_by {|r| r[:b]}
     #p t.inspect
   end

data/test/test_modules_cell.rb

@@ -6,7 +6,7 @@ class TestModulesCell < Minitest::Test
 
   def test_init
     w = Workbook::Cell.new nil
-    assert_equal(nil,w.value)
+    assert_nil(w.value)
     w = Workbook::Cell.new "asdf"
     assert_equal("asdf",w.value)
 
@@ -20,7 +20,7 @@ class TestModulesCell < Minitest::Test
 
   def test_value
     w = Workbook::Cell.new nil
-    assert_equal(nil,w.value)
+    assert_nil(w.value)
     w.value = "asdf"
     assert_equal("asdf",w.value)
     w.value = Date.new
@@ -93,29 +93,29 @@ class TestModulesCell < Minitest::Test
 
   def test_nil
     c = Workbook::Cell.new nil
-    assert_equal(true,c.nil?)
+    assert_nil(c)
   end
 
   def test_colspan_rowspan
     c = Workbook::Cell.new
     c.colspan = 1
     c.rowspan = 1
-    assert_equal(nil,c.colspan)
-    assert_equal(nil,c.rowspan)
+    assert_nil(c.colspan)
+    assert_nil(c.rowspan)
     c.colspan = nil
     c.rowspan = ""
-    assert_equal(nil,c.colspan)
-    assert_equal(nil,c.rowspan)
+    assert_nil(c.colspan)
+    assert_nil(c.rowspan)
     c.colspan = 3
     c.rowspan = "4"
     assert_equal(3,c.colspan)
     c.rowspan = 0
-    assert_equal(nil,c.rowspan)
+    assert_nil(c.rowspan)
     assert_equal(3,c.colspan)
     c.colspan = 0
     c.rowspan = 3
     assert_equal(3,c.rowspan)
-    assert_equal(nil,c.colspan)
+    assert_nil(c.colspan)
   end
 
   def test_cell_type
@@ -125,10 +125,18 @@ class TestModulesCell < Minitest::Test
     end
   end
 
-  def test_index_and_key
+  def test_index
     t = Workbook::Table.new [[:a,:b,:c],[1,2,3],[4,5,6]]
     assert_equal(2, t[2][2].index)
-    assert_equal(:c, t[2][2].key)
+  end
 
+  def test_key
+    t = Workbook::Table.new [[:a,:b,:c],[1,2,3],[4,5,6]]
+    assert_equal(:c, t[2][2].key)
+    t = Workbook::Table.new [[:d,nil,nil],[:a,:b,:c],[1,2,3],[4,5,6]]
+    assert_nil(t[2][2].key)
+    assert_equal(:d, t[2][0].key)
+    t.header = t[1]
+    assert_equal(:a, t[2][0].key)
   end
 end

data/test/test_modules_table_diff_sort.rb

@@ -31,8 +31,6 @@ module Modules
       tself = ba.sheet.table
       tother = bb.sheet.table
 
-      placeholder_row = tother.placeholder_row
-
       ba = Workbook::Book.new [['a','b','c','d'],[1,2,3,4],[4,2,3,4],[3,2,3,4]]
       bb = Workbook::Book.new [['a','b','c','d'],[1,2,3,4],[3,2,3,4],[5,2,3,4]]
       tself = ba.sheet.table

data/test/test_modules_type_parser.rb

@@ -3,7 +3,8 @@ require File.join(File.dirname(__FILE__), 'helper')
 module Modules
   class TestTypeParser < Minitest::Test
     def examples
-      {"2312"=>2312,
+      {
+        "2312"=>2312,
         "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),
@@ -14,10 +15,10 @@ module Modules
         "12/23/1980"=>Date.new(1980,12,23), #TODO: should probably depend on locale, see: http://bugs.ruby-lang.org/issues/634#note-10
         "jA"=>"jA",
         "n"=>"n",
+        ""=>nil,
+        " "=> nil,
         "12 bomen"=>"12 bomen",
         "12 bomenasdfasdfsadf"=>"12 bomenasdfasdfsadf",
-        ""=>nil,
-        " "=>nil,
         "mailto:sadf@asdf.as"=>"sadf@asdf.as",
         "012-3456789"=>"012-3456789",
         "TRUE"=>true
@@ -26,7 +27,7 @@ module Modules
 
     def test_parse
       examples.each do |k,v|
-        assert_equal(v,Workbook::Cell.new(k).parse({:detect_date=>true}))
+        assert(v == Workbook::Cell.new(k).parse({:detect_date => true}))
       end
     end
 
@@ -51,11 +52,12 @@ module Modules
       assert_equal("xls_cell",r[0].value)
       r[1] = Workbook::Cell.new ""
       r[1].parse!
-      assert_equal(nil,r[1].value)
+      assert_nil(r[1].value)
     end
 
     def test_once_failing_files
       w = Workbook::Book.open(File.join(File.dirname(__FILE__), 'artifacts/failing_import1.xls')) # TRUE wasn't parsed properly
+      assert_equal(Workbook::Book, w.class)
     end
   end
 end

data/test/test_readers_csv_reader.rb

@@ -4,7 +4,7 @@ module Readers
   class TestCsvWriter < Minitest::Test
     def test_open
       w = Workbook::Book.new
-      w.open File.join(File.dirname(__FILE__), 'artifacts/simple_csv.csv')
+      w.import File.join(File.dirname(__FILE__), 'artifacts/simple_csv.csv')
       # reads
       #       a,b,c,d
       #       1,2,3,4
@@ -18,7 +18,7 @@ module Readers
     end
     def test_excel_csv_open
       w = Workbook::Book.new
-      w.open File.join(File.dirname(__FILE__), 'artifacts/simple_excel_csv.csv')
+      w.import File.join(File.dirname(__FILE__), 'artifacts/simple_excel_csv.csv')
       # reads
       #   a;b;c
       #   1-1-2001;23;1
@@ -37,7 +37,7 @@ module Readers
     end
     def test_excel_standardized_open
       w = Workbook::Book.new
-      w.open File.join(File.dirname(__FILE__), 'artifacts/excel_different_types.csv')
+      w.import File.join(File.dirname(__FILE__), '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
@@ -49,7 +49,7 @@ module Readers
       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)
+      assert_nil(w.sheet.table[2][:c].value)
     end
     def test_class_read_string
       s = File.read File.join(File.dirname(__FILE__), 'artifacts/simple_csv.csv')

data/test/test_readers_ods_reader.rb

@@ -5,7 +5,7 @@ module Readers
     def test_ods_open
 
       w = Workbook::Book.new
-      w.open File.join(File.dirname(__FILE__), 'artifacts/book_with_tabs_and_colours.ods')
+      w.import File.join(File.dirname(__FILE__), 'artifacts/book_with_tabs_and_colours.ods')
 
       assert_equal([:a, :b, :c, :d, :e],w.sheet.table.header.to_symbols)
       assert_equal(90588,w.sheet.table[2][:b].value)
@@ -13,7 +13,7 @@ module Readers
 
     def test_styling
       w = Workbook::Book.new
-      w.open File.join(File.dirname(__FILE__), 'artifacts/book_with_tabs_and_colours.ods')
+      w.import File.join(File.dirname(__FILE__), 'artifacts/book_with_tabs_and_colours.ods')
       assert_equal("#ffff99",w.sheet.table[3][:c].format[:background_color])
       assert_equal(true,w.sheet.table[0][:e].format.all_names.include?("Heading1"))
       # TODO: column styles
@@ -24,7 +24,7 @@ module Readers
 
     def test_complex_types
       w = Workbook::Book.new
-      w.open File.join(File.dirname(__FILE__), 'artifacts/complex_types.ods')
+      w.import File.join(File.dirname(__FILE__), 'artifacts/complex_types.ods')
       assert_equal(Date.new(2011,11,15), w.sheet.table[2][3].value)
       assert_equal("http://murb.nl", w.sheet.table[3][2].value)
       assert_equal("Sadfasdfsd > 2", w.sheet.table[4][2].value)
@@ -33,24 +33,24 @@ module Readers
 
     def test_excel_standardized_open
       w = Workbook::Book.new
-      w.open File.join(File.dirname(__FILE__), 'artifacts/excel_different_types.ods')
+      w.import File.join(File.dirname(__FILE__), 'artifacts/excel_different_types.ods')
       assert_equal([:a,:b,:c, :d],w.sheet.table.header.to_symbols[0..3])
       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.to_s)
-      assert_equal(nil,w.sheet.table[2][:c].value)
+      assert_nil(w.sheet.table[2][:c].value)
     end
 
     def test_sheet_with_combined_cells
       w = Workbook::Book.new
-      w.open File.join(File.dirname(__FILE__), 'artifacts/sheet_with_combined_cells.ods')
+      w.import File.join(File.dirname(__FILE__), 'artifacts/sheet_with_combined_cells.ods')
       t = w.sheet.table
       assert_equal("14 90589",t[1][:a].value)
       assert_equal(Workbook::NilValue,t[1][:b].value.class)
       assert_equal(:covered,t[1][:b].value.reason)
       assert_equal(2,t[1][:a].colspan)
-      assert_equal(nil,t[1][:c].colspan)
+      assert_nil(t[1][:c].colspan)
       assert_equal(2,t["D3"].rowspan)
       assert_equal(2,t["D5"].rowspan)
       assert_equal(2,t["D5"].colspan)
@@ -58,11 +58,11 @@ module Readers
 
     def test_book_with_colspans
       w = Workbook::Book.new
-      w.open File.join(File.dirname(__FILE__), 'artifacts/book_with_colspans.ods')
+      w.import File.join(File.dirname(__FILE__), 'artifacts/book_with_colspans.ods')
       t = w.sheet.table
       assert_equal(2,t["B1"].colspan)
       assert_equal(2,t["D1"].colspan)
-      assert_equal(nil,t["D3"].value)
+      assert_nil(t["D3"].value)
       assert_equal("g",t["A19"].value)
       assert_equal(0.03,t["D17"].value)
     end