sheets 0.9.1 → 1.0.0

data/lib/sheets/parsers/roo_parser.rb

@@ -1,4 +1,5 @@
 require 'roo'
+require File.join( File.expand_path(File.dirname(__FILE__)), 'roo_patches.rb' )
 
 class Sheets::Parsers::RooParser < Sheets::Parsers::Base
   parses :xls, :xlsx, :ods

data/lib/sheets/parsers/roo_patches.rb

@@ -0,0 +1,5 @@
+puts "Loading Roo Patches"
+Dir[ File.join( File.expand_path(File.dirname(__FILE__)), 'roo_patches', '*.rb' ) ].each do |file|
+  puts "- #{File.basename(file)}"
+  require file
+end

data/lib/sheets/parsers/roo_patches/roo_patch_28885.rb

@@ -0,0 +1,116 @@
+# RubyForge Patch: 28885 - Fixes to Honor XLSX Base Date Format
+# NOTE: This fix is *highly* brittle. If roo updates, this may break roo.
+
+class Excelx
+
+  def initialize(filename, packed=nil, file_warning = :error) #, create = false)
+    super()
+    @file_warning = file_warning
+    @tmpdir = "oo_"+$$.to_s
+    @tmpdir = File.join(ENV['ROO_TMP'], @tmpdir) if ENV['ROO_TMP'] 
+    unless File.exists?(@tmpdir)
+      FileUtils::mkdir(@tmpdir)
+    end
+    filename = open_from_uri(filename) if filename[0,7] == "http://"
+    filename = unzip(filename) if packed and packed == :zip
+    begin
+      file_type_check(filename,'.xlsx','an Excel-xlsx')
+      @cells_read = Hash.new
+      @filename = filename
+      unless File.file?(@filename)
+        raise IOError, "file #{@filename} does not exist"
+      end
+      @@nr += 1
+      @file_nr = @@nr
+      extract_content(@filename)
+      file = File.new(File.join(@tmpdir, @file_nr.to_s+"_roo_workbook.xml"))
+      # TODO: @workbook_doc = XML::Parser.io(file).parse
+      @workbook_doc = Nokogiri::XML(file)
+      
+      # Set the base date, could be 1900 or 1904 depending on the system of origin.
+      date_base_element = @workbook_doc.search('workbookPr').attribute('date1904')
+      if date_base_element && date_base_element.value.to_i == 1
+        @base_date = Date.parse('1904-01-01')
+      else
+        @base_date = Date.parse('1900-01-01')
+      end
+      @base_datetime = DateTime.parse( @base_date.strftime("%Y-%m-%d") )
+      
+      file.close
+      @shared_table = []
+      if File.exist?(File.join(@tmpdir, @file_nr.to_s+'_roo_sharedStrings.xml'))
+        file = File.new(File.join(@tmpdir, @file_nr.to_s+'_roo_sharedStrings.xml'))
+        #TODO: @sharedstring_doc = XML::Parser.io(file).parse
+        @sharedstring_doc = Nokogiri::XML(file)
+        file.close
+        read_shared_strings(@sharedstring_doc)
+      end
+      @styles_table = []
+      @style_definitions = Array.new # TODO: ??? { |h,k| h[k] = {} }
+      if File.exist?(File.join(@tmpdir, @file_nr.to_s+'_roo_styles.xml'))
+        file = File.new(File.join(@tmpdir, @file_nr.to_s+'_roo_styles.xml'))
+        #TODO: @styles_doc = XML::Parser.io(file).parse
+        @styles_doc = Nokogiri::XML(file)
+        file.close
+        read_styles(@styles_doc)
+      end
+      @sheet_doc = []
+      @sheet_files.each_with_index do |item, i|
+        file = File.new(item)
+        #TODO: @sheet_doc[i] = XML::Parser.io(file).parse
+        @sheet_doc[i] = Nokogiri::XML(file)
+        file.close
+      end
+    ensure
+      #if ENV["roo_local"] != "thomas-p"
+      FileUtils::rm_r(@tmpdir)
+      #end
+    end
+    @default_sheet = self.sheets.first
+    @cell = Hash.new
+    @cell_type = Hash.new
+    @formula = Hash.new
+    @first_row = Hash.new
+    @last_row = Hash.new
+    @first_column = Hash.new
+    @last_column = Hash.new
+    @header_line = 1
+    @excelx_type = Hash.new
+    @excelx_value = Hash.new
+    @s_attribute = Hash.new # TODO: ggf. wieder entfernen nur lokal benoetigt
+  end
+
+  def set_cell_values(sheet,x,y,i,v,vt,formula,tr,str_v,
+      excelx_type=nil,
+      excelx_value=nil,
+      s_attribute=nil)
+    key = [y,x+i]
+    @cell_type[sheet] = {} unless @cell_type[sheet]
+    @cell_type[sheet][key] = vt
+    @formula[sheet] = {} unless @formula[sheet]
+    @formula[sheet][key] = formula  if formula
+    @cell[sheet]    = {} unless @cell[sheet]
+    case @cell_type[sheet][key]
+    when :float
+      @cell[sheet][key] = v.to_f
+    when :string
+      @cell[sheet][key] = str_v
+    when :date
+      @cell[sheet][key] = (@base_date+v.to_i).strftime("%Y-%m-%d")
+    when :datetime
+      @cell[sheet][key] = (@base_datetime+v.to_f).strftime("%Y-%m-%d %H:%M:%S")
+    when :percentage
+      @cell[sheet][key] = v.to_f
+    when :time
+      @cell[sheet][key] = v.to_f*(24*60*60)
+    else
+      @cell[sheet][key] = v
+    end
+    @excelx_type[sheet] = {} unless @excelx_type[sheet]
+    @excelx_type[sheet][key] = excelx_type
+    @excelx_value[sheet] = {} unless @excelx_value[sheet]
+    @excelx_value[sheet][key] = excelx_value
+    @s_attribute[sheet] = {} unless @s_attribute[sheet]
+    @s_attribute[sheet][key] = s_attribute
+  end
+end

