maintain 0.2.11 → 0.2.12

data/VERSION

@@ -1 +1 @@
-0.2.11
+0.2.12

data/lib/maintain/backend/active_record.rb

@@ -9,9 +9,25 @@ 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|
-          instance.send("#{attribute}_changed?") && instance.send(attribute_check) &&
-            (!options[:if] || (options[:if].is_a?(Proc) && instance.instance_eval(&options[:unless])) || instance.send(options[:if])) &&
-            (!options[:unless] || !(options[:unless].is_a?(Proc) && instance.instance_eval(&options[:unless])) || !instance.send(options[:unless]))
+          if instance.send("#{attribute}_changed?") && instance.send(attribute_check)
+            if options[:if]
+              if options[:if].is_a?(Proc)
+                instance.instance_eval(&options[:if])
+              else
+                instance.send(options[:if])
+              end
+            elsif options[:unless]
+              if options[:unless].is_a?(Proc)
+                !instance.instance_eval(&options[:unless])
+              else
+                !instance.send(options[:unless])
+              end
+            else
+              true
+            end
+          else
+            false
+          end
         }
       end
 

data/maintain.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{maintain}
-  s.version = "0.2.10"
+  s.version = "0.2.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Flip Sasser"]
-  s.date = %q{2011-06-03}
+  s.date = %q{2011-07-13}
   s.description = %q{
       Maintain is a simple state machine mixin for Ruby objects. It supports comparisons, bitmasks,
       and hooks that really work. It can be used for multiple attributes and will always do its best to

data/spec/active_record_spec.rb

@@ -129,7 +129,8 @@ if proceed
 
           on :enter, :old, :do_something
           on :exit, :foo, :do_something_else
-          
+          on :enter, :bar, lambda { hello! }, :if => :run_hello?
+          on :exit, :bar, lambda { hello! }, :unless => :run_hello?
         end
 
         ActiveMaintainTest.class_eval do
@@ -140,6 +141,18 @@ if proceed
           def do_something_else
             # Do something else!
           end
+
+          def hello!
+            
+          end
+
+          def run_hello!
+            @run_hello = !@run_hello# ? false : true
+          end
+
+          def run_hello?
+            @run_hello
+          end
         end
       end
 
@@ -164,6 +177,38 @@ if proceed
         active_maintain_test.status = :new
         active_maintain_test.save
       end
+
+      it "should not run the :bar enter hook if run_hello? returns false" do
+        active_maintain_test = ActiveMaintainTest.new
+        active_maintain_test.should_not_receive(:hello!)
+        active_maintain_test.status = :bar
+        active_maintain_test.save
+      end
+
+      it "should run the :bar enter hook if run_hello? returns true" do
+        active_maintain_test = ActiveMaintainTest.new
+        active_maintain_test.run_hello!
+        active_maintain_test.should_receive(:hello!)
+        active_maintain_test.status = :bar
+        active_maintain_test.save
+      end
+
+      it "should not run the :bar exit hook if run_hello? returns true" do
+        active_maintain_test = ActiveMaintainTest.create(:status => :bar)
+        active_maintain_test.run_hello!
+        active_maintain_test.run_hello?.should be_true
+        active_maintain_test.should_not_receive(:hello!)
+        active_maintain_test.status = :foo
+        active_maintain_test.save
+      end
+
+      it "should run the :bar exit hook if run_hello? returns false" do
+        active_maintain_test = ActiveMaintainTest.create(:status => :bar)
+        active_maintain_test.run_hello?.should be_false
+        active_maintain_test.should_receive(:hello!)
+        active_maintain_test.status = :foo
+        active_maintain_test.save
+      end
     end
 
     describe "named_scopes" do
@@ -199,5 +244,23 @@ if proceed
       end
 
     end
+
+    describe "serialization" do
+      before :all do
+        ActiveMaintainTest.maintain :status do
+          state :new, :default => true
+          state :old
+          state :foo
+          state :bar
+          aggregate :everything, :as => [:new, :old, :foo, :bar]
+          aggregate :fakes, :as => [:foo, :bar]
+        end
+      end
+
+      it "should not screw with to_json" do
+        foo = ActiveMaintainTest.create
+        foo.as_json.should == {:active_maintain_test => {:id => foo.id, :permissions => 0, :status => :new}.stringify_keys}.stringify_keys
+      end
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: maintain
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 2
-  - 11
-  version: 0.2.11
+  - 12
+  version: 0.2.12
 platform: ruby
 authors: 
 - Flip Sasser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-23 00:00:00 -04:00
+date: 2011-07-13 00:00:00 -04:00
 default_executable: 
 dependencies: []