state_machines-activerecord 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df749084be8ba0698e46dcfd0d06efddf6de293c3cfecd4f97541d1c043a93a1
-  data.tar.gz: 79a60950d37f2afbc122fd26077a6479810c47d4e68f96bcf189eef05e7e47a5
+  metadata.gz: d4d6c3db18b13bbece06c33f047109e49d17eb1b97e8d26d8e001ed02a554b7a
+  data.tar.gz: ebd085709c837eb3c76994e23780b884136a338f92b63eb77c8c64620bd1980e
 SHA512:
-  metadata.gz: 3ef19adb60ee1b7074eee66f0e7170bf87d7f9de287324c1f128ff298a720bf5b51755fb2f5067869cc44a2f0910a1c50896dff0a1e0667fb95f308cd6207735
-  data.tar.gz: 6f058b6758f87082bc678feb3efb8c6e45210eabe7d955d7ee92930ca4b8a55918b3d19e3d3ea87c6d3bc46f1b214ab633c92ec08e67ca27924a69ad26df4646
+  metadata.gz: febb1df5b304114be86875716fb620b7c1b7fe1d0d44bea3c52c92451345e2cf2fb57e11cbd87d9b277079a52ebb9f82734d4174ea6722e8c6d933d274f88f6d
+  data.tar.gz: 3ee22472203164647a9d65ef4a5df8edfeda3874144b57281b9dce79ae210006f171bc02fdcdd24d44afd08ed4b9dff409b61d443a61052a1baeee27d8f3ed16

data/.travis.yml

@@ -1,72 +1,19 @@
 language: ruby
-sudo: false
 cache: bundler
 
 rvm:
-  - 2.1
-  - 2.2.9
-  - 2.3.8
-  - 2.4.6
-  - 2.5.5
-  - 2.6.2
+  - 2.5.8
+  - 2.6.6
+  - 2.7.2
   - jruby
-  - rbx-2
 
 gemfile:
-  - gemfiles/active_record_4.1.gemfile
-  - gemfiles/active_record_4.2.gemfile
+  - gemfiles/active_record_5.1.gemfile
+  - gemfiles/active_record_5.2.gemfile
+  - gemfiles/active_record_6.0.gemfile
+  - gemfiles/active_record_6.1.gemfile
+  - gemfiles/active_record_edge.gemfile
 
 matrix:
-  include:
-    - gemfile: gemfiles/active_record_5.0.gemfile
-      rvm: 2.2.9
-    - gemfile: gemfiles/active_record_5.0.gemfile
-      rvm: 2.3.8
-    - gemfile: gemfiles/active_record_5.0.gemfile
-      rvm: 2.4.6
-    - gemfile: gemfiles/active_record_5.0.gemfile
-      rvm: 2.5.5
-    - gemfile: gemfiles/active_record_5.0.gemfile
-      rvm: 2.6.2
-    - gemfile: gemfiles/active_record_5.1.gemfile
-      rvm: 2.2.9
-    - gemfile: gemfiles/active_record_5.1.gemfile
-      rvm: 2.3.8
-    - gemfile: gemfiles/active_record_5.1.gemfile
-      rvm: 2.4.6
-    - gemfile: gemfiles/active_record_5.1.gemfile
-      rvm: 2.5.5
-    - gemfile: gemfiles/active_record_5.1.gemfile
-      rvm: 2.6.2
-    - gemfile: gemfiles/active_record_5.2.gemfile
-      rvm: 2.2.9
-    - gemfile: gemfiles/active_record_5.2.gemfile
-      rvm: 2.3.8
-    - gemfile: gemfiles/active_record_5.2.gemfile
-      rvm: 2.4.6
-    - gemfile: gemfiles/active_record_5.2.gemfile
-      rvm: 2.5.5
-    - gemfile: gemfiles/active_record_5.2.gemfile
-      rvm: 2.6.2
-    - gemfile: gemfiles/active_record_6.0.gemfile
-      rvm: 2.5.5
-    - gemfile: gemfiles/active_record_6.0.gemfile
-      rvm: 2.6.2
-    - gemfile: gemfiles/active_record_edge.gemfile
-      rvm: 2.5.5
-    - gemfile: gemfiles/active_record_edge.gemfile
-      rvm: 2.6.2
-  exclude:
-    - gemfile: gemfiles/active_record_4.1.gemfile
-      rvm: 2.4.6
-    - gemfile: gemfiles/active_record_4.1.gemfile
-      rvm: 2.5.5
-    - gemfile: gemfiles/active_record_4.1.gemfile
-      rvm: 2.6.2
   allow_failures:
     - rvm: jruby
-    - rvm: rbx-2
-    - gemfile: gemfiles/active_record_edge.gemfile
-      rvm: 2.5.5
-    - gemfile: gemfiles/active_record_edge.gemfile
-      rvm: 2.6.2

data/Appraisals

@@ -1,34 +1,29 @@
-appraise "active_record_4.1" do
- gem "sqlite3", platforms: [:mri, :rbx]
- gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
- gem "activerecord", github: 'rails/rails',  branch: '4-1-stable'
-end
-
-appraise "active_record_4.2" do
+appraise "active_record_5.1" do
   gem "sqlite3", platforms: [:mri, :rbx]
   gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
-  gem "activerecord", github: 'rails/rails',  branch: '4-2-stable'
+  gem "activerecord", github: 'rails/rails',  branch: '5-1-stable'
+  gem "activemodel", github: 'rails/rails', branch: '5-1-stable'
 end
 
-appraise "active_record_5.0" do
+appraise "active_record_5.2" do
   gem "sqlite3", platforms: [:mri, :rbx]
   gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
-  gem "activerecord", github: 'rails/rails',  branch: '5-0-stable'
-  gem "activemodel", github: 'rails/rails', branch: '5-0-stable'
+  gem "activerecord", github: 'rails/rails',  branch: '5-2-stable'
+  gem "activemodel", github: 'rails/rails', branch: '5-2-stable'
 end
 
-appraise "active_record_5.1" do
+appraise 'active_record_6.0' do
   gem "sqlite3", platforms: [:mri, :rbx]
   gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
-  gem "activerecord", github: 'rails/rails',  branch: '5-1-stable'
-  gem "activemodel", github: 'rails/rails', branch: '5-1-stable'
+  gem "activerecord", github: 'rails/rails',  branch: '6-0-stable'
+  gem "activemodel", github: 'rails/rails', branch: '6-0-stable'
 end
 
-appraise "active_record_5.2" do
+appraise 'active_record_6.1' do
   gem "sqlite3", platforms: [:mri, :rbx]
   gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
-  gem "activerecord", github: 'rails/rails',  branch: '5-2-stable'
-  gem "activemodel", github: 'rails/rails', branch: '5-2-stable'
+  gem "activerecord", github: 'rails/rails',  branch: '6-1-stable'
+  gem "activemodel", github: 'rails/rails', branch: '6-1-stable'
 end
 
 appraise "active_record_edge" do

data/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 gemspec
 
-platforms :mri_20, :mri_21 do
+platforms :mri do
   gem 'pry-byebug'
 end

data/LICENSE.txt

@@ -1,5 +1,5 @@
 Copyright (c) 2006-2012 Aaron Pfeifer
-Copyright (c) 2014-2015 Abdelkader Boudih
+Copyright (c) 2014-2021 Abdelkader Boudih
 
 MIT License
 

data/README.md

@@ -1,9 +1,9 @@
-[![Build Status](https://travis-ci.org/state-machines/state_machines-activerecord.svg?branch=master)](https://travis-ci.org/state-machines/state_machines-activerecord)
+[![Build Status](https://travis-ci.com/state-machines/state_machines-activerecord.svg?branch=master)](https://travis-ci.com/state-machines/state_machines-activerecord)
 [![Code Climate](https://codeclimate.com/github/state-machines/state_machines-activerecord.svg)](https://codeclimate.com/github/state-machines/state_machines-activerecord)
 
 # StateMachines Active Record Integration
 
-The Active Record 4.1+ integration adds support for database transactions, automatically
+The Active Record 5.1+ integration adds support for database transactions, automatically
 saving the record, named scopes, validation errors.
 
 ## Installation

data/gemfiles/active_record_5.1.gemfile

@@ -7,7 +7,7 @@ gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
 gem "activerecord", github: "rails/rails", branch: "5-1-stable"
 gem "activemodel", github: "rails/rails", branch: "5-1-stable"
 
-platforms :mri_20, :mri_21 do
+platforms :mri do
   gem "pry-byebug"
 end
 

data/gemfiles/active_record_5.2.gemfile

@@ -7,7 +7,7 @@ gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
 gem "activerecord", github: "rails/rails", branch: "5-2-stable"
 gem "activemodel", github: "rails/rails", branch: "5-2-stable"
 
-platforms :mri_20, :mri_21 do
+platforms :mri do
   gem "pry-byebug"
 end
 

data/gemfiles/active_record_6.0.gemfile

@@ -4,7 +4,11 @@ source "https://rubygems.org"
 
 gem "sqlite3", platforms: [:mri, :rbx]
 gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
-gem "activerecord", github: "rails/rails", branch: "master"
-gem "activemodel", github: "rails/rails", branch: "master"
+gem "activerecord", github: "rails/rails", branch: "6-0-stable"
+gem "activemodel", github: "rails/rails", branch: "6-0-stable"
+
+platforms :mri do
+  gem "pry-byebug"
+end
 
 gemspec path: "../"

data/gemfiles/active_record_6.1.gemfile

@@ -0,0 +1,14 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sqlite3", platforms: [:mri, :rbx]
+gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
+gem "activerecord", github: "rails/rails", branch: "6-1-stable"
+gem "activemodel", github: "rails/rails", branch: "6-1-stable"
+
+platforms :mri do
+  gem "pry-byebug"
+end
+
+gemspec path: "../"

data/gemfiles/active_record_edge.gemfile

@@ -2,13 +2,13 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3", :platforms => [:mri, :rbx]
-gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
-gem "activerecord", :github => "rails/rails", :branch => "master"
-gem "activemodel", :github => "rails/rails", :branch => "master"
+gem "sqlite3", platforms: [:mri, :rbx]
+gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
+gem "activerecord", github: "rails/rails", branch: "master"
+gem "activemodel", github: "rails/rails", branch: "master"
 
-platforms :mri_20, :mri_21 do
+platforms :mri do
   gem "pry-byebug"
 end
 
-gemspec :path => "../"
+gemspec path: "../"

data/lib/state_machines/integrations/active_record.rb

@@ -507,11 +507,11 @@ module StateMachines
       def define_action_hook
         if action_hook == :save
           define_helper :instance, <<-end_eval, __FILE__, __LINE__ + 1
-              def save(*)
+              def save(*, **)
                 self.class.state_machine(#{name.inspect}).send(:around_save, self) { super }
               end
 
-              def save!(*)
+              def save!(*, **)
                 result = self.class.state_machine(#{name.inspect}).send(:around_save, self) { super }
                 result || raise(ActiveRecord::RecordInvalid.new(self))
               end

data/lib/state_machines/integrations/active_record/version.rb

@@ -1,7 +1,7 @@
 module StateMachines
   module Integrations
     module ActiveRecord
-      VERSION = '0.6.0'
+      VERSION = '0.8.0'
     end
   end
 end

data/state_machines-activerecord.gemspec

@@ -15,11 +15,12 @@ Gem::Specification.new do |spec|
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.test_files    = spec.files.grep(/^test\//)
+  spec.required_ruby_version     = '>= 2.2.2'
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'state_machines-activemodel', '>= 0.5.0'
-  spec.add_dependency 'activerecord' , '>= 4.1'
-  spec.add_development_dependency 'rake', '~> 10.3'
+  spec.add_dependency 'state_machines-activemodel', '>= 0.8.0'
+  spec.add_dependency 'activerecord' , '>= 5.1'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'sqlite3', '~> 1.3'
   spec.add_development_dependency 'appraisal', '>= 1'
   spec.add_development_dependency 'minitest' , '>= 5.4.0'

data/test/machine_with_dirty_attribute_and_custom_attributes_during_loopback_test.rb

@@ -19,6 +19,6 @@ class MachineWithDirtyAttributeAndCustomAttributesDuringLoopbackTest < BaseTestC
   end
 
   def test_should_not_track_attribute_changes
-    assert_equal nil, @record.changes['status']
+    assert_nil @record.changes['status']
   end
 end

data/test/machine_with_dirty_attribute_and_state_events_test.rb

@@ -15,6 +15,6 @@ class MachineWithDirtyAttributeAndStateEventsTest < BaseTestCase
   end
 
   def test_should_not_track_attribute_change
-    assert_equal nil, @record.changes['state']
+    assert_nil @record.changes['state']
   end
 end

data/test/machine_with_dirty_attributes_during_loopback_test.rb

@@ -17,6 +17,6 @@ class MachineWithDirtyAttributesDuringLoopbackTest < BaseTestCase
   end
 
   def test_should_not_track_attribute_changes
-    assert_equal nil, @record.changes['state']
+    assert_nil @record.changes['state']
   end
 end

data/test/machine_with_event_attributes_on_save_test.rb

@@ -212,13 +212,13 @@ class MachineWithEventAttributesOnSaveTest < BaseTestCase
   def test_should_return_nil_on_around_transition_rollback
     @machine.before_transition { @model.create! }
     @machine.around_transition { @model.create!; raise ActiveRecord::Rollback }
-    assert_equal nil, @record.save
+    assert_nil @record.save
     assert_equal 0, @model.count
   end
 
   def test_should_return_nil_on_before_transition_rollback
     @machine.before_transition { raise ActiveRecord::Rollback }
-    assert_equal nil, @record.save
+    assert_nil @record.save
     assert_equal 0, @model.count
   end
 

data/test/machine_with_scopes_and_owner_subclass_test.rb

@@ -20,7 +20,7 @@ class MachineWithScopesAndOwnerSubclassTest < BaseTestCase
   def test_should_only_include_records_without_subclass_states_in_without_scope
     parked = @subclass.create :state => 'parked'
     idling = @subclass.create :state => 'idling'
-    first_gear = @subclass.create :state => 'first_gear'
+    @subclass.create :state => 'first_gear'
 
     assert_equal [parked, idling], @subclass.without_states(:first_gear).all
   end

data/test/machine_with_scopes_test.rb

@@ -43,7 +43,7 @@ class MachineWithScopesTest < BaseTestCase
 
   def test_should_only_include_records_without_state_in_singular_without_scope
     parked = @model.create :state => 'parked'
-    idling = @model.create :state => 'idling'
+    @model.create :state => 'idling'
 
     assert_equal [parked], @model.without_state(:idling).all
   end
@@ -55,13 +55,13 @@ class MachineWithScopesTest < BaseTestCase
   def test_should_only_include_records_without_states_in_plural_without_scope
     parked = @model.create :state => 'parked'
     idling = @model.create :state => 'idling'
-    first_gear = @model.create :state => 'first_gear'
+    @model.create :state => 'first_gear'
 
     assert_equal [parked, idling], @model.without_states(:first_gear).all
   end
 
   def test_should_allow_chaining_scopes
-    parked = @model.create :state => 'parked'
+    @model.create :state => 'parked'
     idling = @model.create :state => 'idling'
 
     assert_equal [idling], @model.without_state(:parked).with_state(:idling).all

data/test/machine_with_static_initial_state_test.rb

@@ -114,7 +114,7 @@ class MachineWithStaticInitialStateTest < BaseTestCase
     MachineWithStaticInitialStateTest.const_set('Owner', owner_model)
 
     owner = owner_model.create
-    record = @model.create(:state => 'idling', :owner_id => owner.id)
+    @model.create(:state => 'idling', :owner_id => owner.id)
     assert_equal 'idling', owner.vehicles[0].state
   end
 
@@ -131,7 +131,7 @@ class MachineWithStaticInitialStateTest < BaseTestCase
     MachineWithStaticInitialStateTest.const_set('Owner', owner_model)
 
     owner = owner_model.create
-    record = @model.create(:state => 'idling', :owner_id => owner.id)
+    @model.create(:state => 'idling', :owner_id => owner.id)
     assert_equal 'idling', owner.vehicle.state
   end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: state_machines-activerecord
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Abdelkader Boudih
 - Aaron Pfeifer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-04-10 00:00:00.000000000 Z
+date: 2020-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: state_machines-activemodel
@@ -17,42 +17,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -124,12 +124,10 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/active_record_4.1.gemfile
-- gemfiles/active_record_4.2.gemfile
-- gemfiles/active_record_5.0.gemfile
 - gemfiles/active_record_5.1.gemfile
 - gemfiles/active_record_5.2.gemfile
 - gemfiles/active_record_6.0.gemfile
+- gemfiles/active_record_6.1.gemfile
 - gemfiles/active_record_edge.gemfile
 - lib/state_machines-activerecord.rb
 - lib/state_machines/integrations/active_record.rb
@@ -193,7 +191,7 @@ homepage: https://github.com/state-machines/state_machines-activerecord/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -201,15 +199,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: State machines Active Record Integration
 test_files:

data/gemfiles/active_record_4.1.gemfile

@@ -1,13 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "sqlite3", "< 1.4.0",:platforms => [:mri, :rbx]
-gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
-gem "activerecord", :github => "rails/rails", :branch => "4-1-stable"
-
-platforms :mri_20, :mri_21 do
-  gem "pry-byebug"
-end
-
-gemspec :path => "../"

data/gemfiles/active_record_4.2.gemfile

@@ -1,13 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "sqlite3", "< 1.4.0",:platforms => [:mri, :rbx]
-gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
-gem "activerecord", :github => "rails/rails", :branch => "4-2-stable"
-
-platforms :mri_20, :mri_21 do
-  gem "pry-byebug"
-end
-
-gemspec :path => "../"

data/gemfiles/active_record_5.0.gemfile

@@ -1,14 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "sqlite3", "< 1.4.0",:platforms => [:mri, :rbx]
-gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
-gem "activerecord", :github => "rails/rails", :branch => "5-0-stable"
-gem "activemodel", :github => "rails/rails", :branch => "5-0-stable"
-
-platforms :mri_20, :mri_21 do
-  gem "pry-byebug"
-end
-
-gemspec :path => "../"