bstard 0.1.0 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTJmMDJmODEzNDNjOWNjODJlMDRmOWUyZWQ3N2I3NmY5NTA2ODk3Mw==
+    MDViNjIxNWEzZjM2N2RkZjM4ODRkZjljODgxNmI2ODlkZjVjMmM1MA==
   data.tar.gz: !binary |-
-    NjI3YmVkYzhkYWE5YTA1MGY3MGYxN2ZlMjliNDY1YzNiODlkZTg2Mw==
+    MTkwYzViNzdlNmUwYWIyODEwODkyNTI5ZDY3ZTJkMmFmYzAyMTQxMQ==
 SHA512:
   metadata.gz: !binary |-
-    ODM1MGQxYzkzNTQzYzkyNTEzYTE1MGY0YmI2MmY2OTUxMDUyOTg0YmU3MjM3
-    NWVjM2E4YjVlMTZlMjMyZmRhOTMxZmI4MTQ3Y2Q5M2IzMTRlMDcxNzU0YmVi
-    ZmM1ZTg4ZjQ3MzIzYjI5NTUzYWM3Zjc0ZGM3MjkxMTZiOTY1NTk=
+    NjViYjlmNTFmMjJjMTY0YzI5MGQzMDUxMjdjNzQ2NTc1MTczZWNiMjNlNjY4
+    ZDljODk0ZTUwODRmNDIzNGUyZWY3YWZlMGJlNGI0Y2U1ODMzYjJiN2JkMjUy
+    NTI1NWQ5MjExYmNiZWE5NzEzODhkZTg5NzFmNWZjMWE5Yjk3Njc=
   data.tar.gz: !binary |-
-    ZGNlZDk4Njk5Zjg4OTkwMTg4Y2Q5ODI5Njc2YjZjNjgwNGQ4MTM2YjE2Mjkw
-    MTI2YmMxZTA4Y2NkNGE2NzkyZjg1MjI4MDdhNzgwNjMyOTViZmNiODg2OWQy
-    OWQzYzgxZTI4OWI1YjczMTI1OWIyYTZhZjE4NTg1NTI2ZGQ2NTc=
+    NDk4MmMxNDg5NjMwZjRhOTYzYWJmMjI1NDA2MmI5MjcxZmQ2ZWJmNzI5MGM1
+    NmY4YmRkNzkyNjY1NmExMWI1MGFhZjRmMDIwYjU3Y2FiNzk2OGMwMDk3MTc0
+    YjM0NGJiYTEwMTY1M2RhNTExMGQ3NmI5MDhiOWQyNTk0MTA4NGQ=

data/README.md

@@ -32,7 +32,7 @@ Use `Bstard.define` to describe your state machine
 
 This defines a state machine that:
 
- - has __new__ __submitted__ and __deleted__ states
+ - has __new__, __submitted__ and __deleted__ states
  - responds to _submit_ and _delete_ events
  - has an initial state of __new__
  - transitions from __new__ to __submitted__ when triggered by the _submit_ event
@@ -95,7 +95,7 @@ Event callbacks are configured with `on`
 ``` ruby
   machine = Bstard.define do |fsm|
     # ...
-    fsm.on :submit do |previous_state|
+    fsm.on :submit do |event, state, next_state|
       # code that needs to be run when :submit is triggered
     end
   end
@@ -106,7 +106,7 @@ State change callbacks are configured with `when`
 ``` ruby
   machine = Bstard.define do |fsm|
     # ...
-    fsm.when :submitted do |previous_state|
+    fsm.when :submitted do |event, previous_state, state|
       # code that needs to run when state changes to :submitted
     end
   end
@@ -117,10 +117,10 @@ Use the symbol `:any` for event or state change callbacks that should by run whe
 ``` ruby
   machine = Bstard.define do |fsm|
     # ...
-    fsm.on :any do |previous_state|
+    fsm.on :any do |event, state, next_state|
       # code that will run when any event is triggered
     end
-    fsm.when :any do |previous_state|
+    fsm.when :any do |event, previous_state, state|
       # code that will run when after any state change
     end
   end
@@ -141,8 +141,8 @@ private
       fsm.initial status
       fsm.event :save, :new => :draft
       fsm.event :approve, :draft => :approved
-      fsm.when :any do |prev_state|
-        status = fsm.current_state
+      fsm.when :any do |event, prev_state, new_state|
+        status = new_state
       end
     end
   end
@@ -162,7 +162,7 @@ To run the tests, run `bundle exec rake test`.
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/bstard/fork )
+1. Fork it ( https://github.com/tonyheadford/bstard/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/bstard/fsm.rb

@@ -59,12 +59,12 @@ class Bstard::Fsm
         transitions = @events[evt]
         raise Bstard::InvalidEvent.new("Unknown event <#{evt.to_s}>") if transitions.nil?
         new_state = transitions[current_state]
-        raise Bstard::InvalidTransition.new("Cannot <#{evt.to_s}> from [#{current_state.to_s}]") if new_state.nil?
-        @event_callbacks.fetch(evt.to_sym, []).concat(@event_callbacks.fetch(:any, [])).each { |c| c.call(current_state) }
         old_state = current_state
+        raise Bstard::InvalidTransition.new("Cannot <#{evt.to_s}> from [#{current_state.to_s}]") if new_state.nil?
+        @event_callbacks.fetch(evt.to_sym, []).concat(@event_callbacks.fetch(:any, [])).each { |c| c.call(evt, old_state, new_state) }
         @current_state = new_state
-        @state_callbacks.fetch(current_state, []).concat(@state_callbacks.fetch(:any, [])).each { |c| c.call(old_state) }
-        current_state
+        @state_callbacks.fetch(current_state, []).concat(@state_callbacks.fetch(:any, [])).each { |c| c.call(evt, old_state, new_state) }
+        new_state
       end
     end
   end

data/lib/bstard/version.rb

@@ -1,4 +1,4 @@
 module Bstard
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bstard
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Tony Headford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-08 00:00:00.000000000 Z
+date: 2015-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler