importer 0.3.0 → 0.3.2

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.2

data/importer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{importer}
-  s.version = "0.3.0"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Micha\305\202 Szajbe"]
-  s.date = %q{2010-03-20}
+  s.date = %q{2010-03-25}
   s.description = %q{Define new objects or modifications of existing ones in XML file and import them to your application.}
   s.email = %q{michal.szajbe@gmail.com}
   s.extra_rdoc_files = [
@@ -52,7 +52,6 @@ Gem::Specification.new do |s|
      "test/importer/import/simple_test.rb",
      "test/importer/imported_object/active_record_test.rb",
      "test/importer/imported_object/simple_test.rb",
-     "test/importer/imported_object_test.rb",
      "test/importer/parser/csv_test.rb",
      "test/importer/parser/xml_test.rb",
      "test/importer/parser_test.rb",
@@ -70,7 +69,6 @@ Gem::Specification.new do |s|
      "test/importer/import/simple_test.rb",
      "test/importer/imported_object/active_record_test.rb",
      "test/importer/imported_object/simple_test.rb",
-     "test/importer/imported_object_test.rb",
      "test/importer/parser/csv_test.rb",
      "test/importer/parser/xml_test.rb",
      "test/importer/parser_test.rb",

data/lib/importer.rb

@@ -53,10 +53,8 @@ module Importer
       transaction do
         import.start!
 
-        imported_object_klass = Importer::ImportedObject.get_klass(import)
-
         data.each do |attributes|
-          imported_object = imported_object_klass.new(:import => import)
+          imported_object = import.build_imported_object
 
           if object = find_on_import(import, attributes)
             imported_object.state = "existing_object"

data/lib/importer/import/active_record.rb

@@ -31,7 +31,11 @@ module Importer
       named_scope :started,  :conditions => { :workflow_state => "started" }
       named_scope :finished, :conditions => { :workflow_state => "finished" }
 
-      has_many :imported_objects, :class_name => "Importer::ImportedObject::ActiveRecord"
+      has_many :imported_objects, :class_name => "Importer::ImportedObject::ActiveRecord", :foreign_key => "import_id"
+
+      def build_imported_object
+        imported_objects.build(:import => self)
+      end
     end
   end
 end

data/lib/importer/import/simple.rb

@@ -52,6 +52,10 @@ module Importer
       end
 
       alias_method :save!, :save
+
+      def build_imported_object
+        Importer::ImportedObject::Simple.new(:import => self)
+      end
     end
   end
 end

data/lib/importer/imported_object.rb

@@ -1,7 +1,5 @@
 module Importer
   module ImportedObject
-    def self.get_klass(import)
-      import.class.to_s.sub("Importer::Import", "Importer::ImportedObject").constantize
-    end
+
   end
 end

data/test/importer/import/active_record_test.rb

@@ -24,4 +24,13 @@ class Importer::Import::ActiveRecordTest < Test::Unit::TestCase
       end
     end
   end
+
+  context "an import" do
+    setup { @import = Factory(:active_record_import) }
+
+    should "correctly build imported object" do
+      imported_object = @import.build_imported_object
+      assert_equal @import, imported_object.import
+    end
+  end
 end

data/test/importer/import/simple_test.rb

@@ -24,4 +24,13 @@ class Importer::Import::SimpleTest < Test::Unit::TestCase
       end
     end
   end
+
+  context "an import" do
+    setup { @import = Factory(:simple_import) }
+
+    should "correctly build imported object" do
+      imported_object = @import.build_imported_object
+      assert_equal @import, imported_object.import
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: importer
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors: 
 - "Micha\xC5\x82 Szajbe"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-20 00:00:00 +01:00
+date: 2010-03-25 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -137,7 +137,6 @@ files:
 - test/importer/import/simple_test.rb
 - test/importer/imported_object/active_record_test.rb
 - test/importer/imported_object/simple_test.rb
-- test/importer/imported_object_test.rb
 - test/importer/parser/csv_test.rb
 - test/importer/parser/xml_test.rb
 - test/importer/parser_test.rb
@@ -177,7 +176,6 @@ test_files:
 - test/importer/import/simple_test.rb
 - test/importer/imported_object/active_record_test.rb
 - test/importer/imported_object/simple_test.rb
-- test/importer/imported_object_test.rb
 - test/importer/parser/csv_test.rb
 - test/importer/parser/xml_test.rb
 - test/importer/parser_test.rb

data/test/importer/imported_object_test.rb

@@ -1,13 +0,0 @@
-require 'helper'
-
-class Importer::ImportedObjectTest < Test::Unit::TestCase
-  should "return ActiveRecord imported object for ActiveRecord import" do
-    import = Factory(:active_record_import)
-    assert_equal Importer::ImportedObject::ActiveRecord, Importer::ImportedObject.get_klass(import)
-  end
-
-  should "return Simple imported object for Simple import" do
-    import = Factory(:simple_import)
-    assert_equal Importer::ImportedObject::Simple, Importer::ImportedObject.get_klass(import)
-  end
-end