aasm 2.3.1 → 2.4.0

data/spec/unit/auth_machine_spec.rb

@@ -0,0 +1,66 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+
+describe 'AuthMachine on initialization' do
+  before(:each) do
+    @auth = AuthMachine.new
+  end
+
+  it 'should be in the pending state' do
+    @auth.aasm_current_state.should == :pending
+  end
+
+  it 'should have an activation code' do
+    @auth.has_activation_code?.should be_true
+    @auth.activation_code.should_not be_nil
+  end
+end
+
+describe 'AuthMachine when being unsuspended' do
+  it 'should be able to be unsuspended' do
+    @auth = AuthMachine.new
+    @auth.activate!
+    @auth.suspend!
+    @auth.may_unsuspend?.should be_true
+  end
+  
+  it 'should not be able to be unsuspended into active' do
+    @auth = AuthMachine.new
+    @auth.suspend!
+    @auth.may_unsuspend?(:active).should_not be_true
+  end
+  
+  it 'should not be able to be unpassified' do
+    @auth = AuthMachine.new
+    @auth.activate!
+    @auth.suspend!
+    @auth.unsuspend!
+    
+    @auth.may_unpassify?.should_not be_true
+  end
+  
+  it 'should be active if previously activated' do
+    @auth = AuthMachine.new
+    @auth.activate!
+    @auth.suspend!
+    @auth.unsuspend!
+
+    @auth.aasm_current_state.should == :active
+  end
+
+  it 'should be pending if not previously activated, but an activation code is present' do
+    @auth = AuthMachine.new
+    @auth.suspend!
+    @auth.unsuspend!
+
+    @auth.aasm_current_state.should == :pending
+  end
+
+  it 'should be passive if not previously activated and there is no activation code' do
+    @auth = AuthMachine.new
+    @auth.activation_code = nil
+    @auth.suspend!
+    @auth.unsuspend!
+
+    @auth.aasm_current_state.should == :passive
+  end
+end

data/spec/{functional → unit}/conversation_spec.rb

@@ -1,8 +1,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
-require File.expand_path(File.join(File.dirname(__FILE__), 'conversation'))
 
-describe Conversation, 'description' do
-  it '.aasm_states should contain all of the states' do
+describe 'aasm_states' do
+  it 'should contain all of the states' do
     Conversation.aasm_states.should == [:needs_attention, :read, :closed, :awaiting_response, :junk]
   end
 end

data/spec/unit/event_spec.rb

@@ -65,15 +65,6 @@ describe AASM::SupportingClasses::Event, 'when firing an event' do
 end
 
 describe AASM::SupportingClasses::Event, 'when executing the success callback' do
-  class ThisNameBetterNotBeInUse
-    include AASM
-
-    aasm_state :initial
-    aasm_state :symbol
-    aasm_state :string
-    aasm_state :array
-    aasm_state :proc
-  end
 
   it "should send the success callback if it's a symbol" do
     ThisNameBetterNotBeInUse.instance_eval {

data/spec/unit/memory_leak_spec.rb

@@ -0,0 +1,34 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+
+describe "state machines" do
+
+  def number_of_objects(clazz)
+    ObjectSpace.each_object(clazz) {}
+  end
+  
+  def machines
+    AASM::StateMachine.instance_variable_get("@machines")
+  end
+
+  it "should be created without memory leak" do
+    machines_count = machines.size
+    state_count = number_of_objects(AASM::SupportingClasses::State)
+    event_count = number_of_objects(AASM::SupportingClasses::Event)
+    transition_count = number_of_objects(AASM::SupportingClasses::StateTransition)
+
+    load File.expand_path(File.dirname(__FILE__) + '/../models/not_auto_loaded/process.rb')
+    machines.size.should == machines_count + 1                                                  # + Process
+    number_of_objects(Models::Process).should == 0
+    number_of_objects(AASM::SupportingClasses::State).should == state_count + 3                 # + Process
+    number_of_objects(AASM::SupportingClasses::Event).should == event_count + 2                 # + Process
+    number_of_objects(AASM::SupportingClasses::StateTransition).should == transition_count + 2  # + Process
+
+    Models.send(:remove_const, "Process") if Models.const_defined?("Process")
+    load File.expand_path(File.dirname(__FILE__) + '/../models/not_auto_loaded/process.rb')
+    machines.size.should == machines_count + 1                                                  # + Process
+    number_of_objects(AASM::SupportingClasses::State).should == state_count + 3                 # + Process
+    number_of_objects(AASM::SupportingClasses::Event).should == event_count + 2                 # + Process
+    number_of_objects(AASM::SupportingClasses::StateTransition).should == transition_count + 2  # + Process
+  end
+
+end

data/spec/unit/new_dsl_spec.rb

@@ -0,0 +1,28 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+
+describe "the new dsl" do
+
+  before(:each) do
+    @process = ProcessWithNewDsl.new
+  end
+  
+  it 'should use an initial event' do
+    @process.aasm_current_state.should == :sleeping
+    @process.should be_sleeping
+  end
+  
+  it 'should have states and transitions' do
+    @process.flagged.should be_nil
+    @process.start!
+    @process.should be_running
+    @process.flagged.should be_true
+    @process.stop!
+    @process.should be_suspended
+  end
+
+  it 'should not conflict with other event or state methods' do
+    lambda {ProcessWithNewDsl.state}.should raise_error(RuntimeError, "wrong state method")
+    lambda {ProcessWithNewDsl.event}.should raise_error(RuntimeError, "wrong event method")
+  end
+
+end

data/spec/unit/state_spec.rb

@@ -1,6 +1,5 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
-# TODO These are specs ported from original aasm
 describe AASM::SupportingClasses::State do
   before(:each) do
     @name    = :astate
@@ -13,20 +12,23 @@ describe AASM::SupportingClasses::State do
 
   it 'should set the name' do
     state = new_state
-
     state.name.should == :astate
   end
 
-  it 'should set the options and expose them as options' do
-    state = new_state
+  it 'should set the display_name from name' do
+    new_state.display_name.should == 'Astate'
+  end
 
-    state.options.should == @options
+  it 'should set the display_name from options' do
+    new_state(:display => "A State").display_name.should == 'A State'
   end
 
-  it 'should be equal to a symbol of the same name' do
-    state = new_state
+  it 'should set the options and expose them as options' do
+    new_state.options.should == @options
+  end
 
-    state.should == :astate
+  it 'should be equal to a symbol of the same name' do
+    new_state.should == :astate
   end
 
   it 'should be equal to a State of the same name' do
@@ -50,16 +52,16 @@ describe AASM::SupportingClasses::State do
 
     state.call_action(:entering, record)
   end
-  
+
   it 'should send a message to the record for each action' do
     state = new_state(:entering => [:a, :b, "c", lambda {|r| r.foobar }])
-    
+
     record = mock('record')
     record.should_receive(:a)
     record.should_receive(:b)
     record.should_receive(:c)
     record.should_receive(:foobar)
-    
+
     state.call_action(:entering, record)
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: aasm
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 31
   prerelease: 
   segments: 
   - 2
-  - 3
-  - 1
-  version: 2.3.1
+  - 4
+  - 0
+  version: 2.4.0
 platform: ruby
 authors: 
 - Scott Barron
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-10 00:00:00 +02:00
+date: 2011-11-26 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -159,6 +159,7 @@ extra_rdoc_files: []
 files: 
 - .document
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -166,6 +167,7 @@ files:
 - aasm.gemspec
 - lib/aasm.rb
 - lib/aasm/aasm.rb
+- lib/aasm/base.rb
 - lib/aasm/event.rb
 - lib/aasm/localizer.rb
 - lib/aasm/persistence.rb
@@ -177,25 +179,23 @@ files:
 - lib/aasm/version.rb
 - spec/database.yml
 - spec/en.yml
-- spec/functional/conversation.rb
-- spec/functional/conversation_spec.rb
+- spec/models/conversation.rb
+- spec/models/not_auto_loaded/process.rb
+- spec/models/process_with_new_dsl.rb
 - spec/schema.rb
 - spec/spec_helper.rb
+- spec/spec_helpers/models_spec_helper.rb
 - spec/unit/aasm_spec.rb
 - spec/unit/active_record_persistence_spec.rb
+- spec/unit/auth_machine_spec.rb
 - spec/unit/before_after_callbacks_spec.rb
+- spec/unit/conversation_spec.rb
 - spec/unit/event_spec.rb
 - spec/unit/localizer_spec.rb
+- spec/unit/memory_leak_spec.rb
+- spec/unit/new_dsl_spec.rb
 - spec/unit/state_spec.rb
 - spec/unit/state_transition_spec.rb
-- test/functional/auth_machine_test.rb
-- test/models/process.rb
-- test/test_helper.rb
-- test/unit/aasm_test.rb
-- test/unit/event_test.rb
-- test/unit/state_machine_test.rb
-- test/unit/state_test.rb
-- test/unit/state_transition_test.rb
 has_rdoc: true
 homepage: http://rubyist.github.com/aasm/
 licenses: []
@@ -233,22 +233,20 @@ summary: State machine mixin for Ruby objects
 test_files: 
 - spec/database.yml
 - spec/en.yml
-- spec/functional/conversation.rb
-- spec/functional/conversation_spec.rb
+- spec/models/conversation.rb
+- spec/models/not_auto_loaded/process.rb
+- spec/models/process_with_new_dsl.rb
 - spec/schema.rb
 - spec/spec_helper.rb
+- spec/spec_helpers/models_spec_helper.rb
 - spec/unit/aasm_spec.rb
 - spec/unit/active_record_persistence_spec.rb
+- spec/unit/auth_machine_spec.rb
 - spec/unit/before_after_callbacks_spec.rb
+- spec/unit/conversation_spec.rb
 - spec/unit/event_spec.rb
 - spec/unit/localizer_spec.rb
+- spec/unit/memory_leak_spec.rb
+- spec/unit/new_dsl_spec.rb
 - spec/unit/state_spec.rb
 - spec/unit/state_transition_spec.rb
-- test/functional/auth_machine_test.rb
-- test/models/process.rb
-- test/test_helper.rb
-- test/unit/aasm_test.rb
-- test/unit/event_test.rb
-- test/unit/state_machine_test.rb
-- test/unit/state_test.rb
-- test/unit/state_transition_test.rb

data/test/functional/auth_machine_test.rb

@@ -1,148 +0,0 @@
-require 'test_helper'
-
-class AuthMachine
-  include AASM
-
-  attr_accessor :activation_code, :activated_at, :deleted_at
-
-  aasm_initial_state :pending
-
-  aasm_state :passive
-  aasm_state :pending, :enter => :make_activation_code
-  aasm_state :active,  :enter => :do_activate
-  aasm_state :suspended
-  aasm_state :deleted, :enter => :do_delete, :exit => :do_undelete
-
-  aasm_event :register do
-    transitions :from => :passive, :to => :pending, :guard => Proc.new {|u| u.can_register? }
-  end
-
-  aasm_event :activate do
-    transitions :from => :pending, :to => :active
-  end
-
-  aasm_event :suspend do
-    transitions :from => [:passive, :pending, :active], :to => :suspended
-  end
-
-  aasm_event :delete do
-    transitions :from => [:passive, :pending, :active, :suspended], :to => :deleted
-  end
-
-  # a dummy event that can never happen
-  aasm_event :unpassify do
-    transitions :from => :passive, :to => :active, :guard => Proc.new {|u| false }
-  end
-  
-  aasm_event :unsuspend do
-    transitions :from => :suspended, :to => :active,  :guard => Proc.new {|u| u.has_activated? }
-    transitions :from => :suspended, :to => :pending, :guard => Proc.new {|u| u.has_activation_code? }
-    transitions :from => :suspended, :to => :passive
-  end
-
-  def initialize
-    # the AR backend uses a before_validate_on_create :aasm_ensure_initial_state
-    # lets do something similar here for testing purposes.
-    aasm_enter_initial_state
-  end
-
-  def make_activation_code
-    @activation_code = 'moo'
-  end
-
-  def do_activate
-    @activated_at = Time.now
-    @activation_code = nil
-  end
-
-  def do_delete
-    @deleted_at = Time.now
-  end
-
-  def do_undelete
-    @deleted_at = false
-  end
-
-  def can_register?
-    true
-  end
-
-  def has_activated?
-    !!@activated_at
-  end
-
-  def has_activation_code?
-    !!@activation_code
-  end
-end
-
-class AuthMachineTest < Test::Unit::TestCase
-  context 'authentication state machine' do
-    context 'on initialization' do
-      setup do
-        @auth = AuthMachine.new
-      end
-
-      should 'be in the pending state' do
-        assert_equal :pending, @auth.aasm_current_state
-      end
-
-      should 'have an activation code' do
-        assert @auth.has_activation_code?
-        assert_not_nil @auth.activation_code
-      end
-    end
-
-    context 'when being unsuspended' do
-      
-      should 'be able to be unsuspended' do
-        @auth = AuthMachine.new
-        @auth.activate!
-        @auth.suspend!
-        assert @auth.may_unsuspend?
-      end
-      
-      should 'not be able to be unsuspended into active' do
-        @auth = AuthMachine.new
-        @auth.suspend!
-        assert_equal false, @auth.may_unsuspend?(:active)
-      end
-      
-      should 'not be able to be unpassified' do
-        @auth = AuthMachine.new
-        @auth.activate!
-        @auth.suspend!
-        @auth.unsuspend!
-        
-        assert_equal false, @auth.may_unpassify?
-      end
-      
-      should 'be active if previously activated' do
-        @auth = AuthMachine.new
-        @auth.activate!
-        @auth.suspend!
-        @auth.unsuspend!
-
-        assert_equal :active, @auth.aasm_current_state
-      end
-
-      should 'be pending if not previously activated, but an activation code is present' do
-        @auth = AuthMachine.new
-        @auth.suspend!
-        @auth.unsuspend!
-
-        assert_equal :pending, @auth.aasm_current_state
-      end
-
-      should 'be passive if not previously activated and there is no activation code' do
-        @auth = AuthMachine.new
-        @auth.activation_code = nil
-        @auth.suspend!
-        @auth.unsuspend!
-
-        assert_equal :passive, @auth.aasm_current_state
-      end
-    end
-
-  end
-end