genki-merb_component 0.2.0.1 → 0.2.1

data/Rakefile

@@ -5,7 +5,7 @@ require 'merb-core'
 require 'merb-core/tasks/merb'
 
 GEM_NAME = "merb_component"
-GEM_VERSION = "0.2.0.1"
+GEM_VERSION = "0.2.1"
 AUTHOR = "Genki Takiuchi"
 EMAIL = "genki@s21g.com"
 HOMEPAGE = "http://blog.s21g.com/genki"
@@ -24,6 +24,7 @@ spec = Gem::Specification.new do |s|
   s.email = EMAIL
   s.homepage = HOMEPAGE
   s.add_dependency('merb', '>= 1.0.7.1')
+  s.add_development_dependency('merb_full_url', '>= 0.0.2')
   s.require_path = 'lib'
   s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
   

data/lib/merb_component/controller_ext.rb

@@ -53,7 +53,7 @@ class Merb::Controller
               begin
                 layout = cc.class.default_layout
                 cc.class.layout(options[:layout])
-                response = cc._abstract_dispatch(action)
+                cc._abstract_dispatch(action)
               ensure
                 cc.class.layout(layout)
               end
@@ -69,6 +69,9 @@ class Merb::Controller
             # GET with component id
             object = model.get(params[:id])
             c.instance_variable_set(var, object)
+          elsif params[:format]
+            @component_format = params.delete(:format)
+            #c._abstract_dispatch(action)
           end
           c.instance_variable_set("#{var}_component", object)
 
@@ -76,6 +79,20 @@ class Merb::Controller
           c.params[:id] = id if id
           c.params[:action] = c.action_name = agg_action.to_s
         }, :only => arg)
+
+        add_filter(_after_filters, proc{|c|
+          # setup request
+          request.reset_params!
+          request.instance_variable_set(:@params, params.merge(
+            :controller => arg, :action => :index,
+            :format => @component_format))
+
+          # call index action of subsidiary controller with scope
+          cc = Object.full_const_get(arg.to_s.camel_case).new(request)
+          @body = Aggregator.new(c, cc.class) do
+            cc._abstract_dispatch(:index)
+          end.result
+        }, :only => agg_action, :if => proc{@component_format})
       end
     end
   end
@@ -150,13 +167,18 @@ private
     req.reset_params!
     req.instance_variable_set :@params, params
 
-    Aggregator.new(self, controller) do
+    Aggregator.new(this = 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
+        cc = this.instance_variable_get(:@_caught_content)
+        instance_variable_get(:@_caught_content).each do |k, v|
+          next if k == :for_layout
+          cc[k].nil? ? this.throw_content(k, v) : this.append_content(k, v)
+        end
         render :layout => false
       end
     end.result

data/lib/merb_component/router_ext.rb

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

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

@@ -1,5 +1,6 @@
 class Comments < Application
   is_component :comment
+  provides :atom, :only => :index
 
   def new
     @comment = Comment.new

data/spec/fixture/app/views/comments/index.atom.builder

@@ -0,0 +1,21 @@
+xml.instruct! :xml, :version=>"1.0" 
+xml.feed(:xmlns => "http://www.w3.org/2005/Atom") do |feed|
+  feed.title @title
+  feed.link :type => 'text/html', :rel => 'alternate',
+    :href => full_resource(:comments)
+
+  @comments.each do |comment|
+    feed.entry do |entry|
+      entry.id comment.id
+      entry.title "Comment to post#%s" % comment.post.id
+      entry.content comment.body, :type => 'text'
+      #entry.issued comment.created_at
+      #entry.modified comment.updated_at
+      entry.link :type => "text/html", :rel => "alternate",
+        :href => full_resource(comment)
+      #entry.author do |author|
+      #  author.name comment.user.login
+      #end
+    end
+  end
+end

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

@@ -9,3 +9,7 @@
 </ul>
 
 <%= link_to "next", url(:page => params[:page].to_i + 1) %>
+
+<% throw_content :for_post do %>
+  test_content
+<% end %>

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

@@ -2,3 +2,5 @@
 
 <%= component :comments, :index %>
 <%= form_for_component :comments %>
+
+<%= catch_content :for_post %>

data/spec/posts_spec.rb

@@ -36,6 +36,7 @@ describe "Posts controller" do
     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']")
+    res.should contain("test_content")
   end
 
   it "should show html for pagination params" do
@@ -156,4 +157,17 @@ describe "Posts controller" do
 
     pending "should check pagination"
   end
+
+  it "should provide atom feed for comments" do
+    comment = @post.comments.create(:body => "test")
+    comment.should_not be_new_record
+    res = request(resource(@post, :comments, :format => :atom))
+    res.should be_successful
+    res.should have_xpath("//feed/title")
+    url = "http://example.org/posts/#{@post.id}/comments"
+    res.should have_xpath("//feed/link[@href='#{url}']")
+    res.should have_xpath("//entry/title")
+    url = "http://example.org/posts/#{@post.id}/comments/#{comment.id}"
+    res.should have_xpath("//entry/link[@href='#{url}']")
+  end
 end

data/spec/spec_helper.rb

@@ -12,6 +12,8 @@ dependency "merb-action-args"
 dependency "merb-helpers"
 dependency "merb-assets"
 dependency "dm-validations"
+dependency "merb-builder"
+dependency "merb_full_url"
 
 use_orm :datamapper
 use_test :rspec
@@ -28,6 +30,7 @@ Merb.start_environment(
   :log_file     => File.dirname(__FILE__) / '..' / "merb_test.log"
 )
 DataMapper.setup(:default, "sqlite3::memory:")
+Merb.add_mime_type(:atom, :to_atom, %w[application/atom+xml])
 
 Spec::Runner.configure do |config|
   config.include(Merb::Test::ViewHelper)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: genki-merb_component
 version: !ruby/object:Gem::Version 
-  version: 0.2.0.1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Genki Takiuchi
@@ -21,6 +21,15 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.0.7.1
     version: 
+- !ruby/object:Gem::Dependency 
+  name: merb_full_url
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.0.2
+    version: 
 description: Merb plugin that provides composition of controllers.
 email: genki@s21g.com
 executables: []
@@ -58,6 +67,7 @@ files:
 - 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.atom.builder
 - spec/fixture/app/views/comments/index.html.erb
 - spec/fixture/app/views/comments/new.html.erb
 - spec/fixture/app/views/layout