aasm 5.0.1 → 5.0.6

data/spec/generators/active_record_generator_spec.rb

@@ -43,5 +43,11 @@ if defined?(ActiveRecord)
       assert_migration "db/migrate/add_state_to_jobs.rb"
     end
 
+    it "dont add column if column is already exists" do
+      require 'models/active_record/work.rb'
+      load_schema
+      run_generator %w(work status)
+      assert_no_migration "db/migrate/add_status_to_jobs.rb"
+    end
   end
 end

data/spec/models/active_record/instance_level_skip_validation_example.rb

@@ -0,0 +1,19 @@
+class InstanceLevelSkipValidationExample < ActiveRecord::Base
+  include AASM
+
+  aasm :state do
+    state :new, :initial => true
+    state :draft
+    state :complete
+
+    event :set_draft do
+      transitions from: :new, to: :draft
+    end
+
+    event :complete do
+      transitions from: %i[draft new], to: :complete
+    end
+  end
+
+  validates :some_string, presence: true
+end

data/spec/models/active_record/person.rb

@@ -0,0 +1,23 @@
+class Base < ActiveRecord::Base
+  include AASM
+
+  aasm column: 'status' do
+    state :inactive, initial: true
+    state :active
+
+    event :activate do
+      transitions from: :inactive, to: :active
+    end
+
+    event :deactivate do
+      transitions from: :active, to: :inactive
+    end
+  end
+
+  self.abstract_class = true
+  self.table_name = 'users'
+end
+
+
+class Person < Base
+end

data/spec/models/active_record/work.rb

@@ -0,0 +1,3 @@
+class Work < ActiveRecord::Base
+  include AASM
+end

data/spec/models/callbacks/with_state_arg.rb

@@ -8,7 +8,7 @@ module Callbacks
       state :closed
       state :out_to_lunch
 
-      event :close, :before => :before_method, :after => :after_method do
+      event :close, :before => :before_method, :after => :after_method, :before_success => :before_success_method, :success => :success_method3 do
         transitions :to => :closed, :from => [:open], :after => :transition_method, :success => :success_method
         transitions :to => :out_to_lunch, :from => [:open], :after => :transition_method2, :success => :success_method2
       end
@@ -16,6 +16,8 @@ module Callbacks
 
     def before_method(arg); end
 
+    def before_success_method(arg); end
+
     def after_method(arg); end
 
     def transition_method(arg); end
@@ -26,5 +28,7 @@ module Callbacks
 
     def success_method2(arg); end
 
+    def success_method3(arg); end
+
   end
 end

data/spec/models/callbacks/with_state_arg_multiple.rb

@@ -8,7 +8,7 @@ module Callbacks
       state :closed
       state :out_to_lunch
 
-      event :close, :before => :before_method, :after => :after_method do
+      event :close, :before => :before_method, :after => :after_method, :before_success => :before_success_method, :success => :success_method do
         transitions :to => :closed, :from => [:open], :after => :transition_method
         transitions :to => :out_to_lunch, :from => [:open], :after => :transition_method2
       end
@@ -16,11 +16,14 @@ module Callbacks
 
     def before_method(arg); end
 
+    def before_success_method(arg); end
+
     def after_method(arg); end
 
     def transition_method(arg); end
 
     def transition_method2(arg); end
 
+    def success_method(arg); end
   end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,13 @@
+require 'simplecov'
+SimpleCov.start do
+  add_filter '/spec/'
+end
+
+if ENV['CI'] == 'true'
+  require 'codecov'
+  SimpleCov.formatter = SimpleCov::Formatter::Codecov
+end
+
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)))
 $LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib')))
 require 'aasm'

data/spec/unit/abstract_class_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+if defined?(ActiveRecord)
+  require 'models/active_record/person'
+
+  load_schema
+  describe 'Abstract subclassing' do
+
+    it 'should have the parent states' do
+      Person.aasm.states.each do |state|
+        expect(Base.aasm.states).to include(state)
+      end
+      expect(Person.aasm.states).to eq(Base.aasm.states)
+    end
+
+    it 'should have the same events as its parent' do
+      expect(Base.aasm.events).to eq(Person.aasm.events)
+    end
+
+    it 'should not break aasm methods when super class is abstract_class' do
+      person = Person.new
+      person.status = 'active'
+      person.deactivate!
+      expect(person.aasm.current_state).to eq(:inactive)
+    end
+
+  end
+end

data/spec/unit/callback_multiple_spec.rb

@@ -154,6 +154,8 @@ describe 'callbacks for the new DSL' do
     expect(cb).to receive(:before_method).with(:arg1).once.ordered
     expect(cb).to receive(:transition_method).never
     expect(cb).to receive(:transition_method2).with(:arg1).once.ordered
+    expect(cb).to receive(:before_success_method).with(:arg1).once.ordered
+    expect(cb).to receive(:success_method).with(:arg1).once.ordered
     expect(cb).to receive(:after_method).with(:arg1).once.ordered
     cb.close!(:out_to_lunch, :arg1)
 
@@ -161,6 +163,8 @@ describe 'callbacks for the new DSL' do
     some_object = double('some object')
     expect(cb).to receive(:before_method).with(some_object).once.ordered
     expect(cb).to receive(:transition_method2).with(some_object).once.ordered
+    expect(cb).to receive(:before_success_method).with(some_object).once.ordered
+    expect(cb).to receive(:success_method).with(some_object).once.ordered
     expect(cb).to receive(:after_method).with(some_object).once.ordered
     cb.close!(:out_to_lunch, some_object)
   end

data/spec/unit/callbacks_spec.rb

@@ -203,6 +203,32 @@ describe 'callbacks for the new DSL' do
       }.to raise_error(AASM::InvalidTransition)
     end
 
+    it "does not propagate failures to next attempt of same transition" do
+      callback = Callbacks::Basic.new(:log => false, :fail_transition_guard => true)
+
+      expect {
+        callback.close!
+      }.to raise_error(AASM::InvalidTransition, "Event 'close' cannot transition from 'open'. Failed callback(s): [:transition_guard].")
+
+      expect {
+        callback.close!
+      }.to raise_error(AASM::InvalidTransition, "Event 'close' cannot transition from 'open'. Failed callback(s): [:transition_guard].")
+    end
+
+    it "does not propagate failures to next attempt of same event when no transition is applicable" do
+      callback = Callbacks::Basic.new(:log => false, :fail_transition_guard => true)
+
+      expect {
+        callback.close!
+      }.to raise_error(AASM::InvalidTransition, "Event 'close' cannot transition from 'open'. Failed callback(s): [:transition_guard].")
+
+      callback.aasm.current_state = :closed
+
+      expect {
+        callback.close!
+      }.to raise_error(AASM::InvalidTransition, "Event 'close' cannot transition from 'closed'.")
+    end
+
     it "does not run transition_guard twice for multiple permitted transitions" do
       show_debug_log = false
       callback = Callbacks::MultipleTransitionsTransitionGuard.new(:log => show_debug_log, :fail_transition_guard => true)
@@ -289,7 +315,9 @@ describe 'callbacks for the new DSL' do
     expect(cb).to receive(:before_method).with(:arg1).once.ordered
     expect(cb).to receive(:transition_method).with(:arg1).once.ordered
     expect(cb).to receive(:transition_method).never
+    expect(cb).to receive(:before_success_method).with(:arg1).once.ordered
     expect(cb).to receive(:success_method).with(:arg1).once.ordered
+    expect(cb).to receive(:success_method3).with(:arg1).once.ordered
     expect(cb).to receive(:success_method).never
     expect(cb).to receive(:after_method).with(:arg1).once.ordered
     cb.close!(:arg1)
@@ -299,7 +327,9 @@ describe 'callbacks for the new DSL' do
     expect(cb).to receive(:before_method).with(some_object).once.ordered
     expect(cb).to receive(:transition_method).with(some_object).once.ordered
     expect(cb).to receive(:transition_method).never
+    expect(cb).to receive(:before_success_method).with(some_object).once.ordered
     expect(cb).to receive(:success_method).with(some_object).once.ordered
