merb 0.4.1 → 0.4.2

data/lib/merb/view_context.rb

@@ -22,7 +22,6 @@ module Merb
                        @_format_value
                        @_content_type
                        @_merb_unmatched
-                       @_template_format
                        @_provided_formats
                        @template]
 
@@ -69,13 +68,11 @@ module Merb
     # catch any method calls that the controller responds to
     # and delegate them back to the controller.
     def method_missing(sym, *args, &blk)
-      if @web_controller.respond_to? sym
-        @web_controller.send(sym, *args, &blk)
-      elsif @_merb_partial_locals.key? sym
+      if @_merb_partial_locals.key?(sym)
         @_merb_partial_locals[sym]
       else
-        super
-      end    
+        @web_controller.send(sym, *args, &blk)
+      end
     end
     
   end

data/lib/patch

@@ -0,0 +1,69 @@
+Index: Rakefile
+===================================================================
+--- Rakefile	(revision 888)
++++ Rakefile	(working copy)
+@@ -1,4 +1,4 @@
+-
++PLATFORM = RUBY_PLATFORM if !defined?(PLATFORM)
+ require 'rubygems'
+ gem 'echoe', '>=2.7'
+ require 'echoe'
+Index: ext/http11/http11.c
+===================================================================
+--- ext/http11/http11.c	(revision 888)
++++ ext/http11/http11.c	(working copy)
+@@ -74,7 +74,7 @@
+   f = rb_str_dup(global_http_prefix);
+   f = rb_str_buf_cat(f, field, flen); 
+ 
+-  for(ch = RSTRING(f)->ptr, end = ch + RSTRING(f)->len; ch < end; ch++) {
++  for(ch = RSTRING_PTR(f), end = ch + RSTRING_LEN(f); ch < end; ch++) {
+     if(*ch == '-') {
+       *ch = '_';
+     } else {
+@@ -169,12 +169,12 @@
+   rb_hash_aset(req, global_gateway_interface, global_gateway_interface_value);
+   if((temp = rb_hash_aref(req, global_http_host)) != Qnil) {
+     /* ruby better close strings off with a '\0' dammit */
+-    colon = strchr(RSTRING(temp)->ptr, ':');
++    colon = strchr(RSTRING_PTR(temp), ':');
+     if(colon != NULL) {
+-      rb_hash_aset(req, global_server_name, rb_str_substr(temp, 0, colon - RSTRING(temp)->ptr));
++      rb_hash_aset(req, global_server_name, rb_str_substr(temp, 0, colon - RSTRING_PTR(temp)));
+       rb_hash_aset(req, global_server_port, 
+-          rb_str_substr(temp, colon - RSTRING(temp)->ptr+1, 
+-            RSTRING(temp)->len));
++          rb_str_substr(temp, colon - RSTRING_PTR(temp)+1, 
++            RSTRING_LEN(temp)));
+     } else {
+       rb_hash_aset(req, global_server_name, temp);
+       rb_hash_aset(req, global_server_port, global_port_80);
+@@ -295,8 +295,8 @@
+   DATA_GET(self, http_parser, http);
+ 
+   from = FIX2INT(start);
+-  dptr = RSTRING(data)->ptr;
+-  dlen = RSTRING(data)->len;
++  dptr = RSTRING_PTR(data);
++  dlen = RSTRING_LEN(data);
+ 
+   if(from >= dlen) {
+     rb_raise(eHttpParserError, "Requested start is after data buffer end.");
+Index: ext/http11/ext_help.h
+===================================================================
+--- ext/http11/ext_help.h	(revision 888)
++++ ext/http11/ext_help.h	(working copy)
+@@ -11,4 +11,13 @@
+ #define TRACE() 
+ #endif
+ 
++/* ruby 1.9 compat */
++#ifndef RSTRING_PTR
++#define RSTRING_PTR(str) RSTRING(str)->ptr
++#endif
++
++#ifndef RSTRING_LEN
++#define RSTRING_LEN(str) RSTRING(str)->len
++#endif
++
+ #endif

data/lib/tasks/merb.rake

@@ -36,7 +36,7 @@ namespace :merb do
     FileUtils.rm_rf install_path
 
     puts "  Freezing Merb Framework from svn, revision #{revision}"
-    system "svn co -r #{revision} http://svn.devjavu.com/merb/trunk/lib #{install_path}"
+    system "svn export -r #{revision} http://svn.devjavu.com/merb/trunk/lib #{install_path}"
     install_merb_script
     
     puts "  Use script/merb to start instead of plain merb"

data/spec/fixtures/config/environments/environment_config_test.yml

@@ -0,0 +1 @@
+:loaded_config_for_environment_config_test: true

data/spec/fixtures/controllers/render_spec_controllers.rb

@@ -21,17 +21,32 @@ end
 
 class FakeModel
   
-  def to_json
+  def to_json(*args)
     "{'foo':'bar'}"
   end
   
-  def to_xml
+  def to_xml(*args)
     "<foo>bar</foo>"
   end
 end
 
-class RenderObjectController < Merb::Controller
+class FakeModelWithArguments
+  
+  def to_json(*args)
+    options = args.last.is_a?(Hash) ? args.pop : {}
+    '[' + args.map { |arg| "'#{arg}'" }.join(',') + ']'
+  end
+  
+  def to_xml(*args)
+    options = args.last.is_a?(Hash) ? args.pop.stringify_keys : {}
+    options.keys.sort.inject('') do |str, tag|
+      str << "<#{tag}>#{options[tag]}</#{tag}>"
+    end
+  end
   
+end
+
+class RenderObjectController < Merb::Controller
   
   def render_object
     provides :xml,:json
@@ -47,6 +62,49 @@ class RenderObjectController < Merb::Controller
     
 end
 
+class RenderObjectWithArgumentsController < Merb::Controller
+  
+  provides :xml, :foo => 'bar'
+  provides :json, ['foo', 'bar']
+  
+  def render_standard
+    @foo = FakeModelWithArguments.new
+    render @foo
+  end
+  
+  def render_specific
+    provides :xml, :foo => 'bar', :biz => 'baz'
+    provides :json, ['foo', 'bar', 'baz']
+    @foo = FakeModelWithArguments.new
+    render @foo
+  end
+      
+end
+
+class RenderObjectWithBlockController < Merb::Controller
+  
+  provides :xml do |obj, controller|
+    obj.to_xml(:foo => controller.class.name)
+  end
+  
+  provides :json do |obj|
+    obj.to_json('foo')
+  end
+  
+  def render_standard
+    @foo = FakeModelWithArguments.new
+    render @foo
+  end
+  
+  def render_specific
+    callback = lambda { |obj, controller, method| obj.send(method, controller.class.name, 'foo', 'bar', 'baz', :foo => controller.class.name.upcase) }
+    provides :xml, :json, callback
+    @foo = FakeModelWithArguments.new
+    render @foo
+  end
+      
+end
+
 class ExtensionTemplateController < Merb::Controller
   provides :js, :xml
   def erubis_templates
@@ -112,4 +170,5 @@ class ExtensionTemplateController < Merb::Controller
 end
 
 Merb::Server.load_action_arguments
-Merb::Server.load_controller_template_path_cache
+Merb::Server.load_controller_template_path_cache
+Merb::Server.load_erubis_inline_helpers

data/spec/fixtures/views/examples/template_throw_content_without_block.html.erb

@@ -0,0 +1,3 @@
+<% throw_content(:content_without_block, "Content Without Block") -%>
+
+<%= catch_content :content_without_block %>

data/spec/fixtures/views/partials/_erubis.html.erb

@@ -1 +1 @@
-<%= respond_to?(:yo)  ? yo : "No Locals!" %>
+<%= respond_to?(:yo) && yo  ? yo : "No Locals!" %>

data/spec/merb/abstract_controller_spec.rb

@@ -14,6 +14,7 @@ describe Merb::AbstractController do
   
   after(:all) do
     Merb::Server.load_controller_template_path_cache
+    Merb::Server.load_erubis_inline_helpers    
   end
   
   it "should add a template path" do

data/spec/merb/controller_filters_spec.rb

@@ -4,12 +4,26 @@ class TestFiltersController < Merb::Controller
   
   before :filter1
   before :will_halt, :only => :four
+  
+  before :overwrite_before_filter, :only => :two
+  after  :overwrite_after_filter, :exclude => :four
+  
+  after  :after_will_be_skipped
+  before :before_will_be_skipped
+
   before Proc.new {|c| c.one }, :exclude => [:one, :three, :uses_params]
   after  Proc.new {|c| c.five }, :exclude => [:one, :three, :uses_params]  
   after  :filter2
   before :modifies_param, :only => :uses_params
-  after :restores_param, :only => :uses_params
+  after  :restores_param, :only => :uses_params
+
+  before :overwrite_before_filter, :only => :three
+  after  :overwrite_after_filter, :exclude => [:one, :two, :uses_param]
+
+  skip_before :before_will_be_skipped
+  skip_after  :after_will_be_skipped
   
+  # filters
   
   def will_halt
     throw :halt
@@ -37,7 +51,25 @@ class TestFiltersController < Merb::Controller
   def filter2
     @filter2='called'
   end
-    
+  
+  def before_will_be_skipped
+    @before_skip='called'
+  end
+  
+  def after_will_be_skipped
+    @after_skip='called'
+  end
+  
+  def overwrite_before_filter
+    @overwrite_before_filter='called'
+  end
+  
+  def overwrite_after_filter
+    @overwrite_after_filter='called'    
+  end
+  
+  # actions
+  
   def one
     session.data.should == {}
     @one = 'one'
@@ -89,7 +121,8 @@ class TestPrivateActions < Merb::Controller
     "notcallable"
   end
   
-end  
+end
+
 describe "Dispatch and before/after filters" do
   
   def call_filter_action(action, extra_params = {})
@@ -184,5 +217,37 @@ describe "Dispatch and before/after filters" do
       lambda { TestFiltersController.send(filter_type, []) }.should raise_error(ArgumentError)
     end
   end
+  
+  it "should be overwritten by a subsequent call with the same filter" do
+    c = new_controller( 'two', TestFiltersController )
+    c.dispatch(:two)
+    c.body.should == 'two'
+    c.instance_variable_get('@overwrite_before_filter').should == nil
+    c.instance_variable_get('@overwrite_after_filter').should == nil    
+    
+    c = new_controller( 'three', TestFiltersController )
+    c.dispatch(:three)
+    c.body.should == 'three'
+    c.instance_variable_get('@overwrite_before_filter').should == 'called'
+    c.instance_variable_get('@overwrite_after_filter').should == 'called'
+  end
+  
+  it "should not run if skipped" do
+    c = new_controller( 'one', TestFiltersController )
+    c.dispatch(:one)
+    c.body.should == 'one'
+    c.instance_variable_get('@one').should == 'one' 
+    c.instance_variable_get('@two').should == nil
+    c.instance_variable_get('@three').should == nil 
+
+    c.instance_variable_get('@before_skip').should == nil
+    c.instance_variable_get('@after_skip').should == nil    
+  end
+  
+  it "should not allow skipping a filter that is not a symbol or string" do
+    ["before", "after"].each do |filter_type|    
+      lambda { TestFiltersController.send('skip_'+filter_type, Proc.new{|c|puts c}) }.should raise_error(ArgumentError)
+    end
+  end
 
 end

data/spec/merb/controller_spec.rb

@@ -13,9 +13,20 @@ describe "Merb::Controller" do
     c = new_controller
     c._layout.should == :application
   end
+  
+  it "should have a spec helper to dispatch that skips the router" do
+    Merb::Router.should_not_receive(:match)
+    dispatch_to(Bar, :foo, :id => "1") do |controller|
+      controller.should_receive(:foo).with("1")
+    end
+  end
+  
 end
 
 describe Merb::Controller, "url generator tests" do
+  
+  it_should_behave_like "class with general url generation"
+  
   def new_url_controller(route, params = {:action => 'show', :controller => 'Test'})
     request = OpenStruct.new
     request.route = route
@@ -25,43 +36,6 @@ describe Merb::Controller, "url generator tests" do
     
     Merb::Controller.build(request, response)
   end
-  
-  before(:all) do
-    Merb::Router.prepare do |r|
-      @resource_routes = r.resources(:blogs)
-      r.resources(:gardens) do |gardens|
-        @nested_resource = gardens.resources :flowers
-      end
-      @test_route = r.match("/the/:place/:goes/here").to(:controller => "Test", :action => "show").name(:test)
-      @default_route = r.default_routes
-    end
-  end
-  
-  it "should generate a url from a route using a hash" do
-    c = new_url_controller(@test_route, :place => "1")
-    c.url_from_route(@test_route, :goes => "g").should == "/the/1/g/here"
-  end
-
-  it "should generate a url from a route using an object" do
-    c = new_url_controller(@test_route, :place => "2")
-    obj = OpenStruct.new(:goes => "elsewhere")
-    c.url_from_route(@test_route, obj).should == "/the/2/elsewhere/here"
-  end
-
-  it "should generate a url and tack extra params on as a query string" do
-    c = new_url_controller(@test_route, :place => "1")
-    c.url_from_route(@test_route, :goes => "g", :page => 2).should == "/the/1/g/here?page=2"
-  end
-  
-  it "should generate a url directly from a hash using the current route as a default" do
-    c = new_url_controller(@test_route, :goes => "swimmingly")
-    c.url(:place => "provo").should == "/the/provo/swimmingly/here"
-  end
-  
-  it "should generate a default route url with just :controller" do
-    c = new_url_controller(@default_route)
-    c.url(:controller => "welcome").should == "/welcome"
-  end
 
   it "should generate a default route url with just :action" do
     c = new_url_controller(@default_route, :controller => "foo")
@@ -73,11 +47,6 @@ describe Merb::Controller, "url generator tests" do
     c.url(:id => "23").should == "/foo/bar/23"
   end
 
-  it 'should generate urls from nested resources' do
-    c = new_url_controller(@nested_resource, :garden => 5)
-    c.url(:flower, :garden_id => 1, :id => 3).should == "/gardens/1/flowers/3"
-  end
-
   it "should generate a default route url with an extra param" do
     c = new_url_controller(@default_route, :controller => "foo", :action => "bar")
     c.url(:controller => :current, :monkey => "quux").should == "/foo/bar?monkey=quux"
@@ -105,40 +74,38 @@ describe Merb::Controller, "url generator tests" do
     c.url(:action => :recent, :format => :txt).should == "/foo/recent.txt"
   end  
   
-  it "should generate a default route url with all options" do
-    c = new_url_controller(@default_route, :controller => "foo", :action => "bar")
-    c.url(:controller => "foo", :action => "bar", :id => "baz", :format => :js, :monkey => "quux").should == "/foo/bar/baz.js?monkey=quux"
-  end
-  
   it "should handle nested nested and more nested hashes and arrays" do
     c = new_url_controller(@default_route, :controller => "foo", :action => "bar")
     url = c.url(:controller => :current, :user => {:filter => {:name => "quux*"}, :order => ["name"]})
     url.should match(%r{/foo/bar?.*user\[filter\]\[name\]=quux%2A})
     url.should match(%r{/foo/bar?.*user\[order\]\[\]=name})
   end
+end
+
+describe "Controller", "redirect spec helpers" do
+  class Redirector < Merb::Controller
+    def index
+      redirect("/foo")
+    end
+    def show
+    end
+  end
   
-  it "should handle an object as the second arg" do
-    c = new_url_controller(@resource_routes, :controller => "blogs", :action => "show")
-    blog = mock("blog")
-    blog.should_receive(:id).once.and_return(7)
-    url = c.url(:blog, blog)
-    url.should == "/blogs/7"
+  before(:each) do
+    @controller = Redirector.build(fake_request)
   end
-
-  it "should point to /blogs/:blog_id if @blog is not new_record" do
-    c = new_url_controller(@resource_routes, :controller => "blogs", :action => "index")
-    blog = mock("blog")
-    blog.should_receive(:id).once.and_return(7)
-    blog.should_receive(:new_record?).once.and_return(false)
-    url = c.url(:blog, blog)
-    url.should == "/blogs/7"
+  
+  it "should be able to match redirects" do
+    @controller.dispatch('index')
+    @controller.status.should be_redirect
+    @controller.should redirect
+    @controller.should redirect_to("/foo")
   end
-
-  it "should point to /blogs/ if @blog is new_record" do
-    c = new_url_controller(@resource_routes, :controller => "blogs", :action => "index")
-    blog = mock("blog")
-    blog.should_receive(:new_record?).once.and_return(true)
-    url = c.url(:blog, blog)
-    url.should == "/blogs/"
+  
+  it "should be able to negative match redirects" do
+    @controller.dispatch('show')
+    @controller.status.should_not be_redirect
+    @controller.should_not redirect
+    @controller.should_not redirect_to("/foo")
   end
 end