Skip to content

Commit

Permalink
reorganize to match rubyist/aasm
Browse files Browse the repository at this point in the history
  • Loading branch information
ttilley committed Aug 8, 2009
1 parent 904b6b4 commit 1e4c038
Show file tree
Hide file tree
Showing 12 changed files with 193 additions and 193 deletions.
8 changes: 4 additions & 4 deletions Rakefile
Expand Up @@ -34,7 +34,7 @@ rd = Rake::RDocTask.new(:rdoc) do |rdoc|
rdoc.title = 'AASM'
rdoc.options << '--line-numbers' << '--inline-source' << '--main' << 'README.rdoc' << '--title' << 'AASM'
rdoc.rdoc_files.include('README.rdoc', 'MIT-LICENSE', 'TODO', 'CHANGELOG')
rdoc.rdoc_files.include('lib/**/*.rb', 'doc/**/*.rdoc')
rdoc.rdoc_files.include('lib/*.rb', 'lib/**/*.rb', 'doc/**/*.rdoc')
end

if !defined?(Gem)
Expand All @@ -54,9 +54,9 @@ EOF
s.extra_rdoc_files = rd.rdoc_files.reject {|fn| fn =~ /\.rb$/}.to_a
s.rdoc_options = rd.options

s.authors = ['Scott Barron', 'Scott Petersen']
s.email = 'petersen@dunedain289.com'
s.homepage = 'http://github.com/dunedain289/aasm'
s.authors = ['Scott Barron', 'Scott Petersen', 'Travis Tilley']
s.email = 'ttilley@gmail.com'
s.homepage = 'http://github.com/ttilley/aasm'
end

package_task = Rake::GemPackageTask.new(spec) do |pkg|
Expand Down
4 changes: 2 additions & 2 deletions aasm.gemspec
@@ -1,8 +1,8 @@
PKG_FILES = ["CHANGELOG", "MIT-LICENSE", "Rakefile", "README.rdoc", "TODO", "lib/aasm.rb", "lib/event.rb", "lib/persistence/active_record_persistence.rb", "lib/persistence.rb", "lib/state.rb", "lib/state_machine.rb", "lib/state_transition.rb", "doc/jamis.rb"]
PKG_FILES = ["CHANGELOG", "MIT-LICENSE", "Rakefile", "README.rdoc", "TODO", "lib/aasm/aasm.rb", "lib/aasm/event.rb", "lib/aasm/persistence/active_record_persistence.rb", "lib/aasm/persistence.rb", "lib/aasm/state.rb", "lib/aasm/state_machine.rb", "lib/aasm/state_transition.rb", "lib/aasm.rb", "doc/jamis.rb"]

Gem::Specification.new do |s|
s.name = 'aasm'
s.version = "2.1.0"
s.version = "2.1.1"
s.summary = %q{State machine mixin for Ruby objects}
s.description = %q{AASM is a continuation of the acts as state machine rails plugin, built for plain Ruby objects.}

Expand Down
1 change: 0 additions & 1 deletion aasm.rb

This file was deleted.

186 changes: 1 addition & 185 deletions lib/aasm.rb
@@ -1,185 +1 @@
require File.join(File.dirname(__FILE__), 'event')
require File.join(File.dirname(__FILE__), 'state')
require File.join(File.dirname(__FILE__), 'state_machine')
require File.join(File.dirname(__FILE__), 'persistence')

module AASM
def self.Version
'2.1.0'
end

class InvalidTransition < RuntimeError
end

class UndefinedState < RuntimeError
end

def self.included(base) #:nodoc:
base.extend AASM::ClassMethods
AASM::Persistence.set_persistence(base)
unless AASM::StateMachine[base]
AASM::StateMachine[base] = AASM::StateMachine.new('')
end
end

module ClassMethods
def inherited(klass)
AASM::StateMachine[klass] = AASM::StateMachine[self].clone
super
end

def aasm_initial_state(set_state=nil)
if set_state
AASM::StateMachine[self].initial_state = set_state
else
AASM::StateMachine[self].initial_state
end
end

def aasm_initial_state=(state)
AASM::StateMachine[self].initial_state = state
end

def aasm_state(name, options={})
sm = AASM::StateMachine[self]
sm.create_state(name, options)
sm.initial_state = name unless sm.initial_state

define_method("#{name.to_s}?") do
aasm_current_state == name
end
end

def aasm_event(name, options = {}, &block)
sm = AASM::StateMachine[self]

unless sm.events.has_key?(name)
sm.events[name] = AASM::SupportingClasses::Event.new(name, options, &block)
end

define_method("#{name.to_s}!") do |*args|
aasm_fire_event(name, true, *args)
end

define_method("#{name.to_s}") do |*args|
aasm_fire_event(name, false, *args)
end
end

def aasm_states
AASM::StateMachine[self].states
end

def aasm_events
AASM::StateMachine[self].events
end

def aasm_states_for_select
AASM::StateMachine[self].states.map { |state| state.for_select }
end

end

# Instance methods
def aasm_current_state
return @aasm_current_state if @aasm_current_state

if self.respond_to?(:aasm_read_state) || self.private_methods.include?('aasm_read_state')
@aasm_current_state = aasm_read_state
end
return @aasm_current_state if @aasm_current_state
aasm_determine_state_name(self.class.aasm_initial_state)
end

def aasm_events_for_current_state
aasm_events_for_state(aasm_current_state)
end

def aasm_events_for_state(state)
events = self.class.aasm_events.values.select {|event| event.transitions_from_state?(state) }
events.map {|event| event.name}
end

private
def set_aasm_current_state_with_persistence(state)
save_success = true
if self.respond_to?(:aasm_write_state) || self.private_methods.include?('aasm_write_state')
save_success = aasm_write_state(state)
end
self.aasm_current_state = state if save_success

save_success
end

def aasm_current_state=(state)
if self.respond_to?(:aasm_write_state_without_persistence) || self.private_methods.include?('aasm_write_state_without_persistence')
aasm_write_state_without_persistence(state)
end
@aasm_current_state = state
end

def aasm_determine_state_name(state)
case state
when Symbol, String
state
when Proc
state.call(self)
else
raise NotImplementedError, "Unrecognized state-type given. Expected Symbol, String, or Proc."
end
end

def aasm_state_object_for_state(name)
obj = self.class.aasm_states.find {|s| s == name}
raise AASM::UndefinedState, "State :#{name} doesn't exist" if obj.nil?
obj
end

def aasm_fire_event(name, persist, *args)
old_state = aasm_state_object_for_state(aasm_current_state)
event = self.class.aasm_events[name]

old_state.call_action(:exit, self)

# new event before callback
event.call_action(:before, self)

new_state_name = event.fire(self, *args)

unless new_state_name.nil?
new_state = aasm_state_object_for_state(new_state_name)

# new before_ callbacks
old_state.call_action(:before_exit, self)
new_state.call_action(:before_enter, self)

new_state.call_action(:enter, self)

persist_successful = true
if persist
persist_successful = set_aasm_current_state_with_persistence(new_state_name)
event.execute_success_callback(self) if persist_successful
else
self.aasm_current_state = new_state_name
end

if persist_successful
old_state.call_action(:after_exit, self)
new_state.call_action(:after_enter, self)
event.call_action(:after, self)

self.aasm_event_fired(name, old_state.name, self.aasm_current_state) if self.respond_to?(:aasm_event_fired)
else
self.aasm_event_failed(name, old_state.name) if self.respond_to?(:aasm_event_failed)
end

persist_successful
else
if self.respond_to?(:aasm_event_failed)
self.aasm_event_failed(name, old_state.name)
end

false
end
end
end
require File.join(File.dirname(__FILE__), 'aasm', 'aasm')

0 comments on commit 1e4c038

Please sign in to comment.