transitions 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2c18ccf9710c9acf987c3bab92b3f496c0109ef
-  data.tar.gz: 050d68e232efbe9d830eabb7163c54536e451fee
+  metadata.gz: c5fdc12a9620c4afb752d88f581df0416e1bfb2c
+  data.tar.gz: 2e513473a1ab671758977874cc4670c43a38d76b
 SHA512:
-  metadata.gz: 4c467765c0917f255aacf6cc082a33e5e21afe38f37d408376bc6055408317b05d4f3f3862db2ffbb2d9a5bbbe1c6124ffed10e3beb356ef6dee593308cc0ba4
-  data.tar.gz: 6891fc7543e6d755c284bd4724e8fcead9405c822f2491b420616d0557866fafea947fd1c4fdc8be7a7837418ac4fdbfe807f6dc014f83a8c7c083c37563f452
+  metadata.gz: 8843c2845f29a81cc1a4fe170796976850515a3d5b513996e50e4904ae8a418d47fa38be5e72f1a325623e0295910df7022c4f061c395bc9aeb8120a6d84e2c8
+  data.tar.gz: a00d3f4ed41f725e47e4afc81aa030958e86d966f1192008365c988e9a167d3243dd2d79126fd7365a2965cd58071779294b59d8caaefef2849e3f41d43c56f5

data/.gitignore

@@ -3,4 +3,5 @@ pkg
 .bundle
 .idea/
 Gemfile.lock
+gemfiles/*.lock
 *.swp

data/.travis.yml

@@ -1,3 +1,9 @@
 rvm:
   - 2.0.0
   - 1.9.3
+  - jruby-19mode
+gemfile:
+  - gemfiles/rails_3_0.gemfile
+  - gemfiles/rails_3_1.gemfile
+  - gemfiles/rails_3_2.gemfile
+  - gemfiles/rails_4_0.gemfile

data/Appraisals

@@ -0,0 +1,23 @@
+appraise "rails_3_0" do
+  gem "activerecord", "~> 3.0.10"
+  gem "activerecord-jdbcsqlite3-adapter", :platforms=>:jruby
+  gem 'sqlite3', :platforms => :ruby
+end
+
+appraise "rails_3_1" do
+  gem "activerecord", "~>3.1.12"
+  gem "activerecord-jdbcsqlite3-adapter", :platforms=>:jruby
+  gem 'sqlite3', :platforms => :ruby
+end
+
+appraise "rails_3_2" do
+  gem "activerecord", "~>3.2.14"
+  gem "activerecord-jdbcsqlite3-adapter", :platforms=>:jruby
+  gem 'sqlite3', :platforms => :ruby
+end
+
+appraise "rails_4_0" do
+  gem "activerecord", "~>4.0.0"
+  gem "activerecord-jdbcsqlite3-adapter", '1.3.0.rc1', :platforms=>:jruby
+  gem 'sqlite3', :platforms => :ruby
+end

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.1.12
+
+* (troessner) Fix issue 107: timestamps are updated even if guard fails.
+
 # 0.1.10
 
 * (troessner) Fix: Using a custom ActiveRecord select query without the name of the state attribute would trigger an exception.

data/Gemfile

@@ -1,3 +1,7 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec
+
+gem 'activerecord', '~> 3.2.14'
+gem 'activerecord-jdbcsqlite3-adapter', :platforms => :jruby
+gem 'sqlite3', :platforms => :ruby

data/README.md

@@ -22,44 +22,48 @@ issue](https://github.com/troessner/transitions/issues/86) for example).
 #### Rails
 
 This goes into your Gemfile:
-
-    gem "transitions", :require => ["transitions", "active_model/transitions"]
+```ruby
+gem "transitions", :require => ["transitions", "active_model/transitions"]
+```
 
 … and this into your ORM model:
-
-    include ActiveModel::Transitions
+```ruby
+include ActiveModel::Transitions
+```
 
 #### Standalone
-
-    gem install transitions
+```shell
+gem install transitions
+```
 
 ### Using transitions
+```ruby
+class Product
+  include ActiveModel::Transitions
 
-    class Product
-      include ActiveModel::Transitions
-
-      state_machine do
-        state :available # first one is initial state
-        state :out_of_stock, :exit => :exit_out_of_stock
-        state :discontinued, :enter => lambda { |product| product.cancel_orders }
-
-        event :discontinued do
-          transitions :to => :discontinued, :from => [:available, :out_of_stock], :on_transition => :do_discontinue
-        end
-        event :out_of_stock, :success => :reorder do
-          transitions :to => :out_of_stock, :from => [:available, :discontinued]
-        end
-        event :available do
-          transitions :to => :available, :from => [:out_of_stock], :guard => lambda { |product| product.in_stock > 0 }
-        end
-      end
-    end
+  state_machine do
+    state :available # first one is initial state
+    state :out_of_stock, :exit => :exit_out_of_stock
+    state :discontinued, :enter => lambda { |product| product.cancel_orders }
 
+    event :discontinued do
+      transitions :to => :discontinued, :from => [:available, :out_of_stock], :on_transition => :do_discontinue
+    end
+    event :out_of_stock, :success => :reorder do
+      transitions :to => :out_of_stock, :from => [:available, :discontinued]
+    end
+    event :available do
+      transitions :to => :available, :from => [:out_of_stock], :guard => lambda { |product| product.in_stock > 0 }
+    end
+  end
+end
+```
 In this example we assume that you are in a rails project using Bundler, which
 would automatically require `transitions`. If this is not the case for you you
 have to add
-
-    require 'transitions'
+```ruby
+require 'transitions'
+```
 
 wherever you load your dependencies in your application.
 
@@ -80,18 +84,20 @@ wherever you load your dependencies in your application.
 
 Use the (surprise ahead) `current_state` method - in case you didn't set a
 state explicitly you'll get back the state that you defined as initial state.
-
-    >> Product.new.current_state
-    => :available
+```ruby
+>> Product.new.current_state
+=> :available
+```
 
 You can also set a new state explicitly via `update_current_state(new_state,
 persist = true / false)` but you should never do this unless you really know
 what you're doing and why - rather use events / state transitions (see below).
 
 Predicate methods are also available using the name of the state.
-
-    >> Product.new.available?
-    => true
+```ruby
+>> Product.new.available?
+=> true
+```
 
 #### Events
 
@@ -103,14 +109,16 @@ modify state but instead returns a boolean letting you know if a given
 transition is possible.
 
 In addition, a `can_transition?` method is added to the object that expects one or more event names as arguments. This semi-verbose method name is used to avoid collission with [https://github.com/ryanb/cancan](the authorization gem CanCan).
-
-    >> Product.new.can_transition? :out_of_stock
-    => true
+```ruby
+>> Product.new.can_transition? :out_of_stock
+=> true
+```
 
 If you need to get all available transitions for current state you can simply call:
-
-    >> Product.new.available_transitions
-    => [:discontinued, :out_of_stock]
+```ruby
+>> Product.new.available_transitions
+=> [:discontinued, :out_of_stock]
+```
     
 #### Automatic scope generation
 
@@ -118,26 +126,28 @@ If you need to get all available transitions for current state you can simply ca
 ActiveRecord and tell it to do so via the `auto_scopes` option:
 
 Given a model like this:
-
-    class Order < ActiveRecord::Base
-      include ActiveModel::Transitions
-      state_machine :auto_scopes => true do
-        state :pick_line_items
-        state :picking_line_items
-        event :move_cart do
-          transitions to: :pick_line_items, from: :picking_line_items
-        end
-      end
+```ruby
+class Order < ActiveRecord::Base
+  include ActiveModel::Transitions
+  state_machine :auto_scopes => true do
+    state :pick_line_items
+    state :picking_line_items
+    event :move_cart do
+      transitions to: :pick_line_items, from: :picking_line_items
     end
+  end
+end
+```
 
 you can use this feature a la:
-
-    >> Order.pick_line_items
-    => []
-    >> Order.create!
-    => #<Order id: 3, state: "pick_line_items", description: nil, created_at: "2011-08-23 15:48:46", updated_at: "2011-08-23 15:48:46">
-    >> Order.pick_line_items
-    => [#<Order id: 3, state: "pick_line_items", description: nil, created_at: "2011-08-23 15:48:46", updated_at: "2011-08-23 15:48:46">]
+```ruby
+>> Order.pick_line_items
+=> []
+>> Order.create!
+=> #<Order id: 3, state: "pick_line_items", description: nil, created_at: "2011-08-23 15:48:46", updated_at: "2011-08-23 15:48:46">
+>> Order.pick_line_items
+=> [#<Order id: 3, state: "pick_line_items", description: nil, created_at: "2011-08-23 15:48:46", updated_at: "2011-08-23 15:48:46">]
+```
 
 #### Using `guard`
 
@@ -145,16 +155,18 @@ Each event definition takes an optional `guard` argument, which acts as a
 predicate for the transition.
 
 You can pass in Symbols, Strings, or Procs like this:
-
-    event :discontinue do
-      transitions :to => :discontinued, :from => [:available, :out_of_stock], :guard => :can_discontinue
-    end
+```ruby
+event :discontinue do
+  transitions :to => :discontinued, :from => [:available, :out_of_stock], :guard => :can_discontinue
+end
+```
 
 or
-
-    event :discontinue do
-      transitions :to => :discontinued, :from => [:available, :out_of_stock], :guard => [:can_discontinue, :super_sure?]
-    end
+```ruby
+event :discontinue do
+  transitions :to => :discontinued, :from => [:available, :out_of_stock], :guard => [:can_discontinue, :super_sure?]
+end
+```
 
 Any arguments passed to the event method will be passed on to the `guard`
 predicate.
@@ -166,10 +178,11 @@ you to execute methods on transition.
 
 You can pass in a Symbol, a String, a Proc or an Array containing method names
 as Symbol or String like this:
-
-    event :discontinue do
-      transitions :to => :discontinued, :from => [:available, :out_of_stock], :on_transition => [:do_discontinue, :notify_clerk]
-    end
+```ruby
+event :discontinue do
+  transitions :to => :discontinued, :from => [:available, :out_of_stock], :on_transition => [:do_discontinue, :notify_clerk]
+end
+```
 
 Any arguments passed to the event method will be passed on to the `on_transition` callback.
 
@@ -193,24 +206,27 @@ In case you need to trigger a method call after a successful transition you
 can use `success`. This will be called after the `save!` is complete (if you
 use the `state_name!` method) and should be used for any methods that require
 that the object be persisted.
-
-    event :discontinue, :success => :notfiy_admin do
-      transitions :to => :discontinued, :from => [:available, :out_of_stock]
-    end
+```ruby
+event :discontinue, :success => :notfiy_admin do
+  transitions :to => :discontinued, :from => [:available, :out_of_stock]
+end
+```
 
 In addition to just specify the method name on the record as a symbol you can
 pass a lambda to perfom some more complex success callbacks:
-
-    event :discontinue, :success => lambda { |order| AdminNotifier.notify_about_discontinued_order(order) } do
-      transitions :to => :discontinued, :from => [:available, :out_of_stock]
-    end
+```ruby
+event :discontinue, :success => lambda { |order| AdminNotifier.notify_about_discontinued_order(order) } do
+  transitions :to => :discontinued, :from => [:available, :out_of_stock]
+end
+```
 
 If you need it, you can even call multiple methods or lambdas just passing an
 array:
-
-    event :discontinue, :success => [:notify_admin, lambda { |order| AdminNotifier.notify_about_discontinued_order(order) }] do
-      transitions :to => :discontinued, :from => [:available, :out_of_stock]
-    end
+```ruby
+event :discontinue, :success => [:notify_admin, lambda { |order| AdminNotifier.notify_about_discontinued_order(order) }] do
+  transitions :to => :discontinued, :from => [:available, :out_of_stock]
+end
+```
 
 #### Timestamps
 
@@ -218,17 +234,18 @@ If you'd like to note the time of a state change, Transitions comes with
 timestamps free! To activate them, simply pass the `timestamp` option to the
 event definition with a value of either true or the name of the timestamp
 column. *NOTE - This should be either true, a String or a Symbol*
-
-    # This will look for an attribute called exploded_at or exploded_on (in that order)
-    # If present, it will be updated
-    event :explode, :timestamp => true do
-      transitions :from => :complete, :to => :exploded
-    end
-
-    # This will look for an attribute named repaired_on to update upon save
-    event :rebuild, :timestamp => :repaired_on do
-      transitions :from => :exploded, :to => :rebuilt
-    end
+```ruby
+# This will look for an attribute called exploded_at or exploded_on (in that order)
+# If present, it will be updated
+event :explode, :timestamp => true do
+  transitions :from => :complete, :to => :exploded
+end
+
+# This will look for an attribute named repaired_on to update upon save
+event :rebuild, :timestamp => :repaired_on do
+  transitions :from => :exploded, :to => :rebuilt
+end
+```
 
 #### Using `event_fired` and `event_failed`
 
@@ -236,47 +253,52 @@ In case you define `event_fired` and / or `event_failed`, `transitions` will
 use those callbacks correspondingly.
 
 You can use those callbacks like this:
+```ruby
+def event_fired(current_state, new_state, event)
+  MyLogger.info "Event fired #{event.inspect}"
+end
 
-    def event_fired(current_state, new_state, event)
-      MyLogger.info "Event fired #{event.inspect}"
-    end
-
-    def event_failed(event)
-      MyLogger.warn "Event failed #{event.inspect}"
-    end
+def event_failed(event)
+  MyLogger.warn "Event failed #{event.inspect}"
+end
+```
 
 #### Listing all the available states and events
 
 You can easily get a listing of all available states:
-
-    Order.available_states # Uses the <tt>default</tt> state machine
-    # => [:pick_line_items, :picking_line_items]
+```ruby
+Order.available_states # Uses the <tt>default</tt> state machine
+# => [:pick_line_items, :picking_line_items]
+```
 
 Same goes for the available events:
-
-    Order.available_events
-    # => [:move_cart]
+```ruby
+Order.available_events
+# => [:move_cart]
+```
 
 #### Explicitly setting the initial state with the `initial` option
-
-    state_machine :initial => :closed do
-      state :open
-      state :closed
-    end
+```ruby
+state_machine :initial => :closed do
+  state :open
+  state :closed
+end
+```
 
 ### Configuring a different column name with ActiveRecord
 
 To use a different column than `state` to track it's value simply do this:
+```ruby
+class Product < ActiveRecord::Base
+  include Transitions
 
-    class Product < ActiveRecord::Base
-      include Transitions
+  state_machine :attribute_name => :different_column do
 
-      state_machine :attribute_name => :different_column do
+    ...
 
-        ...
-
-      end
-    end
+  end
+end
+```
 
 ### Known bugs / limitations
 

data/Rakefile

@@ -2,6 +2,8 @@ require "bundler"
 Bundler::GemHelper.install_tasks
 Bundler.setup
 
+require 'appraisal'
+
 require "rake/testtask"
 Rake::TestTask.new(:test) do |test|
   test.libs = %w(lib test)

data/gemfiles/rails_3_0.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 3.0.10"
+gem "activerecord-jdbcsqlite3-adapter", :platforms=>:jruby
+gem "sqlite3", :platforms=>:ruby
+
+gemspec :path=>"../"

data/gemfiles/rails_3_1.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~>3.1.12"
+gem "activerecord-jdbcsqlite3-adapter", :platforms=>:jruby
+gem "sqlite3", :platforms=>:ruby
+
+gemspec :path=>"../"

data/gemfiles/rails_3_2.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~>3.2.14"
+gem "activerecord-jdbcsqlite3-adapter", :platforms=>:jruby
+gem "sqlite3", :platforms=>:ruby
+
+gemspec :path=>"../"

data/gemfiles/rails_4_0.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~>4.0.0"
+gem "activerecord-jdbcsqlite3-adapter", "1.3.0.rc1", :platforms=>:jruby
+gem "sqlite3", :platforms=>:ruby
+
+gemspec :path=>"../"

data/lib/active_model/transitions.rb

@@ -50,10 +50,10 @@ module ActiveModel
       validate :state_presence
       validate :state_inclusion
     end
-    
+
     # The optional options argument is passed to find when reloading so you may
     # do e.g. record.reload(:lock => true) to reload the same record with an
-    # exclusive row lock. 
+    # exclusive row lock.
     def reload(options = nil)
       super.tap do
         sm = self.class.get_state_machine
@@ -75,7 +75,7 @@ module ActiveModel
       write_state_without_persistence(prev_state)
       raise
     end
-    
+
     def write_state_without_persistence(state)
       ivar = self.class.get_state_machine.current_state_variable
       instance_variable_set(ivar, state)
@@ -88,8 +88,8 @@ module ActiveModel
 
     def set_initial_state
       # In case we use a query with a custom select that excludes our state attribute name we need to skip the initialization below.
-      if self.has_attribute?(transitions_state_column_name)
-        self[transitions_state_column_name] ||= self.class.get_state_machine.initial_state.to_s
+      if self.has_attribute?(transitions_state_column_name) && state_not_set?
+        self[transitions_state_column_name] = self.class.get_state_machine.initial_state.to_s
         self.class.get_state_machine.state_index[self[transitions_state_column_name].to_sym].call_action(:enter, self)
       end
     end
@@ -105,5 +105,9 @@ module ActiveModel
         self.errors.add(transitions_state_column_name, :inclusion, :value => self[transitions_state_column_name])
       end
     end
+
+    def state_not_set?
+      self[transitions_state_column_name].nil?
+    end
   end
 end

data/lib/transitions/event.rb

@@ -49,14 +49,14 @@ module Transitions
       next_state = nil
       transitions.each do |transition|
         next if to_state && !Array(transition.to).include?(to_state)
-        if transition.perform(obj, *args)
+        if transition.executable?(obj, *args)
           next_state = to_state || Array(transition.to).first
           transition.execute(obj, *args)
+          update_event_timestamp(obj, next_state) if timestamp_defined?
           break
         end
       end
       # Update timestamps on obj if a timestamp has been defined
-      update_event_timestamp(obj, next_state) if timestamp_defined?
       next_state
     end
 

data/lib/transitions/state_transition.rb

@@ -29,7 +29,7 @@ module Transitions
       @options = opts
     end
 
-    def perform(obj, *args)
+    def executable?(obj, *args)
       [@guard].flatten.all? { |g| perform_guard(obj, g, *args) }
     end
 

data/lib/transitions/version.rb

@@ -1,3 +1,3 @@
 module Transitions
-  VERSION = '0.1.11'
+  VERSION = '0.1.12'
 end

data/test/active_record/test_active_record.rb

@@ -5,12 +5,11 @@ class CreateTrafficLights < ActiveRecord::Migration
     create_table(:traffic_lights, :force => true) do |t|
       t.string :state
       t.string :name
+      t.string :power
     end
   end
 end
 
-set_up_db CreateTrafficLights
-
 class CreateDifferentTrafficLights < ActiveRecord::Migration
   def self.up
     create_table(:different_traffic_lights) do |t|
@@ -20,11 +19,8 @@ class CreateDifferentTrafficLights < ActiveRecord::Migration
   end
 end
 
-set_up_db CreateDifferentTrafficLights
-
 class TrafficLight < ActiveRecord::Base
   include ActiveModel::Transitions
-  attr_reader :power
 
   state_machine :auto_scopes => true do
     state :off, enter: :turn_power_on
@@ -51,15 +47,11 @@ class TrafficLight < ActiveRecord::Base
   end
 
   def turn_power_on
-    raise "the power should not have been on already" if @power == :on
-    @power = :on
+    raise "the power should not have been on already" if power == "on"
+    self.power = "on"
   end
 end
 
-class ProtectedTrafficLight < TrafficLight
-  attr_protected :state
-end
-
 class ValidatingTrafficLight < TrafficLight
   validate {|t| errors.add(:base, 'This TrafficLight will never validate after creation') unless t.new_record? }
 end
@@ -90,7 +82,12 @@ class TestActiveRecord < Test::Unit::TestCase
 
   test "calls enter when setting the initial state" do
     @new_light = TrafficLight.new
-    assert_equal :on, @new_light.power
+    assert_equal "on", @new_light.power
+  end
+
+  test "does not call enter when loading a persisted record" do
+    assert_equal "on", @light.power
+    assert_nothing_raised { TrafficLight.find(@light.id) }
   end
 
   test "transition to a valid state" do
@@ -122,14 +119,6 @@ class TestActiveRecord < Test::Unit::TestCase
     assert_equal :off, @light.current_state
   end
 
-  test "transition does persists state when state is protected" do
-    protected_light = ProtectedTrafficLight.create!
-    protected_light.reset!
-    assert_equal :red, protected_light.current_state
-    protected_light.reload
-    assert_equal "red", protected_light.state
-  end
-
   test "transition with wrong state will not validate" do
     for s in @light.class.get_state_machine.states
       @light.state = s.name
@@ -160,7 +149,7 @@ class TestActiveRecord < Test::Unit::TestCase
     @light.update_attribute(:state, 'green')
     assert @light.reload.green?, "reloaded state should come from database, not instance variable"
   end
-  
+
   test "calling non-bang event updates state attribute" do
     @light.reset!
     assert @light.red?
@@ -170,6 +159,29 @@ class TestActiveRecord < Test::Unit::TestCase
   end
 end
 
+if ActiveRecord::VERSION::MAJOR == 3
+
+  class TestMassAssignmentActiveRecord < Test::Unit::TestCase
+    # attr_protected unfortunately invokes a db call, so this test requires that
+    # we define the class after the table already exists.
+    def setup
+      set_up_db CreateTrafficLights
+
+      @light_with_protected_state = Class.new(TrafficLight) do
+        attr_protected :state
+      end
+    end
+
+    test "transition does persists state when state is protected" do
+      protected_light = @light_with_protected_state.create!
+      protected_light.reset!
+      assert_equal :red, protected_light.current_state
+      protected_light.reload
+      assert_equal "red", protected_light.state
+    end
+  end
+end
+
 class TestNewActiveRecord < TestActiveRecord
 
   def setup
@@ -305,7 +317,7 @@ class TestActiveRecordWithDifferentColumnName < Test::Unit::TestCase
     @light.update_attribute(:different_state, 'green')
     assert @light.reload.green?, "reloaded state should come from database, not instance variable"
   end
-  
+
   test "calling non-bang event updates state attribute" do
     @light.reset!
     assert @light.red?

data/test/active_record/test_active_record_scopes.rb

@@ -1,9 +1,9 @@
 require "helper"
 
-class CreateBears < ActiveRecord::Migration
+class CreateBunnies < ActiveRecord::Migration
   def self.up
-    create_table(:bears, :force => true) do |t|
-      t.string :state
+    create_table(:bunnies, :force => true) do |t|
+      t.string :status # Explicitly use another state column to ensure that this whole enchilada is working with other state column names than the default ones.
     end
   end
 end
@@ -16,16 +16,6 @@ class CreatePuppies < ActiveRecord::Migration
   end
 end
 
-class CreateBunnies < ActiveRecord::Migration
-  def self.up
-    create_table(:bunnies, :force => true) do |t|
-      t.string :status # Explicitly use another state column to ensure that this whole enchilada is working with other state column names than the default ones.
-    end
-  end
-end
-
-set_up_db CreateBunnies, CreatePuppies
-
 class Bunny < ActiveRecord::Base
   include ActiveModel::Transitions
 
@@ -44,7 +34,7 @@ end
 
 class TestScopes < Test::Unit::TestCase
   def setup
-    set_up_db CreateBears, CreateBunnies, CreatePuppies
+    set_up_db CreateBunnies, CreatePuppies
     @bunny = Bunny.create!
   end
 

data/test/active_record/test_active_record_timestamps.rb

@@ -9,12 +9,11 @@ class CreateOrders < ActiveRecord::Migration
       t.datetime :prepared_on
       t.datetime :dispatched_at
       t.date :cancellation_date
+      t.boolean :allow_transition, :default => true
     end
   end
 end
 
-set_up_db CreateOrders
-
 class Order < ActiveRecord::Base
   include ActiveModel::Transitions
 
@@ -25,7 +24,7 @@ class Order < ActiveRecord::Base
     state :prepared
     state :delivered
     state :cancelled
-    
+
     # no timestamp col is being specified here - should be ignored
     event :place do
       transitions :from => :opened, :to => :placed
@@ -33,7 +32,7 @@ class Order < ActiveRecord::Base
 
     # should set paid_at timestamp
     event :pay, :timestamp => true do
-      transitions :from => :placed, :to => :paid
+      transitions :from => :placed, :to => :paid, :guard => lambda { |obj| obj.allow_transition }
     end
 
     # should set prepared_on
@@ -45,12 +44,12 @@ class Order < ActiveRecord::Base
     event :deliver, :timestamp => "dispatched_at" do
       transitions :from => :prepared, :to => :delivered
     end
-    
+
     # should set cancellation_date
     event :cancel, :timestamp => :cancellation_date do
       transitions :from => [:placed, :paid, :prepared], :to => :cancelled
     end
-    
+
     # should raise an exception as there is no timestamp col
     event :reopen, :timestamp => true do
       transitions :from => :cancelled, :to => :opened
@@ -75,41 +74,49 @@ class TestActiveRecordTimestamps < Test::Unit::TestCase
     assert_nothing_raised { @order.place! }
     assert_equal @order.state, "placed"
   end
-  
+
   test "moving to paid should set paid_at" do
-    @order = create_order(:placed)    
+    @order = create_order(:placed)
     @order.pay!
     @order.reload
     assert_not_nil @order.paid_at
   end
-  
+
+  test "moving to paid should not set paid_at if our guard evaluates to false" do
+    @order = create_order(:placed)
+    @order.update_attribute :allow_transition, false
+    @order.pay!
+    @order.reload
+    assert_nil @order.paid_at
+  end
+
   test "moving to prepared should set prepared_on" do
-    @order = create_order(:paid)    
+    @order = create_order(:paid)
     @order.prepare!
     @order.reload
     assert_not_nil @order.prepared_on
   end
-  
+
   test "moving to delivered should set dispatched_at" do
-    @order = create_order(:prepared)    
+    @order = create_order(:prepared)
     @order.deliver!
     @order.reload
     assert_not_nil @order.dispatched_at
   end
-  
+
   test "moving to cancelled should set cancellation_date" do
-    @order = create_order(:placed)    
+    @order = create_order(:placed)
     @order.cancel!
     @order.reload
     assert_not_nil @order.cancellation_date
   end
-  
+
   test "moving to reopened should raise an exception as there is no attribute" do
-    @order = create_order(:cancelled)    
-    assert_raise(NoMethodError) { @order.re_open! } 
+    @order = create_order(:cancelled)
+    assert_raise(NoMethodError) { @order.re_open! }
     @order.reload
   end
-  
+
   test "passing an invalid value to timestamp options should raise an exception" do
     assert_raise(ArgumentError) do
       class Order < ActiveRecord::Base
@@ -119,8 +126,8 @@ class TestActiveRecordTimestamps < Test::Unit::TestCase
             transitions :from => :prepared, :to => :placed
           end
         end
-        
-      end      
+
+      end
     end
   end
 end

data/test/active_record/test_custom_select.rb

@@ -1,18 +1,15 @@
 require "helper"
 
-# Regressiontest for https://github.com/troessner/transitions/issues/95
-# TODO We use this Trafficlight class quite a lot in our specs including a ton of duplication.
-#      Unify class and migration definition in one place and then clean up all related specs, including this one.
-class CreateTrafficLights < ActiveRecord::Migration
+# Regression test for https://github.com/troessner/transitions/issues/95
+class CreateSwitches < ActiveRecord::Migration
   def self.up
-    create_table(:traffic_lights, :force => true) do |t|
+    create_table(:switches, :force => true) do |t|
       t.string :state
-      t.string :name
     end
   end
 end
 
-class TrafficLight < ActiveRecord::Base
+class Switch < ActiveRecord::Base
   include ActiveModel::Transitions
 
   state_machine do
@@ -23,12 +20,12 @@ end
 
 class TestCustomSelect < Test::Unit::TestCase
   def setup
-    set_up_db CreateTrafficLights
-    @light = TrafficLight.create!
+    set_up_db CreateSwitches
+    Switch.create!
   end
 
   test "should not trigger an exception when we use a custom select query which excludes the name of our state attribute" do
-    result = TrafficLight.select("id, name")
+    result = Switch.select(:id)
     assert_nothing_raised NoMethodError do
       result.inspect
     end

data/test/state_transition/test_state_transition_guard_check.rb

@@ -7,7 +7,7 @@ class TestStateTransitionGuardCheck < Test::Unit::TestCase
     opts = {:from => "foo", :to => "bar"}
       st = Transitions::StateTransition.new(opts)
 
-    assert st.perform(nil, *args)
+    assert st.executable?(nil, *args)
   end
 
   test "should call the method on the object if guard is a symbol" do
@@ -17,7 +17,7 @@ class TestStateTransitionGuardCheck < Test::Unit::TestCase
     obj = stub
     obj.expects(:test_guard).with(*args)
 
-    st.perform(obj, *args)
+    st.executable?(obj, *args)
   end
 
   test "should call the method on the object if guard is a string" do
@@ -27,7 +27,7 @@ class TestStateTransitionGuardCheck < Test::Unit::TestCase
     obj = stub
     obj.expects(:test_guard).with(*args)
 
-    st.perform(obj, *args)
+    st.executable?(obj, *args)
   end
 
   test "should call the proc passing the object if the guard is a proc" do
@@ -37,7 +37,7 @@ class TestStateTransitionGuardCheck < Test::Unit::TestCase
     obj = stub
     obj.expects(:test_guard).with(*args)
 
-    st.perform(obj, *args)
+    st.executable?(obj, *args)
   end
 
   test "should call the method on the object if guard is a symbol" do
@@ -48,7 +48,7 @@ class TestStateTransitionGuardCheck < Test::Unit::TestCase
     obj.expects(:test_guard).with(*args).returns(true)
     obj.expects(:test_another_guard).with(*args).returns(true)
 
-    assert st.perform(obj, *args)
+    assert st.executable?(obj, *args)
   end
 
 end

data/transitions.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency "mocha", '~> 0.11.0' # With mocha 0.12 we get: undefined method `run' for #<StateMachineMachineTest:0x94918b8> (NoMethodError)
   s.add_development_dependency "rake"
   s.add_development_dependency "random_data"
-  s.add_development_dependency "sqlite3"
-  s.add_development_dependency "activerecord", "~> 3"
+  s.add_development_dependency 'appraisal'
+  s.add_development_dependency "activerecord", [">= 3.0", "<= 4.0"]
 
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: transitions
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Jakub Kuzma
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-09 00:00:00.000000000 Z
+date: 2013-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -82,7 +82,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -99,16 +99,22 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - <=
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - <=
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4.0'
 description: Lightweight state machine extracted from ActiveModel
 email: timo.roessner@googlemail.com
 executables: []
@@ -119,11 +125,16 @@ files:
 - .ruby-gemset
 - .ruby-version
 - .travis.yml
+- Appraisals
 - CHANGELOG.md
 - Gemfile
 - MIT-LICENSE.txt
 - README.md
 - Rakefile
+- gemfiles/rails_3_0.gemfile
+- gemfiles/rails_3_1.gemfile
+- gemfiles/rails_3_2.gemfile
+- gemfiles/rails_4_0.gemfile
 - lib/active_model/transitions.rb
 - lib/active_record/transitions.rb
 - lib/transitions.rb
@@ -172,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: transitions
-rubygems_version: 2.0.6
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: State machine extracted from ActiveModel