state_machines 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4408b8e84e9ed5e15d4c26a98acd7190a6e5a66
-  data.tar.gz: 47f30c2fda4189ab81c1c1dca43774a2e0d56965
+  metadata.gz: 3935f97b4e0314e076a6a35afc73f4f187058293
+  data.tar.gz: f2e5c9374a4f1b05729035f14f4909dc7f218518
 SHA512:
-  metadata.gz: ca98c4bbd71a2a351ba3f3b6f70951a70ac0148dfa019eae76cb99083d2f4a02afe967f0464ec8bceaf92defb59f5512681f1ae95a177dd6707742b68cf055f0
-  data.tar.gz: ddf52356a4ef5738bd7a27dfd6d61f95f3e72f38f3ee60a70202706eb2a3bdcbf526954682addb9f42dec6fa57b75ba406521cf49c25a77937e18cca8999a39f
+  metadata.gz: 48312c212788cc3b03356ea37dbfa1cd5b73ea881b2f61f6367d3d8ad3eece0c145b79bc47b7c895b222651f887af31ca3695028c2c8f87d43f4e7a166944d42
+  data.tar.gz: 4e05b6813f79d0374d9f21be4f91567fa09ed5c18fb9dd99ae108be5e1d813f149fbd757b3ee11ff1f9988d0819a3fa81907967cbcdbb0858d8a12c3de27514a

data/Changelog.md

@@ -0,0 +1,12 @@
+*   Pass `static: false` in case you don't want initial states to be forced. e.g.
+
+    ```ruby
+    # will set the initial machine state
+    @machines.initialize_states(@object)
+
+    # optionally you can pass the attributes to have that as the initial state
+    @machines.initialize_states(@object, {}, { state: 'finished' })
+
+    # or pass set `static` to false if you want to keep the `object.state` current value
+    @machines.initialize_states(@object, { static: false })
+    ```

data/Contributors.md

@@ -0,0 +1,39 @@
+- Aaron Gibralter
+- Aaron Pfeifer
+- Abdelkader Boudih
+- Akira Matsuda
+- Andrea Longhi
+- Brad Heller
+- Brandon Dimcheff
+- Casey Howard
+- Chinasaur
+- Daniel Huckstep
+- Durran Jordan
+- Gareth Adams
+- Jahangir Zinedine
+- Jeremy Wells
+- Joe Lind
+- Jon Evans
+- Markus Schirp
+- Michael Klishin
+- Mikhail Shirkov
+- Mohamed Alouane
+- Nate Murray
+- Nathan Long
+- Nicolas Blanco
+- Pawel Pierzchala
+- Pete Forde
+- Peter Lampesberger
+- Rin Raeuber
+- Robert Poor
+- Rustam Zagirov
+- Sandro Turriate and Tim Pope
+- Sean O'Brien
+- Stefan Penner
+- Steve Richert
+- Wojciech Wnętrzak
+- @chris
+- @gmitrev
+- @nblumoe
+- @reiner
+- @sanemat

data/lib/state_machines/machine_collection.rb

@@ -1,8 +1,6 @@
 module StateMachines
   # Represents a collection of state machines for a class
   class MachineCollection < Hash
-
-    
     # Initializes the state of each machine in the given object.  This can allow
     # states to be initialized in two groups: static and dynamic.  For example:
     # 
@@ -13,22 +11,25 @@ module StateMachines
     # If no block is provided, then all states will still be initialized.
     # 
     # Valid configuration options:
-    # * <tt>:static</tt> - Whether to initialize static states.  If set to
-    #   :force, the state will be initialized regardless of its current value.
-    #   Default is :force.
+    # * <tt>:static</tt> - Whether to initialize static states. Unless set to
+    #   false, the state will be initialized regardless of its current value.
+    #   Default is true.
     # * <tt>:dynamic</tt> - Whether to initialize dynamic states.  If set to
     #   :force, the state will be initialized regardless of its current value.
     #   Default is true.
     # * <tt>:to</tt> - A hash to write the initialized state to instead of
     #   writing to the object.  Default is to write directly to the object.
-    def initialize_states(object, options = {})
+    def initialize_states(object, options = {}, attributes = {})
       options.assert_valid_keys( :static, :dynamic, :to)
       options = {:static => true, :dynamic => true}.merge(options)
 
       result = yield if block_given?
 
       each_value do |machine| 
