state_machines-activerecord 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0467475491e44a4a57bce108c9e10475220e937e
-  data.tar.gz: 002af38c81f3ca6f5848fb43b2588111515bac32
+  metadata.gz: 277d564cbe1bae3f17fc6b0815c3de7cc35da5b7
+  data.tar.gz: 8e08a4a5c559aad5218e40e44ca334d64063d735
 SHA512:
-  metadata.gz: a99458f33ce86d0a3150fd64dc914abf406069270039a0771f83c6643468c26577cf94ebd253cc24bab8612650fb9b0c0a0498c9d0b1a9b570c7785fbbd8e2e3
-  data.tar.gz: 72deac09c29fca06947b33c6308d2bd7f3b49fd989a1be84305eeaee601c186d6cdf892c9a093751f9045e520d971a39d9f61066a07b872811a6ccb8d4ea4c52
+  metadata.gz: 8e3f2c598b1acb5bf5dfe5772a017352d49d6284c5e48862e53458bb7f49f3687147c0dd38a427855a6248b40437849bf3a5b0b07fe3621745aeb0fe9bbf7915
+  data.tar.gz: bdb62e5b5240ccf2985149059031ad227ff37c88fb3136ea784beb52c4c7a830d4ee4ad18d5f4478597af2d17b127cb8420c2c734d5510091854b131bab07b6b

data/.travis.yml

@@ -4,8 +4,9 @@ cache: bundler
 
 rvm:
   - 2.1
-  - 2.2.5
-  - 2.3.1
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
   - jruby
   - rbx-2
 
@@ -16,17 +17,32 @@ gemfile:
 matrix:
   include:
     - gemfile: gemfiles/active_record_5.0.gemfile
-      rvm: 2.2.5
+      rvm: 2.2.7
     - gemfile: gemfiles/active_record_5.0.gemfile
-      rvm: 2.3.1
+      rvm: 2.3.4
+    - gemfile: gemfiles/active_record_5.0.gemfile
+      rvm: 2.4.1
+    - gemfile: gemfiles/active_record_5.1.gemfile
+      rvm: 2.2.7
+    - gemfile: gemfiles/active_record_5.1.gemfile
+      rvm: 2.3.4
+    - gemfile: gemfiles/active_record_5.1.gemfile
+      rvm: 2.4.1
+    - gemfile: gemfiles/active_record_edge.gemfile
+      rvm: 2.2.7
     - gemfile: gemfiles/active_record_edge.gemfile
-      rvm: 2.2.5
+      rvm: 2.3.4
     - gemfile: gemfiles/active_record_edge.gemfile
-      rvm: 2.3.1
+      rvm: 2.4.1
+  exclude:
+    - gemfile: gemfiles/active_record_4.1.gemfile
+      rvm: 2.4.1
   allow_failures:
     - rvm: jruby
     - rvm: rbx-2
     - gemfile: gemfiles/active_record_edge.gemfile
-      rvm: 2.2.5
+      rvm: 2.2.7
+    - gemfile: gemfiles/active_record_edge.gemfile
+      rvm: 2.3.4
     - gemfile: gemfiles/active_record_edge.gemfile
-      rvm: 2.3.1
+      rvm: 2.4.1

data/Appraisals

@@ -17,6 +17,13 @@ appraise "active_record_5.0" do
   gem "activemodel", github: 'rails/rails', branch: '5-0-stable'
 end
 
+appraise "active_record_5.1" 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'
+end
+
 appraise "active_record_edge" do
   gem "sqlite3", platforms: [:mri, :rbx]
   gem "activerecord-jdbcsqlite3-adapter", platform: :jruby

data/gemfiles/active_record_5.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: "5-1-stable"
+gem "activemodel", github: "rails/rails", branch: "5-1-stable"
+
+platforms :mri_20, :mri_21 do
+  gem "pry-byebug"
+end
+
+gemspec path: "../"

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

@@ -1,7 +1,7 @@
 module StateMachines
   module Integrations
     module ActiveRecord
-      VERSION = '0.4.0'
+      VERSION = '0.4.1'
     end
   end
 end

data/state_machines-activerecord.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'state_machines-activemodel', '>= 0.3.0'
-  spec.add_dependency 'activerecord' , '>= 4.1', '< 5.1'
+  spec.add_dependency 'activerecord' , '>= 4.1', '< 5.2'
   spec.add_development_dependency 'rake', '~> 10.3'
   spec.add_development_dependency 'sqlite3', '~> 1.3'
   spec.add_development_dependency 'appraisal', '>= 1'

data/test/machine_with_event_attributes_on_save_test.rb

@@ -69,7 +69,7 @@ class MachineWithEventAttributesOnSaveTest < BaseTestCase
   end
 
   def test_should_not_run_after_callbacks_with_failures_disabled_if_fails
-    @model.before_create { |record| false }
+    @model.before_create { |record| abort_from_callback }
 
     ran_callback = false
     @machine.after_transition { ran_callback = true }
@@ -82,7 +82,7 @@ class MachineWithEventAttributesOnSaveTest < BaseTestCase
   end
 
   def test_should_run_failure_callbacks__if_fails
-    @model.before_create { |record| false }
+    @model.before_create { |record| abort_from_callback }
 
     ran_callback = false
     @machine.after_failure { ran_callback = true }
@@ -95,7 +95,7 @@ class MachineWithEventAttributesOnSaveTest < BaseTestCase
   end
 
   def test_should_not_run_around_callbacks_if_fails
-    @model.before_create { |record| false }
+    @model.before_create { |record| abort_from_callback }
 
     ran_callback = false
     @machine.around_transition { |block| block.call; ran_callback = true }

data/test/test_helper.rb

@@ -14,7 +14,9 @@ ActiveRecord::Base.logger = Logger.new("#{File.dirname(__FILE__)}/../log/active_
 
 if ActiveSupport.gem_version >= Gem::Version.new('4.2.0')
   ActiveSupport.test_order = :random
-  ActiveRecord::Base.raise_in_transactional_callbacks = true
+  if ActiveSupport.gem_version < Gem::Version.new('5.1.x')
+    ActiveRecord::Base.raise_in_transactional_callbacks = true
+  end
 end
 
 class BaseTestCase < ActiveSupport::TestCase
@@ -28,6 +30,14 @@ class BaseTestCase < ActiveSupport::TestCase
       self.table_name = table_name.to_s
       connection.create_table(table_name, :force => true) { |t| t.string(:state) } if create_table
 
+      define_method(:abort_from_callback) do
+        if ActiveSupport.gem_version >= Gem::Version.new('5.0')
+          throw :abort
+        else
+          false
+        end
+      end
+
       (
       class << self;
         self;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: state_machines-activerecord
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Abdelkader Boudih
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-17 00:00:00.000000000 Z
+date: 2017-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: state_machines-activemodel
@@ -34,7 +34,7 @@ dependencies:
         version: '4.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,7 +44,7 @@ dependencies:
         version: '4.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -133,6 +133,7 @@ files:
 - 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_edge.gemfile
 - lib/state_machines-activerecord.rb
 - lib/state_machines/integrations/active_record.rb
@@ -211,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: State machines Active Record Integration