data/lib/sheets/parsers/roo_patches/roo_patch_29045.rb

@@ -0,0 +1,2 @@
+# RubyForge Patch: 29045 - Fixes missing date format "January 10, 2011"
+Excelx::FORMATS["mmm\\ d\\,\\ yyyy"] = :date

data/lib/sheets/version.rb

@@ -1,3 +1,3 @@
 module Sheets
-  VERSION = "0.9.1"
+  VERSION = "1.0.0"
 end

data/sheets.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "sheets"
 
   s.add_dependency('spreadsheet', '>= 0.6.5.2')
-  s.add_dependency('roo', '>= 1.9.3')
+  s.add_dependency('roo', '= 1.9.3')
   # These are the dependencies roo forgot:
   s.add_dependency('builder', '>= 3.0.0')
   s.add_dependency('rubyzip', '>= 0.9.4')

data/test/parsers/roo_parser_test.rb

@@ -0,0 +1,8 @@
+class TestRooParser < Test::Unit::TestCase
+  
+  def test_roo_date_format_issue
+    sheet = Sheets::Base.new( 'test/data/roo_issue_28885_test.xlsx' )
+
+    assert_equal "2011-01-10", sheet.to_array[1][0]
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sheets
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 23
   prerelease: 
   segments: 
-  - 0
-  - 9
   - 1
-  version: 0.9.1
+  - 0
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Bradley J. Spaulding
@@ -41,7 +41,7 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         hash: 53
         segments: 
@@ -137,6 +137,9 @@ files:
 - lib/sheets/parsers/base.rb
 - lib/sheets/parsers/csv_parser.rb
 - lib/sheets/parsers/roo_parser.rb
+- lib/sheets/parsers/roo_patches.rb
+- lib/sheets/parsers/roo_patches/roo_patch_28885.rb
+- lib/sheets/parsers/roo_patches/roo_patch_29045.rb
 - lib/sheets/renderable.rb
 - lib/sheets/renderers/base.rb
 - lib/sheets/renderers/csv_renderer.rb
@@ -144,6 +147,7 @@ files:
 - lib/sheets/version.rb
 - sheets.gemspec
 - test/base_test.rb
+- test/data/roo_issue_28885_test.xlsx
 - test/data/simple.csv
 - test/data/simple.ods
 - test/data/simple.xls
@@ -152,6 +156,7 @@ files:
 - test/parseable_test.rb
 - test/parsers/basic_parsers_test.rb
 - test/parsers/csv_parser_test.rb
+- test/parsers/roo_parser_test.rb
 - test/renderable_test.rb
 - test/renderers/basic_renderers_test.rb
 - test/renderers/csv_renderer_test.rb
@@ -193,6 +198,7 @@ specification_version: 3
 summary: Sheets provides a Facade for importing spreadsheets that gives the application control. Any Spreadsheet can be represented as either (1) a two dimensional array, or (2) an array of hashes. Sheets' goal is to convert any spreadsheet format to one of these native Ruby data structures.
 test_files: 
 - test/base_test.rb
+- test/data/roo_issue_28885_test.xlsx
 - test/data/simple.csv
 - test/data/simple.ods
 - test/data/simple.xls
@@ -201,6 +207,7 @@ test_files:
 - test/parseable_test.rb
 - test/parsers/basic_parsers_test.rb
 - test/parsers/csv_parser_test.rb
+- test/parsers/roo_parser_test.rb
 - test/renderable_test.rb
 - test/renderers/basic_renderers_test.rb
 - test/renderers/csv_renderer_test.rb