state_machines-activemodel 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ed10c396e1ecfa0348f197a8ff88cd14b7c50caa
-  data.tar.gz: 8f10503a48c265778c185a033f456a849be9d38b
+SHA256:
+  metadata.gz: 0a65ab5931d785bfe167675a0232d773e7512535bfa35f9425836927d112216f
+  data.tar.gz: 52d09ca9cac1fb9d5536817fcff391e26da9b08c8e1ec6d22d2c60c6d9f143b8
 SHA512:
-  metadata.gz: 88715204d3416f42cc70aa26ea45fe74fb757154b9e6785f421f29266a4f873898da764ab2604ee572e4599ba427ac9306a8e57e03555c4839cf989dc37ba236
-  data.tar.gz: 936ae8ef8ef2b30e3af943f7368d11316712ea321ae1cf071c0121188bbad1ab0bed28b4b5b424897dc5af6b245778e13199c2a0b2d7a2da2a5a4767d2157e14
+  metadata.gz: 0b30f78d8a2bb57b60f0d4e9efcce549b4aadcb4727014aa39f727497f6413a159d877d8d6cbb21c9a7d30f80c94cc7fb3cd4f0448b13c4cdde92ac50ccb5205
+  data.tar.gz: b8ed3d456e734a6ab8e10afd1743c290a761d6c1149c7fb8bcc3812991683a43ce2a3748b0bab0dfc4a3c332a0eaa7bb2e2a5ecc712c10efcc1b246a6dd5b3f7

data/.travis.yml

@@ -4,42 +4,64 @@ cache: bundler
 
 rvm:
   - 2.1
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1
+  - 2.2.9
+  - 2.3.6
+  - 2.4.3
+  - 2.5.0
   - jruby
   - rbx-2
 
 gemfile:
-  - gemfiles/active_model_4.1.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.6
     - gemfile: gemfiles/active_model_5.0.gemfile
-      rvm: 2.2.7
+      rvm: 2.2.9
     - gemfile: gemfiles/active_model_5.0.gemfile
-      rvm: 2.3.4
+      rvm: 2.3.6
     - gemfile: gemfiles/active_model_5.0.gemfile
-      rvm: 2.4.1
+      rvm: 2.4.3
+    - gemfile: gemfiles/active_model_5.0.gemfile
+      rvm: 2.5.0
+    - gemfile: gemfiles/active_model_5.1.gemfile
+      rvm: 2.2.9
     - gemfile: gemfiles/active_model_5.1.gemfile
-      rvm: 2.2.7
+      rvm: 2.3.6
     - gemfile: gemfiles/active_model_5.1.gemfile
-      rvm: 2.3.4
+      rvm: 2.4.3
     - gemfile: gemfiles/active_model_5.1.gemfile
-      rvm: 2.4.1
+      rvm: 2.5.0
+    - gemfile: gemfiles/active_model_5.2.gemfile
+      rvm: 2.2.9
+    - gemfile: gemfiles/active_model_5.2.gemfile
+      rvm: 2.3.6
+    - gemfile: gemfiles/active_model_5.2.gemfile
+      rvm: 2.4.3
+    - gemfile: gemfiles/active_model_5.2.gemfile
+      rvm: 2.5.0
     - gemfile: gemfiles/active_model_edge.gemfile
-      rvm: 2.2.7
+      rvm: 2.2.9
     - gemfile: gemfiles/active_model_edge.gemfile
-      rvm: 2.3.4
+      rvm: 2.3.6
     - gemfile: gemfiles/active_model_edge.gemfile
-      rvm: 2.4.1
+      rvm: 2.4.3
+    - gemfile: gemfiles/active_model_edge.gemfile
+      rvm: 2.5.0
   allow_failures:
     - rvm: jruby
     - rvm: rbx-2
     - gemfile: gemfiles/active_model_edge.gemfile
-      rvm: 2.2.7
+      rvm: 2.2.9
+    - gemfile: gemfiles/active_model_edge.gemfile
+      rvm: 2.3.6
     - gemfile: gemfiles/active_model_edge.gemfile
-      rvm: 2.3.4
+      rvm: 2.4.3
     - gemfile: gemfiles/active_model_edge.gemfile
-      rvm: 2.4.1
+      rvm: 2.5.0

data/Appraisals

@@ -15,6 +15,10 @@ 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/gemfiles/active_model_5.2.gemfile

@@ -0,0 +1,11 @@
+# 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/lib/state_machines/integrations/active_model/version.rb

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

data/state_machines-activemodel.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   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', '< 5.2'
+  spec.add_dependency 'activemodel', '>= 4.1', '< 6.0'
 
   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/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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: state_machines-activemodel
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Abdelkader Boudih
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-20 00:00:00.000000000 Z
+date: 2018-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: state_machines
@@ -34,7 +34,7 @@ dependencies:
         version: '4.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,7 +44,7 @@ dependencies:
         version: '4.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -134,6 +134,7 @@ files:
 - 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_edge.gemfile
 - lib/state_machines-activemodel.rb
 - lib/state_machines/integrations/active_model.rb
@@ -185,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: ActiveModel integration for State Machines