workbook 0.4.3 → 0.4.4

data/.gitignore

@@ -4,4 +4,5 @@ compare*.xls
 sharepoint_download_excel.*
 *.gem
 bin
+Gemfile.lock
 *.rb~

data/.travis.yml

@@ -3,4 +3,5 @@ rvm:
   - 1.9.3
   - 1.8.7
   - jruby-18mode
+  - 2.0.0
 #  - jruby-19mode

data/Gemfile

@@ -1,4 +1,6 @@
 source "http://rubygems.org"
 
 # Specify your gem's dependencies in workbook.gemspec
+
 gemspec
+gem 'rubyzip', :require => 'zip/zip'

data/README.md

@@ -60,20 +60,34 @@ simply clone the row, and add it back:
 
     b = Workbook::Book.open("template.xls")
     table = b.sheet.table
-    template_row = table[1] # can be any, but I typically have a well
-                            # formatted header row + an example template 
-			    # row for the data
+    template_row = table[1]            # can be any, but I typically have a well
+                                    # formatted header row + an example template
+                                    # row for the data
     [1,2,3,4].each do |v|
       new_row = template_row.clone
-      table << new_row      # to use the symbol style header references, 
-                            # the row first needs to be added back to the 
-			    # table
+      table << new_row              # to use the symbol style header references, 
+                                    # the row first needs to be added back to the 
+                                    # table
       new_row[:a] = v
     end
-    table.delete(template_row) # you don't want the template to show up
-                               # in the endresult
-    b.write("result.xls")   # write it!
+    table.delete(template_row)      # you don't want the template to show up
+                                    # in the endresult
+    b.write("result.xls")           # write it!
     
+Another typical use case is exporting a list of ActiveRecord-objects to xls (it is assumed that the headers of the excel-table correspond 
+(like "Total order price" and `total_order_price` match) to the headers of the database-table ):
+
+    b = Workbook::Book.open("template.xls")
+    table = b.sheet.table
+    template_row = table[1]         # see above
+    Order.where("created_at > ?", Time.now - 1.week).each do |order|
+      new_row = template_row.clone
+      new_row.table = table
+      order.to_hash.each{|k,v| row[k]=v}
+    end
+    table.delete(template_row)      # you don't want the template to show up
+                                    # in the endresult
+    b.write("recent_orders.xls")    # write it!
 
 
   <!-- Feature *to implement*: 
@@ -83,7 +97,7 @@ Feature *to implement*, get a single column:
     t[:b]
 	# returns [<Workbook::Cel @value=2>,<Workbook::Cel @value=4>,<Workbook::Cel @value=6>] 
 	
-On my wishlist: In the future I hope to return the cell value directly, without the intermediate Workbook::Cel class in between.
+On my wishlist: In the future I hope to return the cell value directly, without the intermediate Workbook::Cell class in between.
 	
 	-->
 	
@@ -113,15 +127,17 @@ And a new book with a new sheet/table will be returned containing the difference
 
 Currently writing is limited to the following formats. Templating support is still limited.
 	
-	b.to_xls 			# returns a spreadsheet workbook
-	b.write_to_xls filename 	# writes to filename
-	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.
+	b.to_xls                # returns a spreadsheet workbook
+	b.write_to_xls filename # writes to filename
+	t.(write_)to_csv                # returns a csv-string (called on tables)
+	b.(write_)to_html               # returns a clean html-page with all tables; unformatted, format-names are used in the classes
+    t.(write_)to_json               # returns the values of a table in json
+    
+In case you want to display a formatted 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). 
+Workbook should be compatible with ruby 1.8.7, 1.9.3, 2.0.0 (jruby 1.8 mode works as well, but currently there are some issues with jruby 1.9 and encoding). 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
 

data/lib/workbook.rb

@@ -9,6 +9,7 @@ require 'workbook/cell'
 require 'workbook/format'
 require 'workbook/template'
 require 'workbook/version'
