stator 0.0.14 → 0.0.15

data/README.md

@@ -8,12 +8,13 @@ gem 'stator', '~> x.y.z'
 
 ## Usage
 
-If you've used the state_machine it's a pretty similar dsl. You define your state machine, transitions, states, and your callbacks (if any). One difference is that stator assumes you've set your db column to the initial state.
+If you've used the state_machine gem it's a pretty similar dsl. You define your state machine, transitions, states, and your callbacks (if any). One difference is that stator assumes you've set your db column's default value to the initial state.
 
 ```ruby
   class User < ActiveRecord::Base
     extend Stator::Model
 
+    # initial state (column default) is "unactivated"
     stator do
 
       transition :semiactivate do

data/lib/stator/integration.rb

@@ -44,16 +44,21 @@ module Stator
       is  = self.state
 
       if @record.new_record?
-        unless @machine.matching_transition(::Stator::Transition::ANY, is)
-          @record.errors.add(@machine.field, "is not a valid state")
-        end
+        invalid_state! unless @machine.matching_transition(::Stator::Transition::ANY, is)
       else
-        unless @machine.matching_transition(was, is)
-          @record.errors.add(@machine.field, "cannot transition to #{is.inspect} from #{was.inspect}")
-        end
+        invalid_transition!(was, is) unless @machine.matching_transition(was, is)
       end
     end
 
+    # todo: i18n
+    def invalid_state!
+      @record.errors.add(@machine.field, "is not a valid state")
+    end
+
+    def invalid_transition!(was, is)
+      @record.errors.add(@machine.field, "cannot transition to #{is.inspect} from #{was.inspect}")
+    end
+
     def track_transition
       self.attempt_to_track_state(self.state_was)
       self.attempt_to_track_state(self.state)

data/lib/stator/transition.rb

@@ -67,6 +67,8 @@ module Stator
       options[:use_previous] ||= false
       %Q{
           (
+            self._stator(#{@namespace.inspect}).integration(self).state_changed?
+          ) && (
             #{@froms.inspect}.include?(self._stator(#{@namespace.inspect}).integration(self).state_was(#{options[:use_previous].inspect})) ||
             #{@froms.inspect}.include?(::Stator::Transition::ANY)
           ) && (
@@ -80,12 +82,24 @@ module Stator
       klass.class_eval <<-EV, __FILE__, __LINE__ + 1
         def #{@full_name}(should_save = true)
           integration = self._stator(#{@namespace.inspect}).integration(self)
+
+          unless can_#{@full_name}?
+            integration.invalid_transition!(integration.state, #{@to.inspect}) if should_save
+            return false
+          end
+
           integration.state = #{@to.inspect}
           self.save if should_save
         end
 
         def #{@full_name}!
           integration = self._stator(#{@namespace.inspect}).integration(self)
+
+          unless can_#{@full_name}?
+            integration.invalid_transition!(integration.state, #{@to.inspect})
+            raise ActiveRecord::RecordInvalid.new(self)
+          end
+
           integration.state = #{@to.inspect}
           self.save!
         end

data/lib/stator/version.rb

@@ -1,7 +1,7 @@
 module Stator
   MAJOR       = 0
   MINOR       = 0
-  PATCH       = 14
+  PATCH       = 15
   PRERELEASE  = nil
 
   VERSION = [MAJOR, MINOR, PATCH, PRERELEASE].compact.join('.')

data/spec/model_spec.rb

@@ -41,7 +41,16 @@ describe Stator::Model do
 
     u.should_not be_valid
     u.errors[:state].should_not be_empty
+  end
+
+  it 'should not allow a transition that is currently in a `to` state' do
+    u = User.new(:email => 'fred@example.com')
+    u.activate!
+    u.hyperactivate!
 
+    lambda{
+      u.hyperactivate!
+    }.should raise_error(/cannot transition to \"hyperactivated\" from \"hyperactivated\"/)
   end
 
   it 'should run conditional validations' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stator
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-22 00:00:00.000000000 Z
+date: 2014-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord