reorganize things a bit

Rakefile

@@ -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)

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.rb", "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", "doc/jamis.rb"]
 
 Gem::Specification.new do |s|
   s.name = 'aasm'
-  s.version = "2.0.6"
+  s.version = "2.0.7"
   s.summary = 'State machine mixin for Ruby objects'
   s.description = <<-EOF
 AASM is a continuation of the acts as state machine rails plugin, built for plain Ruby objects.

lib/aasm.rb

@@ -1,158 +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.0.6'
-  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
-    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_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)
-    aasm_state_object_for_state(aasm_current_state).call_action(:exit, self)
-
-    new_state = self.class.aasm_events[name].fire(self, *args)
-
-    unless new_state.nil?
-      aasm_state_object_for_state(new_state).call_action(:enter, self)
-
-      persist_successful = true
-      if persist
-        persist_successful = set_aasm_current_state_with_persistence(new_state)
-        self.class.aasm_events[name].execute_success_callback(self) if persist_successful
-      else
-        self.aasm_current_state = new_state
-      end
-
-      if persist_successful 
-        self.aasm_event_fired(self.aasm_current_state, new_state) if self.respond_to?(:aasm_event_fired)
-      else
-        self.aasm_event_failed(name) if self.respond_to?(:aasm_event_failed)
-      end
-
-      persist_successful
-    else
-      if self.respond_to?(:aasm_event_failed)
-        self.aasm_event_failed(name)
-      end
-
-      false
-    end
-  end
-end
+require File.join(File.dirname(__FILE__), 'aasm', 'aasm')

lib/aasm/aasm.rb

@@ -0,0 +1,158 @@
+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.0.7'
+  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
+    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_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)
+    aasm_state_object_for_state(aasm_current_state).call_action(:exit, self)
+
+    new_state = self.class.aasm_events[name].fire(self, *args)
+
+    unless new_state.nil?
+      aasm_state_object_for_state(new_state).call_action(:enter, self)
+
+      persist_successful = true
+      if persist
+        persist_successful = set_aasm_current_state_with_persistence(new_state)
+        self.class.aasm_events[name].execute_success_callback(self) if persist_successful
+      else
+        self.aasm_current_state = new_state
+      end
+
+      if persist_successful 
+        self.aasm_event_fired(self.aasm_current_state, new_state) if self.respond_to?(:aasm_event_fired)
+      else
+        self.aasm_event_failed(name) if self.respond_to?(:aasm_event_failed)
+      end
+
+      persist_successful
+    else
+      if self.respond_to?(:aasm_event_failed)
+        self.aasm_event_failed(name)
+      end
+
+      false
+    end
+  end
+end

spec/spec_helper.rb

@@ -1 +1 @@
-require File.join(File.dirname(__FILE__), '..', 'aasm')
+require File.join(File.dirname(__FILE__), '..', 'lib', 'aasm', 'aasm')