+require 'workbook/column'
 
 module Workbook
   class << self

data/lib/workbook/cell.rb

@@ -36,6 +36,19 @@ module Workbook
       end
     end
 
+    # Change the current value
+    #
+    # @param [Numeric,String,Time,Date,TrueClass,FalseClass,NilClass] value a valid value
+    def value= value
+      if valid_value? value
+        @value = value
+      else
+        raise ArgumentError, "value should be of a primitive type, e.g. a string, or an integer, not a #{value.class} (is_a? [TrueClass,FalseClass,Date,Time,Numeric,String, NilClass])"
+      end
+    end
+
+    # Change the current format
+    #
     # @param [Workbook::Format, Hash] f set the formatting properties of this Cell
     def format= f
       if f.is_a? Workbook::Format
@@ -47,10 +60,15 @@ module Workbook
       end
     end
 
+    # Returns current format
+    #
+    # @returns [Workbook::Format] the current format
     def format
       @format ||= Workbook::Format.new
     end
 
+    # Tests for equality based on its value (formatting is irrelevant)
+    #
     # @param [Workbook::Cell] other cell to compare against
     # @return [Boolean]
     def ==(other)
@@ -122,7 +140,9 @@ module Workbook
       v
     end
 
-    # @param [Workbook::Cell] other cell to compare against, can compare different value-types using #compare_on_class
+    # Compare
+    # @param [Workbook::Cell] other cell to compare against (based on value), can compare different value-types using #compare_on_class
+    # @returns [Fixnum] -1, 0, 1
     def <=> other
       rv = nil
       begin

data/lib/workbook/column.rb

@@ -0,0 +1,30 @@
+# -*- encoding : utf-8 -*-
+module Workbook
+
+  # Column helps us to store general properties of a column, and lets us easily perform operations on values within a column
+  class Column
+    attr_accessor :column_type # :primary_key, :string, :text, :integer, :float, :decimal, :datetime, :date, :binary, :boolean.
+    attr_accessor :limit #character limit
+    attr_accessor :default #default cell
+
+    def initialize(options={})
+      options.each{ |k,v| self.public_send("#{k}=",v) }
+    end
+
+    def column_type= column_type
+      if [:primary_key, :string, :text, :integer, :float, :decimal, :datetime, :date, :binary, :boolean].include? column_type
+        @column_type = column_type
+      else
+        raise ArgumentError, "value should be a symbol indicating a primitive type, e.g. a string, or an integer (valid values are: :primary_key, :string, :text, :integer, :float, :decimal, :datetime, :date, :binary, :boolean)"
+
+      end
+    end
+
+    def default= value
+      @default = value if value.class == Cell
+      @default = Cell.new(value)
+    end
+
+
+  end
+end

data/lib/workbook/readers/ods_reader.rb

@@ -13,7 +13,6 @@ module Workbook
         Zip::ZipFile.open(file_obj) do |zipfile|
           zipfile.entries.each do |file|
             styles = zipfile.read(file.name) if file.name == "styles.xml"
-
             content = zipfile.read(file.name) if file.name == "content.xml"
           end
         end
@@ -140,10 +139,11 @@ module Workbook
         value = CGI.unescapeHTML(@cell.xpath("text:p//text()").to_s)
         value = (value=="") ? nil : value
         case valuetype
-        when 'float'
-          value = @cell.xpath("@office:value").to_s.to_f
         when 'integer'
           value = @cell.xpath("@office:value").to_s.to_i
+        when 'float'
+          value = @cell.xpath("@office:value").to_s.to_f
+          value = value.to_i unless @cell.xpath("@office:value").to_s.match(/\./) #sadly most integers are typed as floats...
         when 'date'
           value = DateTime.parse(@cell.xpath("@office:date-value").to_s)
         end

data/lib/workbook/readers/xlsx_reader.rb

