from_excel 1.0.1 → 1.1.0

data/lib/excel_import.rb

@@ -157,9 +157,26 @@ module ExcelImport
   def self.included(base)
     class << base
       def from_excel spreadsheet, opt={}
-        integrator = Integrator.new(Excel.new(spreadsheet.path), self, opt)
+        from_spreadsheet(:xls, spreadsheet, opt)
+      end
+      
+      def from_ooo spreadsheet, opt={}
+        from_spreadsheet(:ods, spreadsheet, opt)
+      end
+      
+      private
+      
+      def from_spreadsheet type, spreadsheet, opt={}
+        klass = case type
+        when :ods 
+          Openoffice
+        when :xls 
+          Excel
+        end
+        integrator = Integrator.new(klass.new(spreadsheet.path), self, opt)
         integrator.rows_to_objects
       end
+      
     end
   end
   

data/test/test_from_ods.rb

@@ -0,0 +1,11 @@
+require 'helper'
+
+class TestFromExcel < Test::Unit::TestCase
+  SIMPLE_SHEET= File.join(File.dirname(__FILE__), 'spreadsheets/simple_sheet.ods')
+
+  def test_import_with_simple_sheet
+    assert users = User.from_ooo(File.new SIMPLE_SHEET)
+    assert_equal sheet_users, users
+  end
+  
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: from_excel
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
-  - 0
   - 1
-  version: 1.0.1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Philippe Cantin
@@ -31,7 +31,7 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
-description: Import Excel spreadsheet to ruby objects
+description: Import Excel & OpenOffice spreadsheet to ruby objects
 email: 
 executables: []
 
@@ -49,6 +49,7 @@ files:
 - test/model/user.rb
 - test/test_bounds.rb
 - test/test_from_excel.rb
+- test/test_from_ods.rb
 - test/test_mapping.rb
 homepage: http://github.com/anoiaque/from_excel
 licenses: []
@@ -82,7 +83,7 @@ rubyforge_project:
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Import Excel spreadsheet to ruby objects
+summary: Import Excel & OpenOffice spreadsheet to ruby objects
 test_files: 
 - test/helper.rb
 - test/model/adress.rb
@@ -90,4 +91,5 @@ test_files:
 - test/model/user.rb
 - test/test_bounds.rb
 - test/test_from_excel.rb
+- test/test_from_ods.rb
 - test/test_mapping.rb