import 0.0.2 → 0.0.3

data/.gitignore

@@ -1,7 +1,7 @@
 .bundle/
 log/*.log
 pkg/
-test/dummy/db/*.sqlite3
-test/dummy/config/database.yml
-test/dummy/log/*.log
-test/dummy/tmp/
+spec/dummy/db/*.sqlite3
+spec/dummy/config/database.yml
+spec/dummy/log/*.log
+spec/dummy/tmp/

data/Gemfile

@@ -11,4 +11,6 @@ gemspec
 # your gem to rubygems.org.
 
 # To use debugger
-# gem 'ruby-debug19', :require => 'ruby-debug'
+# gem 'ruby-debug19', :require => 'ruby-debug'
+
+gem 'activerecord-import', :git => 'git@github.com:Applicat/activerecord-import.git' 

data/Gemfile.lock

@@ -1,7 +1,15 @@
+GIT
+  remote: git@github.com:Applicat/activerecord-import.git
+  revision: b4d634d74c9fefa9a7a5fe1c6d3c46ea089bd7be
+  specs:
+    activerecord-import (0.2.9)
+      activerecord (~> 3.0pre)
+      activerecord (~> 3.0pre)
+
 PATH
   remote: .
   specs:
-    import (0.0.2)
+    import (0.0.3)
       activerecord-import
       rails (~> 3.1.0)
       state_machine
@@ -34,9 +42,6 @@ GEM
       activesupport (= 3.1.0)
       arel (~> 2.2.1)
       tzinfo (~> 0.3.29)
-    activerecord-import (0.2.8)
-      activerecord (~> 3.0pre)
-      activerecord (~> 3.0pre)
     activeresource (3.1.0)
       activemodel (= 3.1.0)
       activesupport (= 3.1.0)
@@ -62,7 +67,7 @@ GEM
       factory_girl (~> 2.1.0)
       railties (>= 3.0.0)
     ffi (1.0.9)
-    guard (0.7.0)
+    guard (0.8.0)
       thor (~> 0.14.6)
     guard-rspec (0.4.5)
       guard (>= 0.4.0)
@@ -133,7 +138,7 @@ GEM
     sprockets (2.0.0)
       hike (~> 1.2)
       rack (~> 1.0)
-      tilt (!= 1.3.0, ~> 1.1)
+      tilt (~> 1.1, != 1.3.0)
     state_machine (1.0.2)
     thor (0.14.6)
     tilt (1.3.3)
@@ -150,6 +155,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activerecord-import!
   capybara
   factory_girl_rails
   guard-rspec

data/README.rdoc

@@ -4,15 +4,7 @@ Data entity importer for Ruby and asynchronous handling wrapped around activerec
 
 ## Usage
 
-Perform the installation as follows
-
-    rails g import:install
-    
-Run the installed migration
-
-    rake db:migrate
-    
-## Changelog
+https://github.com/Applicat/Import/wiki
 
 ## License
 

data/lib/import.rb

@@ -1,6 +1,9 @@
+# encoding: UTF-8
+
 require 'state_machine'
 require File.dirname(__FILE__) + '/import/resource.rb'
 require File.dirname(__FILE__) + '/import/no_relation.rb'
+require File.dirname(__FILE__) + '/import/importable.rb'
 
 module Import
 end

data/lib/import/importable.rb

@@ -0,0 +1,14 @@
+class ActiveRecord::Base
+  class << self
+    def find_existing_entries(criteria, values)
+      class_eval <<-EOV
+find_by_sql(
+  [
+    "SELECT #{self.table_name}.id AS id, #{self.table_name}.name AS name FROM #{self.table_name} WHERE #{criteria}",
+    "#{values.join('", "')}"
+  ]
+).map{|a| [a.id, a.name]}
+EOV
+    end  
+  end
+end

data/lib/import/no_relation.rb

@@ -1,5 +1,8 @@
 module Import
-  class NoRelation < Resource
+  class NoRelation < Resource    
+    attr_accessible :logger, :input, :email, :resource_class
+    attr_accessor :resource_class 
+    
     protected
     
     def parse_resource(resource)
@@ -7,7 +10,7 @@ module Import
     end
     
     def append_existing_resources_criteria(resource)
-      @existing_resources_criteria << "(#{table_name}.name = ?)"
+      @existing_resources_criteria << "(#{resource_class.table_name}.name = ?)"
       @existing_resources_criteria_values << resource
     end
     

data/lib/import/resource.rb

@@ -4,20 +4,7 @@ module Import
   
     belongs_to :author, :class_name => 'User'
     belongs_to :parent, :polymorphic => true
-    
-    TYPES = [
-      [I18n.t('imports.types.user_import'), 'Importer::User'],
-      [I18n.t('imports.types.group_affiliation_import'), 'Importer::GroupAffiliation'],
-      [I18n.t('imports.types.music_group_label_affiliation_import'), 'Importer::Music::GroupLabelAffiliation'],
-      [I18n.t('imports.types.music_group_artist_affiliation_import'), 'Importer::Music::GroupArtistAffiliation'],
-      [I18n.t('imports.types.music_group_release_affiliation_import'), 'Importer::Music::GroupReleaseAffiliation'],
-      [I18n.t('imports.types.music_group_video_affiliation_import'), 'Importer::Music::GroupVideoAffiliation'],
-      [I18n.t('imports.types.music_artist_import'), 'Importer::Music::Artist'],
-      [I18n.t('imports.types.music_release_import'), 'Import::Music::Release']
-    ]
-    INDEX_COLUMNS = ['id', 'type', 'author_id', 'parent_type', 'parent_id']
       
-    validates :type, :inclusion => { :in => TYPES.map(&:last) }
     validates :input, :presence => true
     validates_format_of :email, :with  => /\A[^@]+@([^@\.]+\.)+[^@\.]+\z/, :allow_blank => true
     
@@ -70,10 +57,6 @@ module Import
     end
     
     def collection(force = true)
-      unless resource_class.respond_to?(:find_existing_entries)
-        raise I18n.t('imports.errors.derive_from_resource', :class_name => resource_class.class_name)
-      end
-      
       if force
         @existing_collection = find_existing_resources
       else
@@ -84,11 +67,11 @@ module Import
     protected
     
     def parse_resource(resource)
-      raise I18n.t('imports.errors.override_parse_resource', :class_name => self.class_name)
+      raise I18n.t('imports.errors.override_parse_resource', :class_name => self.class.name)
     end
     
     def append_existing_resources_criteria(resource)
-      raise I18n.t('imports.errors.override_append_existing_resources_criteria', :class_name => self.class_name)
+      raise I18n.t('imports.errors.override_append_existing_resources_criteria', :class_name => self.class.name)
     end
     
     def all_dependencies_loaded?
@@ -99,7 +82,7 @@ module Import
     end
     
     def import_resources  
-      raise I18n.t('imports.errors.override_import_resources', :class_name => self.class_name)  
+      raise I18n.t('imports.errors.override_import_resources', :class_name => self.class.name)  
     end
     
     def find_existing_resources
@@ -114,7 +97,7 @@ module Import
     end
     
     def parsed_resources_missing
-      raise I18n.t('imports.errors.override_parsed_resources_missing', :class_name => self.class_name)  
+      raise I18n.t('imports.errors.override_parsed_resources_missing', :class_name => self.class.name)  
     end
       
     def resource_class
@@ -160,6 +143,7 @@ module Import
       if self.exception.blank?
         return true
       elsif self.parent_import_id.blank?
+        raise self.exception
         self.my_fail!
         return false
       else

data/lib/import/version.rb

@@ -1,3 +1,3 @@
 module Import
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/dummy/app/models/music/artist.rb

@@ -5,16 +5,4 @@ class Music::Artist < ActiveRecord::Base
   validates_uniqueness_of :name, :case_sensitive => false
   
   attr_accessible :name, :tag_list, :author_id
-  
-  # TODO: Move to Import::NoRelation
-  def self.find_existing_entries(criteria, values)
-    class_eval <<-EOV
-find_by_sql(
-  [
-    "SELECT music_artists.id AS id, music_artists.name AS name FROM music_artists WHERE #{criteria}",
-    "#{values.join('", "')}"
-  ]
-).map{|a| [a.id, a.name]}
-EOV
-  end  
 end

data/spec/dummy/log/test.log

@@ -36,3 +36,203 @@
    (0.7ms)  RELEASE SAVEPOINT active_record_1
   Music::Artist Load (3.8ms)  SELECT `music_artists`.* FROM `music_artists` ORDER BY `music_artists`.`id` DESC LIMIT 1
    (8.4ms)  ROLLBACK
+   (0.2ms)  BEGIN
+   (0.2ms)  SAVEPOINT active_record_1
+  SQL (0.5ms)  INSERT INTO `imports` (`author_id`, `created_at`, `email`, `exception`, `input`, `parameters`, `parent_id`, `parent_type`, `state`, `type`, `updated_at`) VALUES (NULL, '2011-09-26 04:29:39', NULL, NULL, 'Paradise Lost', '--- {}\n', NULL, NULL, 'draft', 'Importer::Music::Artist', '2011-09-26 04:29:39')
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  Music::Artist Load (0.3ms)  SELECT music_artists.id AS id, music_artists.name AS name FROM music_artists WHERE (music_artists.name = 'Paradise Lost')
+   (26.7ms)  SHOW VARIABLES like 'max_allowed_packet';
+  Class Create Many Without Validations Or Callbacks (0.3ms)  INSERT INTO `music_artists` (`name`,`created_at`,`updated_at`) VALUES ('Paradise Lost','2011-09-26 04:29:39','2011-09-26 04:29:39') ON DUPLICATE KEY UPDATE `music_artists`.`updated_at`=VALUES(`updated_at`)
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.2ms)  SAVEPOINT active_record_1
+   (0.6ms)  UPDATE `imports` SET `state` = 'processed', `updated_at` = '2011-09-26 04:29:39', `parameters` = '--- {}\n' WHERE `imports`.`type` IN ('Importer::Music::Artist') AND `imports`.`id` = 10
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+  Music::Artist Load (0.6ms)  SELECT `music_artists`.* FROM `music_artists` ORDER BY `music_artists`.`id` DESC LIMIT 1
+   (36.9ms)  ROLLBACK
+   (0.3ms)  BEGIN
+   (0.2ms)  SAVEPOINT active_record_1
+  SQL (0.5ms)  INSERT INTO `imports` (`author_id`, `created_at`, `email`, `exception`, `input`, `parameters`, `parent_id`, `parent_type`, `state`, `type`, `updated_at`) VALUES (NULL, '2011-09-26 04:32:11', NULL, NULL, 'Paradise Lost', '--- {}\n', NULL, NULL, 'draft', 'Importer::Music::Artist', '2011-09-26 04:32:11')
+   (0.2ms)  RELEASE SAVEPOINT active_record_1
+   (0.3ms)  SAVEPOINT active_record_1
+  Music::Artist Load (1.5ms)  SELECT music_artists.id AS id, music_artists.name AS name FROM music_artists WHERE (music_artists.name = 'Paradise Lost')
+   (0.5ms)  SHOW VARIABLES like 'max_allowed_packet';
+  Class Create Many Without Validations Or Callbacks (0.4ms)  INSERT INTO `music_artists` (`name`,`created_at`,`updated_at`) VALUES ('Paradise Lost','2011-09-26 04:32:11','2011-09-26 04:32:11') ON DUPLICATE KEY UPDATE `music_artists`.`updated_at`=VALUES(`updated_at`)
+   (1.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.3ms)  SAVEPOINT active_record_1
+   (0.6ms)  UPDATE `imports` SET `state` = 'processed', `updated_at` = '2011-09-26 04:32:11', `parameters` = '--- {}\n' WHERE `imports`.`type` IN ('Importer::Music::Artist') AND `imports`.`id` = 11
+   (0.2ms)  RELEASE SAVEPOINT active_record_1
+  Music::Artist Load (2.0ms)  SELECT `music_artists`.* FROM `music_artists` ORDER BY `music_artists`.`id` DESC LIMIT 1
+   (29.1ms)  ROLLBACK
+   (28.1ms)  BEGIN
+   (0.2ms)  SAVEPOINT active_record_1
+  SQL (87.5ms)  INSERT INTO `imports` (`author_id`, `created_at`, `email`, `exception`, `input`, `parameters`, `parent_id`, `parent_type`, `state`, `type`, `updated_at`) VALUES (NULL, '2011-09-26 05:44:26', NULL, NULL, 'Paradise Lost', '--- {}\n', NULL, NULL, 'draft', 'Importer::Music::Artist', '2011-09-26 05:44:26')
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  Music::Artist Load (15.1ms)  SELECT music_artists.id AS id, music_artists.name AS name FROM music_artists WHERE (music_artists.name = 'Paradise Lost')
+   (0.4ms)  SHOW VARIABLES like 'max_allowed_packet';
+  Class Create Many Without Validations Or Callbacks (0.6ms)  INSERT INTO `music_artists` (`name`,`created_at`,`updated_at`) VALUES ('Paradise Lost','2011-09-26 05:44:26','2011-09-26 05:44:26') ON DUPLICATE KEY UPDATE `music_artists`.`updated_at`=VALUES(`updated_at`)
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.3ms)  SAVEPOINT active_record_1
+   (25.8ms)  UPDATE `imports` SET `state` = 'processed', `updated_at` = '2011-09-26 05:44:26', `parameters` = '--- {}\n' WHERE `imports`.`type` IN ('Importer::Music::Artist') AND `imports`.`id` = 12
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+  Music::Artist Load (0.6ms)  SELECT `music_artists`.* FROM `music_artists` ORDER BY `music_artists`.`id` DESC LIMIT 1
+   (26.3ms)  ROLLBACK
+   (0.4ms)  BEGIN
+   (0.2ms)  SAVEPOINT active_record_1
+  SQL (49.7ms)  INSERT INTO `imports` (`author_id`, `created_at`, `email`, `exception`, `input`, `parameters`, `parent_id`, `parent_type`, `state`, `type`, `updated_at`) VALUES (NULL, '2011-09-26 05:56:47', NULL, NULL, 'Paradise Lost', '--- {}\n', NULL, NULL, 'draft', 'Importer::Music::Artist', '2011-09-26 05:56:47')
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.2ms)  SAVEPOINT active_record_1
+  Music::Artist Load (64.2ms)  SELECT music_artists.id AS id, music_artists.name AS name FROM music_artists WHERE (music_artists.name = 'Paradise Lost')
+   (0.5ms)  SHOW VARIABLES like 'max_allowed_packet';
+  Class Create Many Without Validations Or Callbacks (0.3ms)  INSERT INTO `music_artists` (`name`,`created_at`,`updated_at`) VALUES ('Paradise Lost','2011-09-26 05:56:47','2011-09-26 05:56:47') ON DUPLICATE KEY UPDATE `music_artists`.`updated_at`=VALUES(`updated_at`)
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+   (2.6ms)  UPDATE `imports` SET `state` = 'processed', `updated_at` = '2011-09-26 05:56:47', `parameters` = '--- {}\n' WHERE `imports`.`type` IN ('Importer::Music::Artist') AND `imports`.`id` = 13
+   (0.3ms)  RELEASE SAVEPOINT active_record_1
+  Music::Artist Load (0.7ms)  SELECT `music_artists`.* FROM `music_artists` ORDER BY `music_artists`.`id` DESC LIMIT 1
+   (41.6ms)  ROLLBACK
+   (0.1ms)  BEGIN
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.4ms)  INSERT INTO `imports` (`author_id`, `created_at`, `email`, `exception`, `input`, `parameters`, `parent_id`, `parent_type`, `state`, `type`, `updated_at`) VALUES (NULL, '2011-09-26 05:56:47', NULL, NULL, 'Böhse Onkelz', '--- {}\n', NULL, NULL, 'draft', 'Importer::Music::Artist', '2011-09-26 05:56:47')
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  Music::Artist Load (0.4ms)  SELECT music_artists.id AS id, music_artists.name AS name FROM music_artists WHERE (music_artists.name = 'Böhse Onkelz')
+   (0.4ms)  SHOW VARIABLES like 'max_allowed_packet';
+  Class Create Many Without Validations Or Callbacks (0.2ms)  INSERT INTO `music_artists` (`name`,`created_at`,`updated_at`) VALUES ('Böhse Onkelz','2011-09-26 05:56:47','2011-09-26 05:56:47') ON DUPLICATE KEY UPDATE `music_artists`.`updated_at`=VALUES(`updated_at`)
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.5ms)  UPDATE `imports` SET `state` = 'processed', `updated_at` = '2011-09-26 05:56:47', `parameters` = '--- {}\n' WHERE `imports`.`type` IN ('Importer::Music::Artist') AND `imports`.`id` = 14
+   (0.2ms)  RELEASE SAVEPOINT active_record_1
+  Music::Artist Load (0.7ms)  SELECT `music_artists`.* FROM `music_artists` ORDER BY `music_artists`.`id` DESC LIMIT 1
+   (75.0ms)  ROLLBACK
+   (0.8ms)  BEGIN
+   (0.2ms)  SAVEPOINT active_record_1
+  SQL (0.5ms)  INSERT INTO `imports` (`author_id`, `created_at`, `email`, `exception`, `input`, `parameters`, `parent_id`, `parent_type`, `state`, `type`, `updated_at`) VALUES (NULL, '2011-09-26 05:57:54', NULL, NULL, 'Böhse Onkelz', '--- {}\n', NULL, NULL, 'draft', 'Importer::Music::Artist', '2011-09-26 05:57:54')
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.3ms)  SAVEPOINT active_record_1
+  Music::Artist Load (0.4ms)  SELECT music_artists.id AS id, music_artists.name AS name FROM music_artists WHERE (music_artists.name = 'Böhse Onkelz')
+   (0.4ms)  SHOW VARIABLES like 'max_allowed_packet';
+  Class Create Many Without Validations Or Callbacks (0.2ms)  INSERT INTO `music_artists` (`name`,`created_at`,`updated_at`) VALUES ('Böhse Onkelz','2011-09-26 05:57:54','2011-09-26 05:57:54') ON DUPLICATE KEY UPDATE `music_artists`.`updated_at`=VALUES(`updated_at`)
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.5ms)  UPDATE `imports` SET `state` = 'processed', `updated_at` = '2011-09-26 05:57:54', `parameters` = '--- {}\n' WHERE `imports`.`type` IN ('Importer::Music::Artist') AND `imports`.`id` = 15
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+  Music::Artist Load (0.5ms)  SELECT `music_artists`.* FROM `music_artists` ORDER BY `music_artists`.`id` DESC LIMIT 1
+   (0.2ms)  SAVEPOINT active_record_1
+  SQL (0.6ms)  INSERT INTO `imports` (`author_id`, `created_at`, `email`, `exception`, `input`, `parameters`, `parent_id`, `parent_type`, `state`, `type`, `updated_at`) VALUES (NULL, '2011-09-26 05:57:54', NULL, NULL, 'Böhse Onkelz', '--- {}\n', NULL, NULL, 'draft', 'Importer::Music::Artist', '2011-09-26 05:57:54')
+   (0.2ms)  RELEASE SAVEPOINT active_record_1
+   (0.2ms)  SAVEPOINT active_record_1
+  Music::Artist Load (21.3ms)  SELECT music_artists.id AS id, music_artists.name AS name FROM music_artists WHERE (music_artists.name = 'Böhse Onkelz')
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.2ms)  SAVEPOINT active_record_1
+   (0.8ms)  UPDATE `imports` SET `state` = 'processed', `updated_at` = '2011-09-26 05:57:54', `parameters` = '--- {}\n' WHERE `imports`.`type` IN ('Importer::Music::Artist') AND `imports`.`id` = 16
+   (0.2ms)  RELEASE SAVEPOINT active_record_1
+  Music::Artist Load (0.9ms)  SELECT `music_artists`.* FROM `music_artists` ORDER BY `music_artists`.`id` DESC LIMIT 1
+   (20.1ms)  SELECT COUNT(*) FROM `music_artists` 
+   (3.9ms)  ROLLBACK
+   (0.2ms)  BEGIN
+   (0.3ms)  SAVEPOINT active_record_1
+   (0.2ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  Music::Artist Load (0.5ms)  SELECT music_artists.id AS id, music_artists.name AS name FROM music_artists WHERE (no_relations.name = 'Böhse Onkelz')
+Mysql2::Error: Unknown column 'no_relations.name' in 'where clause': SELECT music_artists.id AS id, music_artists.name AS name FROM music_artists WHERE (no_relations.name = 'Böhse Onkelz')
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.3ms)  SAVEPOINT active_record_1
+   (0.2ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.0ms)  ROLLBACK
+   (0.2ms)  BEGIN
+   (0.2ms)  SAVEPOINT active_record_1
+   (0.9ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  Music::Artist Load (0.5ms)  SELECT music_artists.id AS id, music_artists.name AS name FROM music_artists WHERE (no_relations.name = 'Böhse Onkelz')
+Mysql2::Error: Unknown column 'no_relations.name' in 'where clause': SELECT music_artists.id AS id, music_artists.name AS name FROM music_artists WHERE (no_relations.name = 'Böhse Onkelz')
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.2ms)  BEGIN
+   (0.2ms)  SAVEPOINT active_record_1
+   (0.2ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  Music::Artist Load (0.6ms)  SELECT music_artists.id AS id, music_artists.name AS name FROM music_artists WHERE (no_relations.name = 'Böhse Onkelz')
+Mysql2::Error: Unknown column 'no_relations.name' in 'where clause': SELECT music_artists.id AS id, music_artists.name AS name FROM music_artists WHERE (no_relations.name = 'Böhse Onkelz')
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.2ms)  BEGIN
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.2ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  Music::Artist Load (1.8ms)  SELECT music_artists.id AS id, music_artists.name AS name FROM music_artists WHERE (music_artists.name = 'Böhse Onkelz')
+   (0.8ms)  SHOW VARIABLES like 'max_allowed_packet';
+  Class Create Many Without Validations Or Callbacks (0.3ms)  INSERT INTO `music_artists` (`name`,`created_at`,`updated_at`) VALUES ('Böhse Onkelz','2011-09-26 06:16:31','2011-09-26 06:16:31') ON DUPLICATE KEY UPDATE `music_artists`.`updated_at`=VALUES(`updated_at`)
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.4ms)  SAVEPOINT active_record_1
+   (0.2ms)  ROLLBACK TO SAVEPOINT active_record_1
+  Music::Artist Load (0.7ms)  SELECT `music_artists`.* FROM `music_artists` ORDER BY `music_artists`.`id` DESC LIMIT 1
+   (0.2ms)  SAVEPOINT active_record_1
+   (0.2ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  Music::Artist Load (0.4ms)  SELECT music_artists.id AS id, music_artists.name AS name FROM music_artists WHERE (music_artists.name = 'Böhse Onkelz')
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (1.4ms)  SAVEPOINT active_record_1
+   (0.5ms)  ROLLBACK TO SAVEPOINT active_record_1
+  Music::Artist Load (0.6ms)  SELECT `music_artists`.* FROM `music_artists` ORDER BY `music_artists`.`id` DESC LIMIT 1
+   (0.3ms)  SELECT COUNT(*) FROM `music_artists` 
+   (31.6ms)  ROLLBACK
+   (0.1ms)  BEGIN
+   (0.2ms)  SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.2ms)  BEGIN
+   (0.3ms)  SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.2ms)  BEGIN
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.3ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  Music::Artist Load (0.5ms)  SELECT music_artists.id AS id, music_artists.name AS name FROM music_artists WHERE (music_artists.name = 'Böhse Onkelz')
+   (0.6ms)  SHOW VARIABLES like 'max_allowed_packet';
+  Class Create Many Without Validations Or Callbacks (0.3ms)  INSERT INTO `music_artists` (`name`,`created_at`,`updated_at`) VALUES ('Böhse Onkelz','2011-09-26 06:36:58','2011-09-26 06:36:58') ON DUPLICATE KEY UPDATE `music_artists`.`updated_at`=VALUES(`updated_at`)
+   (0.2ms)  RELEASE SAVEPOINT active_record_1
+   (1.0ms)  SAVEPOINT active_record_1
+   (0.3ms)  ROLLBACK TO SAVEPOINT active_record_1
+  Music::Artist Load (0.6ms)  SELECT `music_artists`.* FROM `music_artists` ORDER BY `music_artists`.`id` DESC LIMIT 1
+   (0.2ms)  SAVEPOINT active_record_1
+   (0.3ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (1.6ms)  SAVEPOINT active_record_1
+  Music::Artist Load (0.4ms)  SELECT music_artists.id AS id, music_artists.name AS name FROM music_artists WHERE (music_artists.name = 'Böhse Onkelz')
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.3ms)  ROLLBACK TO SAVEPOINT active_record_1
+  Music::Artist Load (0.4ms)  SELECT `music_artists`.* FROM `music_artists` ORDER BY `music_artists`.`id` DESC LIMIT 1
+   (0.2ms)  SELECT COUNT(*) FROM `music_artists` 
+   (4.8ms)  ROLLBACK
+   (0.2ms)  BEGIN
+   (0.3ms)  SAVEPOINT active_record_1
+  SQL (1.5ms)  INSERT INTO `imports` (`author_id`, `created_at`, `email`, `exception`, `input`, `parameters`, `parent_id`, `parent_type`, `state`, `type`, `updated_at`) VALUES (NULL, '2011-09-26 09:51:42', NULL, NULL, 'Böhse Onkelz', '--- {}\n', NULL, NULL, 'draft', 'Import::NoRelation', '2011-09-26 09:51:42')
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.2ms)  SAVEPOINT active_record_1
+  Music::Artist Load (0.4ms)  SELECT music_artists.id AS id, music_artists.name AS name FROM music_artists WHERE (music_artists.name = 'Böhse Onkelz')
+   (0.5ms)  SHOW VARIABLES like 'max_allowed_packet';
+  Class Create Many Without Validations Or Callbacks (0.3ms)  INSERT INTO `music_artists` (`name`,`created_at`,`updated_at`) VALUES ('Böhse Onkelz','2011-09-26 09:51:42','2011-09-26 09:51:42') ON DUPLICATE KEY UPDATE `music_artists`.`updated_at`=VALUES(`updated_at`)
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.2ms)  SAVEPOINT active_record_1
+   (34.5ms)  UPDATE `imports` SET `state` = 'processed', `updated_at` = '2011-09-26 09:51:42', `parameters` = '--- {}\n' WHERE `imports`.`type` IN ('Import::NoRelation') AND `imports`.`id` = 17
+   (0.3ms)  RELEASE SAVEPOINT active_record_1
+  Music::Artist Load (0.5ms)  SELECT `music_artists`.* FROM `music_artists` ORDER BY `music_artists`.`id` DESC LIMIT 1
+   (1.2ms)  SAVEPOINT active_record_1
+  SQL (0.4ms)  INSERT INTO `imports` (`author_id`, `created_at`, `email`, `exception`, `input`, `parameters`, `parent_id`, `parent_type`, `state`, `type`, `updated_at`) VALUES (NULL, '2011-09-26 09:51:42', NULL, NULL, 'Böhse Onkelz', '--- {}\n', NULL, NULL, 'draft', 'Import::NoRelation', '2011-09-26 09:51:42')
+   (0.2ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  Music::Artist Load (0.4ms)  SELECT music_artists.id AS id, music_artists.name AS name FROM music_artists WHERE (music_artists.name = 'Böhse Onkelz')
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (1.1ms)  SAVEPOINT active_record_1
+   (0.6ms)  UPDATE `imports` SET `state` = 'processed', `updated_at` = '2011-09-26 09:51:42', `parameters` = '--- {}\n' WHERE `imports`.`type` IN ('Import::NoRelation') AND `imports`.`id` = 18
+   (0.2ms)  RELEASE SAVEPOINT active_record_1
+  Music::Artist Load (0.5ms)  SELECT `music_artists`.* FROM `music_artists` ORDER BY `music_artists`.`id` DESC LIMIT 1
+   (0.3ms)  SELECT COUNT(*) FROM `music_artists` 
+   (29.4ms)  ROLLBACK

data/spec/models/no_relation_spec.rb

@@ -1,13 +1,18 @@
+# encoding: utf-8
 require 'spec_helper'
 
 describe Import::NoRelation do
   it "should" do
-    import = Importer::Music::Artist.new(:input => 'Paradise Lost')
-
-    import.save
-    
-    import.process
+    2.times do
+      import = Import::NoRelation.new(:resource_class => Music::Artist, :input => 'Böhse Onkelz')
+      
+      import.save
+      
+      import.process
+      
+      Music::Artist.last.name.should == 'Böhse Onkelz'
+    end
     
-    Music::Artist.last.name.should == 'Paradise Lost'
+    Music::Artist.count == 1
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: import
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &77265660 !ruby/object:Gem::Requirement
+  requirement: &86102640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *77265660
+  version_requirements: *86102640
 - !ruby/object:Gem::Dependency
   name: valium
-  requirement: &77264520 !ruby/object:Gem::Requirement
+  requirement: &86102240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77264520
+  version_requirements: *86102240
 - !ruby/object:Gem::Dependency
   name: state_machine
-  requirement: &77263130 !ruby/object:Gem::Requirement
+  requirement: &86101890 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77263130
+  version_requirements: *86101890
 - !ruby/object:Gem::Dependency
   name: activerecord-import
-  requirement: &77262260 !ruby/object:Gem::Requirement
+  requirement: &86101490 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77262260
+  version_requirements: *86101490
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &77224380 !ruby/object:Gem::Requirement
+  requirement: &86100950 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77224380
+  version_requirements: *86100950
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &77219270 !ruby/object:Gem::Requirement
+  requirement: &86100320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *77219270
+  version_requirements: *86100320
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &77218520 !ruby/object:Gem::Requirement
+  requirement: &86099570 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77218520
+  version_requirements: *86099570
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &77189070 !ruby/object:Gem::Requirement
+  requirement: &86095440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77189070
+  version_requirements: *86095440
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &77186930 !ruby/object:Gem::Requirement
+  requirement: &86095050 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77186930
+  version_requirements: *86095050
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &77186210 !ruby/object:Gem::Requirement
+  requirement: &86094480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77186210
+  version_requirements: *86094480
 - !ruby/object:Gem::Dependency
   name: sdoc
-  requirement: &77185460 !ruby/object:Gem::Requirement
+  requirement: &86093920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77185460
+  version_requirements: *86093920
 description: Data entity importer for Ruby and asynchronous handling wrapped around
   activerecord-import and featured by valium and state_machine.
 email:
@@ -152,6 +152,7 @@ files:
 - lib/generators/import/install/install_generator.rb
 - lib/generators/import/install/templates/migrations/1_create_imports.rb
 - lib/import.rb
+- lib/import/importable.rb
 - lib/import/no_relation.rb
 - lib/import/resource.rb
 - lib/import/version.rb
@@ -166,14 +167,12 @@ files:
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/.gitkeep
 - spec/dummy/app/models/.gitkeep
-- spec/dummy/app/models/importer/music/artist.rb
 - spec/dummy/app/models/music/artist.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
 - spec/dummy/config/database.example.yml
-- spec/dummy/config/database.yml
 - spec/dummy/config/environment.rb
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb
@@ -216,7 +215,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -456035567
+      hash: -444372351
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -225,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -456035567
+      hash: -444372351
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.5

data/spec/dummy/app/models/importer/music/artist.rb

@@ -1,2 +0,0 @@
-class Importer::Music::Artist < Import::NoRelation
-end

data/spec/dummy/config/database.yml

@@ -1,42 +0,0 @@
-# MySQL.  Versions 4.1 and 5.0 are recommended.
-# 
-# Install the MYSQL driver
-#   gem install mysql2
-#
-# Ensure the MySQL gem is defined in your Gemfile
-#   gem 'mysql2'
-#
-# And be sure to use new-style password hashing:
-#   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
-development:
-  adapter: mysql2
-  encoding: utf8
-  reconnect: false
-  database: dummy_import_development
-  pool: 5
-  username: root
-  password: zero2005
-  socket: /var/run/mysqld/mysqld.sock
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
-test:
-  adapter: mysql2
-  encoding: utf8
-  reconnect: false
-  database: dummy_import_test
-  pool: 5
-  username: root
-  password: zero2005
-  socket: /var/run/mysqld/mysqld.sock
-
-production:
-  adapter: mysql2
-  encoding: utf8
-  reconnect: false
-  database: dummy_import_production
-  pool: 5
-  username: root
-  password: zero2005
-  socket: /var/run/mysqld/mysqld.sock