transitions 0.1.4 → 0.1.5

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.0.5
+
+* (troessner) Fix unhelpful error message when event can not be fired.
+* (simonc) Fixing set_initial_state with Mongoid
+
 # 1.0.4
 
 (troessner)

data/lib/active_model/transitions.rb

@@ -63,7 +63,7 @@ module ActiveModel
     end
 
     def set_initial_state
-      self.state ||= self.class.get_state_machine.initial_state.to_s if self.has_attribute?(:state)
+      self.state ||= self.class.get_state_machine.initial_state.to_s if self.respond_to?(:state=)
     end
 
     def state_inclusion

data/lib/transitions/event.rb

@@ -44,7 +44,7 @@ module Transitions
 
     def fire(obj, to_state = nil, *args)
       transitions = @transitions.select { |t| t.from == obj.current_state }
-      raise InvalidTransition, error_message_for_invalid_transitions(obj, to_state) if transitions.size == 0
+      raise InvalidTransition, error_message_for_invalid_transitions(obj) if transitions.size == 0
 
       next_state = nil
       transitions.each do |transition|
@@ -138,8 +138,8 @@ module Transitions
       end
     end
 
-    def error_message_for_invalid_transitions(obj, to_state)
-      "Cannot transition to #{to_state || 'default'} from #{obj.current_state} for `#{obj.class.name}` #{obj.class < ActiveRecord::Base && obj.persisted? ? "with ID #{obj.id} " : nil}"
+    def error_message_for_invalid_transitions(obj)
+      "Can't fire event `#{name}` in current state `#{obj.current_state}` for `#{obj.class.name}` #{obj.class < ActiveRecord::Base && obj.persisted? ? "with ID #{obj.id} " : nil}"
     end
   end
 end

data/lib/transitions/version.rb

@@ -1,3 +1,3 @@
 module Transitions
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

data/test/event/test_event_being_fired.rb

@@ -2,7 +2,7 @@ require "helper"
 
 class TestEventBeingFired < Test::Unit::TestCase
   test "should raise an Transitions::InvalidTransition error if the transitions are empty" do
-    event = Transitions::Event.new(nil, :event)
+    event = Transitions::Event.new(nil, :event_that_is_fired)
     class AnotherDummy; end
     obj = AnotherDummy.new
     obj.stubs(:current_state).returns(:running)
@@ -10,7 +10,7 @@ class TestEventBeingFired < Test::Unit::TestCase
     exception = assert_raise Transitions::InvalidTransition do
       event.fire(obj)
     end
-    assert_match /Cannot transition to default from running for `TestEventBeingFired::AnotherDummy/, exception.message
+    assert_match /Can't fire event `event_that_is_fired` in current state `running` for `TestEventBeingFired::AnotherDummy`/, exception.message
   end
 
   test "should return the state of the first matching transition it finds" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: transitions
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-21 00:00:00.000000000 Z
+date: 2013-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -179,7 +179,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -392757581
+      hash: -1071042129
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: