aasm 3.1.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 624aadcd0801dd7a8fb367c00d29ea7f5dccd6f3
-  data.tar.gz: 8f4d0f3978038a5a16fbe2696efbb1bb1f173603
+  metadata.gz: 3953eaa965802447de8e3783a35c91dcc89e87a4
+  data.tar.gz: 1b70e517fc29f1fad325a0a46d126cab2eebf029
 SHA512:
-  metadata.gz: 9359ea9f090c25f5ae789f3ef47e3ad8829ebf7074e23cb9fee9738537f9207e96a9c5e6ddbbe592c02b2d80aac18df7673aa3427735b0766b6e9a34d4c62dd9
-  data.tar.gz: ddbfc65e9019d92b165f75ebf170c68682e829ed969d9c743df02dabaa03bc53ca6397d5d5b3bb5a8ebe66cae53621cefd8f74bffc4890536638112a6856bf88
+  metadata.gz: 220319a5169ac9f1928a5beaaacf81c72d47ab3cf972dea079633fcc82ac8bfa3d42c97c0ffa38b9526e1a50b729ba331cc7ae29a1267dddd4d3e9ae52a7cd70
+  data.tar.gz: 0eff6b102e298af64e76e6f71cff21989d260c626efada6ed5dc763d092d351fac20a9696f1882ab8110e535b20897def8c5c7d2c013d7df82e4b6c437590a2f

data/.gitignore

@@ -14,3 +14,6 @@ TODO
 .ruby-version
 .ruby-gemset
 alto
+.rspec
+.bundle
+

data/.travis.yml

@@ -5,7 +5,7 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1
   # - jruby-18mode # JRuby in 1.8 mode
   - jruby-19mode # JRuby in 1.9 mode
   - rbx-2.2.1
@@ -22,9 +22,15 @@ matrix:
     - 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 }
+    - 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

@@ -4,6 +4,19 @@
 
  * deprecated old aasm_* class methods (old-style DSL), in preparation for AASM v4.0.0
 
+## 3.2.1
+
+ * bugfix: permissible_events and events did not contain events with an empty "from" transition (see [issue #140](https://github.com/aasm/aasm/issues/140) and [issue #141](https://github.com/aasm/aasm/issues/141), thanks to [@daniel-rikowski](https://github.com/daniel-rikowski))
+
+## 3.2.0
+
+ * support [Sequel](http://sequel.jeremyevans.net/) (see [issue #119](https://github.com/aasm/aasm/issues/119), thanks to [@godfat](https://github.com/godfat))
+ * may not fire an unknown event (see [issue #128](https://github.com/aasm/aasm/issues/128)
+
+## 3.1.1
+
+ * bugfix: don't require ActiveRecord for localizing AASM event and state name (see [issue #113](https://github.com/aasm/aasm/issues/113), thanks to [@silentshade](https://github.com/silentshade))
+
 ## 3.1.0
 
  * validating the current state (see [issue #95](https://github.com/aasm/aasm/issues/95), thanks to [@ivantsepp](https://github.com/ivantsepp))

data/Gemfile

@@ -5,7 +5,8 @@ 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 "rails", "3.2.18"
 gem 'mongoid' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3')
+gem 'sequel'
 
 gemspec

data/README.md

@@ -1,7 +1,7 @@
 # AASM - Ruby state machines
 
 <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)
+[![Build Status](https://travis-ci.org/aasm/aasm.svg?branch=master)](https://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)
 
@@ -278,6 +278,23 @@ class Job < ActiveRecord::Base
 end
 ```
 
+### Sequel
+
+AASM also supports [Sequel](http://sequel.jeremyevans.net/) besides _ActiveRecord_ and _Mongoid_.
+
+```ruby
+class Job < Sequel::Model
+  include AASM
+
+  aasm do # default column: aasm_state
+    ...
+  end
+end
+```
+
+However it's not yet as feature complete as _ActiveRecord_. For example, there are
+scopes defined yet. See [Automatic Scopes](#automatic-scopes).
+
 ### Mongoid
 
 AASM also supports persistence to Mongodb if you're using Mongoid. Make sure
@@ -308,7 +325,7 @@ class Job < ActiveRecord::Base
     state :cleaning
   end
 
-  def sleeping
+  def self.sleeping
     "This method name is in already use"
   end
 end
@@ -317,10 +334,10 @@ end
 ```ruby
 class JobsController < ApplicationController
   def index
-    @running_jobs = jobs.running
-    @recent_cleaning_jobs = jobs.cleaning.where('created_at >=  ?', 3.days.ago)
+    @running_jobs = Job.running
+    @recent_cleaning_jobs = Job.cleaning.where('created_at >=  ?', 3.days.ago)
 
-    # @sleeping_jobs = jobs.sleeping   #=> "This method name is in already use"
+    # @sleeping_jobs = Job.sleeping   #=> "This method name is in already use"
   end
 end
 ```
@@ -431,13 +448,13 @@ Given the `Job` class from above:
 ```ruby
 job = Job.new
 
-job.aasm.states
+job.aasm.states.map(&:name)
 => [:sleeping, :running, :cleaning]
 
-job.aasm.states(:permissible => true)
+job.aasm.states(:permissible => true).map(&:name)
 => [:running]
 job.run
-job.aasm.states(:permissible => true)
+job.aasm.states(:permissible => true).map(&:name)
 => [:cleaning, :sleeping]
 
 job.aasm.events

data/aasm.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   # 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 'minitest'

data/gemfiles/rails_3.2.gemfile

@@ -6,7 +6,8 @@ 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 "rails", "3.2.18"
 gem 'mongoid' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3')
+gem 'sequel'
 
 gemspec :path => "../"

data/gemfiles/rails_4.0.gemfile

@@ -6,6 +6,11 @@ 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"
+gem "rails", "4.0.5"
+
+# mongoid is not yet compatible with Rails >= 4
+# gem 'mongoid' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3')
+
+gem 'sequel'
 
 gemspec :path => "../"

data/gemfiles/rails_4.1.gemfile

@@ -6,6 +6,11 @@ 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"
+gem "rails", "4.1.1"
 
-gemspec :path => "../"
+# mongoid is not yet compatible with Rails >= 4
+# gem 'mongoid' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3')
+
+gem 'sequel'
+
+gemspec :path => "../"

data/lib/aasm/aasm.rb

@@ -5,7 +5,7 @@ module AASM
 
     # do not overwrite existing state machines, which could have been created by
     # inheritance, see class method inherited
-    AASM::StateMachine[base] ||= AASM::StateMachine.new('')
+    AASM::StateMachine[base] ||= AASM::StateMachine.new
 
     AASM::Persistence.load_persistence(base)
     super

data/lib/aasm/base.rb

@@ -1,9 +1,9 @@
 module AASM
   class Base
 
-    def initialize(clazz, options={}, &block)
-      @clazz = clazz
-      @state_machine = AASM::StateMachine[@clazz]
+    def initialize(klass, options={}, &block)
+      @klass = klass
+      @state_machine = AASM::StateMachine[@klass]
       @state_machine.config.column = options[:column].to_sym if options[:column]
       @options = options
 
@@ -30,15 +30,14 @@ module AASM
 
     # define a state
     def state(name, options={})
-      @state_machine.add_state(name, @clazz, options)
-      @state_machine.initial_state = name if options[:initial] || !@state_machine.initial_state
+      @state_machine.add_state(name, @klass, options)
 
-      @clazz.send(:define_method, "#{name.to_s}?") do
+      @klass.send(:define_method, "#{name.to_s}?") do
         aasm.current_state == name
       end
 
-      unless @clazz.const_defined?("STATE_#{name.to_s.upcase}")
-        @clazz.const_set("STATE_#{name.to_s.upcase}", name)
+      unless @klass.const_defined?("STATE_#{name.to_s.upcase}")
+        @klass.const_set("STATE_#{name.to_s.upcase}", name)
       end
     end
 
@@ -49,15 +48,15 @@ module AASM
       # an addition over standard aasm so that, before firing an event, you can ask
       # may_event? and get back a boolean that tells you whether the guard method
       # on the transition will let this happen.
-      @clazz.send(:define_method, "may_#{name.to_s}?") do |*args|
+      @klass.send(:define_method, "may_#{name.to_s}?") do |*args|
         aasm.may_fire_event?(name, *args)
       end
 
-      @clazz.send(:define_method, "#{name.to_s}!") do |*args, &block|
+      @klass.send(:define_method, "#{name.to_s}!") do |*args, &block|
         aasm_fire_event(name, {:persist => true}, *args, &block)
       end
 
-      @clazz.send(:define_method, "#{name.to_s}") do |*args, &block|
+      @klass.send(:define_method, "#{name.to_s}") do |*args, &block|
         aasm_fire_event(name, {:persist => false}, *args, &block)
       end
     end

data/lib/aasm/event.rb

@@ -26,7 +26,7 @@ module AASM
     end
 
     def transitions_from_state(state)
-      @transitions.select { |t| t.from == state }
+      @transitions.select { |t| t.from.nil? or t.from == state }
     end
 
     def transitions_to_state?(state)

data/lib/aasm/instance_base.rb

@@ -75,8 +75,11 @@ module AASM
     end
 
     def may_fire_event?(name, *args)
-      event = @instance.class.aasm.events[name]
-      event.may_fire?(@instance, *args)
+      if event = @instance.class.aasm.events[name]
+        event.may_fire?(@instance, *args)
+      else
+        false # unknown event
+      end
     end
 
     def set_current_state_with_persistence(state)

data/lib/aasm/localizer.rb

@@ -47,7 +47,7 @@ module AASM
 
     def ancestors_list(klass)
       klass.ancestors.select do |ancestor|
-        ancestor.respond_to?(:model_name) unless ancestor == ActiveRecord::Base
+        ancestor.respond_to?(:model_name) unless ancestor.name == 'ActiveRecord::Base'
       end
     end
   end

data/lib/aasm/persistence/base.rb

@@ -87,26 +87,26 @@ module AASM
     # make sure to create a (named) scope for each state
     def state_with_scope(name, *args)
       state_without_scope(name, *args)
-      if AASM::StateMachine[@clazz].config.create_scopes && !@clazz.respond_to?(name)
-        if @clazz.ancestors.map {|klass| klass.to_s}.include?("ActiveRecord::Base")
+      if AASM::StateMachine[@klass].config.create_scopes && !@klass.respond_to?(name)
+        if @klass.ancestors.map {|klass| klass.to_s}.include?("ActiveRecord::Base")
 
-          conditions = {"#{@clazz.table_name}.#{@clazz.aasm_column}" => name.to_s}
+          conditions = {"#{@klass.table_name}.#{@klass.aasm_column}" => name.to_s}
           if ActiveRecord::VERSION::MAJOR >= 4
-            @clazz.class_eval do
+            @klass.class_eval do
               scope name, lambda { where(conditions) }
             end
           elsif ActiveRecord::VERSION::MAJOR >= 3
-            @clazz.class_eval do
+            @klass.class_eval do
               scope name, where(conditions)
             end
           else
-            @clazz.class_eval do
+            @klass.class_eval do
               named_scope name, :conditions => conditions
             end
           end
-        elsif @clazz.ancestors.map {|klass| klass.to_s}.include?("Mongoid::Document")
-          scope_options = lambda { @clazz.send(:where, {@clazz.aasm_column.to_sym => name.to_s}) }
-          @clazz.send(:scope, name, scope_options)
+        elsif @klass.ancestors.map {|klass| klass.to_s}.include?("Mongoid::Document")
+          scope_options = lambda { @klass.send(:where, {@klass.aasm_column.to_sym => name.to_s}) }
+          @klass.send(:scope, name, scope_options)
         end
       end
     end

data/lib/aasm/persistence/sequel_persistence.rb

@@ -0,0 +1,108 @@
+module AASM
+  module Persistence
+    module SequelPersistence
+      def self.included(base)
+        base.send(:include, AASM::Persistence::Base)
+        base.send(:include, AASM::Persistence::SequelPersistence::InstanceMethods)
+      end
+
+      module InstanceMethods
+        def before_validation
+          aasm_ensure_initial_state
+          super
+        end
+
+        def before_create
+          aasm_ensure_initial_state
+          super
+        end
+
+        # Returns the value of the aasm_column - called from <tt>aasm.current_state</tt>
+        #
+        # If it's a new record, and the aasm state column is blank it returns the initial state
+        #
+        #   class Foo < Sequel::Model
+        #     include AASM
+        #     aasm :column => :status do
+        #       state :opened
+        #       state :closed
+        #     end
+        #   end
+        #
+        #   foo = Foo.new
+        #   foo.current_state # => :opened
+        #   foo.close
+        #   foo.current_state # => :closed
+        #
+        #   foo = Foo[1]
+        #   foo.current_state # => :opened
+        #   foo.aasm_state = nil
+        #   foo.current_state # => nil
+        #
+        # NOTE: intended to be called from an event
+        #
+        # This allows for nil aasm states - be sure to add validation to your model
+        def aasm_read_state
+          state = send(self.class.aasm_column)
+          if new? && state.to_s.strip.empty?
+            aasm.determine_state_name(self.class.aasm.initial_state)
+          elsif state.nil?
+            nil
+          else
+            state.to_sym
+          end
+        end
+
+        # Ensures that if the aasm_state column is nil and the record is new
+        # that the initial state gets populated before validation on create
+        #
+        #   foo = Foo.new
+        #   foo.aasm_state # => nil
+        #   foo.valid?
+        #   foo.aasm_state # => "open" (where :open is the initial state)
+        #
+        #
+        #   foo = Foo.find(:first)
+        #   foo.aasm_state # => 1
+        #   foo.aasm_state = nil
+        #   foo.valid?
+        #   foo.aasm_state # => nil
+        #
+        def aasm_ensure_initial_state
+          aasm.enter_initial_state if
+            send(self.class.aasm_column).to_s.strip.empty?
+        end
+
+        # Writes <tt>state</tt> to the state column and persists it to the database
+        #
+        #   foo = Foo[1]
+        #   foo.aasm.current_state # => :opened
+        #   foo.close!
+        #   foo.aasm.current_state # => :closed
+        #   Foo[1].aasm.current_state # => :closed
+        #
+        # NOTE: intended to be called from an event
+        def aasm_write_state state
+          aasm_column = self.class.aasm_column
+          update_ony({aasm_column => state.to_s}, aasm_column)
+        end
+
+        # Writes <tt>state</tt> to the state column, but does not persist it to the database
+        #
+        #   foo = Foo[1]
+        #   foo.aasm.current_state # => :opened
+        #   foo.close
+        #   foo.aasm.current_state # => :closed
+        #   Foo[1].aasm.current_state # => :opened
+        #   foo.save
+        #   foo.aasm.current_state # => :closed
+        #   Foo[1].aasm.current_state # => :closed
+        #
+        # NOTE: intended to be called from an event
+        def aasm_write_state_without_persistence state
+          send("#{self.class.aasm_column}=", state.to_s)
+        end
+      end
+    end
+  end
+end

data/lib/aasm/persistence.rb

@@ -12,6 +12,9 @@ module AASM
         elsif hierarchy.include?("Mongoid::Document")
           require_files_for(:mongoid)
           base.send(:include, AASM::Persistence::MongoidPersistence)
+        elsif hierarchy.include?("Sequel::Model")
+          require_files_for(:sequel)
+          base.send(:include, AASM::Persistence::SequelPersistence)
         end
       end
 

data/lib/aasm/state.rb

@@ -2,9 +2,9 @@ module AASM
   class State
     attr_reader :name, :options
 
-    def initialize(name, clazz, options={})
+    def initialize(name, klass, options={})
       @name = name
-      @clazz = clazz
+      @klass = klass
       update(options)
     end
 
@@ -48,7 +48,7 @@ module AASM
     end
 
     def localized_name
-      AASM::Localizer.new.human_state_name(@clazz, self)
+      AASM::Localizer.new.human_state_name(@klass, self)
     end
     alias human_name localized_name
 

data/lib/aasm/state_machine.rb

@@ -2,20 +2,17 @@ module AASM
   class StateMachine
 
     # the following two methods provide the storage of all state machines
-    def self.[](clazz)
-      (@machines ||= {})[clazz.to_s]
+    def self.[](klass)
+      (@machines ||= {})[klass.to_s]
     end
 
-    def self.[]=(clazz, machine)
-      (@machines ||= {})[clazz.to_s] = machine
+    def self.[]=(klass, machine)
+      (@machines ||= {})[klass.to_s] = machine
     end
 
     attr_accessor :states, :events, :initial_state, :config
-    attr_reader :name
 
-    # QUESTION: what's the name for? [alto, 2012-11-28]
-    def initialize(name)
-      @name = name
+    def initialize
       @initial_state = nil
       @states = []
       @events = {}
@@ -29,8 +26,15 @@ module AASM
       @events = @events.dup
     end
 
-    def add_state(name, clazz, options)
-      @states << AASM::State.new(name, clazz, options) unless @states.include?(name)
+    def add_state(name, klass, options)
+      set_initial_state(name, options)
+      @states << AASM::State.new(name, klass, options) unless @states.include?(name)
+    end
+
+    private
+
+    def set_initial_state(name, options)
+      @initial_state = name if options[:initial] || !initial_state
     end
 
   end # StateMachine

data/lib/aasm/version.rb

@@ -1,3 +1,3 @@
 module AASM
-  VERSION = "3.1.0"
+  VERSION = "3.2.1"
 end

data/spec/unit/complex_example_spec.rb

@@ -72,4 +72,13 @@ describe 'when being unsuspended' do
 
     expect(auth.aasm.current_state).to eq(:passive)
   end
+
+  it "should be able to fire known events" do
+    expect(auth.aasm.may_fire_event?(:activate)).to be_true
+  end
+
+  it "should not be able to fire unknown events" do
+    expect(auth.aasm.may_fire_event?(:unknown)).to be_false
+  end
+
 end

data/spec/unit/event_spec.rb

@@ -58,6 +58,23 @@ describe 'transition inspection' do
   end
 end
 
+describe 'transition inspection without from' do
+  let(:event) do
+    AASM::Event.new(:run) do
+      transitions :to => :running
+    end
+  end
+
+  it 'should support inspecting transitions from other states' do
+    expect(event.transitions_from_state(:sleeping).map(&:to)).to eq([:running])
+    expect(event.transitions_from_state?(:sleeping)).to be_true
+
+    expect(event.transitions_from_state(:cleaning).map(&:to)).to eq([:running])
+    expect(event.transitions_from_state?(:cleaning)).to be_true
+  end
+
+end
+
 describe 'firing an event' do
   it 'should return nil if the transitions are empty' do
     obj = double('object', :aasm => double('aasm', :current_state => 'open'))

data/spec/unit/memory_leak_spec.rb

@@ -2,8 +2,8 @@
 
 # describe "state machines" do
 
-#   def number_of_objects(clazz)
-#     ObjectSpace.each_object(clazz) {}
+#   def number_of_objects(klass)
+#     ObjectSpace.each_object(klass) {}
 #   end
 
 #   def machines

data/spec/unit/persistence/mongoid_persistance_spec.rb

@@ -147,6 +147,6 @@ describe 'mongoid', :if => Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version
     end
 
   rescue LoadError
-    puts "Not running Mongoid specs because mongoid gem if not installed!!!"
+    puts "Not running Mongoid specs because mongoid gem is not installed!!!"
   end
 end

data/spec/unit/persistence/sequel_persistence_spec.rb

@@ -0,0 +1,103 @@
+
+describe 'sequel' do
+  begin
+    require 'sequel'
+    require 'logger'
+    require 'spec_helper'
+
+    before(:all) do
+      db = Sequel.sqlite
+      # if you want to see the statements while running the spec enable the following line
+      # db.loggers << Logger.new($stderr)
+      db.create_table(:models) do
+        primary_key :id
+        String :status
+      end
+
+      @model = Class.new(Sequel::Model(db)) do
+        set_dataset(:models)
+        attr_accessor :default
+        include AASM
+        aasm :column => :status
+        aasm do
+          state :alpha, :initial => true
+          state :beta
+          state :gamma
+          event :release do
+            transitions :from => [:alpha, :beta, :gamma], :to => :beta
+          end
+        end
+      end
+    end
+
+    describe "instance methods" do
+      let(:model) {@model.new}
+
+      it "should respond to aasm persistence methods" do
+        expect(model).to respond_to(:aasm_read_state)
+        expect(model).to respond_to(:aasm_write_state)
+        expect(model).to respond_to(:aasm_write_state_without_persistence)
+      end
+
+      it "should return the initial state when new and the aasm field is nil" do
+        expect(model.aasm.current_state).to eq(:alpha)
+      end
+
+      it "should return the aasm column when new and the aasm field is not nil" do
+        model.status = "beta"
+        expect(model.aasm.current_state).to eq(:beta)
+      end
+
+      it "should return the aasm column when not new and the aasm_column is not nil" do
+        allow(model).to receive(:new?).and_return(false)
+        model.status = "gamma"
+        expect(model.aasm.current_state).to eq(:gamma)
+      end
+
+      it "should allow a nil state" do
+        allow(model).to receive(:new?).and_return(false)
+        model.status = nil
+        expect(model.aasm.current_state).to be_nil
+      end
+
+      it "should call aasm_ensure_initial_state on validation before create" do
+        expect(model).to receive(:aasm_ensure_initial_state).and_return(true)
+        model.valid?
+      end
+
+      it "should call aasm_ensure_initial_state before create, even if skipping validations" do
+        expect(model).to receive(:aasm_ensure_initial_state).and_return(true)
+        model.save(:validate => false)
+      end
+    end
+
+    describe 'subclasses' do
+      it "should have the same states as its parent class" do
+        expect(Class.new(@model).aasm.states).to eq(@model.aasm.states)
+      end
+
+      it "should have the same events as its parent class" do
+        expect(Class.new(@model).aasm.events).to eq(@model.aasm.events)
+      end
+
+      it "should have the same column as its parent even for the new dsl" do
+        expect(@model.aasm_column).to eq(:status)
+        expect(Class.new(@model).aasm_column).to eq(:status)
+      end
+    end
+
+    describe 'initial states' do
+      it 'should support conditions' do
+        @model.aasm do
+          initial_state lambda{ |m| m.default }
+        end
+
+        expect(@model.new(:default => :beta).aasm.current_state).to eq(:beta)
+        expect(@model.new(:default => :gamma).aasm.current_state).to eq(:gamma)
+      end
+    end
+
+  rescue LoadError
+    puts "Not running Sequel specs because sequel gem is not installed!!!"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aasm
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Scott Barron
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-29 00:00:00.000000000 Z
+date: 2014-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -45,14 +45,14 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
@@ -129,6 +129,7 @@ files:
 - lib/aasm/persistence/active_record_persistence.rb
 - lib/aasm/persistence/base.rb
 - lib/aasm/persistence/mongoid_persistence.rb
+- lib/aasm/persistence/sequel_persistence.rb
 - lib/aasm/state.rb
 - lib/aasm/state_machine.rb
 - lib/aasm/transition.rb
@@ -174,6 +175,7 @@ files:
 - spec/unit/new_dsl_spec.rb
 - spec/unit/persistence/active_record_persistence_spec.rb
 - spec/unit/persistence/mongoid_persistance_spec.rb
+- spec/unit/persistence/sequel_persistence_spec.rb
 - spec/unit/simple_example_spec.rb
 - spec/unit/state_spec.rb
 - spec/unit/subclassing_spec.rb
@@ -198,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: State machine mixin for Ruby objects
@@ -244,6 +246,7 @@ test_files:
 - spec/unit/new_dsl_spec.rb
 - spec/unit/persistence/active_record_persistence_spec.rb
 - spec/unit/persistence/mongoid_persistance_spec.rb
+- spec/unit/persistence/sequel_persistence_spec.rb
 - spec/unit/simple_example_spec.rb
 - spec/unit/state_spec.rb
 - spec/unit/subclassing_spec.rb