forceps 0.5.0 → 0.6.0

data/lib/forceps/acts_as_copyable_model.rb

@@ -100,7 +100,6 @@ module Forceps
 
       def create_local_copy_with_simple_attributes(remote_object)
         # 'self.dup.becomes(Invoice)' won't work because of different  AR connections.
-        # todo: prepare for rails 3 and attribute protection
         debug "#{as_trace(remote_object)} copying..."
 
         # todo: pending test for STI scenario
@@ -117,8 +116,9 @@ module Forceps
 
       def base_local_class_for(remote_object)
         base_class = remote_object.class.base_class
-        if remote_object.respond_to?(:type)
-          base_class = remote_object.type.constantize rescue base_class
+        if remote_object.respond_to?(:type) && remote_object.type.present?
+          local_type = remote_object.type.gsub('Forceps::Remote', '')
+          base_class = local_type.constantize rescue base_class
         end
         base_class
       end

data/lib/forceps/client.rb

@@ -47,19 +47,26 @@ module Forceps
     end
 
     def build_new_remote_class(local_class, class_name)
-	    needs_type_condition = (local_class.base_class != ActiveRecord::Base) && local_class.finder_needs_type_condition?
-	    Class.new(local_class) do
-		    self.table_name = local_class.table_name
+      needs_type_condition = (local_class.base_class != ActiveRecord::Base) && local_class.finder_needs_type_condition?
+      Class.new(local_class) do
+        self.table_name = local_class.table_name
 
         include Forceps::ActsAsCopyableModel
 
+        def self.instantiate(record, column_types = {})
+          if record[inheritance_column].present?
+            record[inheritance_column] = "Forceps::Remote::#{record[inheritance_column]}"
+          end
+          super
+        end
+
         # We don't want to include STI condition automatically (the base class extends the original one)
-		    unless needs_type_condition
-			    def self.finder_needs_type_condition?
-				    false
-			    end
-		    end
-	    end
+        unless needs_type_condition
+          def self.finder_needs_type_condition?
+            false
+          end
+        end
+      end
     end
 
     def remote_class_name_for(local_class_name)

data/lib/forceps/version.rb

@@ -1,3 +1,3 @@
 module Forceps
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/test/clone_structures_test.rb

@@ -62,12 +62,4 @@ class CloneStructuresTest < ActiveSupport::TestCase
     assert_identical remote_address, copied_user.address
   end
 
-  test "should download child objects when using single table inheritance" do
-    remote_car = RemoteProduct.create!(name: 'audi')
-    remote_car.update_column :type, 'Car'
-
-    Forceps::Remote::Product.find_by_name('audi').becomes(Forceps::Remote::Product).copy_to_local
-    assert_not_nil Product.find_by_name('CAR: audi')
-  end
-
 end