lawrencepit-machinery 0.3.1 → 0.4

data/lib/machinery/active_record.rb

@@ -1,7 +1,7 @@
 module Machinery
-
   module ActiveRecord
     @@toys = []
+    @@updated = []
     @@recording = false
 
     def self.record
@@ -15,10 +15,19 @@ module Machinery
       @@toys = []
     end
 
-    def self.created_with_machinery(obj)
+    def self.created(obj)
       @@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
 
@@ -26,14 +35,23 @@ 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
 
       def create_with_machinery
         id = create_without_machinery
-        Machinery::ActiveRecord.created_with_machinery(self)
+        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

@@ -9,9 +9,13 @@ module Machinery
   end
 
   def self.load(file)
-    self.module_eval(File.read(file))
+    Machinery.instance_eval(File.read(file))
   end
-  
+
+  def self.define(&block)
+    Machinery.instance_eval(&block)
+  end
+
   private
     def self.make_scenario(context, names, &block)
       Machinery::ActiveRecord.record do
@@ -26,30 +30,30 @@ module Machinery
     end
     alias_method :scenarios, :scenario
     
-    def rollback_scenarios
+    def rollback_scenario
       Machinery::ActiveRecord.clear
     end
+    alias_method :rollback_scenarios, :rollback_scenario
   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.before(:all)  { scenarios(*names) }
+      self.after(:all)   { rollback_scenarios }
+      self.before(:each) { Machinery::ActiveRecord.reload_updated }
     end
     alias_method :scenarios, :scenario
   end
 end
 
+if defined? Test::Unit::TestCase
+  Test::Unit::TestCase.extend Machinery::ExampleGroupMacros
+  Test::Unit::TestCase.send('include', Machinery::Helpers)
+end
+
 if defined? Spec::Example::ExampleGroup
   Spec::Example::ExampleGroup.extend Machinery::ExampleGroupMacros
-  Spec::Example::ExampleGroupFactory[nil].__send__('include', Machinery::Helpers)
+  Spec::Example::ExampleGroupFactory[nil].send('include', Machinery::Helpers)
 end
 
-module Test # :nodoc: all
-  module Unit
-    class TestCase
-      include Machinery::Helpers
-    end
-  end
-end

metadata

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