0
@@ -65,12 +65,18 @@ module PermalinkFu
0
   end
0
   
0
   module PermalinkFinders
0
-    def find_by_permalink(value)
0
-      find(:first, :conditions => { permalink_field => value  })
0
+    def self.extended(base)
0
+      unless base.permalink_field == 'permalink'
0
+        (class << base; self; end).instance_eval do
0
+          define_method(:find_by_permalink) do |value, *args|
0
+            send(:"find_by_#{base.permalink_field}", value, *args)
0
+          end
0
+        end
0
+      end
0
     end
0
     
0
-    def find_by_permalink!(value)
0
-      find_by_permalink(value) ||
0
+    def find_by_permalink!(value, *args)
0
+      find_by_permalink(value, *args) ||
0
       raise(ActiveRecord::RecordNotFound, "Couldn't find #{name} with permalink #{value.inspect}")
0
     end
0
   end

0
@@ -65,6 +65,7 @@ class BaseModel
0
   end
0
   
0
   def self.find(*args)
0
+    return true if args.last.has_key?(:include)
0
     nil
0
   end
0
 
0
@@ -114,6 +115,7 @@ end
0
 class AsModel < BaseModel
0
   attr_reader   :slug
0
   has_permalink :title, :as => :slug
0
+  def self.find_by_slug(value, *args); find(:conditions => {:slug => value}, *args); end
0
 end
0
 
0
 class OverrideParamModel < BaseModel
0
@@ -249,9 +251,17 @@ class PermalinkFuTest < Test::Unit::TestCase
0
     assert_nil AsModel.find_by_permalink("permalink")
0
   end
0
   
0
+  def test_should_merge_options_to_find_by_permalink
0
+    assert AsModel.find_by_permalink('permalink', :include => :result)
0
+  end
0
+  
0
   def test_find_by_permalink!
0
     assert_raises(ActiveRecord::RecordNotFound) { AsModel.find_by_permalink!("permalink") }
0
   end
0
+
0
+  def test_should_merge_options_to_find_by_permalink!
0
+    assert AsModel.find_by_permalink!('permalink', :include => :result)
0
+  end
0
   
0
   def test_should_abide_by_if_proc_condition
0
     @m = IfProcConditionModel.new