lib/stateflow.rb in stateflow-0.4.2 vs lib/stateflow.rb in stateflow-0.5.0.beta

@@ -1,14 +1,16 @@
+require 'active_support'
+
 module Stateflow
-  def self.included(base)
-    base.send :include, InstanceMethods
-    base.extend ClassMethods
-    Stateflow::Persistence.set(base)
+  extend ActiveSupport::Concern
+  
+  included do |base|
+    Stateflow::Persistence.load!(base)
   end
   
   def self.persistence
-    @@persistence ||= :active_record
+    @@persistence ||= nil
   end
   
   def self.persistence=(persistence)
     @@persistence = persistence
   end
@@ -67,5 +69,7 @@
   autoload :Event, 'stateflow/event'
   autoload :Transition, 'stateflow/transition'
   autoload :Persistence, 'stateflow/persistence'
   autoload :Exception, 'stateflow/exception'
 end
+
+require 'stateflow/railtie' if defined?(Rails)