cheap_imports 0.0.3 → 0.0.4

data/examples/{active-record-tarp/example.rb → tarp/ar-example.rb}

@@ -4,7 +4,7 @@ require 'cheap_imports'
 
 ActiveRecord::Base.establish_connection(
   :adapter => 'sqlite3',
-  :database => 'example.sqlite3'
+  :database => 'ar-example.sqlite3'
 )
 
 ActiveRecord::Schema.define :version => 0 do

data/examples/tarp/dm-example.rb

@@ -0,0 +1,34 @@
+require 'rubygems'
+require 'dm-core'
+require 'dm-migrations'
+require 'cheap_imports'
+
+DataMapper.setup(:default, 'sqlite3:dm-example.sqlite3')
+
+class Payment
+  include DataMapper::Resource
+  include CheapImports
+
+  property :id, Serial
+  property :name, String
+  property :paid_on, DateTime
+  property :price, Decimal
+
+  imports :tarp_transactions => {
+    :paid_on => 'Date',
+    :paid_on_format => '%Y-%m-%d',
+    :name => 'Name',
+    :price => 'Price Paid'
+  }
+end
+
+DataMapper.finalize
+DataMapper.auto_migrate!
+
+# Data downloaded from http://subsidyscope.com/bailout/tarp/
+Import.import_from_file([Payment], "tarp_transactions.csv")
+
+Payment.all.each do |p|
+  puts p.inspect
+end
+

data/examples/tarp/run-examples.sh

@@ -0,0 +1,3 @@
+ruby ar-example.rb > ar-example.out
+ruby dm-example.rb > dm-example.out
+

data/lib/cheap_imports.rb

@@ -1,7 +1,7 @@
 module CheapImports
 
   # :stopdoc:
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:

data/lib/cheap_imports/cheap_imports.rb

@@ -33,6 +33,10 @@ module CheapImports
       raise "default hash is empty" if default_hash.empty?
       @recognizable_hashes ||= {:default => default_hash}
     end
+
+    def recognizable_hashes
+      @recognizable_hashes
+    end
     
     # Add a new import definition.
     # 
@@ -87,7 +91,8 @@ module CheapImports
 
         value = nil
 
-        type = c.type.to_s.downcase
+        # ActiveRecord uses type, DataMapper uses e.g. DataMapper::Resource::String
+        type = (c.type || c.class.name.split('::').last).to_s.downcase 
         case type
         when "string", "text", "integer", "boolean"
           if raw_value === ""
@@ -100,6 +105,7 @@ module CheapImports
           date_format_string ||= @recognizable_hashes[style]["#{name.downcase}_#{column_name}_format".to_sym]
           raise "nil date_format_string for #{style} #{column_name}" if date_format_string.empty?
           begin
+            # TODO support for TimeWithZone, make date format string optional with smarter parsing
             value = Date.strptime(raw_value, date_format_string) if type === "date"
             value = DateTime.strptime(raw_value, date_format_string) if type === "datetime"
             value = Time.strptime(raw_value, date_format_string) if type === "time"

data/lib/cheap_imports/import.rb

@@ -18,9 +18,10 @@ module Import
       
       # Clean up the data, get rid of leading/trailing spaces.
       row.collect {|str| str.to_s.strip!}
-      
+
       h = Hash[*header_row.zip(row).flatten]
       klasses.each do |c|
+        c.init_recognizable_hashes if c.recognizable_hashes.nil?
         style = c.recognize_hash_style(h, debug)
         objects << c.import(h, args) if style
       end

data/spec/orms/datamapper_spec.rb

@@ -1,6 +1,7 @@
 require File.join(File.dirname(__FILE__), '..',  %w[spec_helper])
 
 require "dm-core"
+require 'dm-migrations'
 DataMapper.setup(:default, 'sqlite3::memory:')
 
 class Cat
@@ -26,6 +27,7 @@ class Appointment
   }
 end
 
+DataMapper.finalize
 DataMapper.auto_migrate!
 
 describe Cat, "importing default" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Ana Nelson
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-17 00:00:00 +01:00
+date: 2010-06-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,11 +47,16 @@ files:
 - Rakefile
 - bin/cheap_imports
 - clean-arch-install.sh
-- examples/active-record-tarp/.example.rb.swp
-- examples/active-record-tarp/example.out
-- examples/active-record-tarp/example.rb
-- examples/active-record-tarp/example.sqlite3
-- examples/active-record-tarp/tarp_transactions.csv
+- examples/cats.rb
+- examples/tarp/.example.rb.swp
+- examples/tarp/ar-example.out
+- examples/tarp/ar-example.rb
+- examples/tarp/ar-example.sqlite3
+- examples/tarp/dm-example.out
+- examples/tarp/dm-example.rb
+- examples/tarp/dm-example.sqlite3
+- examples/tarp/run-examples.sh
+- examples/tarp/tarp_transactions.csv
 - lib/cheap_imports.rb
 - lib/cheap_imports/cheap_imports.rb
 - lib/cheap_imports/import.rb