0
@@ -8,6 +8,9 @@ module AASM
0
   end
0
   
0
   def self.included(base) #:nodoc:
0
+    # TODO - need to ensure that a machine is being created because
0
+    # AASM was either included or arrived at via inheritance.  It
0
+    # cannot be both.
0
     base.extend AASM::ClassMethods
0
     AASM::Persistence.set_persistence(base)
0
     AASM::StateMachine[base] = AASM::StateMachine.new('')

0
@@ -79,11 +79,14 @@ module AASM
0
         # This method is both a getter and a setter
0
         def aasm_column(column_name=nil)
0
           if column_name
0
-            @aasm_column = column_name.to_sym
0
+            AASM::StateMachine[self].config.column = column_name.to_sym
0
+            # @aasm_column = column_name.to_sym
0
           else
0
-            @aasm_column ||= :aasm_state
0
+            AASM::StateMachine[self].config.column ||= :aasm_state
0
+            # @aasm_column ||= :aasm_state
0
           end
0
-          @aasm_column
0
+          # @aasm_column
0
+          AASM::StateMachine[self].config.column
0
         end
0
 
0
         def find_in_state(number, state, *args)

0
@@ -1,3 +1,5 @@
0
+require 'ostruct'
0
+
0
 module AASM
0
   class StateMachine
0
     def self.[](*args)
0
@@ -9,7 +11,7 @@ module AASM
0
       (@machines ||= {})[args] = val
0
     end
0
     
0
-    attr_accessor :states, :events, :initial_state
0
+    attr_accessor :states, :events, :initial_state, :config
0
     attr_reader :name
0
     
0
     def initialize(name)
0
@@ -17,6 +19,7 @@ module AASM
0
       @initial_state = nil
0
       @states = []
0
       @events = {}
0
+      @config = OpenStruct.new
0
     end
0
 
0
     def create_state(name, options)

0
@@ -1,5 +1,3 @@
0
-require File.join(File.dirname(__FILE__), 'conversation')
0
-
0
 describe Conversation, 'description' do
0
   it '.aasm_states should contain all of the states' do
0
     Conversation.aasm_states.should == [:needs_attention, :read, :closed, :awaiting_response, :junk]

0
@@ -43,6 +43,14 @@ begin
0
     include AASM
0
   end
0
 
0
+  class June < ActiveRecord::Base
0
+    include AASM
0
+    aasm_column :status
0
+  end
0
+  
0
+  class Beaver < June
0
+  end
0
+
0
   describe "aasm model", :shared => true do
0
     it "should include AASM::Persistence::ActiveRecordPersistence" do
0
       @klass.included_modules.should be_include(AASM::Persistence::ActiveRecordPersistence)
0
@@ -178,6 +186,21 @@ begin
0
     
0
   end
0
 
0
+  describe 'Beavers' do
0
+    it "should have the same states as it's parent" do
0
+      Beaver.aasm_states.should == June.aasm_states
0
+    end
0
+    
0
+    it "should have the same events as it's parent" do
0
+      Beaver.aasm_events.should == June.aasm_events
0
+    end
0
+    
0
+    it "should have the same column as it's parent" do
0
+      Beaver.aasm_column.should == :status
0
+    end
0
+  end
0
+  
0
+
0
   # TODO: figure out how to test ActiveRecord reload! without a database
0
 
0
 rescue LoadError => e