spreadsheet 0.7.3 → 0.7.4

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.7.4 / 06.10.2012
+
+* Adds Spreadsheet::Excel::Row#to_a method to properly decode Date and DateTime data.
+* patches by https://github.com/mdgreenfield/spreadsheet
+
 === 0.7.3 / 26.06.2012
 
 * Fix Format borders

data/Manifest.txt

@@ -44,14 +44,15 @@ lib/spreadsheet/workbook.rb
 lib/spreadsheet/worksheet.rb
 lib/spreadsheet/writer.rb
 spreadsheet.gemspec
+test/data/test_borders.xls
 test/data/test_changes.xls
 test/data/test_copy.xls
 test/data/test_datetime.xls
 test/data/test_empty.xls
 test/data/test_formula.xls
 test/data/test_long_sst_record.xls
-test/data/test_merged_cells.xls
 test/data/test_merged_and_protected.xls
+test/data/test_merged_cells.xls
 test/data/test_missing_row.xls
 test/data/test_version_excel5.xls
 test/data/test_version_excel95.xls
@@ -61,9 +62,10 @@ test/excel/row.rb
 test/excel/writer/workbook.rb
 test/excel/writer/worksheet.rb
 test/font.rb
+test/format.rb
 test/integration.rb
 test/row.rb
 test/suite.rb
 test/workbook.rb
-test/worksheet.rb
 test/workbook_protection.rb
+test/worksheet.rb

data/lib/spreadsheet/excel/row.rb

@@ -42,6 +42,12 @@ class Row < Spreadsheet::Row
       enriched_data idx, at(idx)
     end
   end
+  ##
+  # Returns data as an array. If a cell is formatted as a Date or DateTime, the
+  # decoded Date or DateTime value is returned.
+  def to_a
+    self[0...length]
+  end
   private
   def _date data # :nodoc:
     return data if data.is_a?(Date)

data/lib/spreadsheet.rb

@@ -42,7 +42,7 @@ module Spreadsheet
 
   ##
   # The version of Spreadsheet you are using.
-  VERSION = '0.7.3'
+  VERSION = '0.7.4'
 
   ##
   # Default client Encoding. Change this value if your application uses a

data/test/excel/row.rb

@@ -18,6 +18,11 @@ class TestRow < Test::Unit::TestCase
     row = Row.new @worksheet, 0, [nil, 27627.6789]
     assert_equal Date.new(1975,8,21), row.date(1)
   end
+  def test_to_a
+    row = Row.new @worksheet, 0, [nil, 1, 27627.6789]
+    row.set_format(2, Format.new(:number_format => 'DD.MM.YYYY'))
+    assert_equal [nil, 1, Date.new(1975, 8, 21)], row.to_a
+  end
   def test_datetime
     row = Row.new @worksheet, 0, [nil, 27627.765]
     d1 = DateTime.new(1975,8,21) + 0.765

data/test/format.rb

@@ -0,0 +1,87 @@
+#!/usr/bin/env ruby
+# TestFormat -- Spreadsheet -- 06.11.2012 -- mina.git@naguib.ca
+
+$: << File.expand_path('../lib', File.dirname(__FILE__))
+
+require 'test/unit'
+require 'spreadsheet'
+
+module Spreadsheet
+  class TestFormat < Test::Unit::TestCase
+    def setup
+      @format = Format.new
+    end
+    def test_date?
+      assert_equal false, @format.date?
+      @format.number_format = "hms"
+      assert_equal false, @format.date?
+      @format.number_format = "Y"
+      assert_equal true, @format.date?
+      @format.number_format = "YMD"
+      assert_equal true, @format.date?
+    end
+    def test_date_or_time?
+      assert_equal false, @format.date_or_time?
+      @format.number_format = "hms"
+      assert_equal true, @format.date_or_time?
+      @format.number_format = "YMD"
+      assert_equal true, @format.date_or_time?
+      @format.number_format = "hmsYMD"
+      assert_equal true, @format.date_or_time?
+    end
+    def test_datetime?
+      assert_equal false, @format.datetime?
+      @format.number_format = "H"
+      assert_equal false, @format.datetime?
+      @format.number_format = "S"
+      assert_equal false, @format.datetime?
+      @format.number_format = "Y"
+      assert_equal false, @format.datetime?
+      @format.number_format = "HSYMD"
+      assert_equal true, @format.datetime?
+    end
+    def test_time?
+      assert_equal false, @format.time?
+      @format.number_format = "YMD"
+      assert_equal false, @format.time?
+      @format.number_format = "hmsYMD"
+      assert_equal true, @format.time?
+      @format.number_format = "h"
+      assert_equal true, @format.time?
+      @format.number_format = "hm"
+      assert_equal true, @format.time?
+      @format.number_format = "hms"
+      assert_equal true, @format.time?
+    end
+		def test_borders?
+			assert_equal [:none, :none, :none, :none], @format.border
+			@format.border = :thick
+			assert_equal [:thick, :thick, :thick, :thick], @format.border
+			@format.left = :hair
+			assert_equal [:thick, :thick, :thick, :hair], @format.border
+			@format.right = :hair
+			assert_equal [:thick, :thick, :hair, :hair], @format.border
+			@format.top = :hair
+			assert_equal [:thick, :hair, :hair, :hair], @format.border
+			@format.bottom = :hair
+			assert_equal [:hair, :hair, :hair, :hair], @format.border
+			assert_raises(ArgumentError) do			
+				@format.bottom = :bogus
+			end
+			assert_equal [:black, :black, :black, :black], @format.border_color
+			@format.border_color = :green
+			assert_equal [:green, :green, :green, :green], @format.border_color
+			@format.left_color = :red
+			assert_equal [:green, :green, :green, :red], @format.border_color
+			@format.right_color = :red
+			assert_equal [:green, :green, :red, :red], @format.border_color
+			@format.top_color = :red
+			assert_equal [:green, :red, :red, :red], @format.border_color
+			@format.bottom_color = :red
+			assert_equal [:red, :red, :red, :red], @format.border_color
+			assert_raises(ArgumentError) do			
+				@format.bottom_color = :bogus
+			end
+		end
+  end
+end

data/test/integration.rb

@@ -1233,6 +1233,37 @@ module Spreadsheet
       sheet[0,0] # trigger read_worksheet
       assert_equal [[2, 4, 1, 1], [3, 3, 2, 3]], sheet.merged_cells
     end
+    def test_read_borders
+      path = File.join @data, 'test_borders.xls'
+      book = Spreadsheet.open path
+      assert_instance_of Excel::Workbook, book
+      sheet = book.worksheet 0
+      format  = sheet.row(0).format 0
+      assert_equal :none, format.left
+      assert_equal :thin, format.top
+      assert_equal :medium, format.right
+      assert_equal :thick, format.bottom
+      assert_equal :builtin_black, format.left_color
+      assert_equal :red, format.top_color
+      assert_equal :green, format.right_color
+      assert_equal :yellow, format.bottom_color
+    end
+    def test_write_borders
+      book = Spreadsheet::Workbook.new
+      path = File.join @var, 'test_write_borders.xls'
+      sheet1 = book.create_worksheet
+      (sheet1.row(0).format 0).border = :hair
+      (sheet1.row(0).format 0).border_color = :brown
+      assert_nothing_raised do 
+        book.write path
+      end
+      book2 = Spreadsheet.open path
+      assert_instance_of Excel::Workbook, book2
+      sheet2 = book2.worksheet 0
+      format = sheet2.row(0).format 0
+      assert_equal :hair, format.left
+      assert_equal :brown, format.top_color
+    end
 
     private
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spreadsheet
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 7
-  - 3
-  version: 0.7.3
+  - 4
+  version: 0.7.4
 platform: ruby
 authors: 
 - Masaomi Hatakeyama, Zeno R.R. Davatz
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-26 00:00:00 Z
+date: 2012-10-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ruby-ole
@@ -127,14 +127,15 @@ files:
 - lib/spreadsheet/worksheet.rb
 - lib/spreadsheet/writer.rb
 - spreadsheet.gemspec
+- test/data/test_borders.xls
 - test/data/test_changes.xls
 - test/data/test_copy.xls
 - test/data/test_datetime.xls
 - test/data/test_empty.xls
 - test/data/test_formula.xls
 - test/data/test_long_sst_record.xls
-- test/data/test_merged_cells.xls
 - test/data/test_merged_and_protected.xls
+- test/data/test_merged_cells.xls
 - test/data/test_missing_row.xls
 - test/data/test_version_excel5.xls
 - test/data/test_version_excel95.xls
@@ -144,12 +145,13 @@ files:
 - test/excel/writer/workbook.rb
 - test/excel/writer/worksheet.rb
 - test/font.rb
+- test/format.rb
 - test/integration.rb
 - test/row.rb
 - test/suite.rb
 - test/workbook.rb
-- test/worksheet.rb
 - test/workbook_protection.rb
+- test/worksheet.rb
 - .gemtest
 homepage: https://github.com/zdavatz/spreadsheet
 licenses: []