genki-merb_component 0.1.2 → 0.2.0

data/README

@@ -5,14 +5,42 @@ Merb plugin that provides composition of controllers.
 
 Example of use:
 
-  Content of the user (id is 2) goes here
-  <%= component User, :show, :id => 2 %>
+  In config/router.rb:
 
-  Index of posts related with the @user go here
-  <% Post.related_with @user do %>
-    <%= component Post, :index %>
-  <% end %>
+    resources :posts do |post|
+      post.aggregates :comments
+    end
+    resource :admin, :controller => :admin do |admin|
+      admin.aggregates :comments
+    end
 
-  In app/views/posts/index.html.erb,
-  You can access to the corresponding relation like this
-  <%= Post.relation #=> @user %>
+  In controllers:
+
+    class Posts < Application
+      aggregates :comments
+
+    class Admin < Application
+      aggregates :show => :comments
+
+  In views:
+
+    Content of the user (id is 2) goes here
+    <%= component Users, :show, :id => 2 %>
+
+    Or, you can use symbol to specify subsidiary controller
+    <%= component :users, :show, :id => 2 %>
+
+    Index of posts related with the @user go here
+    <% Post.related_with @user do %>
+      <%= component Posts, :index %>
+    <% end %>
+
+    In app/views/posts/index.html.erb,
+    You can access to the corresponding relation like this
+    <%= Post.relation #=> @user %>
+
+  For detail, you can see spec/fixture as an example.
+
+  Enjoy!
+
+  Genki Takiuchi

data/Rakefile

@@ -5,7 +5,7 @@ require 'merb-core'
 require 'merb-core/tasks/merb'
 
 GEM_NAME = "merb_component"
-GEM_VERSION = "0.1.2"
+GEM_VERSION = "0.2.0"
 AUTHOR = "Genki Takiuchi"
 EMAIL = "genki@s21g.com"
 HOMEPAGE = "http://blog.s21g.com/genki"

data/lib/merb_component/controller_ext.rb

@@ -7,59 +7,167 @@ class Merb::Controller
 
   class << self
   private
