From 07a7cddb2d9a320769173f66be4cff231ad0fbd3 Mon Sep 17 00:00:00 2001
From: Jacques Crocker <railsjedi@gmail.com>
Date: Sat, 31 Jul 2010 23:01:38 -0700
Subject: [PATCH] named_scope => scope

---
 app/models/page.rb                                  | 8 ++++----
 app/models/page_part.rb                             | 2 +-
 app/models/site.rb                                  | 4 ++--
 vendor/plugins/custom_fields/spec/models/project.rb | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/models/page.rb b/app/models/page.rb
index 02788e49..8703e5cd 100644
--- a/app/models/page.rb
+++ b/app/models/page.rb
@@ -31,10 +31,10 @@ class Page
   validates_exclusion_of    :slug, :in => Locomotive.config.reserved_slugs, :if => Proc.new { |p| p.depth == 0 }
 
   ## named scopes ##
-  named_scope :latest_updated, :order_by => [[:updated_at, :desc]], :limit => Locomotive.config.lastest_items_nb
-  named_scope :index, :where => { :slug => 'index', :depth => 0 }
-  named_scope :not_found, :where => { :slug => '404', :depth => 0 }
-  named_scope :published, :where => { :published => true }
+  scope :latest_updated, :order_by => [[:updated_at, :desc]], :limit => Locomotive.config.lastest_items_nb
+  scope :index, :where => { :slug => 'index', :depth => 0 }
+  scope :not_found, :where => { :slug => '404', :depth => 0 }
+  scope :published, :where => { :published => true }
 
   ## behaviours ##
   liquify_template :joined_parts
diff --git a/app/models/page_part.rb b/app/models/page_part.rb
index 410bcaca..f2a3c51f 100644
--- a/app/models/page_part.rb
+++ b/app/models/page_part.rb
@@ -16,7 +16,7 @@ class PagePart
   validates_presence_of :name, :slug
 
   ## named scopes ##
-  named_scope :enabled, where(:disabled => false)
+  scope :enabled, where(:disabled => false)
 
   ## methods ##
 
diff --git a/app/models/site.rb b/app/models/site.rb
index 907118b7..b3bf2541 100644
--- a/app/models/site.rb
+++ b/app/models/site.rb
@@ -31,8 +31,8 @@ class Site
   after_destroy :destroy_in_cascade!
 
   ## named scopes ##
-  named_scope :match_domain, lambda { |domain| { :where => { :domains => domain } } }
-  named_scope :match_domain_with_exclusion_of, lambda { |domain, site| { :where => { :domains => domain, :_id.ne => site.id } } }
+  scope :match_domain, lambda { |domain| { :where => { :domains => domain } } }
+  scope :match_domain_with_exclusion_of, lambda { |domain, site| { :where => { :domains => domain, :_id.ne => site.id } } }
 
   ## methods ##
 
diff --git a/vendor/plugins/custom_fields/spec/models/project.rb b/vendor/plugins/custom_fields/spec/models/project.rb
index 0ddd1ee2..888487d6 100644
--- a/vendor/plugins/custom_fields/spec/models/project.rb
+++ b/vendor/plugins/custom_fields/spec/models/project.rb
@@ -13,6 +13,6 @@ class Project
   custom_fields_for :people
   custom_fields_for :tasks
 
-  named_scope :ordered, :order_by => [[:name, :asc]]
+  scope :ordered, :order_by => [[:name, :asc]]
 
 end
\ No newline at end of file