genki-merb_component 0.1.1 → 0.1.2

data/Rakefile

@@ -5,7 +5,7 @@ require 'merb-core'
 require 'merb-core/tasks/merb'
 
 GEM_NAME = "merb_component"
-GEM_VERSION = "0.1.1"
+GEM_VERSION = "0.1.2"
 AUTHOR = "Genki Takiuchi"
 EMAIL = "genki@s21g.com"
 HOMEPAGE = "http://blog.s21g.com/genki"
@@ -49,3 +49,10 @@ task :gemspec do
     file.puts spec.to_ruby
   end
 end
+
+desc "Run specs"
+task :spec do
+  sh "spec --color spec"
+end
+
+task :default => :spec

data/lib/merb_component.rb

@@ -1,15 +1,17 @@
 # make sure we're running inside Merb
 if defined?(Merb::Plugins)
 
-  # Merb gives you a Merb::Plugins.config hash...feel free to put your stuff in your piece of it
+  # Merb gives you a Merb::Plugins.config hash...feel free to put your stuff in
+  # your piece of it
   Merb::Plugins.config[:merb_component] = {
-    :chickens => false
   }
   
   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'
   end
   
   Merb::BootLoader.after_app_loads do

data/lib/merb_component/controller_ext.rb

@@ -1,9 +1,65 @@
 class Merb::Controller
+  METHOD_TO_ACTION = {
+    :post => :create,
+    :put => :update,
+    :delete => :destroy
+  }.freeze
+
+  class << self
+  private
+    def aggregates(*args)
+      @aggregations ||= Mash.new
+      options = extract_options_from_args!(args) || {}
+      args.each do |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)
+          end
+
+          # prepare for performing actoin of principal controller
+          params[:id] = id
+          params[:action] = c.action_name = :show
+        }, :only => arg)
+      end
+    end
+  end
+
+  def _abstract_dispatch(*args)
+    _dispatch = Merb::AbstractController.instance_method(:_dispatch)
+    _dispatch.bind(self).call(*args)
+  end
+
 private
   def component(controller, action, params = {})
     req = request.dup
     req.reset_params!
     req.instance_variable_set :@params, params
-    controller.new(req)._dispatch(action).render :layout => false
+    controller.new(req)._abstract_dispatch(action)
+  end
+
+  def resource(first, *args)
+    model = case first
+    when Symbol, String
+      Object.full_const_get(first.to_s.singular.camel_case)
+    else first.class
+    end
+    return super unless model.relation
+    super(model.relation, first, *args)
   end
 end

data/lib/merb_component/helper_ext.rb

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

data/lib/merb_component/resource_ext.rb

@@ -0,0 +1,7 @@
+module DataMapper::Resource
+  module ClassMethods
+    def build(attrs = {})
+      all.build(attrs)
+    end
+  end
+end

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

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

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

@@ -0,0 +1,2 @@
+class Application < Merb::Controller
+end

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

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

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

@@ -0,0 +1,13 @@
+class Posts < Application
+  aggregates :comments
+
+  def index
+    @posts = Post.all
+    display @posts
+  end
+
+  def show(id)
+    @post = Post.get(id)
+    display @post
+  end
+end

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

@@ -0,0 +1,8 @@
+class Comment
+  include DataMapper::Resource
+
+  property :id, Serial
+  property :body, Text
+  
+  belongs_to :post
+end

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

@@ -0,0 +1,7 @@
+class Post
+  include DataMapper::Resource
+
+  property :id, Serial
+
+  has n, :comments
+end

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

@@ -0,0 +1,7 @@
+<h2>Comments</h2>
+
+<ul>
+<% @comments.each do |comment| %>
+  <li><%= comment.body %></li>
+<% end %>
+</ul>

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

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

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

@@ -0,0 +1,7 @@
+<h1>Posts</h1>
+
+<ul>
+<% @posts.each do |post| %>
+  <li><%= post.id %></li>
+<% end %>
+</ul>

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

@@ -0,0 +1,6 @@
+<h1><%= @post.id %></h1>
+
+<% Comment.related_with(@post) do %>
+  <%= component Comments, :index %>
+  <%= component Comments, :new %>
+<% end %>

data/spec/fixture/config/router.rb

@@ -0,0 +1,14 @@
+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
+  end
+  resource :admin do |admin|
+    admin.match("/:action").to(:controller => :admin)
+    admin.match("/:action/:id").to(:controller => :admin)
+    admin.resources :comments#, :controller => :admin
+  end
+
+  default_routes
+end

data/spec/merb_component_spec.rb

@@ -1,7 +1,11 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
 describe "merb_component" do
-  it "should do nothing" do
-    true.should == true
+  it "should extend controller" do
+    Posts.private_instance_methods.should be_include("component")
+  end
+
+  it "should extend model" do
+    Post.public_methods.should be_include("related_with")
   end
 end

data/spec/posts_spec.rb

@@ -0,0 +1,76 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe Posts do
+  before do
+    @req = Merb::Request.new(
+      Merb::Const::REQUEST_PATH => "/posts",
+      Merb::Const::REQUEST_METHOD => "GET",
+      Merb::Const::QUERY_STRING => "")
+    @c = Posts.new(@req)
+  end
+
+  it "should be a controller" do
+    @c.should be_kind_of(Merb::Controller)
+  end
+end
+
+describe "Posts controller" do
+  before :all do
+    @post = Post.create
+    @comment = @post.comments.create
+  end
+
+  it "should be tested on at least one post" do
+    Post.count.should > 0
+    Comment.count.should > 0
+  end
+
+  it "should show html" do
+    res = request(resource(@post))
+    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']")
+  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 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 contain("foo")
+    Comment.all(:post_id => @post.id).count.should == count + 1
+  end
+
+  it "should show html after update a comment" do
+    comment = @post.comments.last
+    comment.should be_kind_of(Comment)
+    res = request(resource(@post, 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("//ul/li[2]")
+    res.should have_xpath("//form[@method='post']")
+    res.should contain("bar")
+  end
+
+  it "should show html after update a comment" do
+    count = @post.comments.count
+    comment = @post.comments.last
+    comment.should be_kind_of(Comment)
+    res = request(resource(@post, comment), :method => 'DELETE')
+    res.should be_successful
+    res.should have_xpath("//h1")
+    res.should have_xpath("//h2")
+    @post.comments.count.should == count - 1
+  end
+end

data/spec/spec_helper.rb

@@ -1 +1,35 @@
-$:.push File.join(File.dirname(__FILE__), '..', 'lib')
+$:.push File.join(File.dirname(__FILE__), '..', 'lib')
+
+require 'rubygems'
+require 'merb-core'
+require 'merb-core/plugins'
+require 'merb_component'
+require "spec" # Satisfies Autotest and anyone else not using the Rake tasks
+
+dependency "dm-core"
+dependency "dm-aggregates"
+dependency "merb-action-args"
+dependency "merb-helpers"
+
+use_orm :datamapper
+use_test :rspec
+use_template_engine :erb
+
+# this loads all plugins required in your init file so don't add them
+# here again, Merb will do it for you
+Merb.disable(:initfile)
+Merb.start_environment(
+  :testing      => true,
+  :adapter      => 'runner',
+  :environment  => ENV['MERB_ENV'] || 'test',
+  :merb_root    => File.dirname(__FILE__) / 'fixture',
+  :log_file     => File.dirname(__FILE__) / '..' / "merb_test.log"
+)
+DataMapper.setup(:default, "sqlite3::memory:")
+
+Spec::Runner.configure do |config|
+  config.include(Merb::Test::ViewHelper)
+  config.include(Merb::Test::RouteHelper)
+  config.include(Merb::Test::ControllerHelper)
+  config.before(:all){DataMapper.auto_migrate!}
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: genki-merb_component
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Genki Takiuchi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-05 00:00:00 -08:00
+date: 2009-01-25 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,10 +38,33 @@ 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.rb
+- spec/fixture
+- spec/fixture/app
+- spec/fixture/app/controllers
+- spec/fixture/app/controllers/admin.rb
+- spec/fixture/app/controllers/application.rb
+- spec/fixture/app/controllers/comments.rb
+- spec/fixture/app/controllers/posts.rb
+- spec/fixture/app/models
+- spec/fixture/app/models/comment.rb
+- spec/fixture/app/models/post.rb
+- spec/fixture/app/views
+- spec/fixture/app/views/comments
+- spec/fixture/app/views/comments/index.html.erb
+- spec/fixture/app/views/comments/new.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
 has_rdoc: true
 homepage: http://blog.s21g.com/genki