genki-merb_component 0.2.0 → 0.2.0.1

data/README

@@ -25,20 +25,8 @@ Example of use:
   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!

data/Rakefile

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

data/lib/merb_component/controller_ext.rb

@@ -58,8 +58,12 @@ class Merb::Controller
                 cc.class.layout(layout)
               end
               object = cc.instance_variable_get(var)
+              throw(:halt, proc{
+                target = controller_name.singular.intern
+                target = object.send(target) if object.respond_to?(target)
+                redirect resource(target)
+              }) if object.errors.empty?
               c.instance_variable_set(var, object)
-              object = model.new if object.errors.empty?
             end
           elsif params[:id]
             # GET with component id
@@ -77,7 +81,7 @@ class Merb::Controller
   end
 
   class Aggregator
-    attr_reader :controller, :object, :result
+    attr_reader :controller, :object, :result, :context
 
     def initialize(context, controller, &block)
       @context = context
@@ -123,8 +127,22 @@ class Merb::Controller
     (aggregators[self.class] ||= []).last
   end
 
+  def url_with_scope(*args)
+    result = url_without_scope(*args)
+    if (agg = aggregator) && (key = agg.key)
+      resource_without_scope(key) + result
+    else
+      result
+    end
+  end
+  alias_method :url_without_scope, :url
+  alias_method :url, :url_with_scope
+
 private
   def component(controller, action, params = {})
+    params = self.params.merge(
+      :controller => controller, :action => action
+    ).merge(params)
     var = "@#{controller.to_s.singular}"
     object = instance_variable_get("#{var}_component")
     controller = Object.full_const_get(controller.to_s.camel_case)
@@ -156,8 +174,9 @@ private
     end
   end
 
-  def resource(first, *args)
-    return super unless aggregator
+  def resource_with_scope(first, *args)
+    agg = aggregator
+    return resource_without_scope(first, *args) unless agg
 
     controller = case first
     when Symbol, String
@@ -166,8 +185,12 @@ private
       Object.full_const_get(first.class.to_s.pluralize.camel_case)
     end
 
-    return super unless controller <=> aggregator.controller
-    return super unless key = aggregator.key
-    super(key, first, *args)
+    if controller <=> agg.controller && agg.key
+      resource_without_scope(agg.key, first, *args)
+    else
+      resource_without_scope(first, *args)
+    end
   end
+  alias_method :resource_without_scope, :resource
+  alias_method :resource, :resource_with_scope
 end

data/spec/admin_spec.rb

@@ -25,13 +25,24 @@ describe "Admin controller" do
     Comment.count.should > 0
   end
 
-  it "should index html" do
+  it "should show 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")
+    res.should have_xpath("//a[@href='/admin/comments?page=1']")
+  end
+
+  it "should show index html for pagination params" do
+    res = request("/admin/comments?page=2")
+    res.should be_successful
+    res.should have_xpath("//h1")
+    res.should have_xpath("//h2")
+    res.should have_xpath("//ul")
+    res.should_not have_xpath("//form")
+    res.should have_xpath("//a[@href='/admin/comments?page=3']")
   end
 
   it "should show html after update a comment" do
@@ -39,14 +50,14 @@ describe "Admin controller" do
     comment.should be_kind_of(Comment)
     res = request(resource(:admin, comment),
       :method => 'PUT', :params => {:comment => {:body => "bar"}})
+    res.should redirect_to("/admin")
+
+    res = request(res.headers["Location"])
     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")
+    res.should_not have_xpath("//form")
   end
 
   it "should show html after failed to update a comment" do
@@ -70,14 +81,13 @@ describe "Admin controller" do
     comment = @post.comments.last
     comment.should be_kind_of(Comment)
     res = request(resource(:admin, comment), :method => 'DELETE')
+    res.should redirect_to("/admin")
+    
+    res = request(res.headers["Location"])
     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")
+    res.should_not have_xpath("//form")
     @post.comments.count.should == count - 1
   end
 

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

@@ -7,3 +7,5 @@
   </li>
 <% end %>
 </ul>
+
+<%= link_to "next", url(:page => params[:page].to_i + 1) %>

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

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

data/spec/merb_component_spec.rb

@@ -5,21 +5,22 @@ describe "merb_component" 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")
+    Posts.private_instance_methods.should be_include("resource")
+    Posts.public_instance_methods.should be_include("url")
   end
 
   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)
+    c = Posts.new(req)
+    proc do
+      c.send(:component, :comments, :index)
+    end.should raise_error(Merb::Router::GenerationError)
+    c.instance_variable_set(:@post, Post.create)
+    result = c.send(:component, :comments, :index)
     result.should be_kind_of(String)
   end
 end

data/spec/posts_spec.rb

@@ -35,12 +35,29 @@ describe "Posts controller" do
     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']")
+    res.should have_xpath("//a[@href='/posts/#{@post.id}/comments?page=1']")
   end
 
+  it "should show html for pagination params" do
+    res = request("/posts/#{@post.id}/comments?page=2")
+    res.should be_successful
+    res.should have_xpath("//h1")
+    res.should have_xpath("//h2")
+    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']")
+    res.should have_xpath("//a[@href='/posts/#{@post.id}/comments?page=3']")
+    end
+
   it "should show html after post a comment" do
     count = @post.comments.count
     res = request(resource(@post, :comments),
       :method => 'POST', :params => {:comment => {:body => "foo"}})
+    res.should redirect_to("/posts/#{@post.id}")
+
+    res = request(res.headers["Location"])
     res.should be_successful
     res.should have_xpath("//h1")
     res.should have_xpath("//h2")
@@ -75,6 +92,9 @@ describe "Posts controller" do
     comment.should be_kind_of(Comment)
     res = request(resource(@post, comment),
       :method => 'PUT', :params => {:comment => {:body => "bar"}})
+    res.should redirect_to("/posts/#{@post.id}")
+
+    res = request(res.headers["Location"])
     res.should be_successful
     res.should have_xpath("//h1")
     res.should have_xpath("//h2")
@@ -109,6 +129,9 @@ describe "Posts controller" do
     comment = @post.comments.last
     comment.should be_kind_of(Comment)
     res = request(resource(@post, comment), :method => 'DELETE')
+    res.should redirect_to("/posts/#{@post.id}")
+    
+    res = request(res.headers["Location"])
     res.should be_successful
     res.should have_xpath("//h1")
     res.should have_xpath("//h2")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: genki-merb_component
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.0.1
 platform: ruby
 authors: 
 - Genki Takiuchi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-26 00:00:00 -08:00
+date: 2009-01-27 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency