statemachine 2.0.1 → 2.1.0

data/.rvmrc

@@ -1 +1 @@
-rvm use ruby-1.9.2-p290@statemachine
+rvm use ruby-1.9.3-p194@statemachine --create

data/CHANGES

@@ -1,5 +1,14 @@
 = Statemachine Changelog
 
+== Version 2.1.0
+
+* Do not perform transitions if context method returns false | by @zombor (https://github.com/slagyr/statemachine/pull/11)
+
+== Version 2.0.1
+
+* initialize ivars so that runtimes running with -d don't complain about uninitialized ivars (chuckremes)
+* updated to use Bundler and Rspec 2 (ericmeyer)
+
 == Version 1.1.0
 
 DotGraph

data/Gemfile

@@ -2,5 +2,5 @@ source :rubygems
 
 group :development do
   gem 'rake'
-  gem 'rspec', "1.3.0"
+  gem 'rspec', ">= 2.0.0"
 end

data/Gemfile.lock

@@ -1,12 +1,20 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    diff-lcs (1.1.3)
     rake (0.9.2)
-    rspec (1.3.0)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.1)
+    rspec-expectations (2.12.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   rake
-  rspec (= 1.3.0)
+  rspec (>= 2.0.0)

data/Rakefile

@@ -3,7 +3,7 @@ require 'rubygems'
 require 'rake/gempackagetask'
 require 'rake/clean'
 require 'rake/rdoctask'
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 require 'statemachine'
 require "bundler/gem_tasks"
 
@@ -19,10 +19,8 @@ PKG_FILES = FileList[
 
 task :default => :spec
 
-desc "Run all specs"
-Spec::Rake::SpecTask.new do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
-end
+RSpec::Core::RakeTask.new(:spec)
+
 
 WEB_ROOT = File.expand_path('~/Projects/slagyr.github.com/statemachine/')
 

data/lib/statemachine/transition.rb

@@ -17,12 +17,19 @@ module Statemachine
       exits, entries = exits_and_entries(origin, destination)
       exits.each { |exited_state| exited_state.exit(args) }
       
-      origin.statemachine.invoke_action(@action, args, "transition action from #{origin} invoked by '#{@event}' event") if @action
+      if @action
+        result = origin.statemachine.invoke_action(@action, args, "transition action from #{origin} invoked by '#{@event}' event") if @action
+        transition = !(result === false)
+      else
+        transition = true
+      end
       
-      terminal_state = entries.last
-      terminal_state.activate if terminal_state
+      if transition
+        terminal_state = entries.last
+        terminal_state.activate if terminal_state
 
-      entries.each { |entered_state| entered_state.enter(args) }
+        entries.each { |entered_state| entered_state.enter(args) }
+      end
     end
     
     def exits_and_entries(origin, destination)
@@ -61,4 +68,4 @@ module Statemachine
     
   end
   
-end
+end

data/lib/statemachine/version.rb

@@ -2,8 +2,8 @@ module Statemachine
   module VERSION #:nodoc:
     unless defined? MAJOR
       MAJOR  = 2
-      MINOR  = 0
-      TINY   = 1
+      MINOR  = 1
+      TINY   = 0
 
       STRING = [MAJOR, MINOR, TINY].join('.')
       TAG    = "REL_" + [MAJOR, MINOR, TINY].join('_')

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 require 'rubygems'
-require 'spec'
+require 'rspec'
 require 'statemachine'
 
 $IS_TEST = true
@@ -33,12 +33,12 @@ module TurnstileStatemachine
     @alarm_status = false
     @thankyou_status = false
     @lock = "@locked = true"
-    @unlock = "@locked = false"
+    @unlock = "@locked = false; nil"
     @alarm = "@alarm_status = true"
     @thankyou = "@thankyou_status = true"
 
     @sm = Statemachine.build do
-      trans :locked, :coin, :unlocked, "@locked = false"
+      trans :locked, :coin, :unlocked, "@locked = false; nil"
       trans :unlocked, :pass, :locked, "@locked = true"
       trans :locked, :pass, :locked, "@alarm_status = true"
       trans :unlocked, :coin, :locked, "@thankyou_status = true"

metadata

@@ -1,34 +1,24 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: statemachine
-version: !ruby/object:Gem::Version 
-  hash: 13
+version: !ruby/object:Gem::Version
+  version: 2.1.0
   prerelease: 
-  segments: 
-  - 2
-  - 0
-  - 1
-  version: 2.0.1
 platform: ruby
-authors: 
-- "'Micah Micah'"
+authors:
+- ! '''Micah Micah'''
 autorequire: statemachine
 bindir: bin
 cert_chain: []
-
-date: 2012-01-02 00:00:00 +01:00
-default_executable: 
+date: 2012-12-13 00:00:00.000000000 Z
 dependencies: []
-
-description: Statemachine is a ruby library for building Finite State Machines (FSM), also known as Finite State Automata (FSA).
-email: 
-- "'micah@8thlight.com'"
+description: Statemachine is a ruby library for building Finite State Machines (FSM),
+  also known as Finite State Automata (FSA).
+email:
+- ! '''micah@8thlight.com'''
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rvmrc
 - CHANGES
@@ -192,41 +182,31 @@ files:
 - spec/spec_helper.rb
 - spec/transition_spec.rb
 - statemachine.gemspec
-has_rdoc: true
 homepage: http://statemachine.rubyforge.org
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: statemachine
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Statemachine-2.0.1 - Statemachine Library for Ruby http://slagyr.github.com/statemachine
-test_files: 
+summary: Statemachine-2.1.0 - Statemachine Library for Ruby http://slagyr.github.com/statemachine
+test_files:
 - spec/action_invokation_spec.rb
 - spec/builder_spec.rb
 - spec/default_transition_spec.rb