lawrencepit-machinery 0.4.2 → 0.5

data/README.markdown

@@ -10,7 +10,7 @@ in rake tasks to populate a database.
 Why write stuff like:
 
     users(:admin).should be_nil
-    
+
 when you can just as well write:
 
     @user_admin.should be_nil
@@ -124,8 +124,9 @@ After using model_stubbing on a relatively large project for over a year I decid
 a simpler solution was needed. Object graphs need to be easily re-usable by specs,
 unit tests, cucumber stories and ad-hoc database loading.
 
-Machinery works especially great in combination with Machinist.
-
+Machinery works especially great in combination with
+[Machinist](http://github.com/notahat/machinist) or
+[FactoryGirl](http://github.com/thoughtbot/factory_girl).
 
 
 ----

data/lib/machinery/active_record.rb

@@ -1,7 +1,6 @@
 module Machinery
   module ActiveRecord
     @@toys = []
-    @@updated = []
     @@recording = false
 
     def self.record
@@ -25,15 +24,6 @@ module Machinery
       @@toys << obj if @@recording
     end
 
-    def self.updated(obj)
-      @@updated << obj
-    end
-
-    def self.reload_updated
-      @@updated.each { |obj| obj.reload }
-      @@updated = []
-    end
-
     module Extensions
       private
 
@@ -41,9 +31,6 @@ module Machinery
         base.class_eval do
           alias_method :create_without_machinery, :create
           alias_method :create, :create_with_machinery
-
-          alias_method :update_without_machinery, :update
-          alias_method :update, :update_with_machinery
         end
       end
 
@@ -52,12 +39,6 @@ module Machinery
         Machinery::ActiveRecord.created(self)
         id
       end
-
-      def update_with_machinery
-        affected = update_without_machinery
-        Machinery::ActiveRecord.updated(self) if affected > 0
-        affected
-      end
     end
 
   end

data/lib/machinery.rb

@@ -29,19 +29,31 @@ module Machinery
       Machinery.make_scenario(self, names, &block)
     end
     alias_method :scenarios, :scenario
-    
+
     def rollback_scenario
       Machinery::ActiveRecord.clear
     end
     alias_method :rollback_scenarios, :rollback_scenario
+
+    private
+      def clone_instance_variables
+        self.instance_variables.each do |ivar|
+          obj = self.instance_variable_get(ivar)
+          next unless obj.is_a?(::ActiveRecord::Base)
+          clone = obj.clone
+          clone.id = obj.id
+          clone.instance_variable_set('@new_record', obj.new_record?)
+          self.instance_variable_set(ivar, clone)
+        end
+      end
   end
-  
+
   module ExampleGroupMacros
     def scenario(*names, &block)
       Machinery.scenario(names.first, &block) and return if block_given?
       self.before(:all)  { scenarios(*names) }
       self.after(:all)   { rollback_scenarios }
-      self.after(:each)  { Machinery::ActiveRecord.reload_updated }
+      self.before(:each) { clone_instance_variables }
     end
     alias_method :scenarios, :scenario
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: lawrencepit-machinery
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
+  version: "0.5"
 platform: ruby
 authors: 
 - Lawrence Pit