aasm 3.0.14 → 3.0.15

data/spec/unit/{localizer_spec.rb → supporting_classes/localizer_spec.rb}

@@ -3,12 +3,14 @@ require 'active_record'
 require 'logger'
 require 'i18n'
 
+load_schema
+
 class LocalizerTestModel < ActiveRecord::Base
   include AASM
 
   attr_accessor :aasm_state
 
-  aasm_initial_state :open
+  aasm_initial_state :opened
   aasm_state :opened
   aasm_state :closed
 
@@ -16,6 +18,26 @@ class LocalizerTestModel < ActiveRecord::Base
   aasm_event :open
 end
 
+describe 'localized state names' do
+  before(:all) do
+    I18n.load_path << 'spec/en.yml'
+    I18n.default_locale = :en
+    I18n.reload!
+  end
+
+  after(:all) do
+    I18n.load_path.clear
+  end
+
+  it 'should localize' do
+    LocalizerTestModel.aasm.states.detect {|s| s == :opened}.localized_name.should == "It's open now!"
+  end
+
+  it 'should use fallback' do
+    LocalizerTestModel.aasm.states.detect {|s| s == :closed}.localized_name.should == 'Closed'
+  end
+end
+
 describe AASM::SupportingClasses::Localizer, "new style" do
   before(:all) do
     I18n.load_path << 'spec/en.yml'
@@ -32,7 +54,7 @@ describe AASM::SupportingClasses::Localizer, "new style" do
 
   context 'aasm_human_state' do
     it 'should return translated state value' do
-      foo_opened.aasm_human_state.should == "It's opened now!"
+      foo_opened.aasm_human_state.should == "It's open now!"
     end
 
     it 'should return humanized value if not localized' do
@@ -67,7 +89,7 @@ describe AASM::SupportingClasses::Localizer, "deprecated style" do
 
   context 'aasm_human_state' do
     it 'should return translated state value' do
-      foo_opened.aasm_human_state.should == "It's opened now!"
+      foo_opened.aasm_human_state.should == "It's open now!"
     end
 
     it 'should return humanized value if not localized' do

data/spec/unit/{state_spec.rb → supporting_classes/state_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+require 'spec_helper'
 
 describe AASM::SupportingClasses::State do
   before(:each) do
@@ -7,7 +7,7 @@ describe AASM::SupportingClasses::State do
   end
 
   def new_state(options={})
-    AASM::SupportingClasses::State.new(@name, @options.merge(options))
+    AASM::SupportingClasses::State.new(@name, Conversation, @options.merge(options))
   end
 
   it 'should set the name' do

data/spec/unit/{state_transition_spec.rb → supporting_classes/state_transition_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+require 'spec_helper'
 
 describe 'transitions' do
 
@@ -25,7 +25,7 @@ describe 'transitions' do
     silencer.smile_any!.should be_true
     silencer.should be_smiling
   end
-  
+
 end
 
 describe AASM::SupportingClasses::StateTransition do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aasm
 version: !ruby/object:Gem::Version
-  version: 3.0.14
+  version: 3.0.15
   prerelease: 
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-06 00:00:00.000000000Z
+date: 2012-12-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70345873130760 !ruby/object:Gem::Requirement
+  requirement: &70247621982320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70345873130760
+  version_requirements: *70247621982320
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70345873130340 !ruby/object:Gem::Requirement
+  requirement: &70247621981900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70345873130340
+  version_requirements: *70247621981900
 - !ruby/object:Gem::Dependency
   name: sdoc
-  requirement: &70345873129920 !ruby/object:Gem::Requirement
+  requirement: &70247621981480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70345873129920
+  version_requirements: *70247621981480
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70345873129420 !ruby/object:Gem::Requirement
+  requirement: &70247621980980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -57,10 +57,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70345873129420
+  version_requirements: *70247621980980
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70345873129000 !ruby/object:Gem::Requirement
+  requirement: &70247621980560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +68,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70345873129000
+  version_requirements: *70247621980560
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70345873128540 !ruby/object:Gem::Requirement
+  requirement: &70247621980100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +79,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70345873128540
+  version_requirements: *70247621980100
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70345873128120 !ruby/object:Gem::Requirement
+  requirement: &70247621979680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,10 +90,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70345873128120
+  version_requirements: *70247621979680
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70345873127700 !ruby/object:Gem::Requirement
+  requirement: &70247621979260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,10 +101,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70345873127700
+  version_requirements: *70247621979260
 - !ruby/object:Gem::Dependency
   name: ruby-debug-completion
-  requirement: &70345873143660 !ruby/object:Gem::Requirement
+  requirement: &70247622010320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -112,7 +112,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70345873143660
+  version_requirements: *70247622010320
 description: AASM is a continuation of the acts as state machine rails plugin, built
   for plain Ruby objects.
 email: scott@elitists.net, ttilley@gmail.com, aasm@mt7.de
@@ -148,12 +148,14 @@ files:
 - spec/database.yml
 - spec/en.yml
 - spec/en_deprecated_style.yml
+- spec/models/argument.rb
 - spec/models/auth_machine.rb
 - spec/models/callback_new_dsl.rb
 - spec/models/callback_old_dsl.rb
 - spec/models/conversation.rb
 - spec/models/invalid_persistor.rb
 - spec/models/not_auto_loaded/process.rb
+- spec/models/parametrised_event.rb
 - spec/models/persistence.rb
 - spec/models/process_with_new_dsl.rb
 - spec/models/silencer.rb
@@ -164,18 +166,19 @@ files:
 - spec/schema.rb
 - spec/spec_helper.rb
 - spec/spec_helpers/models_spec_helper.rb
-- spec/unit/aasm_spec.rb
-- spec/unit/callbacks_new_dsl_spec.rb
-- spec/unit/callbacks_old_dsl_spec.rb
+- spec/unit/callbacks_spec.rb
 - spec/unit/complex_example_spec.rb
-- spec/unit/event_spec.rb
+- spec/unit/initial_state_spec.rb
 - spec/unit/inspection_spec.rb
-- spec/unit/localizer_spec.rb
 - spec/unit/memory_leak_spec.rb
 - spec/unit/new_dsl_spec.rb
 - spec/unit/persistence/active_record_persistence_spec.rb
-- spec/unit/state_spec.rb
-- spec/unit/state_transition_spec.rb
+- spec/unit/simple_example_spec.rb
+- spec/unit/subclassing_spec.rb
+- spec/unit/supporting_classes/event_spec.rb
+- spec/unit/supporting_classes/localizer_spec.rb
+- spec/unit/supporting_classes/state_spec.rb
+- spec/unit/supporting_classes/state_transition_spec.rb
 homepage: https://github.com/aasm/aasm
 licenses:
 - MIT
@@ -205,12 +208,14 @@ test_files:
 - spec/database.yml
 - spec/en.yml
 - spec/en_deprecated_style.yml
+- spec/models/argument.rb
 - spec/models/auth_machine.rb
 - spec/models/callback_new_dsl.rb
 - spec/models/callback_old_dsl.rb
 - spec/models/conversation.rb
 - spec/models/invalid_persistor.rb
 - spec/models/not_auto_loaded/process.rb
+- spec/models/parametrised_event.rb
 - spec/models/persistence.rb
 - spec/models/process_with_new_dsl.rb
 - spec/models/silencer.rb
@@ -221,15 +226,16 @@ test_files:
 - spec/schema.rb
 - spec/spec_helper.rb
 - spec/spec_helpers/models_spec_helper.rb
-- spec/unit/aasm_spec.rb
-- spec/unit/callbacks_new_dsl_spec.rb
-- spec/unit/callbacks_old_dsl_spec.rb
+- spec/unit/callbacks_spec.rb
 - spec/unit/complex_example_spec.rb
-- spec/unit/event_spec.rb
+- spec/unit/initial_state_spec.rb
 - spec/unit/inspection_spec.rb
-- spec/unit/localizer_spec.rb
 - spec/unit/memory_leak_spec.rb
 - spec/unit/new_dsl_spec.rb
 - spec/unit/persistence/active_record_persistence_spec.rb
-- spec/unit/state_spec.rb
-- spec/unit/state_transition_spec.rb
+- spec/unit/simple_example_spec.rb
+- spec/unit/subclassing_spec.rb
+- spec/unit/supporting_classes/event_spec.rb
+- spec/unit/supporting_classes/localizer_spec.rb
+- spec/unit/supporting_classes/state_spec.rb
+- spec/unit/supporting_classes/state_transition_spec.rb

data/spec/unit/aasm_spec.rb

@@ -1,301 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
-
-describe AASM, '- class level definitions' do
-  it 'should define a class level methods on its including class' do
-    Foo.should respond_to(:aasm_initial_state)
-    Foo.should respond_to(:aasm_state)
-    Foo.should respond_to(:aasm_event)
-    Foo.should respond_to(:aasm_states)
-    Foo.should respond_to(:aasm_states_for_select)
-    Foo.should respond_to(:aasm_events)
-    Foo.should respond_to(:aasm_from_states_for_state)
-  end
-end
-
-describe "naming" do
-  it "work for valid" do
-    Argument.aasm_states.should include(:invalid)
-    Argument.aasm_states.should include(:valid)
-
-    argument = Argument.new
-    argument.invalid?.should be_true
-    argument.aasm_current_state.should == :invalid
-
-    argument.valid!
-    argument.valid?.should be_true
-    argument.aasm_current_state.should == :valid
-  end
-end
-
-describe AASM, '- subclassing' do
-  it 'should have the parent states' do
-    Foo.aasm_states.each do |state|
-      FooTwo.aasm_states.should include(state)
-    end
-  end
-
-  it 'should not add the child states to the parent machine' do
-    Foo.aasm_states.should_not include(:foo)
-  end
-end
-
-
-describe AASM, '- aasm_states_for_select' do
-  it "should return a select friendly array of states" do
-    Foo.aasm_states_for_select.should == [['Open', 'open'], ['Closed', 'closed']]
-  end
-end
-
-describe "aasm_from_states_for_state" do
-  it "should return all from states for a state" do
-    froms = AuthMachine.aasm_from_states_for_state(:active)
-    [:pending, :passive, :suspended].each {|from| froms.should include(from)}
-  end
-
-  it "should return from states for a state for a particular transition only" do
-    froms = AuthMachine.aasm_from_states_for_state(:active, :transition => :unsuspend)
-    [:suspended].each {|from| froms.should include(from)}
-  end
-end
-
-describe AASM, '- instance level definitions' do
-  before(:each) do
-    @foo = Foo.new
-  end
-
-  it 'should define a state querying instance method on including class' do
-    @foo.should respond_to(:open?)
-  end
-
-  it 'should define an event! inance method' do
-    @foo.should respond_to(:close!)
-  end
-end
-
-describe AASM, '- initial states' do
-  before(:each) do
-    @foo = Foo.new
-    @bar = Bar.new
-  end
-
-  it 'should set the initial state' do
-    @foo.aasm_current_state.should == :open
-  end
-
-  it '#open? should be initially true' do
-    @foo.open?.should be_true
-  end
-
-  it '#closed? should be initially false' do
-    @foo.closed?.should be_false
-  end
-
-  it 'should use the first state defined if no initial state is given' do
-    @bar.aasm_current_state.should == :read
-  end
-
-  it 'should determine initial state from the Proc results' do
-    Banker.new(Banker::RICH - 1).aasm_current_state.should == :selling_bad_mortgages
-    Banker.new(Banker::RICH + 1).aasm_current_state.should == :retired
-  end
-end
-
-describe AASM, 'success callbacks' do
-  it 'should call the success callback if one was provided' do
-    foo = Foo.new
-    foo.should_receive(:success_callback)
-    foo.close!
-  end
-
-end
-
-describe AASM, '- event firing without persistence' do
-  it 'should attempt to persist if aasm_write_state is defined' do
-    foo = Foo.new
-
-    def foo.aasm_write_state
-    end
-
-    foo.should_receive(:aasm_write_state_without_persistence).twice
-
-    foo.close
-  end
-end
-
-describe AASM, '- getting events for a state' do
-  it '#aasm_events_for_current_state should use current state' do
-    foo = Foo.new
-    foo.should_receive(:aasm_current_state)
-    foo.aasm_events_for_current_state
-  end
-
-  it '#aasm_events_for_current_state should use aasm_events_for_state' do
-    foo = Foo.new
-    foo.stub!(:aasm_current_state).and_return(:foo)
-    foo.should_receive(:aasm_events_for_state).with(:foo)
-    foo.aasm_events_for_current_state
-  end
-end
-
-describe AASM, '- event callbacks' do
-  describe "with an error callback defined" do
-    before do
-      class Foo
-        aasm_event :safe_close, :success => :success_callback, :error => :error_callback do
-          transitions :to => :closed, :from => [:open]
-        end
-      end
-
-      @foo = Foo.new
-    end
-
-    it "should run error_callback if an exception is raised and error_callback defined" do
-      def @foo.error_callback(e)
-      end
-      @foo.stub!(:enter).and_raise(e=StandardError.new)
-      @foo.should_receive(:error_callback).with(e)
-      @foo.safe_close!
-    end
-
-    it "should raise NoMethodError if exceptionis raised and error_callback is declared but not defined" do
-      @foo.stub!(:enter).and_raise(StandardError)
-      lambda{@foo.safe_close!}.should raise_error(NoMethodError)
-    end
-
-    it "should propagate an error if no error callback is declared" do
-        @foo.stub!(:enter).and_raise("Cannot enter safe")
-        lambda{@foo.close!}.should raise_error(StandardError, "Cannot enter safe")
-    end
-  end
-
-  describe "with aasm_event_fired defined" do
-    before do
-      @foo = Foo.new
-      def @foo.aasm_event_fired(event, from, to)
-      end
-    end
-
-    it 'should call it for successful bang fire' do
-      @foo.should_receive(:aasm_event_fired).with(:close, :open, :closed)
-      @foo.close!
-    end
-
-    it 'should call it for successful non-bang fire' do
-      @foo.should_receive(:aasm_event_fired)
-      @foo.close
-    end
-
-    it 'should not call it for failing bang fire' do
-      @foo.stub!(:aasm_set_current_state_with_persistence).and_return(false)
-      @foo.should_not_receive(:aasm_event_fired)
-      @foo.close!
-    end
-  end
-
-  describe "with aasm_event_failed defined" do
-    before do
-      @foo = Foo.new
-      def @foo.aasm_event_failed(event, from)
-      end
-    end
-
-    it 'should call it when transition failed for bang fire' do
-      @foo.should_receive(:aasm_event_failed).with(:null, :open)
-      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)
-      lambda {@foo.null}.should raise_error(AASM::InvalidTransition)
-    end
-
-    it 'should not call it if persist fails for bang fire' do
-      @foo.stub!(:aasm_set_current_state_with_persistence).and_return(false)
-      @foo.should_receive(:aasm_event_failed)
-      @foo.close!
-    end
-  end
-end
-
-describe AASM, '- state actions' do
-  it "should call enter when entering state" do
-    foo = Foo.new
-    foo.should_receive(:enter)
-
-    foo.close
-  end
-
-  it "should call exit when exiting state" do
-    foo = Foo.new
-    foo.should_receive(:exit)
-
-    foo.close
-  end
-end
-
-
-describe Baz do
-  it "should have the same states as it's parent" do
-    Baz.aasm_states.should == Bar.aasm_states
-  end
-
-  it "should have the same events as it's parent" do
-    Baz.aasm_events.should == Bar.aasm_events
-  end
-end
-
-
-
-describe ChetanPatil do
-  it 'should transition to specified next state (sleeping to showering)' do
-    cp = ChetanPatil.new
-    cp.wakeup! :showering
-
-    cp.aasm_current_state.should == :showering
-  end
-
-  it 'should transition to specified next state (sleeping to working)' do
-    cp = ChetanPatil.new
-    cp.wakeup! :working
-
-    cp.aasm_current_state.should == :working
-  end
-
-  it 'should transition to default (first or showering) state' do
-    cp = ChetanPatil.new
-    cp.wakeup!
-
-    cp.aasm_current_state.should == :showering
-  end
-
-  it 'should transition to default state when on_transition invoked' do
-    cp = ChetanPatil.new
-    cp.dress!(nil, 'purple', 'dressy')
-
-    cp.aasm_current_state.should == :working
-  end
-
-  it 'should call on_transition method with args' do
-    cp = ChetanPatil.new
-    cp.wakeup! :showering
-
-    cp.should_receive(:wear_clothes).with('blue', 'jeans')
-    cp.dress! :working, 'blue', 'jeans'
-  end
-
-  it 'should call on_transition proc' do
-    cp = ChetanPatil.new
-    cp.wakeup! :showering
-
-    cp.should_receive(:wear_clothes).with('purple', 'slacks')
-    cp.dress!(:dating, 'purple', 'slacks')
-  end
-
-  it 'should call on_transition with an array of methods' do
-    cp = ChetanPatil.new
-    cp.wakeup! :showering
-    cp.should_receive(:condition_hair)
-    cp.should_receive(:fix_hair)
-    cp.dress!(:prettying_up)
-  end
-end