super_state 0.2.1 → 0.3.0

data/Rakefile

@@ -45,7 +45,7 @@ spec = Gem::Specification.new do |s|
 
   # Change these as appropriate
   s.name              = "super_state"
-  s.version           = "0.2.1"
+  s.version           = "0.3.0"
   s.summary           = "Super Simple State Machine"
   s.author            = "Matthew Rudy Jacobs"
   s.email             = "MatthewRudyJacobs@gmail.com"

data/lib/super_state.rb

@@ -1,4 +1,5 @@
 require 'super_state/common_states'
+require 'active_support/ordered_hash'
 
 module SuperState
   
@@ -15,6 +16,8 @@ module SuperState
       
       # the initial_state only takes effect when we say record.valid?
       before_validation :set_initial_super_state, :on => :create
+      
+      validate :ensure_super_state
     end
   end
   
@@ -102,6 +105,12 @@ module SuperState
       self.current_super_state.humanize
     end
     
+    def ensure_super_state
+      unless self.class.__super_states.include?(self.current_super_state)
+        errors[self.class.super_state_column] << "is not a valid super state"
+      end
+    end
+    
   end
   
   class BadState < ArgumentError ; end

data/test/common_states_test.rb

@@ -2,19 +2,15 @@ require 'test_helper'
 
 class CommonStatesTest < Test::Unit::TestCase
   
-  class MyClass < ActiveRecord::Base
-    include SuperState::CommonStates
-  end
-  
   # a DD::Batch is a simple example
   def setup
-    @object = MyClass.create!()
+    @object = Commoner.create!()
     assert @object.pending?
-    assert @object.class.ancestors.include?(CommonStates), "mate, it's not a CommonState thing"
+    assert @object.class.ancestors.include?(SuperState::CommonStates), "mate, it's not a CommonState thing"
   end
   
   test "a new record is pending?" do
-    @object = MyClass.new
+    @object = Commoner.new
     assert @object.pending?
   end
   

data/test/super_state_test.rb

@@ -2,6 +2,21 @@ require 'test_helper'
 
 class SuperStateTest < Test::Unit::TestCase
   
+  test "status must be valid" do
+    record = Something.new
+    assert record.valid?
+    
+    record.save!
+    assert record.start?
+    
+    record.status = "not_valid"
+    assert !record.valid?
+    assert_errors record, :status => "is not a valid super state"
+    
+    record.status = "start"
+    assert record.valid?
+  end
+  
   test "abstract the tests" do
     puts "this has been abstracted from a live project"
     puts "as such the tests have not yet been abstracted"

data/test/test_helper.rb

@@ -3,6 +3,62 @@ require 'test/unit'
 require 'active_support/testing/declarative'
 $: << File.expand_path(File.dirname(__FILE__)+"/../lib")
 
+require 'super_state'
+
+require 'active_record'
+require 'mocha'
+
+ActiveRecord::Base.establish_connection(
+  :adapter => (RUBY_PLATFORM=="java" ? "jdbcsqlite3" : "sqlite3"),
+  :database => ":memory:"
+)
+
+ActiveRecord::Schema.define(:version => 0) do
+  create_table :somethings, :force => true do |t|
+    t.string :status
+  end
+end
+
+class Something < ActiveRecord::Base
+  
+  include SuperState
+  
+  super_state :start, :initial => true
+  super_state :middle
+  super_state :end
+  
+end
+
+ActiveRecord::Schema.define(:version => 0) do
+  create_table :commoners, :force => true do |t|
+    t.string :status
+  end
+end
+
+class Commoner < ActiveRecord::Base
+  include SuperState::CommonStates
+end
+
 class Test::Unit::TestCase
   extend ActiveSupport::Testing::Declarative
+  
+  def before_and_after_reload(record)
+    yield
+    record.reload
+    yield
+  end
+  
+  def assert_errors(record, fields)
+    fields.each do |field, errors|
+      assert_errors_on(errors, record, field)
+    end
+  end
+  
+  def assert_errors_on(errors, record, field)
+    assert_equal Array(errors), Array(record.errors[field]), "unexpected errors on #{field.inspect}"
+  end
+  
+  def assert_no_errors_on(record, field)
+    assert_errors_on([], record, field)
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: super_state
 version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Matthew Rudy Jacobs
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-17 00:00:00 +08:00
+date: 2011-03-15 00:00:00 +08:00
 default_executable: 
 dependencies: []
 
@@ -67,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Super Simple State Machine