stateflow 0.4.1 → 0.4.2

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+= Version 0.4.2
+  * Some code neatening by pedromenezes - Thanks!
+  * Added simple benchmark which is probably not accurate :)
+  
 = Version 0.4.1
 	* Removed the depreciation warnings - FINALLY :)
 

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('stateflow', '0.4.1') do |p|
+Echoe.new('stateflow', '0.4.2') do |p|
   p.description    = "State machine that allows dynamic transitions for business workflows"
   p.url            = "http://github.com/ryanza/stateflow"
   p.author         = "Ryan Oberholzer"

data/lib/stateflow/machine.rb

@@ -7,8 +7,8 @@ module Stateflow
       instance_eval(&machine)
     end
     
-    def state_column(name = nil)
-      @state_column ||= name.nil? ? :state : name
+    def state_column(name = :state)
+      @state_column ||= name
     end
 
     private    

data/lib/stateflow/persistence/active_record.rb

@@ -10,16 +10,16 @@ module Stateflow
       
       module InstanceMethods
         def load_from_persistence
-          self.send machine.state_column.to_sym
+          send machine.state_column.to_sym
         end
 
-        def save_to_persistence(new_state, options)
-          self.send("#{machine.state_column}=".to_sym, new_state)
-          self.save if options[:save]
+        def save_to_persistence(new_state, options = {})
+          send("#{machine.state_column}=".to_sym, new_state)
+          save if options[:save]
         end
         
         def ensure_initial_state
-          send("#{self.machine.state_column.to_s}=", self.current_state.name.to_s) if send(self.machine.state_column.to_s).blank?
+          send("#{machine.state_column.to_s}=", current_state.name.to_s) if send(machine.state_column.to_s).blank?
         end
       end
     end

data/lib/stateflow/persistence/mongo_mapper.rb

@@ -10,16 +10,16 @@ module Stateflow
       
       module InstanceMethods
         def load_from_persistence
-          self.send machine.state_column.to_sym
+          send machine.state_column.to_sym
         end
 
-        def save_to_persistence(new_state, options)
-          self.send("#{machine.state_column}=".to_sym, new_state)
-          self.save if options[:save]
+        def save_to_persistence(new_state, options = {})
+          send("#{machine.state_column}=".to_sym, new_state)
+          save if options[:save]
         end
         
         def ensure_initial_state
-          send("#{self.machine.state_column.to_s}=", self.current_state.name.to_s) if self.send(self.machine.state_column.to_s).blank?
+          send("#{machine.state_column.to_s}=", current_state.name.to_s) if send(machine.state_column.to_s).blank?
         end
       end
     end

data/lib/stateflow/persistence/mongoid.rb

@@ -10,16 +10,16 @@ module Stateflow
 
       module InstanceMethods
         def load_from_persistence
-          self.send machine.state_column.to_sym
+          send machine.state_column.to_sym
         end
 
         def save_to_persistence(new_state, options = {})
-          self.send("#{machine.state_column}=".to_sym, new_state)
-          self.save if options[:save]
+          send("#{machine.state_column}=".to_sym, new_state)
+          save if options[:save]
         end
 
         def ensure_initial_state
-          send("#{self.machine.state_column.to_s}=", self.current_state.name.to_s) if send(self.machine.state_column.to_s).blank?
+          send("#{machine.state_column.to_s}=", current_state.name.to_s) if send(machine.state_column.to_s).blank?
         end
       end
     end

data/lib/stateflow/state.rb

@@ -6,7 +6,7 @@ module Stateflow
       @name = name
       @options = Hash.new
       
-      instance_eval(&options) if options
+      instance_eval(&options) if block_given?
     end
     
     def enter(method = nil, &block)

data/lib/stateflow/transition.rb

@@ -22,7 +22,8 @@ module Stateflow
       
       to = execute_action(@decide, base)
       
-      @to.include?(to) ? to : (raise NoStateFound.new("Decision did not return a state that was set in the 'to' argument"))
+      raise NoStateFound.new("Decision did not return a state that was set in the 'to' argument") unless @to.include?(to)
+      to
     end
       
     private

data/stateflow.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{stateflow}
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Oberholzer"]
-  s.date = %q{2011-02-13}
+  s.date = %q{2011-04-07}
   s.description = %q{State machine that allows dynamic transitions for business workflows}
   s.email = %q{ryan@platform45.com}
   s.extra_rdoc_files = ["CHANGELOG.rdoc", "README.rdoc", "lib/stateflow.rb", "lib/stateflow/event.rb", "lib/stateflow/exception.rb", "lib/stateflow/machine.rb", "lib/stateflow/persistence.rb", "lib/stateflow/persistence/active_record.rb", "lib/stateflow/persistence/mongo_mapper.rb", "lib/stateflow/persistence/mongoid.rb", "lib/stateflow/persistence/none.rb", "lib/stateflow/state.rb", "lib/stateflow/transition.rb"]
@@ -15,11 +15,10 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Stateflow", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{stateflow}
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{State machine that allows dynamic transitions for business workflows}
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: stateflow
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 1
-  version: 0.4.1
+  prerelease: 
+  version: 0.4.2
 platform: ruby
 authors: 
 - Ryan Oberholzer
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-13 00:00:00 +00:00
+date: 2011-04-07 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,10 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 0
         version: 2.0.0
   type: :development
   version_requirements: *id001
@@ -40,8 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id002
@@ -53,12 +43,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 0
-        - beta
-        - 20
         version: 2.0.0.beta.20
   type: :development
   version_requirements: *id003
@@ -70,8 +54,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id004
@@ -141,22 +123,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 2
       version: "1.2"
 requirements: []
 
 rubyforge_project: stateflow
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: State machine that allows dynamic transitions for business workflows