Suppressed deprecation warning for named_scope.

lloydpick · Mar 26, 2010 · cab6249 · cab6249
1 parent 7475953
commit cab6249
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/lib/friendly_id/acktive_record/slug.rb b/lib/friendly_id/acktive_record/slug.rb
@@ -5,7 +5,7 @@ class Slug < ::ActiveRecord::Base
   belongs_to :sluggable, :polymorphic => true
   before_save :enable_name_reversion, :set_sequence
   validate :validate_name
-  named_scope :similar_to, lambda {|slug| {:conditions => {
+  send FriendlyId::AcktiveRecord::Compat.scope_method, :similar_to, lambda {|slug| {:conditions => {
         :name           => slug.name,
         :scope          => slug.scope,
         :sluggable_type => slug.sluggable_type

diff --git a/lib/friendly_id/active_record.rb b/lib/friendly_id/active_record.rb
@@ -1,14 +1,13 @@
-require File.join(File.dirname(__FILE__), "acktive_record", "configuration")
-require File.join(File.dirname(__FILE__), "acktive_record", "finders")
-require File.join(File.dirname(__FILE__), "acktive_record", "simple_model")
-require File.join(File.dirname(__FILE__), "acktive_record", "slugged_model")
-require File.join(File.dirname(__FILE__), "acktive_record", "slug")
-require File.join(File.dirname(__FILE__), "acktive_record", "tasks")
-
 module FriendlyId
 
   module AcktiveRecord
 
+    module Compat
+      def self.scope_method
+        ActiveRecord::VERSION::STRING >= "3" ? :scope : :named_scope
+      end
+    end
+
     include FriendlyId::Base
 
     def has_friendly_id(method, options = {})
@@ -43,4 +42,11 @@ def protect_friendly_id_attributes
 
 class ActiveRecord::Base
   extend FriendlyId::AcktiveRecord
-end
+end
+
+require File.join(File.dirname(__FILE__), "acktive_record", "configuration")
+require File.join(File.dirname(__FILE__), "acktive_record", "finders")
+require File.join(File.dirname(__FILE__), "acktive_record", "simple_model")
+require File.join(File.dirname(__FILE__), "acktive_record", "slugged_model")
+require File.join(File.dirname(__FILE__), "acktive_record", "slug")
+require File.join(File.dirname(__FILE__), "acktive_record", "tasks")
diff --git a/test/acktive_record/test_helper.rb b/test/acktive_record/test_helper.rb
@@ -80,7 +80,7 @@ class House < ActiveRecord::Base
 # A model that uses default slug settings and has a named scope
 class Post < ActiveRecord::Base
   has_friendly_id :name, :use_slug => true
-  named_scope :published, :conditions => { :published => true }
+  send FriendlyId::AcktiveRecord::Compat.scope_method, :published, :conditions => { :published => true }
 end
 
 # Model that uses a custom table name