aasm 4.12.0 → 4.12.1

data/lib/aasm/version.rb

@@ -1,3 +1,3 @@
 module AASM
-  VERSION = "4.12.0"
+  VERSION = "4.12.1"
 end

data/lib/generators/active_record/templates/migration.rb

@@ -1,4 +1,4 @@
-class AASMCreate<%= table_name.camelize %> < ActiveRecord::Migration
+class AASMCreate<%= table_name.camelize %> < ActiveRecord::Migration[<%=  ActiveRecord::VERSION::STRING.to_f %>]
   def change
     create_table(:<%= table_name %>) do |t|
       t.string :<%= column_name %>

data/lib/generators/active_record/templates/migration_existing.rb

@@ -1,4 +1,4 @@
-class Add<%= column_name.camelize %>To<%= table_name.camelize %> < ActiveRecord::Migration
+class Add<%= column_name.camelize %>To<%= table_name.camelize %> < ActiveRecord::Migration[<%=  ActiveRecord::VERSION::STRING.to_f %>]
   def change
     add_column :<%= table_name %>, :<%= column_name %>, :string
   end

data/lib/motion-aasm.rb

@@ -11,6 +11,8 @@ file_dependencies = {
 
 exclude_files = [
   'aasm/rspec.*',
+  'aasm/minitest.*',
+  'aasm/minitest_spec.*',
   'aasm/persistence/active_record_persistence.rb',
   'aasm/persistence/dynamoid_persistence.rb',
   'aasm/persistence/mongoid_persistence.rb',

data/spec/models/active_record/complex_active_record_example.rb

@@ -7,7 +7,7 @@ class ComplexActiveRecordExample < ActiveRecord::Base
     state :three
 
     event :increment do
-      transitions :from => :one, :to => :two
+      transitions :from => :one, :to => :two, guard: :allowed?
       transitions :from => :two, :to => :three
     end
     event :reset do
@@ -15,6 +15,10 @@ class ComplexActiveRecordExample < ActiveRecord::Base
     end
   end
 
+  def allowed?
+    true
+  end
+
   aasm :right, :column => 'right' do
     state :alpha, :initial => true
     state :beta

data/spec/models/guardian_without_from_specified.rb

@@ -0,0 +1,18 @@
+class GuardianWithoutFromSpecified
+  include AASM
+
+  aasm do
+    state :alpha, :initial => true
+    state :beta
+    state :gamma
+
+    event :use_guards_where_the_first_fails do
+      transitions :to => :beta,  :guard => :fail
+      transitions :to => :gamma, :guard => :succeed
+    end
+  end
+
+
+  def fail; false; end
+  def succeed; true; end
+end

data/spec/models/namespaced_multiple_example.rb

@@ -25,4 +25,18 @@ class NamespacedMultipleExample
       transitions :from => :approved, :to => :unapproved
     end
   end
+
+  # Test namespace event methods with suffix (ie may_sell_car?, sell_car!)
+  aasm(:car, namespace: :car) do
+    state :unsold, :initial => true
+    state :sold
+
+    event :sell do
+      transitions :from => :unsold, :to => :sold
+    end
+
+    event :return do
+      transitions :from => :sold, :to => :unsold
+    end
+  end
 end

data/spec/models/redis/complex_redis_example.rb

@@ -0,0 +1,40 @@
+class RedisComplexExample
+  include Redis::Objects
+  include AASM
+
+  value :left
+  value :right
+
+  def id
+    1
+  end
+
+  aasm :left, :column => 'left' do
+    state :one, :initial => true
+    state :two
+    state :three
+
+    event :increment do
+      transitions :from => :one, :to => :two
+      transitions :from => :two, :to => :three
+    end
+    event :reset do
+      transitions :from => :three, :to => :one
+    end
+  end
+
+  aasm :right, :column => 'right' do
+    state :alpha, :initial => true
+    state :beta
+    state :gamma
+
+    event :level_up do
+      transitions :from => :alpha, :to => :beta
+      transitions :from => :beta, :to => :gamma
+    end
+    event :level_down do
+      transitions :from => :gamma, :to => :beta
+      transitions :from => :beta, :to => :alpha
+    end
+  end
+end

data/spec/models/redis/redis_multiple.rb

@@ -0,0 +1,20 @@
+class RedisMultiple
+  include Redis::Objects
+  include AASM
+
+  value :status
+
+  def id
+    1
+  end
+
+  aasm :left, :column => :status
+  aasm :left do
+    state :alpha, :initial => true
+    state :beta
+    state :gamma
+    event :release do
+      transitions :from => [:alpha, :beta, :gamma], :to => :beta
+    end
+  end
+end

data/spec/models/redis/redis_simple.rb

@@ -0,0 +1,20 @@
+class RedisSimple
+  include Redis::Objects
+  include AASM
+
+  value :status
+
+  def id
+    1
+  end
+
+  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

data/spec/models/sequel/complex_sequel_example.rb

@@ -1,4 +1,4 @@
-db = Sequel.connect(SEQUEL_DB)
+db = Sequel::DATABASES.first || Sequel.connect(SEQUEL_DB)
 
 # if you want to see the statements while running the spec enable the following line
 # db.loggers << Logger.new($stderr)
@@ -8,8 +8,8 @@ db.create_table(:complex_sequel_examples) do
   String :right
 end
 
-class ComplexSequelExample < Sequel::Model(db)
-  set_dataset(:complex_sequel_examples)
+module Sequel
+class ComplexExample < Sequel::Model(:complex_sequel_examples)
 
   include AASM
 
@@ -43,3 +43,4 @@ class ComplexSequelExample < Sequel::Model(db)
   end
 
 end
+end

data/spec/models/sequel/invalid_persistor.rb

@@ -0,0 +1,52 @@
+db = Sequel::DATABASES.first || Sequel.connect(SEQUEL_DB)
+
+[:invalid_persistors, :multiple_invalid_persistors].each do |table_name|
+  db.create_table(table_name) do
+    primary_key :id
+    String "name"
+    String "status"
+  end
+end
+
+module Sequel
+  class InvalidPersistor < Sequel::Model(:invalid_persistors)
+    plugin :validation_helpers
+
+    include AASM
+    aasm :column => :status, :skip_validation_on_save => true do
+      state :sleeping, :initial => true
+      state :running
+      event :run do
+        transitions :to => :running, :from => :sleeping
+      end
+      event :sleep do
+        transitions :to => :sleeping, :from => :running
+      end
+    end
+
+    def validate
+      super
+      validates_presence :name
+    end
+  end
+
+  class MultipleInvalidPersistor < Sequel::Model(:multiple_invalid_persistors)
+    plugin :validation_helpers
+
+    include AASM
+    aasm :left, :column => :status, :skip_validation_on_save => true do
+      state :sleeping, :initial => true
+      state :running
+      event :run do
+        transitions :to => :running, :from => :sleeping
+      end
+      event :sleep do
+        transitions :to => :sleeping, :from => :running
+      end
+    end
+    def validate
+      super
+      validates_presence :name
+    end
+  end
+end

data/spec/models/sequel/sequel_multiple.rb

@@ -1,4 +1,4 @@
-db = Sequel.connect(SEQUEL_DB)
+db = Sequel::DATABASES.first || Sequel.connect(SEQUEL_DB)
 
 # if you want to see the statements while running the spec enable the following line
 # db.loggers << Logger.new($stderr)
@@ -6,20 +6,20 @@ db.create_table(:multiples) do
   primary_key :id
   String :status
 end
+module Sequel
+  class Multiple < Sequel::Model(:multiples)
+    include AASM
 
-class SequelMultiple < Sequel::Model(db)
-  set_dataset(:multiples)
-  include AASM
+    attr_accessor :default
 
-  attr_accessor :default
-
-  aasm :left, :column => :status
-  aasm :left do
-    state :alpha, :initial => true
-    state :beta
-    state :gamma
-    event :release do
-      transitions :from => [:alpha, :beta, :gamma], :to => :beta
+    aasm :left, :column => :status
+    aasm :left do
+      state :alpha, :initial => true
+      state :beta
+      state :gamma
+      event :release do
+        transitions :from => [:alpha, :beta, :gamma], :to => :beta
+      end
     end
   end
 end

data/spec/models/sequel/sequel_simple.rb

@@ -1,4 +1,4 @@
-db = Sequel.connect(SEQUEL_DB)
+db = Sequel::DATABASES.first || Sequel.connect(SEQUEL_DB)
 
 # if you want to see the statements while running the spec enable the following line
 # db.loggers << Logger.new($stderr)
@@ -7,19 +7,20 @@ db.create_table(:simples) do
   String :status
 end
 
-class SequelSimple < Sequel::Model(db)
-  set_dataset(:simples)
-  include AASM
+module Sequel
+  class Simple < Sequel::Model(:simples)
+    include AASM
 
-  attr_accessor :default
+    attr_accessor :default
 
-  aasm :column => :status
-  aasm do
-    state :alpha, :initial => true
-    state :beta
-    state :gamma
-    event :release do
-      transitions :from => [:alpha, :beta, :gamma], :to => :beta
+    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

data/spec/models/sequel/silent_persistor.rb

@@ -0,0 +1,50 @@
+db = Sequel::DATABASES.first || Sequel.connect(SEQUEL_DB)
+
+[:silent_persistors, :multiple_silent_persistors].each do |t|
+  db.create_table(t) do
+    primary_key :id
+    String "name"
+    String "status"
+  end
+end
+
+module Sequel
+  class SilentPersistor < Sequel::Model(:silent_persistors)
+    plugin :validation_helpers
+
+    include AASM
+    aasm :column => :status, :whiny_persistence => false do
+      state :sleeping, :initial => true
+      state :running
+      event :run do
+        transitions :to => :running, :from => :sleeping
+      end
+      event :sleep do
+        transitions :to => :sleeping, :from => :running
+      end
+    end
+    def validate
+      validates_presence :name
+    end
+  end
+
+  class MultipleSilentPersistor< Sequel::Model(:multiple_silent_persistors)
+    plugin :validation_helpers
+
+    include AASM
+    aasm :left, :column => :status, :whiny_persistence => false do
+      state :sleeping, :initial => true
+      state :running
+      event :run do
+        transitions :to => :running, :from => :sleeping
+      end
+      event :sleep do
+        transitions :to => :sleeping, :from => :running
+      end
+    end
+
+    def validate
+      validates_presence :name
+    end
+  end
+end

data/spec/models/sequel/transactor.rb

@@ -0,0 +1,112 @@
+db = Sequel::DATABASES.first || Sequel.connect(SEQUEL_DB)
+
+[:transactors, :no_lock_transactors, :lock_transactors, :lock_no_wait_transactors, :multiple_transactors].each do |table_name|
+  db.create_table(table_name) do
+    primary_key :id
+    String "name"
+    String "status"
+    Fixnum "worker_id"
+  end
+end
+
+module Sequel
+  class Transactor < Sequel::Model(:transactors)
+
+    many_to_one :worker, class: 'Sequel::Worker'
+
+    include AASM
+    aasm :column => :status do
+      state :sleeping, :initial => true
+      state :running, :before_enter => :start_worker, :after_enter => :fail
+
+      event :run do
+        transitions :to => :running, :from => :sleeping
+      end
+    end
+
+    private
+
+    def start_worker
+      worker.update(status: 'running')
+    end
+
+    def fail
+      raise StandardError.new('failed on purpose')
+    end
+
+  end
+
+  class NoLockTransactor < Sequel::Model(:no_lock_transactors)
+
+    many_to_one :worker, class: 'Sequel::Worker'
+
+    include AASM
+
+    aasm :column => :status do
+      state :sleeping, :initial => true
+      state :running
+
+      event :run do
+        transitions :to => :running, :from => :sleeping
+      end
+    end
+  end
+
+  class LockTransactor < Sequel::Model(:lock_transactors)
+
+    many_to_one :worker, class: 'Sequel::Worker'
+
+    include AASM
+
+    aasm :column => :status, requires_lock: true do
+      state :sleeping, :initial => true
+      state :running
+
+      event :run do
+        transitions :to => :running, :from => :sleeping
+      end
+    end
+  end
+
+  class LockNoWaitTransactor < Sequel::Model(:lock_no_wait_transactors)
+
+    many_to_one :worker, class: 'Sequel::Worker'
+
+    include AASM
+
+    aasm :column => :status, requires_lock: 'FOR UPDATE NOWAIT' do
+      state :sleeping, :initial => true
+      state :running
+
+      event :run do
+        transitions :to => :running, :from => :sleeping
+      end
+    end
+  end
+
+  class MultipleTransactor < Sequel::Model(:multiple_transactors)
+
+    many_to_one :worker, class: 'Sequel::Worker'
+
+    include AASM
+    aasm :left, :column => :status do
+      state :sleeping, :initial => true
+      state :running, :before_enter => :start_worker, :after_enter => :fail
+
+      event :run do
+        transitions :to => :running, :from => :sleeping
+      end
+    end
+
+    private
+
+    def start_worker
+      worker.update(:status, 'running')
+    end
+
+    def fail
+      raise StandardError.new('failed on purpose')
+    end
+
+  end
+end