simply_stated 0.0.3 → 0.0.4

data/.gitignore

@@ -19,3 +19,10 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
+
+test/*.log
+*.sqlite3
+vendor/gems/gems/*
+vendor/gems/specifications/*
+vendor/gems/doc/*
+vendor/gems/environment.rb

data/Gemfile

@@ -0,0 +1,6 @@
+gem 'freighthopper', '>= 0.1.2'
+only 'test' do
+  gem "test-rig", '>= 0.0.3', :require_as => "test_rig"
+  gem 'shoulda'
+  gem 'activerecord', :require_as => 'active_record'
+end

data/README.textile

@@ -2,6 +2,48 @@ h1. simply_stated
 
 Yet another state machine.
 
+h2. Continuous Integration
+
+See "run>code>run":http://runcoderun.com/jbr/simply_stated for the latest build status.  It should be green.
+
+h2. Code
+
+<pre><code>
+  ActiveRecord::Schema.define :version => 0 do
+    create_table :users, :force => true do |t|
+      t.column :name, :string
+      t.column :state, :string, :default => "new"
+    end
+  end
+</code></pre>
+
+<pre><code>
+class User
+  include SimplyStated
+  
+  state :new do
+    transitions { self.state = :has_name if name.present? }
+  end
+  
+  state :has_name do
+    transitions { self.state = :had_name if name.blank? }
+  end
+  
+  state :had_name
+end
+
+user = User.create
+user.state #=> :new
+
+user.update_attributes! :name => "Lombardo"
+user.state #=> :has_name
+
+user.update_attributes! :name => ""
+user.state #=> :had_name
+
+user.state = :explosion #=> raises "invalid state explosion"
+</code></pre>
+
 h2. Note on Patches/Pull Requests
  
 * Fork the project.

data/Rakefile

@@ -11,7 +11,8 @@ begin
     gem.homepage = "http://github.com/jbr/simply_stated"
     gem.authors = ["Jacob Rothstein"]
     gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
-    gem.add_dependency 'freighthopper', '>= 0.1.2'
+    gem.add_dependency 'freighthopper', '>= 0.1.3'
+    gem.add_dependency 'active_record'
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
@@ -22,7 +23,7 @@ end
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
+  test.pattern = 'test/**/*_test.rb'
   test.verbose = true
 end
 
@@ -39,8 +40,6 @@ rescue LoadError
   end
 end
 
-task :test => :check_dependencies
-
 task :default => :test
 
 require 'rake/rdoctask'

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/bin/convert_to_should_syntax

@@ -0,0 +1,3 @@
+#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
+require File.expand_path(File.join(File.dirname(__FILE__), "../vendor/gems/ruby/1.8/environment"))
+load File.expand_path(File.join(File.dirname(__FILE__), "../vendor/gems/ruby/1.8/gems/shoulda-2.10.3/bin/convert_to_should_syntax"))

data/lib/simply_stated.rb

@@ -1,3 +1,4 @@
+require 'set'
 module SimplyStated
   def self.included(klass)
     klass.instance_eval do
@@ -8,6 +9,7 @@ module SimplyStated
       named_scope :in_state, lambda {|*s| {:conditions => ['state in (?)', s.map(&:to_s)]}}
       named_scope :not_in_state, lambda {|*s| {:conditions => ['state not in (?)', s.map(&:to_s)]}}
       self.state_validation_hash = {}
+      self.states = Set.new
     end
   end
   
@@ -33,7 +35,7 @@ module SimplyStated
     def state(state_name, &blk)
       state_name = state_name.to_sym
       State.new(state_name, self).instance_eval(&blk) if blk
-      (self.states ||= []) << state_name
+      self.states << state_name
       (self.state_validation_hash[state_name] ||= []) << state_name
       
       define_method(:"in_state_#{state_name}?") {state == state_name}
@@ -51,11 +53,7 @@ module SimplyStated
         (state_validation_hash[base_state.to_sym] ||= []) << state.to_sym
       end
       
-      if blk
-        with_options :if => :"run_validations_for_state_#{state}?" do |validation_proxy|
-          validation_proxy.instance_eval(&blk)
-        end
-      end
+      eval_with_options(:if => :"run_validations_for_state_#{state}?", &blk) if blk
     end
   end