state_machines-activerecord 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3b0f15bfdc4b116addd104136821751286e8f8452f5513141cd633560e6e004
-  data.tar.gz: 76a1a6abed537af626d8a312cb7e2cb382d1b360a04111179c3808dacc940cf5
+  metadata.gz: 11815a499f4deef7d5f2c64ab0bbb7fd4b18a17110c0f4fa33a607bd764928e5
+  data.tar.gz: 4c5de06c1603fee79e66b2efd2549946f9e047f1bf1c772859c281d16379bf57
 SHA512:
-  metadata.gz: 439cfcd6eadd8abbaf6dd7de97ec584bf582465f1f2ff0dce0988c2b6c73af81a664f185a0b46c38cf7a8184d1365836d07ed3bc04acd117a78fb6b3ac372540
-  data.tar.gz: f37e758e101e747a8e135eea316316271ef5881eb3bff6606e17ceaa3ddf05ad09dc23d96dda2fd3aa22d5ea6fca9be224b19a07e2e0331677b3b9e9208007f9
+  metadata.gz: c325ff584ecf667665c5b94b9769b449a01e80a45f7d8045e05351167381d62251d01ccff4686a5e2429b6776ffb692dbf97cf885aa74c1a72c117d71579fe52
+  data.tar.gz: d648a81589482a9076d33fab2d9b3eed8bf0a36bb3f30daaee12634cf7d7f87ed7e8a85f7f3424eadc4676fccfd333f33fd1bdd4e9ec4b91651f4f8b6a8cbb50

data/README.md

@@ -6,10 +6,6 @@
 The Active Record 4.1+ integration adds support for database transactions, automatically
 saving the record, named scopes, validation errors.
 
-## Dependencies
-
-Active Record 4.1+
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -26,6 +22,10 @@ Or install it yourself as:
 
 ## Usage
 
+For the complete usage guide, see http://www.rubydoc.info/github/state-machines/state_machines-activerecord/StateMachines/Integrations/ActiveRecord
+
+### Example
+
 ```ruby
 class Vehicle < ActiveRecord::Base
   state_machine :initial => :parked do

data/lib/state_machines/integrations/active_record.rb

@@ -460,7 +460,9 @@ module StateMachines
           define_helper :instance, <<-end_eval, __FILE__, __LINE__ + 1
             def initialize(attributes = nil)
               super(attributes) do |*args|
-                self.class.state_machines.initialize_states(self, {}, attributes || {})
+                scoped_attributes = (attributes || {}).merge(self.class.scope_attributes)
+
+                self.class.state_machines.initialize_states(self, {}, scoped_attributes)
                 yield(*args) if block_given?
               end
             end
@@ -468,8 +470,10 @@ module StateMachines
         elsif ::ActiveRecord.gem_version >= Gem::Version.new('4.2')
           define_helper :instance, <<-end_eval, __FILE__, __LINE__ + 1
             def initialize(attributes = nil, options = {})
+              scoped_attributes = (attributes || {}).merge(self.class.scope_attributes)
+
               super(attributes, options) do |*args|
-                self.class.state_machines.initialize_states(self, {}, attributes || {})
+                self.class.state_machines.initialize_states(self, {}, scoped_attributes)
                 yield(*args) if block_given?
               end
             end
@@ -492,8 +496,10 @@ module StateMachines
           # Initializes dynamic states
           define_helper :instance, <<-end_eval, __FILE__, __LINE__ + 1
             def initialize(attributes = nil, options = {})
+              scoped_attributes = (attributes || {}).merge(self.class.scope_attributes)
+
               super(attributes, options) do |*args|
-                self.class.state_machines.initialize_states(self, {}, attributes || {})
+                self.class.state_machines.initialize_states(self, {}, scoped_attributes)
                 yield(*args) if block_given?
               end
             end

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

@@ -1,7 +1,7 @@
 module StateMachines
   module Integrations
     module ActiveRecord
-      VERSION = '0.5.1'
+      VERSION = '0.5.2'
     end
   end
 end

data/test/machine_with_initialized_state_test.rb

@@ -27,6 +27,12 @@ class MachineWithInitializedStateTest < BaseTestCase
     assert_equal 'idling', record.state
   end
 
+  def test_should_allow_different_initial_state_when_using_create_with
+    record = @model.create_with(state: 'idling').new
+
+    assert_equal 'idling', record.state
+  end
+
   def test_should_allow_different_initial_state_when_dynamic
     @machine.initial_state = lambda { :parked }
     record = @model.new(:state => 'idling')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: state_machines-activerecord
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Abdelkader Boudih
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-19 00:00:00.000000000 Z
+date: 2018-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: state_machines-activemodel
@@ -214,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: State machines Active Record Integration