aasm 2.4.0 → 3.0.0

data/spec/unit/aasm_spec.rb

@@ -104,13 +104,6 @@ describe AASM, '- initial states' do
 end
 
 describe AASM, '- event firing with persistence' do
-  it 'should fire the Event' do
-    foo = Foo.new
-
-    Foo.aasm_events[:close].should_receive(:fire).with(foo)
-    foo.close!
-  end
-
   it 'should update the current state' do
     foo = Foo.new
     foo.close!
@@ -172,13 +165,6 @@ describe AASM, '- event firing with persistence' do
 end
 
 describe AASM, '- event firing without persistence' do
-  it 'should fire the Event' do
-    foo = Foo.new
-
-    Foo.aasm_events[:close].should_receive(:fire).with(foo)
-    foo.close
-  end
-
   it 'should update the current state' do
     foo = Foo.new
     foo.close
@@ -274,7 +260,7 @@ describe AASM, '- event callbacks' do
     end
 
     it 'should not call it for failing bang fire' do
-      @foo.stub!(:set_aasm_current_state_with_persistence).and_return(false)
+      @foo.stub!(:aasm_set_current_state_with_persistence).and_return(false)
       @foo.should_not_receive(:aasm_event_fired)
       @foo.close!
     end
@@ -289,16 +275,16 @@ describe AASM, '- event callbacks' do
 
     it 'should call it when transition failed for bang fire' do
       @foo.should_receive(:aasm_event_failed).with(:null, :open)
-      @foo.null!
+      lambda {@foo.null!}.should raise_error(AASM::InvalidTransition)
     end
 
     it 'should call it when transition failed for non-bang fire' do
       @foo.should_receive(:aasm_event_failed).with(:null, :open)
-      @foo.null
+      lambda {@foo.null}.should raise_error(AASM::InvalidTransition)
     end
 
     it 'should not call it if persist fails for bang fire' do
-      @foo.stub!(:set_aasm_current_state_with_persistence).and_return(false)
+      @foo.stub!(:aasm_set_current_state_with_persistence).and_return(false)
       @foo.should_receive(:aasm_event_failed)
       @foo.close!
     end

data/spec/unit/active_record_persistence_spec.rb

@@ -12,11 +12,13 @@ class Gate < ActiveRecord::Base
   # Fake this column for testing purposes
   attr_accessor :aasm_state
 
-  aasm_state :opened
-  aasm_state :closed
+  aasm do
+    state :opened
+    state :closed
 
-  aasm_event :view do
-    transitions :to => :read, :from => [:needs_attention]
+    event :view do
+      transitions :to => :read, :from => [:needs_attention]
+    end
   end
 end
 

data/spec/unit/event_spec.rb

@@ -30,12 +30,12 @@ describe AASM::SupportingClasses::Event do
 end
 
 describe AASM::SupportingClasses::Event, 'when firing an event' do
-  it 'should raise an AASM::InvalidTransition error if the transitions are empty' do
+  it 'should return nil if the transitions are empty' do
     obj = mock('object')
     obj.stub!(:aasm_current_state)
 
     event = AASM::SupportingClasses::Event.new(:event)
-    lambda { event.fire(obj) }.should raise_error(AASM::InvalidTransition)
+    event.fire(obj).should be_nil
   end
 
   it 'should return the state of the first matching transition it finds' do

data/spec/unit/localizer_spec.rb

@@ -18,7 +18,7 @@ class LocalizerTestModel < ActiveRecord::Base
   aasm_event :open
 end
 
-describe AASM::Localizer do
+describe AASM::SupportingClasses::Localizer do
   before(:all) do
     I18n.load_path << 'spec/en.yml'
     I18n.default_locale = :en
@@ -29,23 +29,23 @@ describe AASM::Localizer do
   let (:foo_opened) { LocalizerTestModel.new }
   let (:foo_closed) { LocalizerTestModel.new.tap { |x| x.aasm_state = :closed  } }
 
-  context '.human_state' do
+  context 'aasm_human_state' do
     it 'should return translated state value' do
-       foo_opened.human_state.should == "It's opened now!"
+       foo_opened.aasm_human_state.should == "It's opened now!"
     end
 
     it 'should return humanized value if not localized' do
-      foo_closed.human_state.should == "Closed"
+      foo_closed.aasm_human_state.should == "Closed"
     end
   end
 
-  context '.human_event_name' do
+  context 'aasm_human_event_name' do
     it 'should return translated event name' do
-      LocalizerTestModel.human_event_name(:close).should == "Let's close it!"
+      LocalizerTestModel.aasm_human_event_name(:close).should == "Let's close it!"
     end
 
     it 'should return humanized event name' do
-      LocalizerTestModel.human_event_name(:open).should == "Open"
+      LocalizerTestModel.aasm_human_event_name(:open).should == "Open"
     end
   end
 end

data/spec/unit/state_spec.rb

@@ -41,7 +41,7 @@ describe AASM::SupportingClasses::State do
     record = mock('record')
     record.should_receive(:foo)
 
-    state.call_action(:entering, record)
+    state.fire_callbacks(:entering, record)
   end
 
   it 'should send a message to the record for an action if the action is present as a string' do
@@ -50,7 +50,7 @@ describe AASM::SupportingClasses::State do
     record = mock('record')
     record.should_receive(:foo)
 
-    state.call_action(:entering, record)
+    state.fire_callbacks(:entering, record)
   end
 
   it 'should send a message to the record for each action' do
@@ -62,7 +62,7 @@ describe AASM::SupportingClasses::State do
     record.should_receive(:c)
     record.should_receive(:foobar)
 
-    state.call_action(:entering, record)
+    state.fire_callbacks(:entering, record)
   end
 
   it "should stop calling actions if one of them raises :halt_aasm_chain" do
@@ -73,7 +73,7 @@ describe AASM::SupportingClasses::State do
     record.should_receive(:b).and_throw(:halt_aasm_chain)
     record.should_not_receive(:c)
 
-    state.call_action(:entering, record)
+    state.fire_callbacks(:entering, record)
   end
 
   it 'should call a proc, passing in the record for an action if the action is present' do
@@ -82,6 +82,6 @@ describe AASM::SupportingClasses::State do
     record = mock('record')
     record.should_receive(:foobar)
 
-    state.call_action(:entering, record)
+    state.fire_callbacks(:entering, record)
   end
 end

data/spec/unit/state_transition_spec.rb

@@ -1,5 +1,21 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
+describe 'transitions' do
+
+  it 'should raise an exception when whiny' do
+    process = ProcessWithNewDsl.new
+    lambda { process.stop! }.should raise_error(AASM::InvalidTransition)
+    process.should be_sleeping
+  end
+
+  it 'should not raise an exception when whiny' do
+    silencer = Silencer.new
+    silencer.smile!.should be_false
+    silencer.should be_silent
+  end
+
+end
+
 describe AASM::SupportingClasses::StateTransition do
   it 'should set from, to, and opts attr readers' do
     opts = {:from => 'foo', :to => 'bar', :guard => 'g'}
@@ -116,9 +132,9 @@ describe AASM::SupportingClasses::StateTransition, '- when executing the transit
 
     obj.should_receive(:test)
 
-    st.execute(obj, args)    
+    st.execute(obj, args)
   end
-  
+
   it 'should accept a Symbol for the method name' do
     opts = {:from => 'foo', :to => 'bar', :on_transition => :test}
     st = AASM::SupportingClasses::StateTransition.new(opts)
@@ -127,9 +143,9 @@ describe AASM::SupportingClasses::StateTransition, '- when executing the transit
 
     obj.should_receive(:test)
 
-    st.execute(obj, args)    
+    st.execute(obj, args)
   end
-  
+
   it 'should pass args if the target method accepts them' do
     opts = {:from => 'foo', :to => 'bar', :on_transition => :test}
     st = AASM::SupportingClasses::StateTransition.new(opts)
@@ -144,7 +160,7 @@ describe AASM::SupportingClasses::StateTransition, '- when executing the transit
 
     return_value.should == 'success'
   end
-  
+
   it 'should NOT pass args if the target method does NOT accept them' do
     opts = {:from => 'foo', :to => 'bar', :on_transition => :test}
     st = AASM::SupportingClasses::StateTransition.new(opts)
@@ -159,5 +175,5 @@ describe AASM::SupportingClasses::StateTransition, '- when executing the transit
 
     return_value.should == 'success'
   end
-    
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: aasm
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 7
   prerelease: 
   segments: 
-  - 2
-  - 4
+  - 3
   - 0
-  version: 2.4.0
+  - 0
+  version: 3.0.0
 platform: ruby
 authors: 
 - Scott Barron
@@ -168,20 +168,22 @@ files:
 - lib/aasm.rb
 - lib/aasm/aasm.rb
 - lib/aasm/base.rb
-- lib/aasm/event.rb
-- lib/aasm/localizer.rb
+- lib/aasm/deprecated/aasm.rb
+- lib/aasm/errors.rb
 - lib/aasm/persistence.rb
 - lib/aasm/persistence/active_record_persistence.rb
-- lib/aasm/state.rb
 - lib/aasm/state_machine.rb
-- lib/aasm/state_transition.rb
-- lib/aasm/supporting_classes.rb
+- lib/aasm/supporting_classes/event.rb
+- lib/aasm/supporting_classes/localizer.rb
+- lib/aasm/supporting_classes/state.rb
+- lib/aasm/supporting_classes/state_transition.rb
 - lib/aasm/version.rb
 - spec/database.yml
 - spec/en.yml
 - spec/models/conversation.rb
 - spec/models/not_auto_loaded/process.rb
 - spec/models/process_with_new_dsl.rb
+- spec/models/silencer.rb
 - spec/schema.rb
 - spec/spec_helper.rb
 - spec/spec_helpers/models_spec_helper.rb
@@ -236,6 +238,7 @@ test_files:
 - spec/models/conversation.rb
 - spec/models/not_auto_loaded/process.rb
 - spec/models/process_with_new_dsl.rb
+- spec/models/silencer.rb
 - spec/schema.rb
 - spec/spec_helper.rb
 - spec/spec_helpers/models_spec_helper.rb

data/lib/aasm/event.rb

@@ -1,127 +0,0 @@
-class AASM::SupportingClasses::Event
-  attr_reader :name, :success, :options
-
-  def initialize(name, options = {}, &block)
-    @name = name
-    @transitions = []
-    update(options, &block)
-  end
-
-  # a neutered version of fire - it doesn't actually fir the event, it just
-  # executes the transition guards to determine if a transition is even
-  # an option given current conditions.
-  def may_fire?(obj, to_state=nil)
-    transitions = @transitions.select { |t| t.from == obj.aasm_current_state }
-    return false if transitions.size == 0
-    
-    result = false
-    transitions.each do |transition|
-      next if to_state and !Array(transition.to).include?(to_state)
-      if transition.perform(obj)
-        result = true
-        break
-      end
-    end
-    result
-  end
-  
-  def fire(obj, to_state=nil, *args)
-    transitions = @transitions.select { |t| t.from == obj.aasm_current_state }
-    raise AASM::InvalidTransition, "Event '#{name}' cannot transition from '#{obj.aasm_current_state}'" if transitions.size == 0
-
-    next_state = nil
-    transitions.each do |transition|
-      next if to_state and !Array(transition.to).include?(to_state)
-      if transition.perform(obj, *args)
-        next_state = to_state || Array(transition.to).first
-        transition.execute(obj, *args)
-        break
-      end
-    end
-    next_state
-  end
-
-  def transitions_from_state?(state)
-    @transitions.any? { |t| t.from == state }
-  end
-
-  def transitions_from_state(state)
-    @transitions.select { |t| t.from == state }
-  end
-
-  def all_transitions
-    @transitions
-  end
-
-  def call_action(action, record)
-    action = @options[action]
-    action.is_a?(Array) ?
-            action.each {|a| _call_action(a, record)} :
-            _call_action(action, record)
-  end
-
-  def ==(event)
-    if event.is_a? Symbol
-      name == event
-    else
-      name == event.name
-    end
-  end
-
-  def update(options = {}, &block)
-    if options.key?(:success) then
-      @success = options[:success]
-    end
-    if options.key?(:error) then
-      @error = options[:error]
-    end
-    if block then
-      instance_eval(&block)
-    end
-    @options = options
-    self
-  end
-
-  def execute_success_callback(obj, success = nil)
-    callback = success || @success
-    case(callback)
-      when String, Symbol
-        obj.send(callback)
-      when Proc
-        callback.call(obj)
-      when Array
-        callback.each{|meth|self.execute_success_callback(obj, meth)}
-    end
-  end
-
-  def execute_error_callback(obj, error, error_callback=nil)
-    callback = error_callback || @error
-    raise error unless callback
-    case(callback)
-      when String, Symbol
-        raise NoMethodError unless obj.respond_to?(callback.to_sym)
-        obj.send(callback, error)
-      when Proc
-        callback.call(obj, error)
-      when Array
-        callback.each{|meth|self.execute_error_callback(obj, error, meth)}
-    end
-  end
-
-  private
-
-  def _call_action(action, record)
-    case action
-      when Symbol, String
-        record.send(action)
-      when Proc
-        action.call(record)
-    end
-  end
-
-  def transitions(trans_opts)
-    Array(trans_opts[:from]).each do |s|
-      @transitions << AASM::SupportingClasses::StateTransition.new(trans_opts.merge({:from => s.to_sym}))
-    end
-  end
-end

data/lib/aasm/localizer.rb

@@ -1,36 +0,0 @@
-class AASM::Localizer
-  def human_event_name(klass, event)
-    defaults = ancestors_list(klass).map do |ancestor|
-      :"#{i18n_scope(klass)}.events.#{i18n_klass(ancestor)}.#{event}"
-    end << event.to_s.humanize
-
-    I18n.translate(defaults.shift, :default => defaults, :raise => true)
-  end
-
-  def human_state(obj)
-    klass = obj.class
-    defaults = ancestors_list(klass).map do |ancestor|
-      :"#{i18n_scope(klass)}.attributes.#{i18n_klass(ancestor)}.#{klass.aasm_column}.#{obj.aasm_current_state}"
-    end << obj.aasm_current_state.to_s.humanize
-
-    I18n.translate(defaults.shift, :default => defaults, :raise => true)
-  end
-
-  private
-
-  # added for rails 2.x compatibility
-  def i18n_scope(klass)
-    klass.respond_to?(:i18n_scope) ? klass.i18n_scope : :activerecord
-  end
-
-  # added for rails < 3.0.3 compatibility
-  def i18n_klass(klass)
-    klass.model_name.respond_to?(:i18n_key) ? klass.model_name.i18n_key : klass.name.underscore
-  end
-
-  def ancestors_list(klass)
-    klass.ancestors.select do |ancestor|
-      ancestor.respond_to?(:model_name) unless ancestor == ActiveRecord::Base
-    end
-  end
-end