Allow using find(, :scope => active_record_object) with sluggable ids

lib/friendly_id/sluggable_class_methods.rb

@@ -6,6 +6,7 @@ module FriendlyId::SluggableClassMethods
   def find_one(id_or_name, options) #:nodoc:#
 
     scope = options.delete(:scope)
+    scope = scope.to_param if scope && scope.respond_to?(:to_param)
 
     if id_or_name.is_a?(Integer) || id_or_name.kind_of?(ActiveRecord::Base)
       return super(id_or_name, options)
@@ -23,7 +24,6 @@ def find_one(id_or_name, options) #:nodoc:#
     }
 
     result = with_scope(:find => find_options) { find_initial(options) }
-
     if result
       result.finder_slug_name = id_or_name
     elsif id_or_name.to_i.to_s != id_or_name

test/scoped_model_test.rb

@@ -27,10 +27,14 @@ class ScopedModelTest < Test::Unit::TestCase
       assert_equal 2, Resident.find(:all, @resident.friendly_id).size
     end
 
-    should "find a single scoped records with a scope" do
+    should "find a single scoped records with a scope as a string" do
       assert Resident.find(@resident.friendly_id, :scope => @resident.country.to_param)
     end
 
+    should "find a single scoped records with a scope" do
+      assert Resident.find(@resident.friendly_id, :scope => @resident.country)
+    end
+
     should "raise an error when finding a single scoped record with no scope" do
       assert_raises ActiveRecord::RecordNotFound do
         Resident.find(@resident.friendly_id)