aasm 5.0.3 → 5.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90423050620c1cd3228e8f5f67b76be213c9c491
-  data.tar.gz: 8d583eb68700900b6e0a8c22d6e8b7b0e8714ce7
+  metadata.gz: 537b11c8aadc0b6418e70147aadfaf3d22b396de
+  data.tar.gz: 276ec751af17ec10f441a932b45f487a0fa6ade6
 SHA512:
-  metadata.gz: fb3ca30cbb4d415e5fc9905ae1b9e9ace0b7145ff97f29ce8639a57a99df3df43f3b1626dd9029421e54326085a8e4f5853dfbd21e231c778b3dca058cc980b9
-  data.tar.gz: 72996c355abefda14839e009f50bdcf900b0acd6d43f3d9eabb4e587390dd67b16be0a9eb66119f7e9d394993d266a0af823dedd6b54ad3e20049d7794fe9bfa
+  metadata.gz: f4b0378d3262cb3aabcff3ad438c8cf06ae5e1b87d139e8612eac1c8146fd97c08ea17f425a23e42d2fa7ef1d1c48c58362168450db1026022b3b943df01ddc8
+  data.tar.gz: f2daffa37e70cbbb89e17d1182a9017633f5554cb78ea4bff94c1f6ba51fb50f01330badd3a82cd6890683f5522322fd2b0ea3cde63a0444980566e4b040bc2b

data/.travis.yml

@@ -28,6 +28,7 @@ gemfile:
   - gemfiles/rails_5.0.gemfile
   - gemfiles/rails_5.0_nobrainer.gemfile
   - gemfiles/rails_5.1.gemfile
+  - gemfiles/rails_5.2.gemfile
 
 before_script:
   - mkdir /tmp/dynamodb
@@ -47,6 +48,8 @@ matrix:
       gemfile: gemfiles/rails_5.0_nobrainer.gemfile
     - rvm: 2.3.0
       gemfile: gemfiles/rails_5.1.gemfile
+    - rvm: 2.3.0
+      gemfile: gemfiles/rails_5.2.gemfile
     - rvm: 2.5.0
       gemfile: gemfiles/rails_3.2.gemfile
     - rvm: 2.5.0
@@ -59,6 +62,8 @@ matrix:
       gemfile: gemfiles/rails_5.0.gemfile
     - rvm: jruby-9.1.12.0
       gemfile: gemfiles/rails_5.1.gemfile
+    - rvm: jruby-9.1.12.0
+      gemfile: gemfiles/rails_5.2.gemfile
     - rvm: jruby-9.1.12.0
       gemfile: gemfiles/rails_4.2_nobrainer.gemfile
     - rvm: jruby-9.1.12.0

data/Appraisals

@@ -36,7 +36,7 @@ appraise 'rails_5.0' do
   gem 'rails', '5.0.0'
   gem 'mongoid', '~> 6.0'
   gem 'sequel'
-  gem 'dynamoid', '~> 1', platforms: :ruby
+  gem 'dynamoid', '~> 1.3', platforms: :ruby
   gem 'aws-sdk', '~> 2', platforms: :ruby
   gem 'redis-objects'
 end
@@ -50,7 +50,16 @@ appraise 'rails_5.1' do
   gem 'rails', '5.1'
   gem 'mongoid', '~>6.0'
   gem 'sequel'
-  gem 'dynamoid', '~> 1', platforms: :ruby
+  gem 'dynamoid', '~> 1.3', platforms: :ruby
+  gem 'aws-sdk', '~>2', platforms: :ruby
+  gem 'redis-objects'
+end
+
+appraise 'rails_5.2' do
+  gem 'rails', '5.2'
+  gem 'mongoid', '~>6.0'
+  gem 'sequel'
+  gem 'dynamoid', '~>2.2', platforms: :ruby
   gem 'aws-sdk', '~>2', platforms: :ruby
   gem 'redis-objects'
 end

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ## unreleased
 
+## 5.0.4
+
+* Specify dynamoid version for Rails > 5, [#625](https://github.com/aasm/aasm/pull/625),
+thanks to [waghanza](https://github.com/waghanza)
+* Add travis runner for Rails 5.2, [#624](https://github.com/aasm/aasm/pull/624), thanks
+to [waghanza](https://github.com/waghanza)
+* Cleanup Abstract class issue, [#620](https://github.com/aasm/aasm/pull/620), thanks to
+[dennym](https://github.com/dennym)
+
 ## 5.0.3
 
 * Fix Abstract class issue, [#619](https://github.com/aasm/aasm/pull/619)

data/README.md

@@ -219,7 +219,7 @@ Also, you can pass parameters to events:
 
 In this case the `set_process` would be called with `:defragmentation` argument.
 
-Note that when passing arguments to a state transition, the first argument must be the desired end state. In the above example, we wish to transition to `:running` state and run the callback with `:defragmentation` argument. You can also pass in `nil` as the desired end state, and AASM will try to transition to the first end state defined for that event.
+Note that when passing arguments to a state transition, the first argument should be the desired end state. In the above example, we wish to transition to `:running` state and run the callback with `:defragmentation` argument. You can also omit or pass in `nil` as the desired end state, and AASM will try to transition to the first end state defined for that event.
 
 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.

data/gemfiles/rails_5.0.gemfile

@@ -6,7 +6,7 @@ gem "sqlite3", "~> 1.3.5", platforms: :ruby
 gem "rails", "5.0.0"
 gem "mongoid", "~> 6.0"
 gem "sequel"
-gem "dynamoid", "~> 1", platforms: :ruby
+gem "dynamoid", "~> 1.3", platforms: :ruby
 gem "aws-sdk", "~> 2", platforms: :ruby
 gem "redis-objects"
 

data/gemfiles/rails_5.1.gemfile

@@ -6,7 +6,7 @@ gem "sqlite3", "~> 1.3.5", platforms: :ruby
 gem "rails", "5.1"
 gem "mongoid", "~>6.0"
 gem "sequel"
-gem "dynamoid", "~> 1", platforms: :ruby
+gem "dynamoid", "~> 1.3", platforms: :ruby
 gem "aws-sdk", "~>2", platforms: :ruby
 gem "redis-objects"
 

data/gemfiles/rails_5.2.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sqlite3", "~> 1.3.5", platforms: :ruby
+gem "rails", "5.2"
+gem "mongoid", "~>6.0"
+gem "sequel"
+gem "dynamoid", "~>2.2", platforms: :ruby
+gem "aws-sdk", "~>2", platforms: :ruby
+gem "redis-objects"
+
+gemspec path: "../"

data/lib/aasm/base.rb

@@ -54,25 +54,16 @@ module AASM
       # make sure to raise an error if no_direct_assignment is enabled
       # and attribute is directly assigned though
       aasm_name = @name
-      return true if should_not_define_method(klass) && !@state_machine.config.no_direct_assignment
-      klass.send :define_method, "#{@state_machine.config.column}=", ->(state_name) do
-        if self.class.aasm(:"#{aasm_name}").state_machine.config.no_direct_assignment
-          raise AASM::NoDirectAssignmentError.new(
-            'direct assignment of AASM column has been disabled (see AASM configuration for this class)'
-          )
-        else
-          super(state_name)
+
+      if @state_machine.config.no_direct_assignment
+        @klass.send(:define_method, "#{@state_machine.config.column}=") do |state_name|
+          if self.class.aasm(:"#{aasm_name}").state_machine.config.no_direct_assignment
+            raise AASM::NoDirectAssignmentError.new('direct assignment of AASM column has been disabled (see AASM configuration for this class)')
+          end
         end
       end
     end
 
-    def should_not_define_method(klass)
-      (klass.methods.include?(:abstract_class) &&
-        klass.abstract_class) ||
-      (klass.superclass.methods.include?(:abstract_class) &&
-        klass.superclass.abstract_class)
-    end
-
     # This method is both a getter and a setter
     def attribute_name(column_name=nil)
       if column_name

data/lib/aasm/version.rb

@@ -1,3 +1,3 @@
 module AASM
-  VERSION = "5.0.3"
+  VERSION = "5.0.4"
 end

data/spec/models/active_record/person.rb

@@ -1,7 +1,4 @@
 class Base < ActiveRecord::Base
-  self.abstract_class = true
-  self.table_name = 'users'
-
   include AASM
 
   aasm column: 'status' do
@@ -16,6 +13,9 @@ class Base < ActiveRecord::Base
       transitions from: :active, to: :inactive
     end
   end
+
+  self.abstract_class = true
+  self.table_name = 'users'
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aasm
 version: !ruby/object:Gem::Version
-  version: 5.0.3
+  version: 5.0.4
 platform: ruby
 authors:
 - Thorsten Boettger
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-21 00:00:00.000000000 Z
+date: 2019-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -144,6 +144,7 @@ files:
 - 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