-        machine.initialize_state(object, :force => options[:static] == :force, :to => options[:to]) unless machine.dynamic_initial_state?
+        unless machine.dynamic_initial_state?
+          force = options[:static] == :force || !attributes.keys.include?(machine.attribute)
+          machine.initialize_state(object, force: force, :to => options[:to])
+        end
       end if options[:static]
       
       each_value do |machine|

data/lib/state_machines/version.rb

@@ -1,3 +1,3 @@
 module StateMachines
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/test/unit/machine/machine_with_static_initial_state_test.rb

@@ -29,18 +29,7 @@ class MachineWithStaticInitialStateTest < StateMachinesTest
     assert_equal 'parked', @klass.new.state
   end
 
-  def test_not_set_initial_state_even_if_not_empty
-    @klass.class_eval do
-      def initialize(_attributes = {})
-        self.state = 'idling'
-        super()
-      end
-    end
-    object = @klass.new
-    assert_equal 'idling', object.state
-  end
-
-  def test_should_set_initial_state_prior_to_initialization
+  def test_should_not_initial_state_prior_to_initialization
     base = Class.new do
       attr_accessor :state_on_init
 
@@ -51,7 +40,7 @@ class MachineWithStaticInitialStateTest < StateMachinesTest
     klass = Class.new(base)
     StateMachines::Machine.new(klass, initial: :parked)
 
-    assert_equal 'parked', klass.new.state_on_init
+    assert_nil klass.new.state_on_init
   end
 
   def test_should_be_included_in_known_states

data/test/unit/machine_collection/machine_collection_state_initialization_test.rb

@@ -7,8 +7,8 @@ class MachineCollectionStateInitializationTest < StateMachinesTest
     @klass = Class.new
 
     @machines[:state] = StateMachines::Machine.new(@klass, :state, initial: :parked)
-    @machines[:alarm_state] = StateMachines::Machine.new(@klass, :alarm_state, initial: lambda { |_object| :active })
-    @machines[:alarm_state].state :active, value: lambda { 'active' }
+    @machines[:alarm_state] = StateMachines::Machine.new(@klass, :alarm_state, initial: ->(_object) { :active })
+    @machines[:alarm_state].state :active, value: -> { 'active' }
 
     # Prevent the auto-initialization hook from firing
     @klass.class_eval do
@@ -25,17 +25,17 @@ class MachineCollectionStateInitializationTest < StateMachinesTest
     assert_raises(ArgumentError) { @machines.initialize_states(@object, invalid: true) }
   end
 
-  def test_should_only_initialize_static_states_prior_to_block
+  def test_should_initialize_static_states_after_block
     @machines.initialize_states(@object) do
       @state_in_block = @object.state
       @alarm_state_in_block = @object.alarm_state
     end
 
-    assert_equal 'parked', @state_in_block
+    assert_nil @state_in_block
     assert_nil @alarm_state_in_block
   end
 
-  def test_should_only_initialize_dynamic_states_after_block
+  def test_should_initialize_dynamic_states_after_block
     @machines.initialize_states(@object) do
       @alarm_state_in_block = @object.alarm_state
     end
@@ -57,10 +57,10 @@ class MachineCollectionStateInitializationTest < StateMachinesTest
     assert_equal 'active', @object.alarm_state
   end
 
-  def test_should_not_initialize_existing_static_states_by_default
+  def test_should_initialize_existing_static_states_by_default
     @object.state = 'idling'
     @machines.initialize_states(@object)
-    assert_equal 'idling', @object.state
+    assert_equal 'parked', @object.state
   end
 
   def test_should_initialize_existing_static_states_if_forced
@@ -69,10 +69,10 @@ class MachineCollectionStateInitializationTest < StateMachinesTest
     assert_equal 'parked', @object.state
   end
 
-  def test_should_not_initialize_existing_static_states_if_not_forced
+  def test_should_initialize_existing_static_states_if_not_forced
     @object.state = 'idling'
     @machines.initialize_states(@object, static: true)
-    assert_equal 'idling', @object.state
+    assert_equal 'parked', @object.state
   end
 
   def test_should_skip_dynamic_states_if_disabled

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: state_machines
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Abdelkader Boudih
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-21 00:00:00.000000000 Z
+date: 2015-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -65,6 +65,7 @@ files:
 - ".rspec"
 - ".travis.yml"
 - Changelog.md
+- Contributors.md
 - Gemfile
 - LICENSE.txt
 - README.md