state_machines-activemodel 0.5.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ed10c396e1ecfa0348f197a8ff88cd14b7c50caa
-  data.tar.gz: 8f10503a48c265778c185a033f456a849be9d38b
+SHA256:
+  metadata.gz: 4451c4d642636e3d81d9bb608b8dd78cfbd01bf7340989959e12791ec2fd76e0
+  data.tar.gz: a7c86d2041b2e8deefdc809831802b413f1e0a8f7fec7aa867fcd54685262f9d
 SHA512:
-  metadata.gz: 88715204d3416f42cc70aa26ea45fe74fb757154b9e6785f421f29266a4f873898da764ab2604ee572e4599ba427ac9306a8e57e03555c4839cf989dc37ba236
-  data.tar.gz: 936ae8ef8ef2b30e3af943f7368d11316712ea321ae1cf071c0121188bbad1ab0bed28b4b5b424897dc5af6b245778e13199c2a0b2d7a2da2a5a4767d2157e14
+  metadata.gz: 2fff7546bfd98859e0a8c5e5eb6e97909a4b5d42a3ade4440c8c21bb7728d4257093532a7b63e140c8418682d0da410f657d8a78db48c1bd13cd5f90ef59ff90
+  data.tar.gz: 12bdad22386d96dc415f2eea856c5ca1329cb1fd7f213613102b9cfc0cfcb7da550d1548f633771491cd92b8a8491b390952ec44fb62db7e4cfa1f7e395366cc

data/.travis.yml

@@ -1,45 +1,21 @@
 language: ruby
-sudo: false
 cache: bundler
 
 rvm:
-  - 2.1
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1
+  - 2.5.8
+  - 2.6.6
+  - 2.7.2
   - jruby
   - rbx-2
 
 gemfile:
-  - gemfiles/active_model_4.1.gemfile
-  - gemfiles/active_model_4.2.gemfile
+  - gemfiles/active_model_5.1.gemfile
+  - gemfiles/active_model_5.2.gemfile
+  - gemfiles/active_model_6.0.gemfile
+  - gemfiles/active_model_6.1.gemfile
+  - gemfiles/active_model_edge.gemfile
 
 matrix:
-  include:
-    - gemfile: gemfiles/active_model_5.0.gemfile
-      rvm: 2.2.7
-    - gemfile: gemfiles/active_model_5.0.gemfile
-      rvm: 2.3.4
-    - gemfile: gemfiles/active_model_5.0.gemfile
-      rvm: 2.4.1
-    - gemfile: gemfiles/active_model_5.1.gemfile
-      rvm: 2.2.7
-    - gemfile: gemfiles/active_model_5.1.gemfile
-      rvm: 2.3.4
-    - gemfile: gemfiles/active_model_5.1.gemfile
-      rvm: 2.4.1
-    - gemfile: gemfiles/active_model_edge.gemfile
-      rvm: 2.2.7
-    - gemfile: gemfiles/active_model_edge.gemfile
-      rvm: 2.3.4
-    - gemfile: gemfiles/active_model_edge.gemfile
-      rvm: 2.4.1
   allow_failures:
     - rvm: jruby
     - rvm: rbx-2
-    - gemfile: gemfiles/active_model_edge.gemfile
-      rvm: 2.2.7
-    - gemfile: gemfiles/active_model_edge.gemfile
-      rvm: 2.3.4
-    - gemfile: gemfiles/active_model_edge.gemfile
-      rvm: 2.4.1

data/Appraisals

@@ -1,18 +1,18 @@
 # ActiveModel integrations
-appraise 'active_model_4.1' do
-  gem 'activemodel', github: 'rails/rails', branch: '4-1-stable'
+appraise 'active_model_5.1' do
+  gem 'activemodel', github: 'rails/rails', branch: '5-1-stable'
 end
 
-appraise 'active_model_4.2' do
-  gem 'activemodel', github: 'rails/rails', branch: '4-2-stable'
+appraise 'active_model_5.2' do
+  gem 'activemodel', github: 'rails/rails', branch: '5-2-stable'
 end
 
-appraise 'active_model_5.0' do
-  gem 'activemodel', github: 'rails/rails', branch: '5-0-stable'
+appraise 'active_model_6.0' do
+  gem 'activemodel', github: 'rails/rails', branch: '6-0-stable'
 end
 
-appraise 'active_model_5.1' do
-  gem 'activemodel', github: 'rails/rails', branch: '5-1-stable'
+appraise 'active_model_6.1' do
+  gem 'activemodel', github: 'rails/rails', branch: '6-1-stable'
 end
 
 appraise 'active_model_edge' do

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,5 +1,5 @@
-[![Build Status](https://travis-ci.org/state-machines/state_machines-activemodel.svg?branch=master)](https://travis-ci.org/state-machines/state_machines-activemodel)
-[![Code Climate](https://codeclimate.com/github/state-machines/state_machines-activemodel.png)](https://codeclimate.com/github/state-machines/state_machines-activemodel)
+[![Build Status](https://travis-ci.com/state-machines/state_machines-activemodel.svg?branch=master)](https://travis-ci.org/state-machines/state_machines-activemodel)
+[![Code Climate](https://codeclimate.com/github/state-machines/state_machines-activemodel.svg)](https://codeclimate.com/github/state-machines/state_machines-activemodel)
 
 # StateMachines ActiveModel Integration
 
@@ -21,6 +21,10 @@ Or install it yourself as:
 
     $ gem install state_machines-activemodel
 
+## Dependencies
+
+Active Model 5.1+
+
 ## Usage
 
 ```ruby
@@ -78,11 +82,6 @@ end
 
 ```
 
-Dependencies
-
-Active Model 4.1+
-
-
 ## Contributing
 
 1. Fork it ( https://github.com/state-machines/state_machines-activemodel/fork )

data/gemfiles/{active_model_4.1.gemfile → active_model_5.2.gemfile}

@@ -2,10 +2,10 @@
 
 source "https://rubygems.org"
 
-gem "activemodel", :github => "rails/rails", :branch => "4-1-stable"
+gem "activemodel", github: "rails/rails", branch: "5-2-stable"
 
 platforms :mri_20, :mri_21 do
   gem "pry-byebug"
 end
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/{active_model_4.2.gemfile → active_model_6.0.gemfile}

@@ -2,10 +2,10 @@
 
 source "https://rubygems.org"
 
-gem "activemodel", :github => "rails/rails", :branch => "4-2-stable"
+gem "activemodel", github: "rails/rails", branch: "6-0-stable"
 
 platforms :mri_20, :mri_21 do
   gem "pry-byebug"
 end
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/{active_model_5.0.gemfile → active_model_6.1.gemfile}

@@ -2,10 +2,10 @@
 
 source "https://rubygems.org"
 
-gem "activemodel", :github => "rails/rails", :branch => "5-0-stable"
+gem "activemodel", github: "rails/rails", branch: "6-1-stable"
 
 platforms :mri_20, :mri_21 do
   gem "pry-byebug"
 end
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/active_model_edge.gemfile

@@ -2,10 +2,10 @@
 
 source "https://rubygems.org"
 
-gem "activemodel", :github => "rails/rails", :branch => "master"
+gem "activemodel", github: "rails/rails", branch: "master"
 
 platforms :mri_20, :mri_21 do
   gem "pry-byebug"
 end
 
-gemspec :path => "../"
+gemspec path: "../"

data/lib/state_machines-activemodel.rb

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

data/lib/state_machines/integrations/active_model.rb

@@ -380,7 +380,7 @@ module StateMachines
           end
 
           default_options = default_error_message_options(object, attribute, message)
-          object.errors.add(attribute, message, options.merge(default_options))
+          object.errors.add(attribute, message, **options, **default_options)
         end
       end
 
@@ -465,24 +465,6 @@ module StateMachines
         klass.lookup_ancestors
       end
 
-      # Initializes class-level extensions and defaults for this machine
-      def after_initialize
-        super()
-        load_locale
-      end
-
-      # Loads any locale files needed for translating validation errors
-      def load_locale
-        unless I18n.load_path.include?(locale_path)
-          I18n.load_path.unshift(locale_path)
-          I18n.reload!
-        end
-      end
-
-      def locale_path
-        "#{File.dirname(__FILE__)}/active_model/locale.rb"
-      end
-
       # Skips defining reader/writer methods since this is done automatically
       def define_state_accessor
         name = self.name

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

@@ -1,7 +1,7 @@
 module StateMachines
   module Integrations
     module ActiveModel
-      VERSION = '0.5.0'
+      VERSION = '0.8.0'
     end
   end
 end

data/state_machines-activemodel.gemspec

@@ -16,9 +16,9 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0")
   spec.test_files    = spec.files.grep(/^test\//)
   spec.require_paths = ['lib']
-  spec.required_ruby_version     = '>= 2.0.0'
+  spec.required_ruby_version     = '>= 2.2.2'
   spec.add_dependency 'state_machines', '>= 0.5.0'
-  spec.add_dependency 'activemodel', '>= 4.1', '< 5.2'
+  spec.add_dependency 'activemodel', '>= 5.1'
 
   spec.add_development_dependency 'bundler', '>= 1.6'
   spec.add_development_dependency 'rake', '>= 10'

data/test/machine_with_dirty_attribute_and_custom_attributes_during_loopback_test.rb

@@ -6,6 +6,12 @@ class MachineWithDirtyAttributeAndCustomAttributesDuringLoopbackTest < BaseTestC
       include ActiveModel::Dirty
       model_attribute :status
       define_attribute_methods [:status]
+
+      def save
+        super.tap do
+          changes_applied
+        end
+      end
     end
     @machine = StateMachines::Machine.new(@model, :status, initial: :parked)
     @machine.event :park
@@ -21,6 +27,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

@@ -5,6 +5,12 @@ class MachineWithDirtyAttributeAndStateEventsTest < BaseTestCase
     @model = new_model do
       include ActiveModel::Dirty
       define_attribute_methods [:state]
+
+      def save
+        super.tap do
+          changes_applied
+        end
+      end
     end
     @machine = StateMachines::Machine.new(@model, action: :save, initial: :parked)
     @machine.event :ignite
@@ -18,6 +24,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_and_custom_attribute_test.rb

@@ -6,6 +6,12 @@ class MachineWithDirtyAttributesAndCustomAttributeTest < BaseTestCase
       include ActiveModel::Dirty
       model_attribute :status
       define_attribute_methods [:status]
+
+      def save
+        super.tap do
+          changes_applied
+        end
+      end
     end
     @machine = StateMachines::Machine.new(@model, :status, initial: :parked)
     @machine.event :ignite

data/test/machine_with_dirty_attributes_during_loopback_test.rb

@@ -5,32 +5,14 @@ class MachineWithDirtyAttributesDuringLoopbackTest < BaseTestCase
     @model = new_model do
       include ActiveModel::Dirty
       define_attribute_methods [:state]
-    end
-    @machine = StateMachines::Machine.new(@model, initial: :parked)
-    @machine.event :park
-
-    @record = @model.create
-
-    @transition = StateMachines::Transition.new(@record, @machine, :park, :parked, :parked)
-    @transition.perform
-  end
-
-  def test_should_not_include_state_in_changed_attributes
-    assert_equal [], @record.changed
-  end
 
-  def test_should_not_track_attribute_changes
-    assert_equal nil, @record.changes['state']
-  end
-end
-class MachineWithDirtyAttributeAndCustomAttributesDuringLoopbackTest < BaseTestCase
-  def setup
-    @model = new_model do
-      include ActiveModel::Dirty
-      model_attribute :status
-      define_attribute_methods [:status]
+      def save
+        super.tap do
+          changes_applied
+        end
+      end
     end
-    @machine = StateMachines::Machine.new(@model, :status, initial: :parked)
+    @machine = StateMachines::Machine.new(@model, initial: :parked)
     @machine.event :park
 
     @record = @model.create
@@ -44,6 +26,6 @@ class MachineWithDirtyAttributeAndCustomAttributesDuringLoopbackTest < BaseTestC
   end
 
   def test_should_not_track_attribute_changes
-    assert_equal nil, @record.changes['status']
+    assert_nil @record.changes['state']
   end
 end

data/test/machine_with_dirty_attributes_test.rb

@@ -5,6 +5,12 @@ class MachineWithDirtyAttributesTest < BaseTestCase
     @model = new_model do
       include ActiveModel::Dirty
       define_attribute_methods [:state]
+
+      def save
+        super.tap do
+          changes_applied
+        end
+      end
     end
     @machine = StateMachines::Machine.new(@model, initial: :parked)
     @machine.event :ignite

data/test/machine_with_internationalization_test.rb

@@ -144,28 +144,8 @@ class MachineWithInternationalizationTest < BaseTestCase
     assert_equal 'stop', machine.event(:park).human_name
   end
 
-  def test_should_only_add_locale_once_in_load_path
+  def test_should_have_locale_once_in_load_path
     assert_equal 1, I18n.load_path.select { |path| path =~ %r{active_model/locale\.rb$} }.length
-
-    # Create another ActiveModel model that will triger the i18n feature
-    new_model
-
-    assert_equal 1, I18n.load_path.select { |path| path =~ %r{active_model/locale\.rb$} }.length
-  end
-
-  def test_should_add_locale_to_beginning_of_load_path
-    @original_load_path = I18n.load_path
-    I18n.backend = I18n::Backend::Simple.new
-
-    app_locale = File.dirname(__FILE__) + '/files/en.yml'
-    default_locale = File.dirname(__FILE__) + '/../lib/state_machines/integrations/active_model/locale.rb'
-    I18n.load_path = [app_locale]
-
-    StateMachines::Machine.new(@model)
-
-    assert_equal [default_locale, app_locale].map { |path| File.expand_path(path) }, I18n.load_path.map { |path| File.expand_path(path) }
-  ensure
-    I18n.load_path = @original_load_path
   end
 
   def test_should_prefer_other_locales_first

data/test/test_helper.rb

@@ -32,7 +32,6 @@ class BaseTestCase < MiniTest::Test
 
       def initialize(attrs = {})
         attrs.each { |attr, value| send("#{attr}=", value) }
-        @changed_attributes = {}
       end
 
       def attributes
@@ -40,7 +39,6 @@ class BaseTestCase < MiniTest::Test
       end
 
       def save
-        @changed_attributes = {}
         true
       end
     end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: state_machines-activemodel
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Abdelkader Boudih
 - Aaron Pfeifer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-06-20 00:00:00.000000000 Z
+date: 2020-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: state_machines
@@ -31,20 +31,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -130,10 +124,10 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/active_model_4.1.gemfile
-- gemfiles/active_model_4.2.gemfile
-- gemfiles/active_model_5.0.gemfile
 - gemfiles/active_model_5.1.gemfile
+- gemfiles/active_model_5.2.gemfile
+- gemfiles/active_model_6.0.gemfile
+- gemfiles/active_model_6.1.gemfile
 - gemfiles/active_model_edge.gemfile
 - lib/state_machines-activemodel.rb
 - lib/state_machines/integrations/active_model.rb
@@ -169,7 +163,7 @@ homepage: https://github.com/state-machines/state_machines-activemodel
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -177,16 +171,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: ActiveModel integration for State Machines
 test_files: