minimal_state_machine 0.0.5 → 0.0.6

data/.travis.yml

@@ -0,0 +1,2 @@
+rvm:
+  - 1.9.3

data/README.md

@@ -1,4 +1,4 @@
-# MinimalStateMachine
+# MinimalStateMachine [![Build Status](https://travis-ci.org/issuehunter/minimal_state_machine.png?branch=master)](https://travis-ci.org/issuehunter/minimal_state_machine)
 
 A state machine for ActiveRecord implemented with the state pattern
 
@@ -66,7 +66,7 @@ issue.state
 => #<IssueState::Closed id: 1, type: "IssueState::Closed", state_machine_id: 1, state_machine_type: "Issue", created_at: "2013-01-03 19:13:31", updated_at: "2013-01-03 19:13:31"> 
 ```
 
-If you try to change the state to a non valid state a `MinimalStateMachine::InvalidTransitionError` will be raised.
+If you try to change the state to a non valid state record validation will fail with *invalid transition* error.
 
 If you try to set the state to a non declared state a `MinimalStateMachine::InvalidStateError` will be raised.
 

data/lib/generators/minimal_state_machine/minimal_state_machine_generator.rb

@@ -14,14 +14,14 @@ class MinimalStateMachineGenerator < Rails::Generators::Base
   end
 
   def create_migration_files
-    create_migration_file_if_not_exist 'create_msm_states'
+    create_migration_file_if_not_exist 'create_msm_states', '001'
   end
 
   private
 
-  def create_migration_file_if_not_exist(file_name)
+  def create_migration_file_if_not_exist(file_name, version)
     unless self.class.migration_exists?(File.dirname(File.expand_path("db/migrate/#{file_name}")), file_name)
-      migration_template "#{file_name}.rb", "db/migrate/#{file_name}.rb"
+      migration_template "#{version}_#{file_name}.rb", "db/migrate/#{file_name}.rb"
     end
   end
 end

data/lib/minimal_state_machine.rb

@@ -11,6 +11,10 @@ module MinimalStateMachine
     after_initialize :set_initial_state, :if => proc { state.nil? }
     after_save :destroy_previous_state, :if => proc { previous_state && previous_state != state }
 
+    validate do
+      self.errors.add(:state, 'invalid transition') if previous_state && !previous_state.class.valid_transition_states.include?(state_name)
+    end
+
     attr_accessor :previous_state
 
     def self.states
@@ -21,12 +25,8 @@ module MinimalStateMachine
 
     def state_name=(state_name)
       raise InvalidStateError unless self.class.states.keys.map(&:to_s).include?(state_name)
-
-      if state.nil? || state.new_record?
-        self.state = self.class.states[state_name.to_sym].new
-      else
-        transition_to state_name
-      end
+      
+      transition_to(state_name)
     end
 
     def state_name
@@ -35,15 +35,9 @@ module MinimalStateMachine
 
     private
 
-    class InvalidTransitionError < StandardError; end
-
     def transition_to(state_name)
-      if state.class.valid_transition_states.include?(state_name)
-        self.previous_state = state
-        self.state = self.class.states[state_name.to_sym].new
-      else
-        raise InvalidTransitionError
-      end
+      self.previous_state = state
+      self.state = self.class.states[state_name.to_sym].new
     end
 
     def set_initial_state

data/lib/minimal_state_machine/version.rb

@@ -1,3 +1,3 @@
 module MinimalStateMachine
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/minimal_state_machine.gemspec

@@ -22,4 +22,6 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'debugger'
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'sqlite3'
 end

data/spec/minimal_state_machine_spec.rb

@@ -1,15 +1,5 @@
 require 'spec_helper'
 
-ActiveRecord::Base.connection.execute("DROP TABLE IF EXISTS 'msm_states'")
-ActiveRecord::Base.connection.execute("DROP TABLE IF EXISTS 'state_machines'")
-ActiveRecord::Base.connection.create_table(:msm_states) do |t|
-  t.string :type
-  t.references :state_machine, :polymorphic => true  
-  t.timestamps
-end
-
-ActiveRecord::Base.connection.create_table(:state_machines)
-
 class StateMachine < ActiveRecord::Base
   include MinimalStateMachine
 
@@ -63,8 +53,10 @@ describe StateMachine do
     MinimalStateMachine::State.count.should == 1
   end
 
-  it 'raises an invalid transition error if the new state is not among the allowed transition states' do
-    expect { @state_machine.state_name = 'solved' }.to raise_error('MinimalStateMachine::InvalidTransitionError')
+  it 'adds error if the new state is not among the allowed transition states' do
+    @state_machine.state_name = 'solved'
+    @state_machine.should_not be_valid
+    @state_machine.errors[:state].should include('invalid transition')
   end
 
   it 'raises an invalid state error if the state assigned in not among the allowed states' do

data/spec/spec_helper.rb

@@ -1,20 +1,17 @@
 require 'minimal_state_machine'
 require 'debugger'
 
-root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-ActiveRecord::Base.establish_connection(
-  :adapter => "sqlite3",
-  :database => "#{root}/db/minimal_state_machine.sqlite3"
-)
+ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
 
-RSpec.configure do |config|
-  config.before(:each) do
-    ActiveRecord::Base.connection.increment_open_transactions
-    ActiveRecord::Base.connection.begin_db_transaction
-  end
+ActiveRecord::Migration.verbose = false
+ActiveRecord::Migrator.up("lib/generators/minimal_state_machine/templates")
+ActiveRecord::Migration.create_table :state_machines
 
-  config.after(:each) do
-    ActiveRecord::Base.connection.rollback_db_transaction
-    ActiveRecord::Base.connection.decrement_open_transactions
+RSpec.configure do |config|
+  config.around do |example|
+    ActiveRecord::Base.transaction do
+      example.run
+      raise ActiveRecord::Rollback
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minimal_state_machine
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-04 00:00:00.000000000 Z
+date: 2013-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -75,6 +75,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A state machine for activerecord implemented with the state pattern
 email:
 - matteodepalo@gmail.com
@@ -84,13 +116,13 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- db/.gitkeep
 - lib/generators/minimal_state_machine/minimal_state_machine_generator.rb
-- lib/generators/minimal_state_machine/templates/create_msm_states.rb
+- lib/generators/minimal_state_machine/templates/001_create_msm_states.rb
 - lib/minimal_state_machine.rb
 - lib/minimal_state_machine/state.rb
 - lib/minimal_state_machine/version.rb
@@ -109,12 +141,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3458422209847177818
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3458422209847177818
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24