aasm 3.0.24 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a95f430c49bb639c7f0df66dc4ce2998636ef6a
-  data.tar.gz: 67293708b7b6fbaae038e97d229367d0ca074aa8
+  metadata.gz: 624aadcd0801dd7a8fb367c00d29ea7f5dccd6f3
+  data.tar.gz: 8f4d0f3978038a5a16fbe2696efbb1bb1f173603
 SHA512:
-  metadata.gz: 90707f9d64e5e03e9b58acde6081c9fe5239ff5599ece71a1909abad871dfdb99dfe8d1d63fae89a94d6f5a908754649387cb792f150d09a94f3a3acab2f2714
-  data.tar.gz: 20f34ec847d1fe22c59a7e077c5ccdd54f5ab6483dbab086544c7f7995f8df408a018344248ed9017ce9f8ed23f5d64dfe549855700d68c8797911edae9ceafc
+  metadata.gz: 9359ea9f090c25f5ae789f3ef47e3ad8829ebf7074e23cb9fee9738537f9207e96a9c5e6ddbbe592c02b2d80aac18df7673aa3427735b0766b6e9a34d4c62dd9
+  data.tar.gz: ddbfc65e9019d92b165f75ebf170c68682e829ed969d9c743df02dabaa03bc53ca6397d5d5b3bb5a8ebe66cae53621cefd8f74bffc4890536638112a6856bf88

data/.gitignore

@@ -6,8 +6,11 @@ coverage
 pkg
 rdoc
 Gemfile.lock
+gemfiles/*.lock
 spec/debug.log
 spec/*.db
 TODO
 .rvmrc
+.ruby-version
+.ruby-gemset
 alto

data/.travis.yml

@@ -1,11 +1,30 @@
 language: ruby
+
 rvm:
-  - 1.8.7
+  # - 1.8.7
   - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1.0
   # - jruby-18mode # JRuby in 1.8 mode
-  # - jruby-19mode # JRuby in 1.9 mode
-  - rbx-18mode
-  - rbx-19mode
+  - jruby-19mode # JRuby in 1.9 mode
+  - rbx-2.2.1
+
 services: mongodb
+
+gemfile:
+  - gemfiles/rails_3.2.gemfile
+  - gemfiles/rails_4.0.gemfile
+  - gemfiles/rails_4.1.gemfile
+
+matrix:
+  allow_failures:
+    - rvm: rbx-2.2.1
+    - rvm: jruby-19mode
+  exclude:
+    - { rvm: 1.8.7, gemfile: gemfiles/rails_4.0.gemfile }
+    - { rvm: 1.8.7, gemfile: gemfiles/rails_4.1.gemfile }
+    - { rvm: 1.9.2, gemfile: gemfiles/rails_4.0.gemfile }
+    - { rvm: 1.9.2, gemfile: gemfiles/rails_4.1.gemfile }
+    - { rvm: 1.9.3, gemfile: gemfiles/rails_4.1.gemfile }
+    - { rvm: jruby-19mode, gemfile: gemfiles/rails_4.1.gemfile }

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # CHANGELOG
 
+## 3.9.0 (not yet released)
+
+ * deprecated old aasm_* class methods (old-style DSL), in preparation for AASM v4.0.0
+
+## 3.1.0
+
+ * validating the current state (see [issue #95](https://github.com/aasm/aasm/issues/95), thanks to [@ivantsepp](https://github.com/ivantsepp))
+ * allow configuring behavior of nested transactions (see [issue #107](https://github.com/aasm/aasm/issues/107))
+ * support multiple guards per transition
+ * support event guards (see [issue #85](https://github.com/aasm/aasm/issues/85))
+ * support reading from- and to-state during on_transition callback (see [issue #100](https://github.com/aasm/aasm/issues/100))
+
+## 3.0.26
+
+ * support state.human_name (aliased to state.localized_name) (see [issue #105](https://github.com/aasm/aasm/issues/105))
+
+## 3.0.25
+
+ * initialize the state even if validation is skipped (for ActiveRecord and Mongoid persistence) (see [issue #103](https://github.com/aasm/aasm/issues/103), thanks to [@vfonic](https://github.com/vfonic) and [@aaronklaassen](https://github.com/aaronklaassen))
+
 ## 3.0.24
 
  * added support for event blocks (thanks to [@Intrepidd](https://github.com/Intrepidd))

data/Gemfile

@@ -1,3 +1,11 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
+
+gem "sqlite3",                          :platforms => :ruby
+gem "coveralls",                        :platforms => :ruby
+gem 'rubysl',                           :platforms => :rbx
+gem "jruby-openssl",                    :platforms => :jruby
+gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
+gem "rails", "3.2.15"
+gem 'mongoid' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3')
 
 gemspec

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2006-2012 Scott Barron
+Copyright (c) 2006-2014 Scott Barron
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,6 +1,9 @@
 # AASM - Ruby state machines
 
-[![Gem Version](https://badge.fury.io/rb/aasm.png)](http://badge.fury.io/rb/aasm) [![Build Status](https://secure.travis-ci.org/aasm/aasm.png?branch=master)](http://travis-ci.org/aasm/aasm) [![Code Climate](https://codeclimate.com/github/aasm/aasm.png)](https://codeclimate.com/github/aasm/aasm) [![Coverage Status](https://coveralls.io/repos/aasm/aasm/badge.png?branch=master)](https://coveralls.io/r/aasm/aasm)
+<a href="http://badge.fury.io/rb/aasm"><img src="https://badge.fury.io/rb/aasm@2x.png" alt="Gem Version" height="18"></a>
+[![Build Status](https://secure.travis-ci.org/aasm/aasm.png?branch=master)](http://travis-ci.org/aasm/aasm)
+[![Code Climate](https://codeclimate.com/github/aasm/aasm.png)](https://codeclimate.com/github/aasm/aasm)
+[![Coverage Status](https://coveralls.io/repos/aasm/aasm/badge.png?branch=master)](https://coveralls.io/r/aasm/aasm)
 
 This package contains AASM, a library for adding finite state machines to Ruby classes.
 
@@ -91,7 +94,7 @@ class Job
     state :sleeping, :initial => true, :before_enter => :do_something
     state :running
 
-    event :run, :after => Proc.new { |user| notify_somebody(user) } do
+    event :run, :after => Proc.new { do_afterwards } do
       transitions :from => :sleeping, :to => :running, :on_transition => Proc.new {|obj, *args| obj.set_process(*args) }
     end
 
@@ -114,7 +117,7 @@ class Job
     ...
   end
 
-  def notify_somebody(user)
+  def do_afterwards
     ...
   end
 
@@ -122,7 +125,7 @@ end
 ```
 
 In this case `do_something` is called before actually entering the state `sleeping`,
-while `notify_somebody` is called after the transition `run` (from `sleeping` to `running`)
+while `do_afterwards` is called after the transition `run` (from `sleeping` to `running`)
 is finished.
 
 Here you can see a list of all possible callbacks, together with their order of calling:
@@ -149,6 +152,15 @@ In this case the `set_process` would be called with `:defagmentation` argument.
 In case of an error during the event processing the error is rescued and passed to `:error`
 callback, which can handle it or re-raise it for further propagation.
 
+During the `:on_transition` callback (and reliably only then) you can access the
+originating state (the from-state) and the target state (the to state), like this:
+
+```ruby
+  def set_process(name)
+    logger.info "from #{aasm.from_state} to #{aasm.to_state}"
+  end
+```
+
 ### Guards
 
 Let's assume you want to allow particular transitions only if a defined condition is
@@ -190,6 +202,24 @@ job.may_sleep?  # => false
 job.sleep       # => raises AASM::InvalidTransition
 ```
 
+You can even provide a number of guards, which all have to succeed to proceed
+
+```ruby
+    def walked_the_dog?; ...; end
+
+    event :sleep do
+      transitions :from => :running, :to => :sleeping, :guards => [:cleaning_needed?, :walked_the_dog?]
+    end
+```
+
+If you want to provide guards for all transitions withing an event, you can use event guards
+
+```ruby
+    event :sleep, :guards => [:walked_the_dog?] do
+      transitions :from => :running, :to => :sleeping, :guards => [:cleaning_needed?]
+      transitions :from => :cleaning, :to => :sleeping
+    end
+```
 
 ### ActiveRecord
 
@@ -257,6 +287,7 @@ to include Mongoid::Document before you include AASM.
 class Job
   include Mongoid::Document
   include AASM
+  field :aasm_state
   aasm do
     ...
   end
@@ -325,9 +356,9 @@ class Job < ActiveRecord::Base
 
   aasm do
     state :sleeping, :initial => true
-    state :running
+    state :running, :after_commit => :notify_about_running_job
 
-    event :run, :after_commit => :notify_about_running_job do
+    event :run do
       transitions :from => :sleeping, :to => :running
     end
   end
@@ -338,6 +369,28 @@ class Job < ActiveRecord::Base
 end
 ```
 
+If you want to encapsulate state changes within an own transaction, the behavior
+of this nested transaction might be confusing. Take a look at
+[ActiveRecord Nested Transactions](http://api.rubyonrails.org/classes/ActiveRecord/Transactions/ClassMethods.html)
+if you want to know more about this. Nevertheless, AASM by default requires a new transaction
+`transaction(:requires_new => true)`. You can override this behavior by changing
+the configuration
+
+```ruby
+class Job < ActiveRecord::Base
+  include AASM
+
+  aasm :requires_new_transaction => false do
+    ...
+  end
+
+  ...
+end
+```
+
+which then leads to `transaction(:requires_new => false)`, the Rails default.
+
+
 ### Column name & migration
 
 As a default AASM uses the column `aasm_state` to store the states. You can override
@@ -417,7 +470,7 @@ gem 'aasm'
 
 ## Latest changes ##
 
-Look at the [CHANGELOG](https://github.com/aasm/aasm/blob/master/CHANGELOG.md) for details.
+Take a look at the [CHANGELOG](https://github.com/aasm/aasm/blob/master/CHANGELOG.md) for details about recent changes to the current version.
 
 ## Questions? ##
 
@@ -427,11 +480,11 @@ Feel free to
 * [ask a question on StackOverflow](http://stackoverflow.com) (tag with `aasm`)
 * send us a tweet [@aasm](http://twitter.com/aasm)
 
-## Authors ##
+## Maintainers ##
 
-* [Scott Barron](https://github.com/rubyist)
-* [Travis Tilley](https://github.com/ttilley)
-* [Thorsten Böttger](http://github.com/alto)
+* [Scott Barron](https://github.com/rubyist) (2006–2009, original author)
+* [Travis Tilley](https://github.com/ttilley) (2009–2011)
+* [Thorsten Böttger](http://github.com/alto) (since 2011)
 
 
 ## Warranty ##
@@ -443,7 +496,7 @@ purpose.
 
 ## License ##
 
-Copyright (c) 2006-2012 Scott Barron
+Copyright (c) 2006-2014 Scott Barron
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/aasm.gemspec

@@ -13,22 +13,21 @@ Gem::Specification.new do |s|
   s.date        = Time.now
   s.licenses    = ["MIT"]
 
-  s.add_development_dependency 'activerecord', '3.2.15'
+  # s.add_development_dependency 'activerecord', '3.2.15'
   # s.add_development_dependency 'activerecord', '4.0.1'
 
-  s.add_development_dependency 'mongoid' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3')
+  # s.add_development_dependency 'mongoid' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3')
   s.add_development_dependency 'rake'
   s.add_development_dependency 'sdoc'
-  s.add_development_dependency 'rspec', '~> 2.14'
+  s.add_development_dependency 'rspec', '>= 2.14'
   s.add_development_dependency 'rr'
-  s.add_development_dependency 'sqlite3'
+  # s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'minitest'
   # s.add_development_dependency 'debugger'
   # s.add_development_dependency 'pry'
-  s.add_development_dependency 'ruby-debug-completion'
 
   s.add_development_dependency 'mime-types', '~> 1.25' # needed by coveralls (>= 2.0 needs Ruby >=1.9.2)
-  s.add_development_dependency 'coveralls'
+  # s.add_development_dependency 'coveralls'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/gemfiles/rails_3.2.gemfile

@@ -0,0 +1,12 @@
+source "https://rubygems.org"
+
+gem "sqlite3",                          :platforms => :ruby
+gem "coveralls"
+gem 'rubysl',                           :platforms => :rbx
+gem 'rubinius-developer_tools',         :platforms => :rbx
+gem "jruby-openssl",                    :platforms => :jruby
+gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
+gem "rails", "3.2.16"
+gem 'mongoid' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3')
+
+gemspec :path => "../"

data/gemfiles/rails_4.0.gemfile

@@ -0,0 +1,11 @@
+source "https://rubygems.org"
+
+gem "sqlite3",                          :platforms => :ruby
+gem "coveralls"
+gem 'rubysl',                           :platforms => :rbx
+gem 'rubinius-developer_tools',         :platforms => :rbx
+gem "jruby-openssl",                    :platforms => :jruby
+gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
+gem "rails", "4.0.2"
+
+gemspec :path => "../"

data/gemfiles/rails_4.1.gemfile

@@ -0,0 +1,11 @@
+source "https://rubygems.org"
+
+gem "sqlite3",                          :platforms => :ruby
+gem "coveralls"
+gem 'rubysl',                           :platforms => :rbx
+gem 'rubinius-developer_tools',         :platforms => :rbx
+gem "jruby-openssl",                    :platforms => :jruby
+gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
+gem "rails", "4.1.0.beta1"
+
+gemspec :path => "../"

data/lib/aasm/aasm.rb

@@ -26,52 +26,56 @@ module AASM
       @aasm
     end
 
-    # TODO: maybe better: aasm.initial_state
+    # TODO remove this method in v4.0.0
     def aasm_initial_state(set_state=nil)
       if set_state
-        # deprecated way to set the value
+        warn ".aasm_initial_state(:name) is deprecated and will be removed in version 4.0.0; please use .aasm.initial_state = :name instead!"
         AASM::StateMachine[self].initial_state = set_state
       else
+        warn ".aasm_initial_state is deprecated and will be removed in version 4.0.0; please use .aasm.initial_state instead!"
         AASM::StateMachine[self].initial_state
       end
     end
 
-    # is this better?: aasm.states.name.from_states
+    # TODO remove this method in v4.0.0
     def aasm_from_states_for_state(state, options={})
-      if options[:transition]
-        aasm.events[options[:transition]].transitions_to_state(state).flatten.map(&:from).flatten
-      else
-        aasm.events.map {|k,v| v.transitions_to_state(state)}.flatten.map(&:from).flatten
-      end
+      warn ".aasm_from_states_for_state is deprecated and will be removed in version 4.0.0; please use .aasm.from_states_for_state instead!"
+      aasm.from_states_for_state(state, options)
     end
 
-    # deprecated
+    # TODO remove this method in v4.0.0
     def aasm_initial_state=(state)
+      warn ".aasm_initial_state= is deprecated and will be removed in version 4.0.0"
       AASM::StateMachine[self].initial_state = state
     end
 
-    # deprecated
+    # TODO remove this method in v4.0.0
     def aasm_state(name, options={})
+      warn ".aasm_state is deprecated and will be removed in version 4.0.0; please use .aasm.state instead!"
       aasm.state(name, options)
     end
 
-    # deprecated
+    # TODO remove this method in v4.0.0
     def aasm_event(name, options = {}, &block)
+      warn ".aasm_event is deprecated and will be removed in version 4.0.0; please use .aasm.event instead!"
       aasm.event(name, options, &block)
     end
 
-    # deprecated
+    # TODO remove this method in v4.0.0
     def aasm_states
+      warn ".aasm_states is deprecated and will be removed in version 4.0.0; please use .aasm.states instead!"
       aasm.states
     end
 
-    # deprecated
+    # TODO remove this method in v4.0.0
     def aasm_events
+      warn ".aasm_events is deprecated and will be removed in version 4.0.0; please use .aasm.events instead!"
       aasm.events
     end
 
-    # deprecated
+    # TODO remove this method in v4.0.0
     def aasm_states_for_select
+      warn ".aasm_states_for_select is deprecated and will be removed in version 4.0.0; please use .aasm.states_for_select instead!"
       aasm.states_for_select
     end
 
@@ -103,46 +107,46 @@ module AASM
     true
   end
 
-  # deprecated
+    # TODO remove this method in v4.0.0
   def aasm_current_state
-    # warn "#aasm_current_state is deprecated and will be removed in version 3.2.0; please use #aasm.state instead!"
+    warn "#aasm_current_state is deprecated and will be removed in version 4.0.0; please use #aasm.current_state instead!"
     aasm.current_state
   end
 
-  # deprecated
+    # TODO remove this method in v4.0.0
   def aasm_enter_initial_state
-    # warn "#aasm_enter_initial_state is deprecated and will be removed in version 3.2.0; please use #aasm.enter_initial_state instead!"
+    warn "#aasm_enter_initial_state is deprecated and will be removed in version 4.0.0; please use #aasm.enter_initial_state instead!"
     aasm.enter_initial_state
   end
 
-  # deprecated
+    # TODO remove this method in v4.0.0
   def aasm_events_for_current_state
-    # warn "#aasm_events_for_current_state is deprecated and will be removed in version 3.2.0; please use #aasm.events instead!"
+    warn "#aasm_events_for_current_state is deprecated and will be removed in version 4.0.0; please use #aasm.events(aasm.current_state) instead!"
     aasm.events(aasm.current_state)
   end
 
-  # deprecated
+    # TODO remove this method in v4.0.0
   def aasm_permissible_events_for_current_state
-    # warn "#aasm_permissible_events_for_current_state is deprecated and will be removed in version 3.2.0; please use #aasm.permissible_events instead!"
+    warn "#aasm_permissible_events_for_current_state is deprecated and will be removed in version 4.0.0; please use #aasm.permissible_events instead!"
     aasm.permissible_events
   end
 
-  # deprecated
+    # TODO remove this method in v4.0.0
   def aasm_events_for_state(state_name)
-    # warn "#aasm_events_for_state(state_name) is deprecated and will be removed in version 3.2.0; please use #aasm.events(state_name) instead!"
+    warn "#aasm_events_for_state(state_name) is deprecated and will be removed in version 4.0.0; please use #aasm.events(state_name) instead!"
     aasm.events(state_name)
   end
 
-  # deprecated
+    # TODO remove this method in v4.0.0
   def aasm_human_state
-    # warn "#aasm_human_state is deprecated and will be removed in version 3.2.0; please use #aasm.human_state instead!"
+    warn "#aasm_human_state is deprecated and will be removed in version 4.0.0; please use #aasm.human_state instead!"
     aasm.human_state
   end
 
 private
 
   def aasm_fire_event(event_name, options, *args, &block)
-    event = self.class.aasm_events[event_name]
+    event = self.class.aasm.events[event_name]
     begin
       old_state = aasm.state_object_for_name(aasm.current_state)
       old_state.fire_callbacks(:exit, self)

data/lib/aasm/base.rb

@@ -5,33 +5,31 @@ module AASM
       @clazz = clazz
       @state_machine = AASM::StateMachine[@clazz]
       @state_machine.config.column = options[:column].to_sym if options[:column]
+      @options = options
 
-      if options.key?(:whiny_transitions)
-        @state_machine.config.whiny_transitions = options[:whiny_transitions]
-      elsif @state_machine.config.whiny_transitions.nil?
-        @state_machine.config.whiny_transitions = true # this is the default, so let's cry
-      end
+      # let's cry if the transition is invalid
+      configure :whiny_transitions, true
 
-      if options.key?(:create_scopes)
-        @state_machine.config.create_scopes = options[:create_scopes]
-      elsif @state_machine.config.create_scopes.nil?
-        @state_machine.config.create_scopes = true # this is the default, so let's create scopes
-      end
+      # create named scopes for each state
+      configure :create_scopes, true
 
-      if options.key?(:skip_validation_on_save)
-        @state_machine.config.skip_validation_on_save = options[:skip_validation_on_save]
-      elsif @state_machine.config.skip_validation_on_save.nil?
-        @state_machine.config.skip_validation_on_save = false # this is the default, so don't store any new state if the model is invalid
-      end
+      # don't store any new state if the model is invalid
+      configure :skip_validation_on_save, false
+
+      # use requires_new for nested transactions
+      configure :requires_new_transaction, true
     end
 
-    def initial_state
-      @state_machine.initial_state
+    def initial_state(new_initial_state=nil)
+      if new_initial_state
+        @state_machine.initial_state = new_initial_state
+      else
+        @state_machine.initial_state
+      end
     end
 
     # define a state
     def state(name, options={})
-      # @clazz.aasm_state(name, options)
       @state_machine.add_state(name, @clazz, options)
       @state_machine.initial_state = name if options[:initial] || !@state_machine.initial_state
 
@@ -46,8 +44,6 @@ module AASM
 
     # define an event
     def event(name, options={}, &block)
-      # @clazz.aasm_event(name, options, &block)
-
       @state_machine.events[name] = AASM::Event.new(name, options, &block)
 
       # an addition over standard aasm so that, before firing an event, you can ask
@@ -78,5 +74,24 @@ module AASM
       states.map { |state| state.for_select }
     end
 
+    def from_states_for_state(state, options={})
+      if options[:transition]
+        events[options[:transition]].transitions_to_state(state).flatten.map(&:from).flatten
+      else
+        events.map {|k,v| v.transitions_to_state(state)}.flatten.map(&:from).flatten
+      end
+    end
+
+    private
+
+    def configure(key, default_value)
+      @state_machine.config.send(:new_ostruct_member, key)
+      if @options.key?(key)
+        @state_machine.config.send("#{key}=", @options[key])
+      elsif @state_machine.config.send(key).nil?
+        @state_machine.config.send("#{key}=", default_value)
+      end
+    end
+
   end
 end

data/lib/aasm/event.rb

@@ -6,6 +6,7 @@ module AASM
     def initialize(name, options = {}, &block)
       @name = name
       @transitions = []
+      @guards = Array(options[:guard] || options[:guards])
       update(options, &block)
     end
 
@@ -36,9 +37,9 @@ module AASM
       @transitions.select { |t| t.to == state }
     end
 
-    # deprecated
+    # TODO remove this method in v4.0.0
     def all_transitions
-      # warn "Event#all_transitions is deprecated and will be removed in version 3.2.0; please use Event#transitions instead!"
+      warn "Event#all_transitions is deprecated and will be removed in version 4.0.0; please use Event#transitions instead!"
       transitions
     end
 
@@ -54,8 +55,31 @@ module AASM
       end
     end
 
+    ## DSL interface
+    def transitions(definitions=nil)
+      if definitions # define new transitions
+        # Create a separate transition for each from-state to the given state
+        Array(definitions[:from]).each do |s|
+          @transitions << AASM::Transition.new(attach_event_guards(definitions.merge(:from => s.to_sym)))
+        end
+        # Create a transition if :to is specified without :from (transitions from ANY state)
+        if @transitions.empty? && definitions[:to]
+          @transitions << AASM::Transition.new(attach_event_guards(definitions))
+        end
+      end
+      @transitions
+    end
+
   private
 
+    def attach_event_guards(definitions)
+      unless @guards.empty?
+        given_guards = Array(definitions.delete(:guard) || definitions.delete(:guards))
+        definitions[:guards] = given_guards + @guards
+      end
+      definitions
+    end
+
     def update(options = {}, &block)
       @options = options
       if block then
@@ -68,7 +92,7 @@ module AASM
     def _fire(obj, test, to_state=nil, *args)
       result = test ? false : nil
       if @transitions.map(&:from).any?
-        transitions = @transitions.select { |t| t.from == obj.aasm_current_state }
+        transitions = @transitions.select { |t| t.from == obj.aasm.current_state }
         return result if transitions.size == 0
       else
         transitions = @transitions
@@ -106,19 +130,6 @@ module AASM
       end
     end
 
-    ## DSL interface
-    def transitions(trans_opts=nil)
-      if trans_opts # define new transitions
-        # Create a separate transition for each from state to the given state
-        Array(trans_opts[:from]).each do |s|
-          @transitions << AASM::Transition.new(trans_opts.merge({:from => s.to_sym}))
-        end
-        # Create a transition if to is specified without from (transitions from ANY state)
-        @transitions << AASM::Transition.new(trans_opts) if @transitions.empty? && trans_opts[:to]
-      end
-      @transitions
-    end
-
     [:after, :before, :error, :success].each do |callback_name|
       define_method callback_name do |*args, &block|
         options[callback_name] = Array(options[callback_name])

data/lib/aasm/instance_base.rb

@@ -1,6 +1,8 @@
 module AASM
   class InstanceBase
 
+    attr_accessor :from_state, :to_state
+
     def initialize(instance)
       @instance = instance
     end
@@ -15,7 +17,7 @@ module AASM
     end
 
     def enter_initial_state
-      state_name = determine_state_name(@instance.class.aasm_initial_state)
+      state_name = determine_state_name(@instance.class.aasm.initial_state)
       state_object = state_object_for_name(state_name)
 
       state_object.fire_callbacks(:before_enter, @instance)