simple_state_machine 0.1.0 → 0.2.0

data/TODO

@@ -0,0 +1,4 @@
+- allow other state methods
+- alias ..._and_save with ...!
+- Document after_initialize bug
+

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/simple_state_machine/active_record.rb

@@ -14,11 +14,16 @@ module SimpleStateMachine::ActiveRecord
         @subject.send(:define_method, "#{event_name}_and_save") do |*args|
           old_state = state
           send "#{event_name}", *args
-          if save
-            return true
-          else
+          if !self.errors.entries.empty?
             self.state = old_state
             return false
+          else
+            if save
+              return true
+            else
+              self.state = old_state
+              return false
+            end
           end
         end
       end

data/simple_state_machine.gemspec

@@ -5,16 +5,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{simple_state_machine}
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marek de Heus", "Petrik de Heus"]
-  s.date = %q{2010-08-12}
+  s.date = %q{2010-08-29}
   s.description = %q{A simple DSL to decorate existing methods with logic that guards state transitions.}
   s.email = ["FIX@example.com"]
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+     "README.rdoc",
+     "TODO"
   ]
   s.files = [
     "LICENSE",

data/spec/active_record_spec.rb

@@ -42,7 +42,7 @@ describe User do
   
   # TODO needs nesting/grouping, seems to have some duplication
  
-  describe "events" do
+  describe "and_save" do
     it "persists transitions" do
       user = User.create!(:name => 'name')
       user.invite_and_save.should == true
@@ -50,77 +50,62 @@ describe User do
       User.find(user.id).activation_code.should_not be_nil
     end
 
-    it "persists transitions with !" do
-      user = User.create!(:name => 'name')
-      user.invite_and_save!.should == true
-      User.find(user.id).should be_invited
-      User.find(user.id).activation_code.should_not be_nil
-    end
-
     it "raises an error if an invalid state_transition is called" do
       user = User.create!(:name => 'name')
       l = lambda { user.confirm_invitation_and_save 'abc' }
       l.should raise_error(RuntimeError, "You cannot 'confirm_invitation' when state is 'new'")
     end
 
-    it "returns false if event called and record is invalid" do
+    it "returns false and keeps state if record is invalid" do
       user = User.new
-      user.should_not be_valid
-      user.invite_and_save.should == false
-    end
-
-    it "keeps state if event called and record is invalid" do
-      user = User.new
-      user.should_not be_valid
-      user.invite_and_save.should == false
       user.should be_new
-    end
-
-    it "raises a RecordInvalid event if called with ! and record is invalid" do
-      user = User.new
-      user.should_not be_valid
-      l = lambda { user.invite_and_save! }
-      l.should raise_error(ActiveRecord::RecordInvalid, "Validation failed: Name can't be blank")
-    end
-
-    it "keeps state if event! called and record is invalid" do
-      user = User.new
       user.should_not be_valid
-      begin
-        user.invite_and_save!
-      rescue ActiveRecord::RecordInvalid;end
+      user.invite_and_save.should == false
       user.should be_new
     end
 
-    it "will inspect errors after event and reset state" do
+    it "returns false, keeps state and keeps errors if event adds errors" do
       user = User.create!(:name => 'name')
       user.invite_and_save!
       user.should be_invited
-      user.confirm_invitation('x')
-      user.errors.entries.should == [['activation_code', 'is invalid']]
+      user.confirm_invitation_and_save('x').should == false
       user.should be_invited
+      user.errors.entries.should == [['activation_code', 'is invalid']]
     end
 
-    it "returns false if event adds errors" do
+  end
+
+  describe "and_save!" do
+
+    it "persists transitions" do
       user = User.create!(:name => 'name')
-      user.invite_and_save!
-      user.confirm_invitation('x').should == false
+      user.invite_and_save!.should == true
+      User.find(user.id).should be_invited
+      User.find(user.id).activation_code.should_not be_nil
     end
 
-    it "raises a RecordInvalid if 'event'_and_save! is called and event adds errors" do
+    it "raises an error if an invalid state_transition is called" do
       user = User.create!(:name => 'name')
-      user.invite_and_save!
-      l = lambda { user.confirm_invitation_and_save!('x') }
-      l.should raise_error(ActiveRecord::RecordInvalid, "Validation failed: Activation code is invalid")
+      l = lambda { user.confirm_invitation_and_save! 'abc' }
+      l.should raise_error(RuntimeError, "You cannot 'confirm_invitation' when state is 'new'")
+    end
+
+
+    it "raises a RecordInvalid and keeps state if record is invalid" do
+      user = User.new
+      user.should be_new
+      user.should_not be_valid
+      l = lambda { user.invite_and_save! }
+      l.should raise_error(ActiveRecord::RecordInvalid, "Validation failed: Name can't be blank")
+      user.should be_new
     end
 
-    it "keeps state if record is valid but event adds errors" do
+    it "raises a RecordInvalid and keeps state if event adds errors" do
       user = User.create!(:name => 'name')
       user.invite_and_save!
       user.should be_invited
-      begin
-        user.confirm_invitation_and_save!('x')
-      rescue ActiveRecord::RecordInvalid;end
+      l = lambda { user.confirm_invitation_and_save!('x') }
+      l.should raise_error(ActiveRecord::RecordInvalid, "Validation failed: Activation code is invalid")
       user.should be_invited
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_state_machine
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Marek de Heus
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-12 00:00:00 +02:00
+date: 2010-08-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,6 +45,7 @@ extensions: []
 extra_rdoc_files: 
 - LICENSE
 - README.rdoc
+- TODO
 files: 
 - LICENSE
 - README.rdoc
@@ -65,6 +66,7 @@ files:
 - spec/simple_state_machine_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- TODO
 has_rdoc: true
 homepage: http://github.com/p8/simple_state_machine
 licenses: []