From b1b26af9a2f1c2037f7c2167d747ed33cc639763 Mon Sep 17 00:00:00 2001
From: Tim Morgan <tim@timmorgan.org>
Date: Thu, 14 Oct 2010 22:31:05 -0500
Subject: Allow default_scope to accept a Proc.

---
 activerecord/test/models/post.rb | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'activerecord/test/models')

diff --git a/activerecord/test/models/post.rb b/activerecord/test/models/post.rb
index a3cb9c724a..61e782ff14 100644
--- a/activerecord/test/models/post.rb
+++ b/activerecord/test/models/post.rb
@@ -113,3 +113,9 @@ class PostWithComment < ActiveRecord::Base
   self.table_name = 'posts'
   default_scope where("posts.comments_count > 0").order("posts.comments_count ASC")
 end
+
+class PostForAuthor < ActiveRecord::Base
+  self.table_name = 'posts'
+  cattr_accessor :selected_author
+  default_scope lambda { where(:author_id => PostForAuthor.selected_author) }
+end
-- 
cgit v1.2.3


From d2898d4ef80dc74ef0d6204b5c7f50877659e50e Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 19 Oct 2010 17:27:50 -0700
Subject: scopes can take an object that responds to `call`

---
 activerecord/test/models/topic.rb | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'activerecord/test/models')

diff --git a/activerecord/test/models/topic.rb b/activerecord/test/models/topic.rb
index ba2fe1987b..82d4b5997f 100644
--- a/activerecord/test/models/topic.rb
+++ b/activerecord/test/models/topic.rb
@@ -18,6 +18,13 @@ class Topic < ActiveRecord::Base
       1
     end
   end
+
+  scope :with_object, Class.new(Struct.new(:klass)) {
+    def call
+      klass.where(:approved => true)
+    end
+  }.new(self)
+
   module NamedExtension
     def two
       2
-- 
cgit v1.2.3


From 5b86c3e5bb2bb54003d8f211b46a7b992355dbf5 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Fri, 22 Oct 2010 10:28:53 +0200
Subject: has_one maintains the association with separate
 after_create/after_update

This way parent models can get their own after_create and
after_update callbacks fired after has_one has done its job.
---
 activerecord/test/models/eye.rb | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 activerecord/test/models/eye.rb

(limited to 'activerecord/test/models')

diff --git a/activerecord/test/models/eye.rb b/activerecord/test/models/eye.rb
new file mode 100644
index 0000000000..77f17b578e
--- /dev/null
+++ b/activerecord/test/models/eye.rb
@@ -0,0 +1,37 @@
+class Eye < ActiveRecord::Base
+  attr_reader :after_create_callbacks_stack
+  attr_reader :after_update_callbacks_stack
+  attr_reader :after_save_callbacks_stack
+
+  # Callbacks configured before the ones has_one sets up.
+  after_create :trace_after_create
+  after_update :trace_after_update
+  after_save   :trace_after_save
+
+  has_one :iris
+  accepts_nested_attributes_for :iris
+
+  # Callbacks configured after the ones has_one sets up.
+  after_create :trace_after_create2
+  after_update :trace_after_update2
+  after_save   :trace_after_save2
+  
+  def trace_after_create
+    (@after_create_callbacks_stack ||= []) << iris.new_record?
+  end
+  alias trace_after_create2 trace_after_create
+
+  def trace_after_update
+    (@after_update_callbacks_stack ||= []) << iris.changed?
+  end
+  alias trace_after_update2 trace_after_update
+
+  def trace_after_save
+    (@after_save_callbacks_stack ||= []) << iris.changed?
+  end
+  alias trace_after_save2 trace_after_save
+end
+
+class Iris < ActiveRecord::Base
+  belongs_to :eye
+end
-- 
cgit v1.2.3