+    expect(cb).to receive(:success_method3).with(some_object).once.ordered
     expect(cb).to receive(:success_method).never
     expect(cb).to receive(:after_method).with(some_object).once.ordered
     cb.close!(some_object)

data/spec/unit/complex_example_spec.rb

@@ -90,5 +90,4 @@ describe 'when being unsuspended' do
   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

@@ -294,6 +294,19 @@ describe 'current event' do
     pe.wakeup!
     expect(pe.aasm.current_event).to eql :wakeup!
   end
+
+  describe "when calling events with fire/fire!" do
+    it "fire should populate aasm.current_event and transition (sleeping to showering)" do
+      pe.aasm.fire(:wakeup)
+      expect(pe.aasm.current_event).to eq :wakeup
+      expect(pe.aasm.current_state).to eq :showering
+    end
+    it "fire! should populate aasm.current_event and transition (sleeping to showering)" do
+      pe.aasm.fire!(:wakeup)
+      expect(pe.aasm.current_event).to eq :wakeup!
+      expect(pe.aasm.current_state).to eq :showering
+    end
+  end
 end
 
 describe 'parametrised events' do

data/spec/unit/persistence/active_record_persistence_multiple_spec.rb

@@ -359,13 +359,13 @@ if defined?(ActiveRecord)
 
       # allow it temporarily
       MultipleNoDirectAssignment.aasm(:left).state_machine.config.no_direct_assignment = false
-      obj.aasm_state = :pending
-      expect(obj.aasm_state.to_sym).to eql :pending
+      obj.aasm_state = :running
+      expect(obj.aasm_state.to_sym).to eql :running
 
       # and forbid it again
       MultipleNoDirectAssignment.aasm(:left).state_machine.config.no_direct_assignment = true
-      expect {obj.aasm_state = :running}.to raise_error(AASM::NoDirectAssignmentError)
-      expect(obj.aasm_state.to_sym).to eql :pending
+      expect {obj.aasm_state = :pending}.to raise_error(AASM::NoDirectAssignmentError)
+      expect(obj.aasm_state.to_sym).to eql :running
     end
   end # direct assignment
 

data/spec/unit/persistence/active_record_persistence_spec.rb

@@ -393,13 +393,13 @@ if defined?(ActiveRecord)
 
       # allow it temporarily
       NoDirectAssignment.aasm.state_machine.config.no_direct_assignment = false
-      obj.aasm_state = :pending
-      expect(obj.aasm_state.to_sym).to eql :pending
+      obj.aasm_state = :running
+      expect(obj.aasm_state.to_sym).to eql :running
 
       # and forbid it again
       NoDirectAssignment.aasm.state_machine.config.no_direct_assignment = true
-      expect {obj.aasm_state = :running}.to raise_error(AASM::NoDirectAssignmentError)
-      expect(obj.aasm_state.to_sym).to eql :pending
+      expect {obj.aasm_state = :pending}.to raise_error(AASM::NoDirectAssignmentError)
+      expect(obj.aasm_state.to_sym).to eql :running
     end
   end # direct assignment
 
@@ -748,4 +748,26 @@ if defined?(ActiveRecord)
       expect { job.run }.to raise_error(AASM::InvalidTransition)
     end
   end
+
+  describe 'testing the instance_level skip validation with _without_validation method' do
+    let(:example) do
+      obj = InstanceLevelSkipValidationExample.new(state: 'new')
+      obj.save(validate: false)
+      obj
+    end
+
+    it 'should be able to change the state with invalid record' do
+      expect(example.valid?).to be_falsey
+      expect(example.complete!).to be_falsey
+      expect(example.complete_without_validation!).to be_truthy
+      expect(example.state).to eq('complete')
+    end
+
+    it 'shouldn\'t affect the behaviour of existing method after calling _without_validation! method' do
+      expect(example.set_draft!).to be_falsey
+      expect(example.set_draft_without_validation!).to be_truthy
+      expect(example.state).to eq('draft')
+      expect(example.complete!).to be_falsey
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aasm
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.0.6
 platform: ruby
 authors:
 - Thorsten Boettger
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-07 00:00:00.000000000 Z
+date: 2019-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -95,6 +95,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: codecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.10
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.10
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -117,6 +145,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".document"
+- ".github/ISSUE_TEMPLATE/bug_report.md"
+- ".github/ISSUE_TEMPLATE/feature_request.md"
 - ".gitignore"
 - ".travis.yml"
 - API
@@ -137,14 +167,15 @@ files:
 - aasm.gemspec
 - callbacks.txt
 - docker-compose.yml
+- gemfiles/norails.gemfile
 - gemfiles/rails_3.2.gemfile
-- gemfiles/rails_4.0.gemfile
 - gemfiles/rails_4.2.gemfile
 - gemfiles/rails_4.2_mongoid_5.gemfile
 - gemfiles/rails_4.2_nobrainer.gemfile
 - gemfiles/rails_5.0.gemfile
 - gemfiles/rails_5.0_nobrainer.gemfile
 - gemfiles/rails_5.1.gemfile
+- gemfiles/rails_5.2.gemfile
 - lib/aasm.rb
 - lib/aasm/aasm.rb
 - lib/aasm/base.rb
@@ -206,11 +237,13 @@ files:
 - spec/models/active_record/derivate_new_dsl.rb
 - spec/models/active_record/false_state.rb
 - spec/models/active_record/gate.rb
+- spec/models/active_record/instance_level_skip_validation_example.rb
 - spec/models/active_record/invalid_persistor.rb
 - spec/models/active_record/localizer_test_model.rb
 - spec/models/active_record/no_direct_assignment.rb
 - spec/models/active_record/no_scope.rb
 - spec/models/active_record/persisted_state.rb
+- spec/models/active_record/person.rb
 - spec/models/active_record/provided_and_persisted_state.rb
 - spec/models/active_record/reader.rb
 - spec/models/active_record/readme_job.rb
@@ -224,6 +257,7 @@ files:
 - spec/models/active_record/with_enum_without_column.rb
 - spec/models/active_record/with_false_enum.rb
 - spec/models/active_record/with_true_enum.rb
+- spec/models/active_record/work.rb
 - spec/models/active_record/worker.rb
 - spec/models/active_record/writer.rb
 - spec/models/basic_two_state_machines_example.rb
@@ -312,6 +346,7 @@ files:
 - spec/spec_helpers/redis.rb
 - spec/spec_helpers/remove_warnings.rb
 - spec/spec_helpers/sequel.rb
+- spec/unit/abstract_class_spec.rb
 - spec/unit/api_spec.rb
 - spec/unit/basic_two_state_machines_example_spec.rb
 - spec/unit/callback_multiple_spec.rb
@@ -406,11 +441,13 @@ test_files:
 - spec/models/active_record/derivate_new_dsl.rb
 - spec/models/active_record/false_state.rb
 - spec/models/active_record/gate.rb
+- spec/models/active_record/instance_level_skip_validation_example.rb
 - spec/models/active_record/invalid_persistor.rb
 - spec/models/active_record/localizer_test_model.rb
 - spec/models/active_record/no_direct_assignment.rb
 - spec/models/active_record/no_scope.rb
 - spec/models/active_record/persisted_state.rb
+- spec/models/active_record/person.rb
 - spec/models/active_record/provided_and_persisted_state.rb
 - spec/models/active_record/reader.rb
 - spec/models/active_record/readme_job.rb
@@ -424,6 +461,7 @@ test_files:
 - spec/models/active_record/with_enum_without_column.rb
 - spec/models/active_record/with_false_enum.rb
 - spec/models/active_record/with_true_enum.rb
+- spec/models/active_record/work.rb
 - spec/models/active_record/worker.rb
 - spec/models/active_record/writer.rb
 - spec/models/basic_two_state_machines_example.rb
@@ -512,6 +550,7 @@ test_files:
 - spec/spec_helpers/redis.rb
 - spec/spec_helpers/remove_warnings.rb
 - spec/spec_helpers/sequel.rb
+- spec/unit/abstract_class_spec.rb
 - spec/unit/api_spec.rb
 - spec/unit/basic_two_state_machines_example_spec.rb
 - spec/unit/callback_multiple_spec.rb