0
@@ -1,5 +1,9 @@
0
+* Use named_scope in AR persistence layer, if available [Jan De Poorter]
0
+
0
 * Incremented version number
0
+
0
 * Cleaned up aasm_states_for_select to return the value as a string
0
+
0
 * Specs and bug fixes for the ActiveRecordPersistence, keeping persistence columns in sync
0
   Allowing for nil values in states for active record
0
   Only set state to default state before_validation_on_create

0
@@ -36,7 +36,19 @@ module AASM
0
         base.send(:include, AASM::Persistence::ActiveRecordPersistence::InstanceMethods)
0
         base.send(:include, AASM::Persistence::ActiveRecordPersistence::ReadState) unless base.method_defined?(:aasm_read_state)
0
         base.send(:include, AASM::Persistence::ActiveRecordPersistence::WriteState) unless base.method_defined?(:aasm_write_state)
0
-        base.send(:include, AASM::Persistence::ActiveRecordPersistence::WriteStateWithoutPersistence) unless base.method_defined?(:aasm_write_state_without_persistence)        
0
+        base.send(:include, AASM::Persistence::ActiveRecordPersistence::WriteStateWithoutPersistence) unless base.method_defined?(:aasm_write_state_without_persistence)
0
+        
0
+        if base.respond_to?(:named_scope)
0
+          base.extend(AASM::Persistence::ActiveRecordPersistence::NamedScopeMethods)
0
+          
0
+          base.class_eval do
0
+            class << self
0
+              alias_method :aasm_state_without_named_scope, :aasm_state
0
+              alias_method :aasm_state, :aasm_state_with_named_scope
0
+            end
0
+          end
0
+        end
0
+        
0
         base.before_validation_on_create :aasm_ensure_initial_state
0
       end
0
 
0
@@ -211,6 +223,13 @@ module AASM
0
           end
0
         end
0
       end
0
+
0
+      module NamedScopeMethods
0
+        def aasm_state_with_named_scope name, options = {}
0
+          aasm_state_without_named_scope name, options
0
+          self.named_scope name, :conditions => {self.aasm_column => name.to_s} unless self.scopes.include?(name)
0
+        end       
0
+      end
0
     end
0
   end
0
 end