maintain 0.2.22 → 0.2.23

data/VERSION

@@ -1 +1 @@
-0.2.22
+0.2.23

data/lib/maintain/backend/active_record.rb

@@ -8,7 +8,8 @@ module Maintain
 
       def on(maintainee, attribute, event, state, method, options)
         attribute_check = "#{attribute}#{"_was" if event == :exit}_#{state}?"
-        maintainee.before_save method, :if => lambda {|instance|
+        hook_method = options[:after] ? :after : :before
+        maintainee.send("#{hook_method}_save", method, :if => lambda {|instance|
           if instance.send("#{attribute}_changed?") && instance.send(attribute_check)
             if options[:if]
               if options[:if].is_a?(Proc)
@@ -28,7 +29,7 @@ module Maintain
           else
             false
           end
-        }
+        })
       end
 
       def read(instance, attribute)

data/lib/maintain/maintainer.rb

@@ -86,7 +86,7 @@ module Maintain
     end
 
     def on(*args, &block)
-      options = args.last.is_a?(Hash) ? args.pop : {}
+      options = {:when => :before}.merge(args.last.is_a?(Hash) ? args.pop : {})
       event, state = args.shift, args.shift
       method = args.shift
       if block_given?

data/maintain.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "maintain"
-  s.version = "0.2.19"
+  s.version = "0.2.23"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Flip Sasser"]
-  s.date = "2011-11-02"
+  s.date = "2012-08-21"
   s.description = "\n      Maintain is a simple state machine mixin for Ruby objects. It supports comparisons, bitmasks,\n      and hooks that really work. It can be used for multiple attributes and will always do its best to\n      stay out of your way and let your code drive the machine, and not vice versa.\n    "
   s.email = "flip@x451.com"
   s.extra_rdoc_files = [
@@ -51,7 +51,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/flipsasser/maintain"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.24"
   s.summary = "A Ruby state machine that lets your code do the driving"
 
   if s.respond_to? :specification_version then

data/spec/active_record_spec.rb

@@ -134,6 +134,7 @@ if proceed
           on :exit, :foo, :do_something_else
           on :enter, :bar, lambda { hello! }, :if => :run_hello?
           on :exit, :bar, lambda { hello! }, :unless => :run_hello?
+          on :enter, :bar, :show_my_id, :after => true
         end
 
         ActiveMaintainTest.class_eval do
@@ -156,6 +157,10 @@ if proceed
           def run_hello?
             @run_hello
           end
+
+          def show_my_id
+            puts id
+          end
         end
       end
 
@@ -212,6 +217,13 @@ if proceed
         active_maintain_test.status = :foo
         active_maintain_test.save
       end
+
+      it "should ONLY run the :bar / :show_my_id exit hook AFTER the record is saved" do
+        active_maintain_test = ActiveMaintainTest.new(:status => :foo)
+        active_maintain_test.status = :bar
+        active_maintain_test.should_receive(:puts).with(1)
+        active_maintain_test.save!
+      end
     end
 
     describe "named_scopes" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maintain
 version: !ruby/object:Gem::Version
-  version: 0.2.22
+  version: 0.2.23
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-10 00:00:00.000000000 Z
+date: 2012-08-21 00:00:00.000000000 Z
 dependencies: []
 description: ! "\n      Maintain is a simple state machine mixin for Ruby objects.
   It supports comparisons, bitmasks,\n      and hooks that really work. It can be