aasm 5.0.1 → 5.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea455b8d666bb3c526bec4b9be0736719a3b38a5
-  data.tar.gz: 3987011c8c53b930f369f76399b37194966bd170
+  metadata.gz: 972a54f67c50af93041d8c104cb61069ad8ae6f4
+  data.tar.gz: e4004fe73c08fdcf208afb45fa4e91904d2d97e0
 SHA512:
-  metadata.gz: b35a314d950405db70775b44f8cb06617d5b4987d1f07e586069e19dcab525e761d71551019c53340b622733a8600de5ce238a44cf685854801696203cdda4d0
-  data.tar.gz: 3852368590562313ea46427efb3c41d1f414c9a379e522880d7af472807014350a109ab65c2ebe445dbbd6132cee531375e20bb0fd36a83eea425d4cf054d377
+  metadata.gz: 3e2da17ffaa34ca4a299b3c9b7e7d8832c7fb09cfb07fbfe1315092fbea01cbdb4ee7b7ceca3847533b421a60db97c151b71a57a8c75f42c0e4627881ad5b9f0
+  data.tar.gz: f759c915e858f503d4b168c93b909aa497ba6ac4a3327ad51593dcbe44301e485166f76a5d09a4cd5c470c75cbb98b0085a675c2767e5267cfc0925ad32b777b

data/.travis.yml

@@ -2,9 +2,15 @@ sudo: false
 language: ruby
 cache: bundler
 
+before_install:
+  - rvm list
+  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
+  - gem install bundler -v '1.16.1'
+  - bundle _1.16.1_ install
+
 rvm:
-  - 2.2.6
-  - 2.3.3
+  - 2.3.0
+  - 2.5.0
   - jruby-9.1.12.0
 
 services:
@@ -16,7 +22,6 @@ addons:
 
 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
@@ -36,10 +41,20 @@ script:
 
 matrix:
   exclude:
-    - rvm: 2.2.6
-      gemfile: gemfiles/rails_3.2.gemfile
-    - rvm: 2.3.3
+    - rvm: 2.3.0
+      gemfile: gemfiles/rails_5.0.gemfile
+    - rvm: 2.3.0
+      gemfile: gemfiles/rails_5.0_nobrainer.gemfile
+    - rvm: 2.3.0
+      gemfile: gemfiles/rails_5.1.gemfile
+    - rvm: 2.5.0
       gemfile: gemfiles/rails_3.2.gemfile
+    - rvm: 2.5.0
+      gemfile: gemfiles/rails_4.2.gemfile
+    - rvm: 2.5.0
+      gemfile: gemfiles/rails_4.2_mongoid_5.gemfile
+    - rvm: 2.5.0
+      gemfile: gemfiles/rails_4.2_nobrainer.gemfile
     - rvm: jruby-9.1.12.0
       gemfile: gemfiles/rails_5.0.gemfile
     - rvm: jruby-9.1.12.0

data/Appraisals

@@ -4,17 +4,7 @@ appraise 'rails_3.2' do
   gem 'sequel'
   gem 'bson_ext', platforms: :ruby
   gem 'test-unit', '~> 3.0'
-  gem 'activerecord-jdbcsqlite3-adapter', '1.3.24', platforms: :jruby
-end
-
-appraise 'rails_4.0' do
-  gem 'mime-types', '~> 2', platforms: %i[ruby_19 jruby]
-  gem 'rails', '4.0.13'
-  gem 'mongoid', '~> 4.0'
-  gem 'sequel'
-  gem 'dynamoid', '~> 1', platforms: :ruby
-  gem 'aws-sdk', '~> 2', platforms: :ruby
-  gem 'redis-objects'
+  gem 'minitest'
   gem 'activerecord-jdbcsqlite3-adapter', '1.3.24', platforms: :jruby
 end
 

data/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 ## unreleased
 
+## 5.0.2
+
+* Clear failed callbacks, [#600](https://github.com/aasm/aasm/pull/600), thanks to
+[nedgar](https://github.com/nedgar)
+* README improvements, [#594](https://github.com/aasm/aasm/pull/594),
+[#589](https://github.com/aasm/aasm/pull/589), [#587](https://github.com/aasm/aasm/pull/587),
+[#597](https://github.com/aasm/aasm/pull/597), thanks to [jackscotti](https://github.com/jackscotti), [krmbzds](https://github.com/krmbzds),
+[zegomesjf](https://github.com/zegomesjf), [BKSpurgeon](https://github.com/BKSpurgeon)
+* Update InvalidTransition to include state_machine_name [#592](https://github.com/aasm/aasm/pull/592), thanks to [a14m](https://github.com/a14m)
+* Do not add migration if model and column already exists [#586](https://github.com/aasm/aasm/pull/586), thanks to [KiranJosh](https://github.com/KiranJosh)
+
 ## 5.0.1
 
 * Fix failures array in transition not being reset [#383](https://github.com/aasm/aasm/issues/383)

data/Dockerfile

@@ -1,4 +1,9 @@
-FROM ruby:2.3.4-slim
+ARG RVM_RUBY_VERSIONS="2.4.0 2.5.0"
+ARG RVM_RUBY_DEFAULT="2.4.0"
+FROM msati/docker-rvm
+
+# After Ruby versions are installed we continue as non-root rvm user
+USER ${RVM_USER}
 
 LABEL maintainer="AASM"
 

data/Gemfile

@@ -2,5 +2,5 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'sqlite3',                          :platforms => :ruby
+gem 'sqlite3', '~> 1.3.5', :platforms => :ruby
 gem 'rails', '5.1.4'

data/README.md

@@ -2,7 +2,6 @@
 
 [![Gem Version](https://badge.fury.io/rb/aasm.svg)](http://badge.fury.io/rb/aasm)
 [![Build Status](https://travis-ci.org/aasm/aasm.svg?branch=master)](https://travis-ci.org/aasm/aasm)
-[![Dependency Status](https://gemnasium.com/aasm/aasm.svg)](https://gemnasium.com/aasm/aasm)
 [![Code Climate](https://codeclimate.com/github/aasm/aasm/badges/gpa.svg)](https://codeclimate.com/github/aasm/aasm)
 
 ## Index
@@ -385,6 +384,21 @@ If you prefer a more Ruby-like guard syntax, you can use `if` and `unless` as we
   end
 ```
 
+You can invoke a Class instead a method since this Class responds to `call` 
+
+```ruby
+    event :sleep do
+      transitions :from => :running, :to => :sleeping, :guards => Dog
+    end
+```
+```ruby
+  class Dog
+    def call
+      cleaning_needed? && walked?
+    end
+    ...
+  end
+```
 
 ### Transitions
 
@@ -1178,7 +1192,15 @@ the 'instance method symbol / string' way whenever possible when defining guardi
 
 #### RSpec
 
-AASM provides some matchers for [RSpec](http://rspec.info): `transition_from`, `have_state`, `allow_event` and `allow_transition_to`. Add `require 'aasm/rspec'` to your `spec_helper.rb` file and use them like this:
+AASM provides some matchers for [RSpec](http://rspec.info): 
+*`transition_from`, 
+* `have_state`, `allow_event`
+* and `allow_transition_to`. 
+
+##### Installation Instructions: 
+* Add `require 'aasm/rspec'` to your `spec_helper.rb` file.
+
+##### Examples Of Usage in Rspec:
 
 ```ruby
 # classes with only the default state machine
@@ -1191,7 +1213,7 @@ expect(job).to allow_event :run
 expect(job).to_not allow_event :clean
 expect(job).to allow_transition_to(:running)
 expect(job).to_not allow_transition_to(:cleaning)
-# on_event also accept arguments
+# on_event also accept multiple arguments
 expect(job).to transition_from(:sleeping).to(:running).on_event(:run, :defragmentation)
 
 # classes with multiple state machine
@@ -1225,6 +1247,9 @@ AASM provides assertions and rspec-like expectations for [Minitest](https://gith
 
 List of supported assertions: `assert_have_state`, `refute_have_state`, `assert_transitions_from`, `refute_transitions_from`, `assert_event_allowed`, `refute_event_allowed`, `assert_transition_to_allowed`, `refute_transition_to_allowed`.
 
+
+##### Examples Of Usage (Minitest):
+
 Add `require 'aasm/minitest'` to your `test_helper.rb` file and use them like this:
 
 ```ruby

data/gemfiles/rails_3.2.gemfile

@@ -2,12 +2,13 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3", platforms: :ruby
+gem "sqlite3", "~> 1.3.5", platforms: :ruby
 gem "rails", "~> 3.2.22"
 gem "mongoid", "~> 3.1"
 gem "sequel"
 gem "bson_ext", platforms: :ruby
 gem "test-unit", "~> 3.0"
+gem "minitest"
 gem "activerecord-jdbcsqlite3-adapter", "1.3.24", platforms: :jruby
 
 gemspec path: "../"

data/gemfiles/rails_4.2.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3", platforms: :ruby
+gem "sqlite3", "~> 1.3.5", platforms: :ruby
 gem "rails", "4.2.5"
 gem "nokogiri", "1.6.8.1", platforms: [:ruby_19]
 gem "mime-types", "~> 2", platforms: [:ruby_19, :jruby]

data/gemfiles/rails_4.2_mongoid_5.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3", platforms: :ruby
+gem "sqlite3", "~> 1.3.5", platforms: :ruby
 gem "rails", "4.2.5"
 gem "mime-types", "~> 2", platforms: [:ruby_19, :jruby]
 gem "mongoid", "~> 5.0"

data/gemfiles/rails_4.2_nobrainer.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3", platforms: :ruby
+gem "sqlite3", "~> 1.3.5", platforms: :ruby
 gem "rails", "4.2.5"
 gem "nobrainer", "~> 0.33.0"
 

data/gemfiles/rails_5.0.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3", platforms: :ruby
+gem "sqlite3", "~> 1.3.5", platforms: :ruby
 gem "rails", "5.0.0"
 gem "mongoid", "~> 6.0"
 gem "sequel"

data/gemfiles/rails_5.0_nobrainer.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3", platforms: :ruby
+gem "sqlite3", "~> 1.3.5", platforms: :ruby
 gem "rails", "5.0.0"
 gem "nobrainer", "~> 0.33.0"
 

data/gemfiles/rails_5.1.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3", platforms: :ruby
+gem "sqlite3", "~> 1.3.5", platforms: :ruby
 gem "rails", "5.1"
 gem "mongoid", "~>6.0"
 gem "sequel"

data/lib/aasm/core/event.rb

@@ -125,6 +125,7 @@ module AASM::Core
 
     def _fire(obj, options={}, to_state=::AASM::NO_VALUE, *args)
       result = options[:test_only] ? false : nil
+      clear_failed_callbacks
       transitions = @transitions.select { |t| t.from == obj.aasm(state_machine.name).current_state || t.from == nil}
       return result if transitions.size == 0
 
@@ -139,7 +140,6 @@ module AASM::Core
       end
 
       transitions.each do |transition|
-        transition.failures.clear #https://github.com/aasm/aasm/issues/383
         next if to_state and !Array(transition.to).include?(to_state)
         if (options.key?(:may_fire) && transition.eql?(options[:may_fire])) ||
            (!options.key?(:may_fire) && transition.allowed?(obj, *args))
@@ -158,6 +158,11 @@ module AASM::Core
       result
     end
 
+    def clear_failed_callbacks
+      # https://github.com/aasm/aasm/issues/383, https://github.com/aasm/aasm/issues/599
+      transitions.each { |transition| transition.failures.clear }
+    end
+
     def invoke_callbacks(code, record, args)
       Invoker.new(code, record, args)
              .with_default_return_value(false)

data/lib/aasm/errors.rb

@@ -3,10 +3,11 @@ module AASM
   class UnknownStateMachineError < RuntimeError; end
 
   class InvalidTransition < RuntimeError
-    attr_reader :object, :event_name, :originating_state, :failures
+    attr_reader :object, :event_name, :originating_state, :failures, :state_machine_name
 
     def initialize(object, event_name, state_machine_name, failures = [])
       @object, @event_name, @originating_state, @failures = object, event_name, object.aasm(state_machine_name).current_state, failures
+      @state_machine_name = state_machine_name
       super("Event '#{event_name}' cannot transition from '#{originating_state}'.#{reasoning}")
     end
 

data/lib/aasm/version.rb

@@ -1,3 +1,3 @@
 module AASM
-  VERSION = "5.0.1"
+  VERSION = "5.0.2"
 end

data/lib/generators/aasm/orm_helpers.rb

@@ -22,6 +22,12 @@ RUBY
 
       private
 
+      def column_exists?
+        table_name.singularize.humanize.constantize.column_names.include?(column_name.to_s)
+      rescue NameError
+        false
+      end
+
       def model_exists?
         File.exists?(File.join(destination_root, model_path))
       end

data/lib/generators/active_record/aasm_generator.rb

@@ -11,7 +11,9 @@ module ActiveRecord
       source_root File.expand_path("../templates", __FILE__)
 
       def copy_aasm_migration
-        if model_exists?
+        if column_exists?
+          puts "Both model and column exists"
+        elsif model_exists?
           migration_template "migration_existing.rb", "db/migrate/add_#{column_name}_to_#{table_name}.rb"
         else
           migration_template "migration.rb", "db/migrate/aasm_create_#{table_name}.rb"

data/spec/database.rb

@@ -20,6 +20,10 @@ ActiveRecord::Migration.suppress_messages do
     t.string "right"
   end
 
+  ActiveRecord::Migration.create_table "works", :force => true do |t|
+    t.string "status"
+  end
+
   %w(validators multiple_validators workers invalid_persistors multiple_invalid_persistors silent_persistors multiple_silent_persistors).each do |table_name|
     ActiveRecord::Migration.create_table table_name, :force => true do |t|
       t.string "name"

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/work.rb

@@ -0,0 +1,3 @@
+class Work < ActiveRecord::Base
+  include AASM
+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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aasm
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.0.2
 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-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -138,7 +138,6 @@ files:
 - callbacks.txt
 - docker-compose.yml
 - 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
@@ -224,6 +223,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
@@ -424,6 +424,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

data/gemfiles/rails_4.0.gemfile

@@ -1,15 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "sqlite3", platforms: :ruby
-gem "rails", "4.0.13"
-gem "mime-types", "~> 2", platforms: [:ruby_19, :jruby]
-gem "mongoid", "~> 4.0"
-gem "sequel"
-gem "dynamoid", "~> 1", platforms: :ruby
-gem "aws-sdk", "~> 2", platforms: :ruby
-gem "redis-objects"
-gem "activerecord-jdbcsqlite3-adapter", "1.3.24", platforms: :jruby
-
-gemspec path: "../"