airblade-acts-as-importable 1.0.0 → 1.0.2

data/.gitignore

@@ -1,2 +1,3 @@
 spec/debug.log
 pkg/
+Gemfile.lock

data/lib/acts_as_importable.rb

@@ -32,15 +32,15 @@ module AMC
         end
 
         # This requires a numeric primary key for the legacy tables
-        def import_all_in_batches
-          each do |legacy_model|
+        def import_all_in_batches(*args)
+          find_each(*args) do |legacy_model|
             legacy_model.import
           end
         end
 
         def lookup(id)
           lookup_class = read_inheritable_attribute(:importable_to) || "#{self.to_s.split('::').last}"
-          lookups[id] ||= Kernel.const_get(lookup_class).first(:conditions => {:legacy_id => id, :legacy_class => self.to_s}).try(:id__)
+          lookups[id] ||= Kernel.const_get(lookup_class).first(:conditions => {:legacy_id => id, :legacy_class => self.to_s}).try(:id)
         end
 
         def flush_lookups!
@@ -58,16 +58,13 @@ module AMC
       module InstanceMethods
 
         def import
-          returning to_model do |new_model|
+          to_model.tap do |new_model|
             if new_model
               new_model.legacy_id     = self.id         if new_model.respond_to?(:"legacy_id=")
               new_model.legacy_class  = self.class.to_s if new_model.respond_to?(:"legacy_class=")
 
               if !new_model.save
-                p new_model.errors
-                # TODO log an error that the model failed to save
-                # TODO remove the raise once we're out of the development cycle
-                raise
+                puts "#{new_model.errors.full_messages} <#{self.class.name}:#{id}>"
               end
             end
           end
@@ -78,5 +75,4 @@ module AMC
   end
 end
 
-require 'core_extensions'
 ActiveRecord::Base.class_eval { include AMC::Acts::Importable }

data/lib/version.rb

@@ -1,7 +1,7 @@
 module AMC
   module Acts
     module Importable
-      VERSION = '1.0.0'
+      VERSION = '1.0.2'
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: airblade-acts-as-importable
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: false
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Tim Riley, Andrew Stewart
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-02 00:00:00 +02:00
+date: 2011-08-18 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,7 +50,6 @@ files:
 - airblade-acts-as-importable.gemspec
 - init.rb
 - lib/acts_as_importable.rb
-- lib/core_extensions.rb
 - lib/version.rb
 - spec/acts_as_importable_spec.rb
 - spec/database.yml

data/lib/core_extensions.rb

@@ -1,18 +0,0 @@
-# See http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-talk/212639
-# And http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-talk/210633 for alternative [:id] notation
-class ActiveRecord::Base
-  alias_method :id__, :id if method_defined? :id
-end
-
-
-# From http://weblog.jamisbuck.org/2007/4/6/faking-cursors-in-activerecord
-class <<ActiveRecord::Base
-  def each(limit=1000)
-    rows = find(:all, :conditions => ["#{primary_key} > ?", 0], :limit => limit)
-    while rows.any?
-      rows.each { |record| yield record }
-      rows = find(:all, :conditions => ["#{primary_key} > ?", rows.last.id], :limit => limit)
-    end
-    self
-  end
-end