state_machines-activerecord 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11815a499f4deef7d5f2c64ab0bbb7fd4b18a17110c0f4fa33a607bd764928e5
-  data.tar.gz: 4c5de06c1603fee79e66b2efd2549946f9e047f1bf1c772859c281d16379bf57
+  metadata.gz: df749084be8ba0698e46dcfd0d06efddf6de293c3cfecd4f97541d1c043a93a1
+  data.tar.gz: 79a60950d37f2afbc122fd26077a6479810c47d4e68f96bcf189eef05e7e47a5
 SHA512:
-  metadata.gz: c325ff584ecf667665c5b94b9769b449a01e80a45f7d8045e05351167381d62251d01ccff4686a5e2429b6776ffb692dbf97cf885aa74c1a72c117d71579fe52
-  data.tar.gz: d648a81589482a9076d33fab2d9b3eed8bf0a36bb3f30daaee12634cf7d7f87ed7e8a85f7f3424eadc4676fccfd333f33fd1bdd4e9ec4b91651f4f8b6a8cbb50
+  metadata.gz: 3ef19adb60ee1b7074eee66f0e7170bf87d7f9de287324c1f128ff298a720bf5b51755fb2f5067869cc44a2f0910a1c50896dff0a1e0667fb95f308cd6207735
+  data.tar.gz: 6f058b6758f87082bc678feb3efb8c6e45210eabe7d955d7ee92930ca4b8a55918b3d19e3d3ea87c6d3bc46f1b214ab633c92ec08e67ca27924a69ad26df4646

data/.travis.yml

@@ -5,9 +5,10 @@ cache: bundler
 rvm:
   - 2.1
   - 2.2.9
-  - 2.3.6
-  - 2.4.3
-  - 2.5.0
+  - 2.3.8
+  - 2.4.6
+  - 2.5.5
+  - 2.6.2
   - jruby
   - rbx-2
 
@@ -20,42 +21,52 @@ matrix:
     - gemfile: gemfiles/active_record_5.0.gemfile
       rvm: 2.2.9
     - gemfile: gemfiles/active_record_5.0.gemfile
-      rvm: 2.3.6
+      rvm: 2.3.8
     - gemfile: gemfiles/active_record_5.0.gemfile
-      rvm: 2.4.3
+      rvm: 2.4.6
     - gemfile: gemfiles/active_record_5.0.gemfile
-      rvm: 2.5.0
+      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.6
+      rvm: 2.3.8
+    - gemfile: gemfiles/active_record_5.1.gemfile
+      rvm: 2.4.6
     - gemfile: gemfiles/active_record_5.1.gemfile
-      rvm: 2.4.3
+      rvm: 2.5.5
     - gemfile: gemfiles/active_record_5.1.gemfile
-      rvm: 2.5.0
+      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.6
+      rvm: 2.3.8
+    - gemfile: gemfiles/active_record_5.2.gemfile
+      rvm: 2.4.6
     - gemfile: gemfiles/active_record_5.2.gemfile
-      rvm: 2.4.3
+      rvm: 2.5.5
     - gemfile: gemfiles/active_record_5.2.gemfile
-      rvm: 2.5.0
+      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.4.3
+      rvm: 2.5.5
     - gemfile: gemfiles/active_record_edge.gemfile
-      rvm: 2.5.0
+      rvm: 2.6.2
   exclude:
     - gemfile: gemfiles/active_record_4.1.gemfile
-      rvm: 2.4.3
+      rvm: 2.4.6
     - gemfile: gemfiles/active_record_4.1.gemfile
-      rvm: 2.5.0
+      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.2.7
-    - gemfile: gemfiles/active_record_edge.gemfile
-      rvm: 2.3.4
+      rvm: 2.5.5
     - gemfile: gemfiles/active_record_edge.gemfile
-      rvm: 2.4.1
+      rvm: 2.6.2

data/README.md

@@ -72,7 +72,7 @@ caveat here is that, due to a constraint in ActiveRecord's validation
 framework, custom validators will not work as expected when defined to run
 in multiple states. For example:
 
-~~~
+```ruby
 class Vehicle < ActiveRecord::Base
   state_machine do
     state :first_gear, :second_gear do
@@ -80,21 +80,21 @@ class Vehicle < ActiveRecord::Base
     end
   end
 end
-~~~
+```
 
 In this case, the <tt>:speed_is_legal</tt> validation will only get run
 for the <tt>:second_gear</tt> state.  To avoid this, you can define your
 custom validation like so:
 
-~~~
-  class Vehicle < ActiveRecord::Base
-    state_machine do
-      state :first_gear, :second_gear do
-        validate {|vehicle| vehicle.speed_is_legal}
-      end
+```ruby
+class Vehicle < ActiveRecord::Base
+  state_machine do
+    state :first_gear, :second_gear do
+      validate {|vehicle| vehicle.speed_is_legal}
     end
   end
-~~~
+end
+```
 
 ## Contributing
 

data/gemfiles/active_record_4.1.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3", :platforms => [:mri, :rbx]
+gem "sqlite3", "< 1.4.0",:platforms => [:mri, :rbx]
 gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
 gem "activerecord", :github => "rails/rails", :branch => "4-1-stable"
 

data/gemfiles/active_record_4.2.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3", :platforms => [:mri, :rbx]
+gem "sqlite3", "< 1.4.0",:platforms => [:mri, :rbx]
 gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
 gem "activerecord", :github => "rails/rails", :branch => "4-2-stable"
 

data/gemfiles/active_record_5.0.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3", :platforms => [:mri, :rbx]
+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"

data/gemfiles/active_record_6.0.gemfile

@@ -0,0 +1,10 @@
+# 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: "master"
+gem "activemodel", github: "rails/rails", branch: "master"
+
+gemspec path: "../"

data/lib/state_machines-activerecord.rb

@@ -1 +1,6 @@
+require 'active_support'
 require 'state_machines/integrations/active_record'
+
+ActiveSupport.on_load(:i18n) do
+  I18n.load_path << File.expand_path('state_machines/integrations/active_record/locale.rb', __dir__)
+end

data/lib/state_machines/integrations/active_record.rb

@@ -425,10 +425,6 @@ module StateMachines
         def matching_ancestors
           [::ActiveRecord::Base]
         end
-
-        def locale_path
-          "#{File.dirname(__FILE__)}/active_record/locale.rb"
-        end
       end
 
       protected
@@ -458,7 +454,7 @@ module StateMachines
       def define_state_initializer
         if ::ActiveRecord.gem_version >= Gem::Version.new('5.0.0.alpha')
           define_helper :instance, <<-end_eval, __FILE__, __LINE__ + 1
-            def initialize(attributes = nil)
+            def initialize(attributes = nil, *)
               super(attributes) do |*args|
                 scoped_attributes = (attributes || {}).merge(self.class.scope_attributes)
 

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

@@ -1,7 +1,7 @@
 module StateMachines
   module Integrations
     module ActiveRecord
-      VERSION = '0.5.2'
+      VERSION = '0.6.0'
     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.5.0'
-  spec.add_dependency 'activerecord' , '>= 4.1', '< 6.0'
+  spec.add_dependency 'activerecord' , '>= 4.1'
   spec.add_development_dependency 'rake', '~> 10.3'
   spec.add_development_dependency 'sqlite3', '~> 1.3'
   spec.add_development_dependency 'appraisal', '>= 1'

data/test/integration_test.rb

@@ -22,8 +22,4 @@ class IntegrationTest < BaseTestCase
   def test_should_have_defaults
     assert_equal({action: :save, use_transactions: true}, StateMachines::Integrations::ActiveRecord.defaults)
   end
-
-  def test_should_have_a_locale_path
-    assert_not_nil StateMachines::Integrations::ActiveRecord.locale_path
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: state_machines-activerecord
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Abdelkader Boudih
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-22 00:00:00.000000000 Z
+date: 2019-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: state_machines-activemodel
@@ -32,9 +32,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,9 +39,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -135,6 +129,7 @@ files:
 - 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_edge.gemfile
 - lib/state_machines-activerecord.rb
 - lib/state_machines/integrations/active_record.rb
@@ -213,8 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: State machines Active Record Integration