-    def aggregates(*args)
-      @aggregations ||= Mash.new
-      options = extract_options_from_args!(args) || {}
-      args.each do |arg|
+    def is_component(resource = nil)
+      resource = controller_name.singular if resource.nil?
+      r = resource.to_s
+      m = r.camel_case
+      iv = proc{|i| "(@#{r} = #{m}.#{i})"}
+      ivs = proc{|i| "(@#{r.pluralize} = #{m}.#{i})"}
+      class_eval <<-"RUBY"
+        def index; display #{ivs["all"]} end
+        def show(id) display #{iv["get(id)"]} end
+        def new; display #{iv["new"]} end
+        def edit(id) display #{iv["get(id)"]} end
+        def create(#{r}) #{iv["create(#{r})"]} end
+        def update(id,#{r}) #{iv["get(id)"]}.update_attributes(#{r}) end
+        def destroy(id) #{iv["get(id)"]}.destroy end
+      RUBY
+    end
+
+    def aggregates(aggregation, options = {})
+      if aggregation.is_a?(Symbol)
+        aggregation = {:show => aggregation}
+      end
+      aggregation.each do |agg_action, arg|
         define_method(arg){} unless method_defined?(arg)
         model = Object.full_const_get(arg.to_s.singular.camel_case)
         key = "#{controller_name.singular}_id"
         var = "@#{arg.to_s.singular}"
 
         add_filter(_before_filters, proc{|c|
-          # setup request
           id = params.delete(key)
-          req = request.dup
-          req.reset_params!
-          req.instance_variable_set(:@params, params.merge(
-            :controller => arg, :action => METHOD_TO_ACTION[req.method]))
-
-          # call action of subsidiary controller with scope
-          cc = Object.full_const_get(params[:action].camel_case).new(req)
-          model.send :with_scope, key => id do
-            cc._abstract_dispatch(req.params[:action])
-            result = cc.instance_variable_get(var)
-            c.instance_variable_set(var, result)
+          method = request.method
+          scope = Mash.new
+          scope[key] = id if id
+          object = nil
+          if action = METHOD_TO_ACTION[method]
+            # setup request
+            req = request.dup
+            req.reset_params!
+            req.instance_variable_set(:@params,
+              params.merge(:controller => arg, :action => action))
+
+            # call action of subsidiary controller with scope
+            cc = Object.full_const_get(params[:action].camel_case).new(req)
+            model.send :with_scope, scope do
+              begin
+                layout = cc.class.default_layout
+                cc.class.layout(options[:layout])
+                response = cc._abstract_dispatch(action)
+              ensure
+                cc.class.layout(layout)
+              end
+              object = cc.instance_variable_get(var)
+              c.instance_variable_set(var, object)
+              object = model.new if object.errors.empty?
+            end
+          elsif params[:id]
+            # GET with component id
+            object = model.get(params[:id])
+            c.instance_variable_set(var, object)
           end
+          c.instance_variable_set("#{var}_component", object)
 
           # prepare for performing actoin of principal controller
-          params[:id] = id
-          params[:action] = c.action_name = :show
+          c.params[:id] = id if id
+          c.params[:action] = c.action_name = agg_action.to_s
         }, :only => arg)
       end
     end
   end
 
+  class Aggregator
+    attr_reader :controller, :object, :result
+
+    def initialize(context, controller, &block)
+      @context = context
+      @controller = controller
+      @agg_name = @context.controller_name.singular.intern
+      model_class = Object.full_const_get(controller.name.singular)
+      @object = @context.instance_variable_get("@#{@agg_name}")
+      @scope = {}
+
+      if @object
+        relationship = model_class.relationships[@agg_name]
+        key_names = relationship.child_key.map{|i| i.name}
+        @scope = Hash[key_names.zip(@object.key)] if @object
+      end
+
+      @result = begin
+        Thread.critical = true
+        aggregators = Thread::current[:aggregators] ||= {}
+        (aggregators[controller] ||= []).push(self)
+        if model_class.respond_to?(:with_scope)
+          model_class.send(:with_scope, @scope, &block)
+        else
+          block.call
+        end
+      ensure
+        aggregators[controller].pop
+        Thread.critical = false
+      end
+    end
+
+    def key
+      @object || @agg_name
+    end
+  end
+
   def _abstract_dispatch(*args)
     _dispatch = Merb::AbstractController.instance_method(:_dispatch)
     _dispatch.bind(self).call(*args)
   end
 
+  def aggregator
+    aggregators = Thread::current[:aggregators] ||= {}
+    (aggregators[self.class] ||= []).last
+  end
+
 private
   def component(controller, action, params = {})
+    var = "@#{controller.to_s.singular}"
+    object = instance_variable_get("#{var}_component")
+    controller = Object.full_const_get(controller.to_s.camel_case)
     req = request.dup
     req.reset_params!
     req.instance_variable_set :@params, params
-    controller.new(req)._abstract_dispatch(action)
+
+    Aggregator.new(self, controller) do
+      controller.new(req)._dispatch(action).instance_eval do
+        if object
+          original = instance_variable_get(var)
+          object.attributes = original.attributes if original
+          instance_variable_set(var, object)
+        end
+        render :layout => false
+      end
+    end.result
+  end
+
+  def form_for_component(controller, params = {}, &block)
+    var = "@#{controller.to_s.singular}"
+    object = instance_variable_get(var)
+    return nil if object.nil?
+    object = instance_variable_get("#{var}_component") || object
+    if object.new_record?
+      component(controller, :new, params)
+    else
+      component(controller, :edit, {:id => object.id}.merge(params))
+    end
   end
 
   def resource(first, *args)
-    model = case first
+    return super unless aggregator
+
+    controller = case first
     when Symbol, String
-      Object.full_const_get(first.to_s.singular.camel_case)
-    else first.class
+      Object.full_const_get(first.to_s.camel_case)
+    else
+      Object.full_const_get(first.class.to_s.pluralize.camel_case)
     end
-    return super unless model.relation
-    super(model.relation, first, *args)
+
+    return super unless controller <=> aggregator.controller
+    return super unless key = aggregator.key
+    super(key, first, *args)
   end
 end

data/lib/merb_component/resource_ext.rb

@@ -1,7 +1,11 @@
 module DataMapper::Resource
   module ClassMethods
-    def build(attrs = {})
-      all.build(attrs)
+    # set scope
+    def new(attrs = {})
+      collection = all
+      collection.repository.scope do
+        super(collection.default_attributes.merge(attrs))
+      end
     end
   end
 end

data/lib/merb_component/router_ext.rb

@@ -0,0 +1,8 @@
+Merb::Router.extensions do
+  def aggregates(resource, options = {})
+    options[:controller] ||= @params[:controller]
+    match("/:action/:id").to(options)
+    match("/:action").to(options)
+    resources resource
+  end
+end

data/lib/merb_component.rb

@@ -9,9 +9,8 @@ if defined?(Merb::Plugins)
   Merb::BootLoader.before_app_loads do
     # require code that must be loaded before the application
     require 'merb_component/controller_ext'
-    require 'merb_component/model_ext'
     require 'merb_component/resource_ext'
-    require 'merb_component/helper_ext'
+    require 'merb_component/router_ext'
   end
   
   Merb::BootLoader.after_app_loads do

data/spec/admin_spec.rb

@@ -0,0 +1,96 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe Admin do
+  before do
+    @req = Merb::Request.new(
+      Merb::Const::REQUEST_PATH => "/admin",
+      Merb::Const::REQUEST_METHOD => "GET",
+      Merb::Const::QUERY_STRING => "")
+    @c = Admin.new(@req)
+  end
+
+  it "should be a controller" do
+    @c.should be_kind_of(Merb::Controller)
+  end
+end
+
+describe "Admin controller" do
+  before :all do
+    @post = Post.create
+    @comment = @post.comments.create(:body => "test")
+  end
+
+  it "should be tested on at least one post and comment" do
+    Post.count.should > 0
+    Comment.count.should > 0
+  end
+
+  it "should index html" do
+    res = request(resource(:admin))
+    res.should be_successful
+    res.should have_xpath("//h1")
+    res.should have_xpath("//h2")
+    res.should have_xpath("//ul/li")
+    res.should_not have_xpath("//form")
+  end
+
+  it "should show html after update a comment" do
+    comment = @post.comments.last
+    comment.should be_kind_of(Comment)
+    res = request(resource(:admin, comment),
+      :method => 'PUT', :params => {:comment => {:body => "bar"}})
+    res.should be_successful
+    res.should have_xpath("//h1")
+    res.should have_xpath("//h2")
+    res.should have_xpath("//ul/li[1]")
+    res.should have_xpath("//form[@action='/admin/comments']")
+    res.should have_xpath("//form[@method='post']")
+    res.should_not have_xpath("//input[@value='put']")
+    res.should contain("bar")
+  end
+
+  it "should show html after failed to update a comment" do
+    comment = @post.comments.last
+    comment.should be_kind_of(Comment)
+    res = request(resource(:admin, comment),
+      :method => 'PUT', :params => {:comment => {:body => ""}})
+    res.should be_successful
+    res.should have_xpath("//h1")
+    res.should have_xpath("//h2")
+    res.should have_xpath("//ul/li[1]")
+    res.should have_xpath("//form[@action='/admin/comments/#{comment.id}']")
+    res.should have_xpath("//form[@method='post']")
+    res.should have_xpath("//input[@value='put']")
+    res.should have_tag("div.error")
+    res.should have_tag("input.error[@name='comment[body]']")
+  end
+
+  it "should show html after delete a comment" do
+    count = @post.comments.count
+    comment = @post.comments.last
+    comment.should be_kind_of(Comment)
+    res = request(resource(:admin, comment), :method => 'DELETE')
+    res.should be_successful
+    res.should have_xpath("//h1")
+    res.should have_xpath("//h2")
+    res.should have_xpath("//form")
+    res.should have_xpath("//form[@action='/admin/comments']")
+    res.should have_xpath("//form[@method='post']")
+    res.should_not have_xpath("//input[@value='put']")
+    res.should_not have_xpath("//body/meta")
+    @post.comments.count.should == count - 1
+  end
+
+  it "should show html after show a comment" do
+    comment = @post.comments.create(:body => "hello")
+    comment.should_not be_new_record
+    res = request(resource(:admin, comment), :method => 'GET')
+    res.should be_successful
+    res.should have_xpath("//h1")
+    res.should have_xpath("//h2")
+    res.should have_xpath("//form[@action='/admin/comments/#{comment.id}']")
+    res.should have_xpath("//form[@method='post']")
+    res.should have_xpath("//input[@value='put']")
+    res.should_not have_xpath("//body/meta")
+  end
+end

data/spec/fixture/app/controllers/admin.rb

@@ -1,8 +1,7 @@
 class Admin < Application
-  aggregates :comments
+  aggregates :show => :comments
 
-  def index
-    @comments = Comment.all
+  def show
     render
   end
 end

data/spec/fixture/app/controllers/comments.rb

@@ -1,25 +1,15 @@
 class Comments < Application
-  def index
-    @comments = Comment.all
-    display @comments
-  end
+  is_component :comment
 
   def new
-    @comment = Comment.build
+    @comment = Comment.new
+    @comment.body = "new"
     display @comment
   end
 
-  def create(comment)
-    @comment = Comment.all.create(comment)
-  end
-
-  def update(id, comment)
+  def edit(id)
     @comment = Comment.get(id)
-    @comment.update_attributes(comment)
-  end
-
-  def destroy(id)
-    @comment = Comment.get(id)
-    @comment.destroy
+    @comment.body = "edit"
+    display @comment
   end
 end

data/spec/fixture/app/controllers/posts.rb

@@ -8,6 +8,7 @@ class Posts < Application
 
   def show(id)
     @post = Post.get(id)
+    @comment = @post.comments.build
     display @post
   end
 end

data/spec/fixture/app/models/comment.rb

@@ -5,4 +5,6 @@ class Comment
   property :body, Text
   
   belongs_to :post
+
+  validates_present :body
 end

data/spec/fixture/app/views/admin/show.html.erb

@@ -0,0 +1,4 @@
+<h1>Admin</h1>
+
+<%= component :comments, :index %>
+<%= form_for_component :comments %>

data/spec/fixture/app/views/comments/edit.html.erb

@@ -0,0 +1,11 @@
+<h3>
+  Edit Comment of 
+  <%= link_to h(@comment.post.id), resource(@comment.post) %>
+</h3>
+
+<%= error_messages_for @comment %>
+
+<%= form_for @comment, :action => resource(@comment), :method => :put do %>
+  <%= text_field :body %>
+  <%= submit "Submit" %>
+<% end =%>

data/spec/fixture/app/views/comments/index.html.erb

@@ -2,6 +2,8 @@
 
 <ul>
 <% @comments.each do |comment| %>
-  <li><%= comment.body %></li>
+  <li>
+    <%= link_to h(comment.body), resource(comment) %>
+  </li>
 <% end %>
 </ul>

data/spec/fixture/app/views/comments/new.html.erb

@@ -1,3 +1,6 @@
+<%= error_messages_for @comment %>
+
 <%= form_for @comment, :action => resource(:comments) do %>
+  <%= text_field :body %>
   <%= submit "submit" %>
 <% end =%>

data/spec/fixture/app/views/layout/application.html.erb

@@ -0,0 +1,11 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:v="urn:schemas-microsoft-com:vml" xml:lang="en-us" lang="en-us">
+<head>
+  <title>merb_component</title>
+  <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+</head>
+<body>
+  <%= catch_content :for_layout %>
+</body>
+</html>

data/spec/fixture/app/views/posts/show.html.erb

@@ -1,6 +1,4 @@
-<h1><%= @post.id %></h1>
+<h1><%= link_to @post.id.to_s, resource(@post) %></h1>
 
-<% Comment.related_with(@post) do %>
-  <%= component Comments, :index %>
-  <%= component Comments, :new %>
-<% end %>
+<%= component Comments, :index %>
+<%= form_for_component :comments %>

data/spec/fixture/config/router.rb

@@ -1,13 +1,10 @@
 Merb::Router.prepare do
-  resources :posts do |posts|
-    posts.match("/:action").to(:controller => :posts)
-    posts.match("/:action/:id").to(:controller => :posts)
-    posts.resources :comments#, :controller => :posts
+  resources :comments
+  resources :posts do |post|
+    post.aggregates :comments
   end
-  resource :admin do |admin|
-    admin.match("/:action").to(:controller => :admin)
-    admin.match("/:action/:id").to(:controller => :admin)
-    admin.resources :comments#, :controller => :admin
+  resource :admin, :controller => :admin do |admin|
+    admin.aggregates :comments
   end
 
   default_routes

data/spec/merb_component_spec.rb

@@ -3,9 +3,23 @@ require File.dirname(__FILE__) + '/spec_helper'
 describe "merb_component" do
   it "should extend controller" do
     Posts.private_instance_methods.should be_include("component")
+    Posts.private_instance_methods.should be_include("form_for_component")
+    Posts.instance_methods.should be_include("aggregator")
   end
 
-  it "should extend model" do
-    Post.public_methods.should be_include("related_with")
+  it "should not extend model" do
+    Post.public_methods.should_not be_include("related_with")
+  end
+
+  it "should accept controller class as the first param of compoent" do
+    req = Merb::Request.new({})
+    result = Posts.new(req).send(:component, Comments, :index)
+    result.should be_kind_of(String)
+  end
+
+  it "should accept symbol as the first param of compoent" do
+    req = Merb::Request.new({})
+    result = Posts.new(req).send(:component, :comments, :index)
+    result.should be_kind_of(String)
   end
 end

data/spec/posts_spec.rb

@@ -17,7 +17,7 @@ end
 describe "Posts controller" do
   before :all do
     @post = Post.create
-    @comment = @post.comments.create
+    @comment = @post.comments.create(:body => "test")
   end
 
   it "should be tested on at least one post" do
@@ -33,6 +33,8 @@ describe "Posts controller" do
     res.should have_xpath("//ul/li")
     res.should have_xpath("//form[@method='post']")
     res.should have_xpath("//form[@action='/posts/#{@post.id}/comments']")
+    res.should_not have_xpath("//input[@value='put']")
+    res.should have_xpath("//input[@value='new']")
   end
 
   it "should show html after post a comment" do
@@ -45,10 +47,29 @@ describe "Posts controller" do
     res.should have_xpath("//ul/li[1]")
     res.should have_xpath("//ul/li[2]")
     res.should have_xpath("//form[@method='post']")
+    res.should have_xpath("//form[@action='/posts/#{@post.id}/comments']")
+    res.should_not have_xpath("//input[@value='put']")
     res.should contain("foo")
     Comment.all(:post_id => @post.id).count.should == count + 1
   end
 
+  it "should show html after failed to post a comment" do
+    count = Comment.all(:post_id => @post.id).count
+    res = request(resource(@post, :comments),
+      :method => 'POST', :params => {:comment => {:body => ""}})
+    res.should be_successful
+    res.should have_xpath("//h1")
+    res.should have_xpath("//h2")
+    res.should have_xpath("//ul/li[1]")
+    res.should have_xpath("//ul/li[2]")
+    res.should have_xpath("//form[@method='post']")
+    res.should have_xpath("//form[@action='/posts/#{@post.id}/comments']")
+    res.should_not have_xpath("//input[@value='put']")
+    res.should have_tag("div.error")
+    res.should have_tag("input.error[@name='comment[body]']")
+    Comment.all(:post_id => @post.id).count.should == count
+  end
+
   it "should show html after update a comment" do
     comment = @post.comments.last
     comment.should be_kind_of(Comment)
@@ -60,10 +81,30 @@ describe "Posts controller" do
     res.should have_xpath("//ul/li[1]")
     res.should have_xpath("//ul/li[2]")
     res.should have_xpath("//form[@method='post']")
+    res.should have_xpath("//form[@action='/posts/#{@post.id}/comments']")
+    res.should_not have_xpath("//input[@value='put']")
     res.should contain("bar")
   end
 
-  it "should show html after update a comment" do
+  it "should show html after failed to update a comment" do
+    comment = @post.comments.last
+    comment.should be_kind_of(Comment)
+    res = request(resource(@post, comment),
+      :method => 'PUT', :params => {:comment => {:body => ""}})
+    res.should be_successful
+    res.should have_xpath("//h1")
+    res.should have_xpath("//h2")
+    res.should have_xpath("//ul/li[1]")
+    res.should have_xpath("//ul/li[2]")
+    res.should have_xpath("//form[@method='post']")
+    url = "/posts/#{@post.id}/comments/#{comment.id}"
+    res.should have_xpath("//form[@action='#{url}']")
+    res.should have_xpath("//input[@value='put']")
+    res.should have_tag("div.error")
+    res.should have_tag("input.error[@name='comment[body]']")
+  end
+
+  it "should show html after delete a comment" do
     count = @post.comments.count
     comment = @post.comments.last
     comment.should be_kind_of(Comment)
@@ -71,6 +112,25 @@ describe "Posts controller" do
     res.should be_successful
     res.should have_xpath("//h1")
     res.should have_xpath("//h2")
+    res.should have_xpath("//form[@action='/posts/#{@post.id}/comments']")
+    res.should have_xpath("//form[@method='post']")
+    res.should_not have_xpath("//input[@value='put']")
     @post.comments.count.should == count - 1
   end
+
+  it "should show html after show a comment" do
+    comment = @post.comments.create(:body => "test")
+    comment.should_not be_new_record
+    res = request(resource(@post, comment), :method => 'GET')
+    res.should be_successful
+    res.should have_xpath("//h1")
+    res.should have_xpath("//h2")
+    url = "/posts/#{@post.id}/comments/#{comment.id}"
+    res.should have_xpath("//form[@action='#{url}']")
+    res.should have_xpath("//input[@value='put']")
+    res.should_not have_xpath("//body/meta")
+    res.should have_xpath("//input[@value='edit']")
+
+    pending "should check pagination"
+  end
 end

data/spec/spec_helper.rb

@@ -10,6 +10,8 @@ dependency "dm-core"
 dependency "dm-aggregates"
 dependency "merb-action-args"
 dependency "merb-helpers"
+dependency "merb-assets"
+dependency "dm-validations"
 
 use_orm :datamapper
 use_test :rspec

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: genki-merb_component
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors: 
 - Genki Takiuchi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-25 00:00:00 -08:00
+date: 2009-01-26 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,11 +38,11 @@ files:
 - TODO
 - lib/merb_component
 - lib/merb_component/controller_ext.rb
-- lib/merb_component/helper_ext.rb
 - lib/merb_component/merbtasks.rb
-- lib/merb_component/model_ext.rb
 - lib/merb_component/resource_ext.rb
+- lib/merb_component/router_ext.rb
 - lib/merb_component.rb
+- spec/admin_spec.rb
 - spec/fixture
 - spec/fixture/app
 - spec/fixture/app/controllers
@@ -54,15 +54,19 @@ files:
 - spec/fixture/app/models/comment.rb
 - spec/fixture/app/models/post.rb
 - spec/fixture/app/views
+- spec/fixture/app/views/admin
+- spec/fixture/app/views/admin/show.html.erb
 - spec/fixture/app/views/comments
+- spec/fixture/app/views/comments/edit.html.erb
 - spec/fixture/app/views/comments/index.html.erb
 - spec/fixture/app/views/comments/new.html.erb
+- spec/fixture/app/views/layout
+- spec/fixture/app/views/layout/application.html.erb
 - spec/fixture/app/views/posts
 - spec/fixture/app/views/posts/index.html.erb
 - spec/fixture/app/views/posts/show.html.erb
 - spec/fixture/config
 - spec/fixture/config/router.rb
-- spec/fixture/tmp
 - spec/merb_component_spec.rb
 - spec/posts_spec.rb
 - spec/spec_helper.rb

data/lib/merb_component/helper_ext.rb

@@ -1,4 +0,0 @@
-module Merb
-  module GlobalHelpers
-  end
-end

data/lib/merb_component/model_ext.rb

@@ -1,26 +0,0 @@
-module DataMapper::Model
-  def related_with(model, &block)
-    model_class = model.class
-    storage_name = model_class.storage_name
-    assoc_name = storage_name.singular.intern
-    key_names = relationships[assoc_name].child_key.map{|i| i.name}
-    push_relation(model)
-    with_scope(Hash[key_names.zip(model.key)], &block)
-  ensure
-    pop_relation
-  end
-
-  def relation
-    (Thread::current[:relation] || []).last
-  end
-
-private
-  def push_relation(relation)
-    Thread::current[:relation] ||= []
-    Thread::current[:relation].push relation
-  end
-
-  def pop_relation
-    Thread::current[:relation].pop
-  end
-end