All tests now passing with AR 3.

lib/friendly_id/acktive_record/finders.rb

@@ -148,24 +148,6 @@ def find(*args, &block)
         end
       end
 
-      # protected
-      #
-      # def find_one(id_or_name, options)
-      #   finder = Finders::FinderProxy.new(id_or_name, self, options)
-      #   finder.unfriendly? ? super : finder.find or super
-      # end
-      #
-      # def find_some(ids_and_names, options)
-      #   Finders::FinderProxy.new(ids_and_names, self, options).find
-      # end
-      #
-      # # Since Rails goes out of its way to make these options completely
-      # # inaccessible, we have to copy them here.
-      # def validate_find_options(options)
-      #   options.assert_valid_keys([:conditions, :include, :joins, :limit, :offset,
-      #     :order, :select, :readonly, :group, :from, :lock, :having, :scope])
-      # end
-
     end
 
   end

lib/friendly_id/acktive_record/slugged_model.rb

@@ -109,7 +109,7 @@ def find_options
         end
 
         def raise_scoped_error
-          scope_message = options[:scope] || "expected, but none given"
+          scope_message = scope || "expected, but none given"
           message = "%s, scope: %s" % [@error.message, scope_message]
           raise ::ActiveRecord::RecordNotFound, message
         end

lib/friendly_id/finders.rb

@@ -35,7 +35,7 @@ def initialize(ids, model_class, options={})
         self.ids = ids
         self.options = options
         self.model_class = model_class
-        self.scope = options[:scope]
+        self.scope = options.delete :scope
       end
 
       def method_missing(*args, &block)
@@ -67,7 +67,9 @@ def ids=(ids)
       alias :id= :ids=
 
       def scope=(scope)
-        @scope = scope.to_param unless scope.nil?
+        unless scope.nil?
+          @scope = scope.respond_to?(:to_param) ? scope.to_param : scope.to_s
+        end
       end
     end