lib/canard/find_abilities.rb in canard-0.2.0 vs lib/canard/find_abilities.rb in canard-0.2.1

@@ -5,17 +5,18 @@
     # definitions. By default, Canard will attempt to load abilities from
     # Rails.root + /abilities/.
     attr_accessor :abilities_path
     
     def ability_definitions
-      @ability_definitions ||= {}
+      Abilities.definitions
     end
     
     def abilities_for(role, &block)
+      ::ActiveSupport::Deprecation.warn("abilities_for is deprecated and will be removed from Canard 0.4.0. Use Canard::Abilities.for and move the definitions to app/abilities.")
       ability_definitions[role] = block
     end
-    
+
   end
 
   def self.find_abilities #:nodoc:
     
     absolute_abilities_path = File.expand_path(abilities_path)
@@ -23,9 +24,16 @@
     if File.directory? absolute_abilities_path
       Dir[File.join(absolute_abilities_path, '**', '*.rb')].sort.each do |file|
         self.class_eval File.read(file)
       end
     end
+    
+    Abilities.definition_paths.each do |path|
+      Dir[File.join(Rails.root, path, '**', '*.rb')].sort.each do |file|
+        load file
+      end
+    end
 
   end
+  
   
 end
\ No newline at end of file