state_machines-activemodel 0.6.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c0c2ff3f596aa6cef5995e482bcebf703eae4a12b69ab74eab03808bd11c6d6
-  data.tar.gz: f52f715a48845c350ddb25d84ea7a9e17ec9d95ea333cd57c329175cb9dcf01f
+  metadata.gz: c8bb31a6d52d73caf948365731b8670f86a57814d839c4606cd12c88b178f48f
+  data.tar.gz: c3f2f12fc7077f4fb230b08908314684fbbe7c59153cd12cc35dbacd767dd386
 SHA512:
-  metadata.gz: 8585ea04188c0f058c5ac7673ff9df179222c0419a51b9f82d76bf38bd42a25409def954d0bfc2dbf54c2fb24830f02d13ae0307f2879b56c7c36e7aca27c3dd
-  data.tar.gz: 06e2b22e4c65b8a0f10052d73891b1f54016cb00952829320e65a4ce9ea1fc8fbb0427bff6fbdfb58cd3095e65f4f9a63a775916957d2fb8ca7b89eabc60608c
+  metadata.gz: 8dd82a7786ea47d62fb36e04fd85be1451d1d37666702545bf9db2c0b13601d61ca65c1ab0b28844f64e7cdab82e62a1ea8221706b5d8342b003caa1fb8d9f08
+  data.tar.gz: 944d5c9ce3320e1f46e638c120ee2fcf4bd97f4c98ab3fad8e1598bc2fe2cd0a80ed2db61dc86535b551366c38108c4a007729eaeef4703e5a9e51c874921a2a

data/LICENSE.txt

@@ -1,5 +1,5 @@
 Copyright (c) 2006-2012 Aaron Pfeifer
-Copyright (c) 2014-2015 Abdelkader Boudih
+Copyright (c) 2014-2023 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://github.com/state-machines/state_machines-activemodel/actions/workflows/ruby.yml/badge.svg)
+[![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/lib/state_machines/integrations/active_model/version.rb

@@ -1,7 +1,7 @@
 module StateMachines
   module Integrations
     module ActiveModel
-      VERSION = '0.6.0'
+      VERSION = '0.9.0'
     end
   end
 end

data/lib/state_machines/integrations/active_model.rb

@@ -184,7 +184,9 @@ module StateMachines
     # == Observers
     #
     # In order to hook in observer support for your application, the
-    # ActiveModel::Observing feature must be included.  Because of the way
+    # ActiveModel::Observing feature must be included.  This can be added by including the
+    # https://github.com/state-machines/state_machines-activemodel-observers gem in your 
+    # Gemfile. Because of the way
     # ActiveModel observers are designed, there is less flexibility around the
     # specific transitions that can be hooked in.  However, a large number of
     # hooks *are* supported.  For example, if a transition for a object's
@@ -380,7 +382,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
 
@@ -405,6 +407,10 @@ module StateMachines
       def define_state_initializer
         define_helper :instance, <<-end_eval, __FILE__, __LINE__ + 1
           def initialize(params = {})
+            params.transform_keys! do |key|
+              self.class.attribute_aliases[key.to_s] || key.to_s
+            end if self.class.respond_to?(:attribute_aliases)
+
             self.class.state_machines.initialize_states(self, {}, params) { super }
           end
         end_eval

data/test/machine_with_initialized_aliased_attribute_test.rb

@@ -0,0 +1,33 @@
+require_relative 'test_helper'
+
+class MachineWithInitializedAliasedAttributeTest < BaseTestCase
+  def test_should_match_original_attribute_value_with_attribute_methods
+    model = new_model do
+      include ActiveModel::AttributeMethods
+      alias_attribute :custom_status, :state
+    end
+
+    machine = StateMachines::Machine.new(model, initial: :parked, integration: :active_model)
+    machine.other_states(:started)
+
+    record = model.new(custom_status: 'started')
+
+    refute record.state?(:parked)
+    assert record.state?(:started)
+  end
+
+  def test_should_not_match_original_attribute_value_without_attribute_methods
+    model = new_model do
+      alias_attribute :custom_status, :state
+    end
+
+    machine = StateMachines::Machine.new(model, initial: :parked, integration: :active_model)
+    machine.other_states(:started)
+
+    record = model.new(custom_status: 'started')
+
+    assert record.state?(:parked)
+    refute record.state?(:started)
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: state_machines-activemodel
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Abdelkader Boudih
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-09 00:00:00.000000000 Z
+date: 2023-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: state_machines
@@ -17,22 +17,19 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.1'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '6.0'
   type: :runtime
@@ -40,9 +37,6 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.1'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '6.0'
 - !ruby/object:Gem::Dependency
@@ -123,26 +117,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
-- Appraisals
-- Gemfile
 - 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_edge.gemfile
 - lib/state_machines-activemodel.rb
 - lib/state_machines/integrations/active_model.rb
 - lib/state_machines/integrations/active_model/locale.rb
 - lib/state_machines/integrations/active_model/version.rb
-- state_machines-activemodel.gemspec
-- test/files/en.yml
 - test/integration_test.rb
 - test/machine_by_default_test.rb
 - test/machine_errors_test.rb
@@ -157,6 +137,7 @@ files:
 - test/machine_with_events_test.rb
 - test/machine_with_failed_after_callbacks_test.rb
 - test/machine_with_failed_before_callbacks_test.rb
+- test/machine_with_initialized_aliased_attribute_test.rb
 - test/machine_with_initialized_state_test.rb
 - test/machine_with_internationalization_test.rb
 - test/machine_with_model_state_attribute_test.rb
@@ -166,7 +147,6 @@ files:
 - test/machine_with_static_initial_state_test.rb
 - test/machine_with_validations_and_custom_attribute_test.rb
 - test/machine_with_validations_test.rb
-- test/test_helper.rb
 homepage: https://github.com/state-machines/state_machines-activemodel
 licenses:
 - MIT
@@ -179,19 +159,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: ActiveModel integration for State Machines
 test_files:
-- test/files/en.yml
 - test/integration_test.rb
 - test/machine_by_default_test.rb
 - test/machine_errors_test.rb
@@ -206,6 +185,7 @@ test_files:
 - test/machine_with_events_test.rb
 - test/machine_with_failed_after_callbacks_test.rb
 - test/machine_with_failed_before_callbacks_test.rb
+- test/machine_with_initialized_aliased_attribute_test.rb
 - test/machine_with_initialized_state_test.rb
 - test/machine_with_internationalization_test.rb
 - test/machine_with_model_state_attribute_test.rb
@@ -215,4 +195,3 @@ test_files:
 - test/machine_with_static_initial_state_test.rb
 - test/machine_with_validations_and_custom_attribute_test.rb
 - test/machine_with_validations_test.rb
-- test/test_helper.rb

data/.gitignore

@@ -1,22 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-tmp
-*.bundle
-*.so
-*.o
-*.a
-mkmf.log
-.idea/
-*.lock

data/.travis.yml

@@ -1,70 +0,0 @@
-language: ruby
-sudo: false
-cache: bundler
-
-rvm:
-  - 2.1
-  - 2.2.9
-  - 2.3.8
-  - 2.4.6
-  - 2.5.5
-  - 2.6.2
-  - jruby
-  - rbx-2
-
-gemfile:
-  - gemfiles/active_model_4.2.gemfile
-
-matrix:
-  include:
-    - gemfile: gemfiles/active_model_4.1.gemfile
-      rvm: 2.1
-    - gemfile: gemfiles/active_model_4.1.gemfile
-      rvm: 2.2.9
-    - gemfile: gemfiles/active_model_4.1.gemfile
-      rvm: 2.3.8
-    - gemfile: gemfiles/active_model_5.0.gemfile
-      rvm: 2.2.9
-    - gemfile: gemfiles/active_model_5.0.gemfile
-      rvm: 2.3.8
-    - gemfile: gemfiles/active_model_5.0.gemfile
-      rvm: 2.4.6
-    - gemfile: gemfiles/active_model_5.0.gemfile
-      rvm: 2.5.5
-    - gemfile: gemfiles/active_model_5.0.gemfile
-      rvm: 2.6.2
-    - gemfile: gemfiles/active_model_5.1.gemfile
-      rvm: 2.2.9
-    - gemfile: gemfiles/active_model_5.1.gemfile
-      rvm: 2.3.8
-    - gemfile: gemfiles/active_model_5.1.gemfile
-      rvm: 2.4.6
-    - gemfile: gemfiles/active_model_5.1.gemfile
-      rvm: 2.5.5
-    - gemfile: gemfiles/active_model_5.1.gemfile
-      rvm: 2.6.2
-    - gemfile: gemfiles/active_model_5.2.gemfile
-      rvm: 2.2.9
-    - gemfile: gemfiles/active_model_5.2.gemfile
-      rvm: 2.3.8
-    - gemfile: gemfiles/active_model_5.2.gemfile
-      rvm: 2.4.6
-    - gemfile: gemfiles/active_model_5.2.gemfile
-      rvm: 2.5.5
-    - gemfile: gemfiles/active_model_5.2.gemfile
-      rvm: 2.6.2
-    - gemfile: gemfiles/active_model_6.0.gemfile
-      rvm: 2.5.5
-    - gemfile: gemfiles/active_model_6.0.gemfile
-      rvm: 2.6.2
-    - gemfile: gemfiles/active_model_edge.gemfile
-      rvm: 2.6.2
-    - gemfile: gemfiles/active_model_edge.gemfile
-      rvm: 2.5.5
-  allow_failures:
-    - rvm: jruby
-    - rvm: rbx-2
-    - gemfile: gemfiles/active_model_edge.gemfile
-      rvm: 2.5.5
-    - gemfile: gemfiles/active_model_edge.gemfile
-      rvm: 2.6.2

data/Appraisals

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

data/Gemfile

@@ -1,8 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in state_machine2_activemodel.gemspec
-gemspec
-
-platforms :mri_20, :mri_21 do
-  gem 'pry-byebug'
-end

data/Rakefile

@@ -1,9 +0,0 @@
-require 'bundler/gem_tasks'
-require 'rake/testtask'
-
-Rake::TestTask.new do |t|
-  t.test_files = FileList['test/*_test.rb']
-end
-
-desc 'Default: run all tests.'
-task default: :test

data/gemfiles/active_model_4.1.gemfile

@@ -1,11 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activemodel", :github => "rails/rails", :branch => "4-1-stable"
-
-platforms :mri_20, :mri_21 do
-  gem "pry-byebug"
-end
-
-gemspec :path => "../"

data/gemfiles/active_model_4.2.gemfile

@@ -1,11 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activemodel", :github => "rails/rails", :branch => "4-2-stable"
-
-platforms :mri_20, :mri_21 do
-  gem "pry-byebug"
-end
-
-gemspec :path => "../"

data/gemfiles/active_model_5.0.gemfile

@@ -1,11 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activemodel", :github => "rails/rails", :branch => "5-0-stable"
-
-platforms :mri_20, :mri_21 do
-  gem "pry-byebug"
-end
-
-gemspec :path => "../"

data/gemfiles/active_model_5.1.gemfile

@@ -1,11 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activemodel", github: "rails/rails", branch: "5-1-stable"
-
-platforms :mri_20, :mri_21 do
-  gem "pry-byebug"
-end
-
-gemspec path: "../"

data/gemfiles/active_model_5.2.gemfile

@@ -1,11 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activemodel", github: "rails/rails", branch: "5-2-stable"
-
-platforms :mri_20, :mri_21 do
-  gem "pry-byebug"
-end
-
-gemspec path: "../"

data/gemfiles/active_model_6.0.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activemodel", github: "rails/rails", branch: "master"
-
-gemspec path: "../"

data/gemfiles/active_model_edge.gemfile

@@ -1,11 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activemodel", :github => "rails/rails", :branch => "master"
-
-platforms :mri_20, :mri_21 do
-  gem "pry-byebug"
-end
-
-gemspec :path => "../"

data/state_machines-activemodel.gemspec

@@ -1,28 +0,0 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'state_machines/integrations/active_model/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = 'state_machines-activemodel'
-  spec.version       = StateMachines::Integrations::ActiveModel::VERSION
-  spec.authors       = ['Abdelkader Boudih', 'Aaron Pfeifer']
-  spec.email         = %w(terminale@gmail.com aaron@pluginaweek.org)
-  spec.summary       = 'ActiveModel integration for State Machines'
-  spec.description   = 'Adds support for creating state machines for attributes on ActiveModel'
-  spec.homepage      = 'https://github.com/state-machines/state_machines-activemodel'
-  spec.license       = 'MIT'
-
-  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.add_dependency 'state_machines', '>= 0.5.0'
-  spec.add_dependency 'activemodel', '>= 4.1', '< 6.0'
-
-  spec.add_development_dependency 'bundler', '>= 1.6'
-  spec.add_development_dependency 'rake', '>= 10'
-  spec.add_development_dependency 'appraisal', '>= 1'
-  spec.add_development_dependency 'minitest', '~> 5.4'
-  spec.add_development_dependency 'minitest-reporters'
-end

data/test/files/en.yml

@@ -1,5 +0,0 @@
-en:
-  activemodel:
-    errors:
-      messages:
-        invalid_transition: "cannot %{event}"

data/test/test_helper.rb

@@ -1,56 +0,0 @@
-begin
-  require 'pry-byebug'
-rescue LoadError
-end
-
-require 'state_machines-activemodel'
-require 'minitest/autorun'
-require 'minitest/reporters'
-require 'active_support/all'
-Minitest::Reporters.use! [Minitest::Reporters::ProgressReporter.new]
-I18n.enforce_available_locales = true
-
-class BaseTestCase < MiniTest::Test
-  protected
-  # Creates a new ActiveModel model (and the associated table)
-  def new_model(&block)
-    # Simple ActiveModel superclass
-    parent = Class.new do
-      def self.model_attribute(name)
-        define_method(name) { instance_variable_defined?("@#{name}") ? instance_variable_get("@#{name}") : nil }
-        define_method("#{name}=") do |value|
-          send("#{name}_will_change!") if self.class <= ActiveModel::Dirty && value != send(name)
-          instance_variable_set("@#{name}", value)
-        end
-      end
-
-      def self.create
-        object = new
-        object.save
-        object
-      end
-
-      def initialize(attrs = {})
-        attrs.each { |attr, value| send("#{attr}=", value) }
-      end
-
-      def attributes
-        @attributes ||= {}
-      end
-
-      def save
-        true
-      end
-    end
-
-    model = Class.new(parent) do
-      def self.name
-        'Foo'
-      end
-
-      model_attribute :state
-    end
-    model.class_eval(&block) if block_given?
-    model
-  end
-end