@@ -7,6 +7,7 @@ module RubyXL
 
     # Improves upon date format detection
     def is_date_format?(num_fmt)
+      num_fmt = num_fmt.to_s
       num_fmt.downcase!
       skip_chars = ['$', '-', '+', '/', '(', ')', ':', ' ']
       num_chars = ['0', '#', '?']
@@ -142,7 +143,12 @@ module Workbook
         #number_of_worksheets = xlsx_spreadsheet.worksheets.count
         xlsx_spreadsheet.worksheets.each_with_index do |worksheet, si|
           s = create_or_open_sheet_at(si)
-          col_widths = xlsx_spreadsheet.worksheets.first.cols.collect{|a| a[:attributes][:width].to_f if a[:attributes]}
+          col_widths = []
+          begin
+            col_widths = xlsx_spreadsheet.worksheets.first.cols.collect{|a| a[:attributes][:width].to_f if a[:attributes]}
+          rescue
+            # Column widths couldn't be read, no big deal...
+          end
           worksheet.each_with_index do |row, ri|
             r = s.table.create_or_open_row_at(ri)
 
@@ -173,11 +179,10 @@ module Workbook
           end
         end
       end
-      private
       def ms_formatting_to_strftime ms_nr_format
         if ms_nr_format
-          ms_nr_format = ms_nr_format.downcase
-          return nil if ms_nr_format == 'general'
+          ms_nr_format = ms_nr_format.to_s.downcase
+          return nil if ms_nr_format == 'general' or ms_nr_format == ""
           ms_nr_format.gsub('yyyy','%Y').gsub('dddd','%A').gsub('mmmm','%B').gsub('ddd','%a').gsub('mmm','%b').gsub('yy','%y').gsub('dd','%d').gsub('mm','%m').gsub('y','%y').gsub('%%y','%y').gsub('d','%e').gsub('%%e','%d').gsub('m','%m').gsub('%%m','%m').gsub(';@','').gsub('\\','')
         end
       end

data/lib/workbook/row.rb

@@ -161,13 +161,28 @@ module Workbook
     #
     # @return [Hash]
     def to_hash
-      return @hash if @hash
+      #return @hash if @hash
       keys = table_header_keys
       values = self
       @hash = {}
       keys.each_with_index {|k,i| @hash[k]=values[i]}
       return @hash
     end
+    
+    # Returns a hash representation of this row
+    #
+    # it differs from #to_hash as it doesn't contain the Workbook's Workbook::Cell-objects, 
+    # but the actual values contained in these cells
+    #
+    # @return [Hash]
+
+    def to_hash_with_values
+      keys = table_header_keys
+      values = self
+      @hash_with_values = {}
+      keys.each_with_index {|k,i| v=values[i]; v=v.value if v; @hash_with_values[k]=v}
+      return @hash_with_values 
+    end
 
     # Compares one row wiht another
     #
@@ -199,7 +214,7 @@ module Workbook
     def clone
       Workbook::Row.new(to_a.collect{|c| c.clone})
     end
-    
+
     # remove all the trailing nil-cells (returning a trimmed clone)
     #
     # @param [Integer] desired_length of the new row
@@ -207,14 +222,14 @@ module Workbook
     def trim(desired_length=nil)
       self.clone.trim!(desired_length)
     end
-    
+
     # remove all the trailing nil-cells (returning a trimmed self)
     #
     # @param [Integer] desired_length of the new row
     # @return [Workbook::Row] self
     def trim!(desired_length=nil)
       self_count = self.count-1
-      self.count.times do |index| 
+      self.count.times do |index|
         index = self_count - index
         if desired_length and index < desired_length
           break
@@ -227,7 +242,7 @@ module Workbook
         end
       end
       (desired_length - self.count).times{|a| self << (Workbook::Cell.new(nil))} if desired_length and (desired_length - self.count) > 0
-      self 
+      self
     end
   end
 end

data/lib/workbook/sheet.rb

@@ -34,7 +34,21 @@ module Workbook
     def table
       first
     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
+
+    # @return [Workbook::Table] the first table of this sheet
+    def table= table, options={}
+      if table.is_a? Workbook::Table
+        self[0] = table
+      else
+        self[0] = Workbook::Table.new(table, self, options)
+      end
+      return table
+    end
+
     # Returns the book this sheet belongs to
     #
     # @return [Workbook::Book] the book this sheet belongs to

data/lib/workbook/table.rb

@@ -1,6 +1,7 @@
 # -*- encoding : utf-8 -*-
 require 'workbook/modules/table_diff_sort'
 require 'workbook/writers/csv_table_writer'
+require 'workbook/writers/json_table_writer'
 
 
 module Workbook
@@ -8,6 +9,7 @@ module Workbook
   class Table < Array
     include Workbook::Modules::TableDiffSort
     include Workbook::Writers::CsvTableWriter
+    include Workbook::Writers::JsonTableWriter
     attr_accessor :sheet
     attr_accessor :name
     attr_accessor :header
@@ -58,7 +60,7 @@ module Workbook
       self.delete_if{|r| r.nil? or r.compact.empty?}
       self
     end
-    
+
     # Add row
     # @param [Workbook::Table, Array] row to add
     def push(row)
@@ -74,7 +76,19 @@ module Workbook
       super(row)
       row.set_table(self)
     end
-    
+
+    # Overrides normal Row's []=-function; automatically converting to row and setting
+    # with the label correctly
+    #
+    # @param [Fixnum] index
+    # @param [Workbook::Table, Array] row to set
+    # @return [Workbook::Cell, nil]
+    def []= (index, row)
+      row = Workbook::Row.new(row) if row.class == Array
+      super(index,row)
+      row.set_table(self)
+    end
+
     def has_contents?
       self.clone.remove_empty_lines!.count != 0
     end
@@ -152,7 +166,7 @@ module Workbook
       end
       return sum-1
     end
-    
+
     # remove all the trailing empty-rows (returning a trimmed clone)
     #
     # @param [Integer] desired_row_length of the rows
@@ -160,7 +174,7 @@ module Workbook
     def trim(desired_row_length=nil)
       self.clone.trim!(desired_row_length)
     end
-    
+
     # remove all the trailing empty-rows (returning a trimmed self)
     #
     # @param [Integer] desired_row_length of the new row
@@ -168,7 +182,7 @@ module Workbook
     def trim!(desired_row_length=nil)
       max_length = self.collect{|a| a.trim.length }.max
       self_count = self.count-1
-      self.count.times do |index| 
+      self.count.times do |index|
         index = self_count - index
         if self[index].trim.empty?
           self.delete_at(index)

data/lib/workbook/version.rb

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

data/lib/workbook/writers/csv_table_writer.rb

@@ -4,6 +4,11 @@ require 'csv'
 module Workbook
   module Writers
     module CsvTableWriter
+      # Output the current workbook to CSV format
+      #
+      # @param [String] filename
+      # @param [Hash] options (not used)
+      # @return [String] csv (comma separated values in a string)
       def to_csv options={}
         csv = ""
         options = {}.merge options
@@ -18,6 +23,16 @@ module Workbook
         end
         csv
       end
+      
+      # Write the current workbook to CSV format
+      #
+      # @param [String] filename
+      # @param [Hash] options   see #to_csv
+      # @return [String] filename
+      def write_to_csv filename="#{title}.csv", options={}
+        File.open(filename, 'w') {|f| f.write(to_csv(options)) }
+        return filename
+      end
 
     end
   end

data/lib/workbook/writers/html_writer.rb

@@ -5,10 +5,10 @@ module Workbook
   module Writers
     module HtmlWriter
 
-      # Generates an Spreadsheet (from the spreadsheet gem) in order to build an XlS
+      # Generates an HTML table ()
       #
       # @param [Hash] options A hash with options
-      # @return [Spreadsheet] A Spreadsheet object, ready for writing or more lower level operations
+      # @return [String] A String containing the HTML code
       def to_html options={}
         options = {:style_with_inline_css=>false}.merge(options)
         builder = Nokogiri::XML::Builder.new do |doc|
@@ -50,10 +50,12 @@ module Workbook
 
 
 
-      # Write the current workbook to Microsoft Excel format (using the spreadsheet gem)
+      # Write the current workbook to HTML format
       #
       # @param [String] filename
       # @param [Hash] options   see #to_xls
+      # @return [String] filename
+
       def write_to_html filename="#{title}.html", options={}
         File.open(filename, 'w') {|f| f.write(to_html(options)) }
         return filename

data/lib/workbook/writers/json_table_writer.rb

@@ -0,0 +1,36 @@
+# -*- encoding : utf-8 -*-
+require 'json'
+
+module Workbook
+  module Writers
+    module JsonTableWriter
+      # Output the current workbook to JSON format
+      #
+      # @param [Hash] options  
+      # @return [String] json string
+      def to_json options={}
+        JSON.generate(to_array_of_hashes_with_values(options))
+      end
+      
+      # Output the current workbook to an array_of_hashes_with_values format
+      #
+      # @param [Hash] options  
+      # @return [Array<Hash>] array with hashes (comma separated values in a string)
+      def to_array_of_hashes_with_values options={}
+        array_of_hashes = self.collect{|a| a.to_hash_with_values unless a.header?}.compact
+        return array_of_hashes
+      end
+      
+      # Write the current workbook to JSON format
+      #
+      # @param [String] filename
+      # @param [Hash] options   see #to_json
+      # @return [String] filename
+      def write_to_json filename="#{title}.json", options={}
+        File.open(filename, 'w') {|f| f.write(to_json(options)) }
+        return filename
+      end
+
+    end
+  end
+end

data/rbeautify.rb

@@ -20,6 +20,8 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+
+To recursively execute this script run: `find . -name "*.rb"|xargs ./rbeautify.rb`
 =end
 
 PVERSION = "Version 2.9, 10/24/2008"

data/test/test_cell.rb

@@ -25,6 +25,12 @@ class TestCell < Test::Unit::TestCase
     assert_equal("asdf",w.value)
     w.value = Date.new
     assert_equal(Date.new,w.value)
+    w.value = 1
+    assert_equal(1,w.value)
+    assert_equal(Fixnum,w.value.class)
+    w.value = 1.0
+    assert_equal(1.0,w.value)
+    assert_equal(Float,w.value.class)
   end
 
   def test_comp

data/test/test_column.rb

@@ -0,0 +1,15 @@
+# -*- encoding : utf-8 -*-
+require File.join(File.dirname(__FILE__), 'helper')
+
+class TestRow < Test::Unit::TestCase
+
+  def test_init
+    c = Workbook::Column.new
+    assert_equal(Workbook::Column, c.class)
+    c = Workbook::Column.new({:limit=>20,:default=>"asdf", :column_type=>:boolean})
+    assert_equal(20, c.limit)
+    assert_equal(Workbook::Cell.new("asdf"), c.default)
+    assert_equal(:boolean, c.column_type)
+    assert_raise(ArgumentError) { Workbook::Column.new({:limit=>20,:default=>"asdf", :column_type=>:bodfolean}) }
+  end
+end

data/test/test_readers_ods_reader.rb

@@ -6,6 +6,7 @@ module Readers
 
       w = Workbook::Book.new
       w.open 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)
     end
@@ -37,7 +38,7 @@ module Readers
       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("42000",w.sheet.table[3][:b].value.to_s)
       assert_equal(nil,w.sheet.table[2][:c].value)
     end
 
@@ -55,7 +56,7 @@ module Readers
       assert_equal(2,t["D5"].colspan)
     end
 
-    def test_duca_sheet
+    def test_book_with_colspans
       w = Workbook::Book.new
       w.open File.join(File.dirname(__FILE__), 'artifacts/book_with_colspans.ods')
       t = w.sheet.table

data/test/test_readers_xlsx_reader.rb

@@ -24,6 +24,16 @@ module Readers
       assert_equal("2012-12-03T12:30:00+00:00",w.sheet.table[7][:datum_gemeld].value.to_s)
       assert_equal("2012-12-03T09:4",w.sheet.table[6][:datum_gemeld].value.to_s[0..14])
     end
-
+    def test_ms_formatting_to_strftime
+      w = Workbook::Book.new
+      assert_equal(nil,w.ms_formatting_to_strftime(nil));
+      assert_equal(nil,w.ms_formatting_to_strftime(""));
+    end
+    def test_monkey_patched_ruby_xl_is_date_format?
+      w = RubyXL::Workbook.new
+      assert_equal(false, w.is_date_format?(nil))
+      assert_equal(false, w.is_date_format?(""))
+      assert_equal(true, w.is_date_format?("D-M-YYY"))
+    end
   end
 end

data/test/test_row.rb

@@ -104,6 +104,35 @@ class TestRow < Test::Unit::TestCase
     assert_equal(date, r2[:asdfasd].value)
     assert_equal(date, r2[1].value)
   end
+  
+
+  def test_to_hash_with_values
+    t = Workbook::Table.new
+    r1 = Workbook::Row.new  ["test", "asdf-asd"]
+    r1.table = t
+    expected = {:test=>"test", :asdfasd=>"asdf-asd"}
+    assert_equal(expected, r1.to_hash_with_values)
+    date = DateTime.now
+    r2 = Workbook::Row.new  [2, date]
+    r2.table = t
+    expected = {:test=>2, :asdfasd=>date}
+    assert_equal(expected, r2.to_hash_with_values)
+  end
+  
+  def test_to_hash_cache
+    t = Workbook::Table.new
+    t << ["test", "asdf-asd"]
+    t << [1, 2]
+    r = t.last
+    assert_equal(1, r[:test].value)
+    t.last[0].value = 3
+    assert_equal(3, r[:test].value)
+    assert_equal(3, r[:test].value)
+    t.last[:test] = nil
+    assert_equal(nil, r[:test].value)  
+    r[:test] = 5
+    assert_equal(5, r[:test].value)    
+  end
 
   def test_compare
     r1 = Workbook::Row.new  ["test", "asdf-asd"]
@@ -156,7 +185,6 @@ class TestRow < Test::Unit::TestCase
   end
 
   def test_clone_has_no_table
-    # actually not desired, but for now enforced.
     b = Workbook::Book.new
     table = b.sheet.table
     table << Workbook::Row.new(["a","b"])
@@ -168,6 +196,46 @@ class TestRow < Test::Unit::TestCase
     assert_equal(2,row[1].value)
   end
 
+  def test_push
+    b = Workbook::Book.new
+    table = b.sheet.table
+    table << Workbook::Row.new(["a","b"])
+    table << Workbook::Row.new([1,2])
+    assert_equal(1,table[1][:a].value)
+    assert_equal(2,table[1][:b].value)
+    b = Workbook::Book.new
+    table = b.sheet.table
+    table.push Workbook::Row.new(["a","b"])
+    table.push Workbook::Row.new([1,2])
+    assert_equal(1,table[1][:a].value)
+    assert_equal(2,table[1][:b].value)
+  end
+
+  def test_assign
+    b = Workbook::Book.new
+    table = b.sheet.table
+    table.push Workbook::Row.new(["a","b"])
+    table[1] = Workbook::Row.new([1,2])
+    assert_equal(1,table[1][:a].value)
+    assert_equal(2,table[1][:b].value)    
+    
+    b = Workbook::Book.new
+    table = b.sheet.table
+    table.push Workbook::Row.new(["a","b"])
+    table[1] = [1,2]
+    assert_equal(1,table[1][:a].value)
+    assert_equal(2,table[1][:b].value)  
+  end
+
+  def test_preservation_of_format_on_assign
+    row = Workbook::Row.new([1,2])
+    cellformat = row.first.format
+    cellformat["background"]="#f00"
+    row[0] = 3
+    assert_equal(3,row[0].value)
+    assert_equal("#f00",row[0].format["background"])
+  end
+
   def test_row_hash_index_assignment
     b = Workbook::Book.new
     table = b.sheet.table
@@ -178,7 +246,7 @@ class TestRow < Test::Unit::TestCase
     row[:b]= 15
     assert_equal(15, table.last.last.value)
   end
-  
+
   def test_trim!
     a = Workbook::Row.new
     a[0] = 1
@@ -230,7 +298,7 @@ class TestRow < Test::Unit::TestCase
     a.trim!(1)
     assert_equal(b, a)
   end
-  
+
   def test_trim
     a = Workbook::Row.new
     a[0] = nil

data/test/test_sheet.rb

@@ -21,7 +21,16 @@ class TestWorkbook < Test::Unit::TestCase
     t = Workbook::Table.new []
     w = Workbook::Sheet.new t
     assert_equal(w.table,t)
+  end
 
+  def test_table_assignment
+    t = Workbook::Table.new []
+    s = Workbook::Sheet.new t
+    assert_equal(s.table,t)
+    data = [["a","b"],[1,2]]
+    s.table=data
+    assert_equal("a",s.table["A1"].value)
+    assert_equal(2,s.table["B2"].value)
   end
 
   def test_book

data/test/test_writers_html_writer.rb

@@ -48,8 +48,10 @@ module Writers
       w.open File.join(File.dirname(__FILE__), 'artifacts/sheet_with_combined_cells.ods')
       html = w.to_html
       assert_equal(true, (html.match(/rowspan="2">15 nov 11 15 nov 11/) ? true : false) )
-      assert_equal(true, (html.match(/colspan="2" rowspan="2">13 mrt 12 15 mrt 12 13 mrt 12 15 mrt 12/) ? true : false) )
-      assert_equal(true, (html.match(/colspan="2">14 90589/) ? true : false) )
+      if RUBY_VERSION >= "1.9"
+        assert_equal(true, (html.match(/colspan="2" rowspan="2">13 mrt 12 15 mrt 12 13 mrt 12 15 mrt 12/) ? true : false) ) 
+        assert_equal(true, (html.match(/colspan="2">14 90589/) ? true : false) )
+      end
     end
   end
 end

data/test/test_writers_json_writer.rb

@@ -0,0 +1,19 @@
+# -*- encoding : utf-8 -*-
+require File.join(File.dirname(__FILE__), 'helper')
+
+module Writers
+  class TestJsonWriter < Test::Unit::TestCase
+    def test_to_array_of_hashes_with_values
+      assert_equal([],Workbook::Table.new.to_array_of_hashes_with_values)
+      assert_equal([],Workbook::Table.new([["a","b"]]).to_array_of_hashes_with_values)
+      assert_equal([{:a=>1,:b=>2},{:a=>Date.new(2012,1,1),:b=>nil}],
+        Workbook::Table.new([["a","b"],[1,2],[Date.new(2012,1,1),nil]]).to_array_of_hashes_with_values)
+    end
+    def test_to_json
+      assert_equal("[]",Workbook::Table.new.to_json)
+      assert_equal("[]",Workbook::Table.new([["a","b"]]).to_json)
+      assert_equal("[{\"a\":1,\"b\":2},{\"a\":\"2012-01-01\",\"b\":null}]",
+        Workbook::Table.new([["a","b"],[1,2],[Date.new(2012,1,1),nil]]).to_json)
+    end
+  end
+end

data/workbook.gemspec

@@ -12,13 +12,18 @@ Gem::Specification.new do |s|
   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 excel, ods and csv and tab separated files, and offers basic diffing and sorting capabilities."
   s.authors     = ["Maarten Brouwers"]
+  s.add_dependency('rubyzip', '0.9.9')
   s.add_dependency('spreadsheet', '>= 0.7.5')
   s.add_dependency('fastercsv') if RUBY_VERSION < "1.9"
   s.add_dependency("rchardet", "~> 1.3")
   s.add_dependency("rake")
+  s.add_dependency("json")
   s.add_dependency('rubyXL')
-  s.add_dependency('nokogiri')
-  s.add_dependency('rubyzip')
+  if RUBY_VERSION < "1.9"
+    s.add_dependency('nokogiri', "~> 1.5.10")
+  else
+    s.add_dependency('nokogiri')
+  end
   s.platform    = Gem::Platform::RUBY
   s.files         = `git ls-files`.split($/)
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: workbook
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -11,6 +11,22 @@ bindir: bin
 cert_chain: []
 date: 2013-04-05 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.9
 - !ruby/object:Gem::Dependency
   name: spreadsheet
   requirement: !ruby/object:Gem::Requirement
@@ -60,7 +76,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubyXL
+  name: json
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -76,7 +92,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: rubyXL
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -92,7 +108,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubyzip
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -123,7 +139,6 @@ files:
 - .yardoc/objects/root.dat
 - .yardoc/proxy_types
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -171,6 +186,7 @@ files:
 - lib/workbook.rb
 - lib/workbook/book.rb
 - lib/workbook/cell.rb
+- lib/workbook/column.rb
 - lib/workbook/format.rb
 - lib/workbook/modules/raw_objects_storage.rb
 - lib/workbook/modules/table_diff_sort.rb
@@ -189,6 +205,7 @@ files:
 - lib/workbook/version.rb
 - lib/workbook/writers/csv_table_writer.rb
 - lib/workbook/writers/html_writer.rb
+- lib/workbook/writers/json_table_writer.rb
 - lib/workbook/writers/xls_writer.rb
 - rbeautify.rb
 - test/artifacts/book_with_colspans.ods
@@ -216,6 +233,7 @@ files:
 - test/helper.rb
 - test/test_book.rb
 - test/test_cell.rb
+- test/test_column.rb
 - test/test_format.rb
 - test/test_functional.rb
 - test/test_modules_table_diff_sort.rb
@@ -230,6 +248,7 @@ files:
 - test/test_table.rb
 - test/test_template.rb
 - test/test_writers_html_writer.rb
+- test/test_writers_json_writer.rb
 - test/test_writers_xls_writer.rb
 - workbook.gemspec
 homepage: http://murb.nl/blog?tags=workbook
@@ -283,6 +302,7 @@ test_files:
 - test/helper.rb
 - test/test_book.rb
 - test/test_cell.rb
+- test/test_column.rb
 - test/test_format.rb
 - test/test_functional.rb
 - test/test_modules_table_diff_sort.rb
@@ -297,5 +317,6 @@ test_files:
 - test/test_table.rb
 - test/test_template.rb
 - test/test_writers_html_writer.rb
+- test/test_writers_json_writer.rb
 - test/test_writers_xls_writer.rb
 has_rdoc: 

data/Gemfile.lock

@@ -1,28 +0,0 @@
-PATH
-  remote: .
-  specs:
-    workbook (0.4.2)
-      nokogiri
-      rake
-      rchardet (~> 1.3)
-      rubyXL
-      rubyzip
-      spreadsheet (>= 0.7.5)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    nokogiri (1.5.9)
-    rake (10.0.4)
-    rchardet (1.3.1)
-    ruby-ole (1.2.11.6)
-    rubyXL (1.2.10)
-    rubyzip (0.9.9)
-    spreadsheet (0.8.5)
-      ruby-ole (>= 1.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  workbook!