From 92dc0ff3e37c27148b003f5a3a601d48fbe5d478 Mon Sep 17 00:00:00 2001 From: Andrew Kennedy Date: Sat, 14 Jan 2012 01:26:17 -0500 Subject: [PATCH 1/2] fix named scope deprecation --- app/models/snippet.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/snippet.rb b/app/models/snippet.rb index f712dba..4bffceb 100644 --- a/app/models/snippet.rb +++ b/app/models/snippet.rb @@ -9,15 +9,15 @@ class Snippet < ActiveRecord::Base has_many :snippet_page_parts, :dependent => :destroy has_many :page_parts, :through => :snippet_page_parts - named_scope :for_page, lambda{ |page| + scope :for_page, lambda{ |page| raise RuntimeError.new("Couldn't find Snippet for a nil Page") if page.blank? joins(:page_parts => :page).where(:pages => {:id => page.id}) } scope :before, where(:snippets_page_parts => {:before_body => true}) - scope :after, where(:snippets_page_parts => {:before_body => false}) - + scope :after, where(:snippets_page_parts => {:before_body => false}) + # rejects any page that has not been translated to the current locale. scope :translated, lambda { pages = Arel::Table.new(Snippet.table_name) From 83ea54812576027d42dd0897a16572c13af67d46 Mon Sep 17 00:00:00 2001 From: Andrew Kennedy Date: Sun, 15 Jan 2012 00:40:24 -0500 Subject: [PATCH 2/2] change named_scope to scope in page_extensions --- lib/extensions/page_extensions.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/extensions/page_extensions.rb b/lib/extensions/page_extensions.rb index b25d8f3..9a5113b 100644 --- a/lib/extensions/page_extensions.rb +++ b/lib/extensions/page_extensions.rb @@ -5,7 +5,7 @@ def self.included(base) base.class_eval do - named_scope :for_snippet, lambda{ |snippet| + scope :for_snippet, lambda{ |snippet| raise RuntimeError.new("Couldn't find Pages for a nil Snippet") if snippet.blank? { :joins => [:snippets_page_parts, :snippets],