state_machines-activemodel 0.100.0 → 0.101.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 111b5dc0bdce6aa5d89e1f0ce4a1b890656c2d2da382c1dc0db0061564f33933
-  data.tar.gz: 063d8903c160b5e5506704aca06d0702fe752a112e5aae67d9a6b8357fcc1fc0
+  metadata.gz: ca8150306fc5ce879e2c381e4689b049b5208189f4e15efb4f6a0d378647cbb5
+  data.tar.gz: 1bad79de7e3337208c134dcea4fbaa90eee5677182dca38f6bfd4b9b943546b9
 SHA512:
-  metadata.gz: ae85cbe306c3b5918fd23e337d38e4db6c737f2fe72dd4fa1856f1e53f182df767cf06f9f1c854fdd69d332602abc182c122793c676b9fe687e364f044893524
-  data.tar.gz: 5a391a11fec4bc4f26437877f3f7f98a489b891a10be2f33385f36138d09796058490f5446571e0ff6f8fb161984273a3594ca71abfe43bcbfe8ec803841b0d6
+  metadata.gz: 1d8cca8f00006c4a43b9c82fade3babc662027b7d5971c5d009c9b6da087cc3d93a4ed60a2f8656cb59346c1dfab115405f23db2237b25e185ac718ca09f8e1f
+  data.tar.gz: 8a39da61112b9c6e7869e1d4779381062857ea36ffd1e026031c04852f30561d3cacc60e8a0a98daa112576924009d109f02fb1f738672996a7ec5a89b2ef6bc

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

@@ -3,7 +3,7 @@
 module StateMachines
   module Integrations
     module ActiveModel
-      VERSION = '0.100.0'
+      VERSION = '0.101.0'
     end
   end
 end

data/test/integration_test.rb

@@ -20,7 +20,7 @@ class IntegrationTest < BaseTestCase
   end
 
   def test_should_not_match_if_class_does_not_include_active_model_features
-    refute StateMachines::Integrations::ActiveModel.matches?(new_model)
+    refute StateMachines::Integrations::ActiveModel.matches?(new_plain_model)
   end
 
   def test_should_have_no_defaults

data/test/machine_initialization_compatibility_test.rb

@@ -6,7 +6,6 @@ class MachineInitializationCompatibilityTest < BaseTestCase
   def setup
     @model = new_model do
       include ActiveModel::Validations
-      attr_accessor :state
     end
 
     @machine = StateMachines::Machine.new(@model, initial: :parked)
@@ -31,9 +30,7 @@ class MachineInitializationCompatibilityTest < BaseTestCase
 
   def test_should_handle_attribute_aliases
     @model.class_eval do
-      def self.attribute_aliases
-        { 'status' => 'state' }
-      end
+      alias_attribute :status, :state
     end
 
     record = @model.new(status: 'idling')

data/test/machine_multiple_test.rb

@@ -5,7 +5,7 @@ require 'test_helper'
 class MachineMultipleTest < BaseTestCase
   def setup
     @model = new_model do
-      model_attribute :status
+      attribute :status, :string
     end
 
     @state_machine = StateMachines::Machine.new(@model, initial: :parked, integration: :active_model)

data/test/machine_with_dirty_attribute_and_custom_attributes_during_loopback_test.rb

@@ -5,13 +5,14 @@ require 'test_helper'
 class MachineWithDirtyAttributeAndCustomAttributesDuringLoopbackTest < BaseTestCase
   def setup
     @model = new_model do
-      include ActiveModel::Dirty
-      model_attribute :status
-      define_attribute_methods [:status]
+      attribute :status, :string
 
       def save
-        super.tap do
+        if valid?
           changes_applied
+          true
+        else
+          false
         end
       end
     end

data/test/machine_with_dirty_attribute_and_state_events_test.rb

@@ -5,12 +5,12 @@ require 'test_helper'
 class MachineWithDirtyAttributeAndStateEventsTest < BaseTestCase
   def setup
     @model = new_model do
-      include ActiveModel::Dirty
-      define_attribute_methods [:state]
-
       def save
-        super.tap do
+        if valid?
           changes_applied
+          true
+        else
+          false
         end
       end
     end

data/test/machine_with_dirty_attributes_and_custom_attribute_test.rb

@@ -5,13 +5,14 @@ require 'test_helper'
 class MachineWithDirtyAttributesAndCustomAttributeTest < BaseTestCase
   def setup
     @model = new_model do
-      include ActiveModel::Dirty
-      model_attribute :status
-      define_attribute_methods [:status]
+      attribute :status, :string
 
       def save
-        super.tap do
+        if valid?
           changes_applied
+          true
+        else
+          false
         end
       end
     end
@@ -26,17 +27,17 @@ class MachineWithDirtyAttributesAndCustomAttributeTest < BaseTestCase
   end
 
   def test_should_include_state_in_changed_attributes
-    assert_equal %w(status), @record.changed
+    assert_equal %w[status], @record.changed
   end
 
   def test_should_track_attribute_change
-    assert_equal %w(parked idling), @record.changes['status']
+    assert_equal %w[parked idling], @record.changes['status']
   end
 
   def test_should_not_reset_changes_on_multiple_transitions
     transition = StateMachines::Transition.new(@record, @machine, :ignite, :idling, :idling)
     transition.perform
 
-    assert_equal %w(parked idling), @record.changes['status']
+    assert_equal %w[parked idling], @record.changes['status']
   end
 end

data/test/machine_with_dirty_attributes_during_loopback_test.rb

@@ -5,12 +5,12 @@ require 'test_helper'
 class MachineWithDirtyAttributesDuringLoopbackTest < BaseTestCase
   def setup
     @model = new_model do
-      include ActiveModel::Dirty
-      define_attribute_methods [:state]
-
       def save
-        super.tap do
+        if valid?
           changes_applied
+          true
+        else
+          false
         end
       end
     end

data/test/machine_with_dirty_attributes_test.rb

@@ -5,12 +5,12 @@ require 'test_helper'
 class MachineWithDirtyAttributesTest < BaseTestCase
   def setup
     @model = new_model do
-      include ActiveModel::Dirty
-      define_attribute_methods [:state]
-
       def save
-        super.tap do
+        if valid?
           changes_applied
+          true
+        else
+          false
         end
       end
     end
@@ -25,17 +25,17 @@ class MachineWithDirtyAttributesTest < BaseTestCase
   end
 
   def test_should_include_state_in_changed_attributes
-    assert_equal %w(state), @record.changed
+    assert_equal %w[state], @record.changed
   end
 
   def test_should_track_attribute_change
-    assert_equal %w(parked idling), @record.changes['state']
+    assert_equal %w[parked idling], @record.changes['state']
   end
 
   def test_should_not_reset_changes_on_multiple_transitions
     transition = StateMachines::Transition.new(@record, @machine, :ignite, :idling, :idling)
     transition.perform
 
-    assert_equal %w(parked idling), @record.changes['state']
+    assert_equal %w[parked idling], @record.changes['state']
   end
 end

data/test/machine_with_initialized_aliased_attribute_test.rb

@@ -6,6 +6,7 @@ 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
 
@@ -19,7 +20,16 @@ class MachineWithInitializedAliasedAttributeTest < BaseTestCase
   end
 
   def test_should_not_match_original_attribute_value_without_attribute_methods
-    model = new_model do
+    model = new_plain_model do
+      include ActiveModel::Model
+
+      attr_accessor :state
+
+      def self.alias_attribute(new_name, old_name)
+        alias_method new_name, old_name
+        alias_method "#{new_name}=", "#{old_name}="
+      end
+
       alias_attribute :custom_status, :state
     end
 
@@ -32,4 +42,3 @@ class MachineWithInitializedAliasedAttributeTest < BaseTestCase
     refute record.state?(:started)
   end
 end
-

data/test/machine_with_non_model_state_attribute_undefined_test.rb

@@ -4,9 +4,8 @@ require 'test_helper'
 
 class MachineWithNonModelStateAttributeUndefinedTest < BaseTestCase
   def setup
-    @model = new_model do
-      def initialize
-      end
+    @model = new_plain_model do
+      def initialize; end
     end
 
     @machine = StateMachines::Machine.new(@model, :status, initial: :parked, integration: :active_model)

data/test/test_helper.rb

@@ -11,45 +11,40 @@ I18n.enforce_available_locales = true
 
 class BaseTestCase < ActiveSupport::TestCase
   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
+  # Creates a plain model without ActiveModel features
+  def new_plain_model(&block)
+    model = Class.new do
+      def self.name
+        'Foo'
       end
+    end
 
-      def initialize(attrs = {})
-        attrs.each { |attr, value| send("#{attr}=", value) }
-      end
+    model.class_eval(&block) if block_given?
 
-      def attributes
-        @attributes ||= {}
-      end
+    model
+  end
 
-      def save
-        true
-      end
-    end
+  # Creates a new ActiveModel model (and the associated table)
+  def new_model(&block)
+    model = Class.new do
+      include ActiveModel::Model
+      include ActiveModel::Attributes
+      include ActiveModel::Dirty
+
+      attribute :state, :string
 
-    model = Class.new(parent) do
       def self.name
         'Foo'
       end
 
-      model_attribute :state
+      def self.create
+        new.tap { |instance| instance.save if instance.respond_to?(:save) }
+      end
     end
+
     model.class_eval(&block) if block_given?
+
     model
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: state_machines-activemodel
 version: !ruby/object:Gem::Version
-  version: 0.100.0
+  version: 0.101.0
 platform: ruby
 authors:
 - Abdelkader Boudih
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.100.0
+        version: 0.100.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.100.0
+        version: 0.100.4
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement