merb-core 0.9.2 → 0.9.3

data/spec/private/core_ext/time_spec.rb

@@ -0,0 +1,16 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+require 'json'
+
+describe Time, "#to_json" do
+  
+  before do
+    @expected = "\"2008-03-28T22:54:20Z\""
+  end
+  
+  it "should transform itself into a ISO 8601 compatible string" do
+    Time.utc(2008, 3, 28, 22, 54, 20).to_json.should == @expected
+    Time.xmlschema("2008-03-28T22:54:20Z").to_json.should == @expected
+    Time.xmlschema("2008-03-28T17:54:20-05:00").to_json.should == @expected
+  end
+  
+end

data/spec/private/dispatch/bootloader_spec.rb

@@ -0,0 +1,24 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe Merb::BootLoader::RackUpApplication do
+
+  it "should default to rack config (rack.rb)" do
+    options = {:merb_root => File.dirname(__FILE__) / 'fixture'}
+    Merb::Config.setup(options)
+    app = Merb::BootLoader::RackUpApplication.run
+    app.class.should == Merb::Rack::Application
+  end
+
+  it "should use rackup config that we specified" do
+    options = {:rackup => File.dirname(__FILE__) / 'fixture' / 'config' / 'black_hole.rb'}
+    Merb::Config.setup(options)
+    app = Merb::BootLoader::RackUpApplication.run
+    app.class.should == Rack::Adapter::BlackHole
+
+    env = Rack::MockRequest.env_for("/black_hole")
+    status, header, body = app.call(env)
+    status.should == 200
+    header.should == { "Content-Type" => "text/plain" }
+    body.should == ""
+  end
+end

data/spec/private/dispatch/fixture/app/views/exeptions/client_error.html.erb

@@ -31,7 +31,7 @@
   <div id="footer-container">
     <hr />
     <div class="left"></div>
-    <div class="right">&copy; 2007 the merb dev team</div>
+    <div class="right">&copy; 2008 the merb dev team</div>
     <p>&nbsp;</p>
   </div>
 </div>

data/spec/private/dispatch/fixture/app/views/exeptions/internal_server_error.html.erb

@@ -129,7 +129,7 @@
 	<div class="internalError">
 		
 		<div class="header">
-			<h1><%= @exception_name %> <sup class="error_<%= @exception.class::STATUS %>"><%= @exception.class::STATUS %></sup></h1>
+			<h1><%= @exception_name %> <sup class="error_<%= @exception.class.status %>"><%= @exception.class.status %></sup></h1>
 			<% if show_details = ::Merb::Config[:exception_details] -%>
 				<h2><%= @exception.message %></h2>
 			<% else -%>

data/spec/private/dispatch/fixture/app/views/exeptions/not_acceptable.html.erb

@@ -32,7 +32,7 @@
   <div id="footer-container">
     <hr />
     <div class="left"></div>
-    <div class="right">&copy; 2007 the merb dev team</div>
+    <div class="right">&copy; 2008 the merb dev team</div>
     <p>&nbsp;</p>
   </div>
 </div>

data/spec/private/dispatch/fixture/app/views/exeptions/not_found.html.erb

@@ -34,7 +34,7 @@
   <div id="footer-container">
     <hr />
     <div class="left"></div>
-    <div class="right">&copy; 2007 the merb dev team</div>
+    <div class="right">&copy; 2008 the merb dev team</div>
     <p>&nbsp;</p>
   </div>
 </div>

data/spec/private/dispatch/fixture/config/black_hole.rb

@@ -0,0 +1,12 @@
+# Alternate rackup config
+module Rack
+  module Adapter
+    class BlackHole
+      def call(env)
+        [ 200, { "Content-Type" => "text/plain" }, "" ]
+      end
+    end
+  end
+end
+
+run Rack::Adapter::BlackHole.new

data/spec/private/dispatch/fixture/log/merb_test.log

@@ -2038,3 +2038,141 @@ Mon, 25 Feb 2008 23:13:12 GMT ~ {:before_filters_time=>6.0e-06, :action_time=>0.
  ~ Params: {"format"=>nil, "action"=>"bar", "id"=>"54", "controller"=>"foo"}
  ~ Routed to: {:action=>"bar", :format=>nil, :controller=>"foo", :id=>"54"}
  ~ {:action_time=>0.000269, :dispatch_time=>0.000425, :before_filters_time=>5.0e-06, :after_filters_time=>5.0e-06}
+ ~ Loaded TEST Environment...
+ ~ Compiling routes...
+ ~ Using 'share-nothing' cookie sessions (4kb limit per client)
+ ~ Loaded TEST Environment...
+ ~ Compiling routes...
+ ~ Using 'share-nothing' cookie sessions (4kb limit per client)
+ ~ Params: {"format"=>nil, "action"=>"bar", "id"=>"54", "controller"=>"foo"}
+ ~ Routed to: {:action=>"bar", :format=>nil, :controller=>"foo", :id=>"54"}
+ ~ {:action_time=>0.00086, :dispatch_time=>0.001065, :before_filters_time=>8.0e-06, :after_filters_time=>6.0e-06}
+ ~ Params: {"format"=>nil, "action"=>"bar", "id"=>"54", "controller"=>"foo"}
+ ~ Routed to: {:action=>"bar", :format=>nil, :controller=>"foo", :id=>"54"}
+ ~ {:action_time=>0.000247, :dispatch_time=>0.000385, :before_filters_time=>6.0e-06, :after_filters_time=>5.0e-06}
+ ~ Loaded TEST Environment...
+ ~ Compiling routes...
+ ~ Using 'share-nothing' cookie sessions (4kb limit per client)
+ ~ Loaded TEST Environment...
+ ~ Compiling routes...
+ ~ Using 'share-nothing' cookie sessions (4kb limit per client)
+ ~ Params: {"format"=>nil, "action"=>"bar", "id"=>"54", "controller"=>"foo"}
+ ~ Routed to: {:action=>"bar", :format=>nil, :controller=>"foo", :id=>"54"}
+ ~ {:action_time=>0.000836, :dispatch_time=>0.00103, :before_filters_time=>8.0e-06, :after_filters_time=>6.0e-06}
+ ~ Params: {"format"=>nil, "action"=>"bar", "id"=>"54", "controller"=>"foo"}
+ ~ Routed to: {:action=>"bar", :format=>nil, :controller=>"foo", :id=>"54"}
+ ~ {:action_time=>0.000239, :dispatch_time=>0.000377, :before_filters_time=>4.0e-06, :after_filters_time=>5.0e-06}
+ ~ Loaded TEST Environment...
+ ~ Compiling routes...
+ ~ Using 'share-nothing' cookie sessions (4kb limit per client)
+ ~ Loaded TEST Environment...
+ ~ Compiling routes...
+ ~ Using 'share-nothing' cookie sessions (4kb limit per client)
+ ~ Loaded TEST Environment...
+ ~ Compiling routes...
+ ~ Using 'share-nothing' cookie sessions (4kb limit per client)
+ ~ Loaded TEST Environment...
+ ~ Compiling routes...
+ ~ Using 'share-nothing' cookie sessions (4kb limit per client)
+ ~ Params: {"format"=>nil, "action"=>"bar", "id"=>"54", "controller"=>"foo"}
+ ~ Routed to: {:action=>"bar", :format=>nil, :controller=>"foo", :id=>"54"}
+ ~ {:action_time=>0.000839, :dispatch_time=>0.001034, :before_filters_time=>7.0e-06, :after_filters_time=>6.0e-06}
+ ~ Params: {"format"=>nil, "action"=>"bar", "id"=>"54", "controller"=>"foo"}
+ ~ Routed to: {:action=>"bar", :format=>nil, :controller=>"foo", :id=>"54"}
+ ~ {:action_time=>0.000238, :dispatch_time=>0.000373, :before_filters_time=>4.0e-06, :after_filters_time=>5.0e-06}
+ ~ Loaded TEST Environment...
+ ~ Compiling routes...
+ ~ Using 'share-nothing' cookie sessions (4kb limit per client)
+ ~ Loaded TEST Environment...
+ ~ Compiling routes...
+ ~ Using 'share-nothing' cookie sessions (4kb limit per client)
+ ~ Params: {"format"=>nil, "action"=>"bar", "id"=>"54", "controller"=>"foo"}
+ ~ Routed to: {:format=>nil, :action=>"bar", :controller=>"foo", :id=>"54"}
+ ~ {:dispatch_time=>0.00124, :action_time=>0.001025, :before_filters_time=>1.0e-05, :after_filters_time=>6.0e-06}
+ ~ Params: {"format"=>nil, "action"=>"bar", "id"=>"54", "controller"=>"foo"}
+ ~ Routed to: {:format=>nil, :action=>"bar", :controller=>"foo", :id=>"54"}
+ ~ {:dispatch_time=>0.000476, :action_time=>0.000335, :before_filters_time=>6.0e-06, :after_filters_time=>5.0e-06}
+ ~ Loaded TEST Environment...
+ ~ Compiling routes...
+ ~ Using 'share-nothing' cookie sessions (4kb limit per client)
+ ~ Loaded TEST Environment...
+ ~ Compiling routes...
+ ~ Using 'share-nothing' cookie sessions (4kb limit per client)
+ ~ Params: {"format"=>nil, "action"=>"bar", "id"=>"54", "controller"=>"foo"}
+ ~ Routed to: {:format=>nil, :action=>"bar", :controller=>"foo", :id=>"54"}
+ ~ {:dispatch_time=>0.001202, :action_time=>0.000997, :before_filters_time=>9.0e-06, :after_filters_time=>5.0e-06}
+ ~ Params: {"format"=>nil, "action"=>"bar", "id"=>"54", "controller"=>"foo"}
+ ~ Routed to: {:format=>nil, :action=>"bar", :controller=>"foo", :id=>"54"}
+ ~ {:dispatch_time=>0.000541, :action_time=>0.000322, :before_filters_time=>5.0e-06, :after_filters_time=>4.0e-06}
+ ~ Loaded TEST Environment...
+ ~ Compiling routes...
+ ~ Using 'share-nothing' cookie sessions (4kb limit per client)
+ ~ Loaded TEST Environment...
+ ~ Compiling routes...
+ ~ Using 'share-nothing' cookie sessions (4kb limit per client)
+ ~ Routed to: {:format=>nil, :action=>"bar", :controller=>"foo", :id=>"54"}
+ ~ Params: {"format"=>nil, "action"=>"bar", "id"=>"54", "controller"=>"foo"}
+ ~ {:dispatch_time=>0.001481, :action_time=>0.001224, :before_filters_time=>1.0e-05, :after_filters_time=>6.0e-06}
+ ~ Routed to: {:format=>nil, :action=>"bar", :controller=>"foo", :id=>"54"}
+ ~ Params: {"format"=>nil, "action"=>"bar", "id"=>"54", "controller"=>"foo"}
+ ~ {:dispatch_time=>0.000606, :action_time=>0.00042, :before_filters_time=>7.0e-06, :after_filters_time=>6.0e-06}
+ ~ Loaded TEST Environment...
+ ~ Compiling routes...
+ ~ Using 'share-nothing' cookie sessions (4kb limit per client)
+ ~ Loaded TEST Environment...
+ ~ Compiling routes...
+ ~ Using 'share-nothing' cookie sessions (4kb limit per client)
+ ~ Routed to: {:format=>nil, :action=>"bar", :controller=>"foo", :id=>"54"}
+ ~ Params: {"format"=>nil, "action"=>"bar", "id"=>"54", "controller"=>"foo"}
+ ~ {:dispatch_time=>0.001454, :action_time=>0.00121, :before_filters_time=>9.0e-06, :after_filters_time=>7.0e-06}
+ ~ Routed to: {:format=>nil, :action=>"bar", :controller=>"foo", :id=>"54"}
+ ~ Params: {"format"=>nil, "action"=>"bar", "id"=>"54", "controller"=>"foo"}
+ ~ {:dispatch_time=>0.000594, :action_time=>0.000413, :before_filters_time=>7.0e-06, :after_filters_time=>5.0e-06}
+ ~ Loaded TEST Environment...
+ ~ Compiling routes...
+ ~ Using 'share-nothing' cookie sessions (4kb limit per client)
+ ~ Loaded TEST Environment...
+ ~ Compiling routes...
+ ~ Using 'share-nothing' cookie sessions (4kb limit per client)
+ ~ Routed to: {:format=>nil, :action=>"bar", :id=>"54", :controller=>"foo"}
+ ~ Params: {"format"=>nil, "action"=>"bar", "id"=>"54", "controller"=>"foo"}
+ ~ {:before_filters_time=>9.0e-06, :after_filters_time=>7.0e-06, :dispatch_time=>0.001479, :action_time=>0.001234}
+ ~ Routed to: {:format=>nil, :action=>"bar", :id=>"54", :controller=>"foo"}
+ ~ Params: {"format"=>nil, "action"=>"bar", "id"=>"54", "controller"=>"foo"}
+ ~ {:before_filters_time=>7.0e-06, :after_filters_time=>7.0e-06, :dispatch_time=>0.000594, :action_time=>0.000407}
+ ~ Loaded TEST Environment...
+ ~ Compiling routes...
+ ~ Using 'share-nothing' cookie sessions (4kb limit per client)
+ ~ Loaded TEST Environment...
+ ~ Compiling routes...
+ ~ Using 'share-nothing' cookie sessions (4kb limit per client)
+ ~ Routed to: {:controller=>"foo", :format=>nil, :action=>"bar", :id=>"54"}
+ ~ Params: {"format"=>nil, "action"=>"bar", "id"=>"54", "controller"=>"foo"}
+ ~ {:dispatch_time=>0.001304, :action_time=>0.001105, :before_filters_time=>8.0e-06, :after_filters_time=>5.0e-06}
+ ~ Routed to: {:controller=>"foo", :format=>nil, :action=>"bar", :id=>"54"}
+ ~ Params: {"format"=>nil, "action"=>"bar", "id"=>"54", "controller"=>"foo"}
+ ~ {:dispatch_time=>0.000448, :action_time=>0.000307, :before_filters_time=>6.0e-06, :after_filters_time=>5.0e-06}
+ ~ Loaded TEST Environment...
+ ~ Compiling routes...
+ ~ Using 'share-nothing' cookie sessions (4kb limit per client)
+ ~ Loaded TEST Environment...
+ ~ Compiling routes...
+ ~ Using 'share-nothing' cookie sessions (4kb limit per client)
+ ~ Routed to: {:controller=>"foo", :format=>nil, :action=>"bar", :id=>"54"}
+ ~ Params: {"format"=>nil, "action"=>"bar", "id"=>"54", "controller"=>"foo"}
+ ~ {:dispatch_time=>0.001304, :action_time=>0.001105, :before_filters_time=>8.0e-06, :after_filters_time=>6.0e-06}
+ ~ Routed to: {:controller=>"foo", :format=>nil, :action=>"bar", :id=>"54"}
+ ~ Params: {"format"=>nil, "action"=>"bar", "id"=>"54", "controller"=>"foo"}
+ ~ {:dispatch_time=>0.000486, :action_time=>0.000345, :before_filters_time=>5.0e-06, :after_filters_time=>6.0e-06}
+ ~ Loaded TEST Environment...
+ ~ Compiling routes...
+ ~ Using 'share-nothing' cookie sessions (4kb limit per client)
+ ~ Loaded TEST Environment...
+ ~ Compiling routes...
+ ~ Using 'share-nothing' cookie sessions (4kb limit per client)
+ ~ Routed to: {:format=>nil, :action=>"bar", :controller=>"foo", :id=>"54"}
+ ~ Params: {"format"=>nil, "action"=>"bar", "id"=>"54", "controller"=>"foo"}
+ ~ {:dispatch_time=>0.001314, :action_time=>0.001112, :before_filters_time=>8.0e-06, :after_filters_time=>6.0e-06}
+ ~ Routed to: {:format=>nil, :action=>"bar", :controller=>"foo", :id=>"54"}
+ ~ Params: {"format"=>nil, "action"=>"bar", "id"=>"54", "controller"=>"foo"}
+ ~ {:dispatch_time=>0.000446, :action_time=>0.000305, :before_filters_time=>6.0e-06, :after_filters_time=>5.0e-06}

data/spec/private/plugins/plugin_spec.rb

@@ -18,13 +18,13 @@ end
 
 describe "Plugins","use_orm" do
   before(:each) do
-    Merb.generator_scope.replace [:merb_default, :merb, :rspec]    
+    Merb.generator_scope.replace [:merb_default, :merb, :rspec]
     Kernel.stub!(:dependency)
   end
-  
+
   it "should raise an error if use_orm is called twice" do
     use_orm(:activerecord)
-    lambda { use_orm(:datamapper) }.should raise_error
+    lambda { use_orm(:datamapper) }.should raise_error("Don't call use_orm more than once")
   end
 
   it "should not have :merb_default in GENERATOR_SCOPE with use_orm(:activerecord)" do
@@ -41,21 +41,22 @@ describe "Plugins","use_orm" do
     use_orm(:activerecord)
     Merb.generator_scope.first.should == :activerecord
   end
-  
+
   it "should call dependency :merb_activerecord with use_orm(:activerecord)" do
     Kernel.should_receive(:dependency).with("merb_activerecord").once.
       and_return(true)
     use_orm(:activerecord)
   end
-  
 end
 
+
+
 describe "Plugins","use_test" do
   before(:each) do
     Merb.generator_scope.replace [:merb_default, :merb, :rspec]
     Kernel.stub!(:dependency)
   end
-  
+
   it "should have :rspec in GENERATOR_SCOPE by default" do
     Merb.generator_scope.should include(:rspec)
   end
@@ -74,8 +75,78 @@ describe "Plugins","use_test" do
     use_test(:test_unit)
     Merb.generator_scope.last.should == :test_unit
   end
-  
+
   it "should raise an error if called with an unsupported test framework" do
     lambda { use_test(:fiddlefaddle) }.should raise_error
   end
-end
+end
+
+
+describe "Plugins", "register_orm" do
+  before(:each) do
+    Merb.generator_scope.replace [:merb_default, :merb, :rspec]
+    Kernel.stub!(:dependency)
+  end
+
+  it "registers ORM plugin at generator scope" do
+    register_orm(:sequel)
+
+    Merb.generator_scope.should include(:sequel)
+  end
+end
+
+
+
+describe "Plugins", "registred_orm?" do
+  before(:each) do
+    Merb.generator_scope.replace [:merb_default, :merb, :rspec]
+    Kernel.stub!(:dependency)
+  end
+
+  it "returns false unless ORM is registred" do
+    registred_orm?(:sequel).should be(false)
+  end
+
+  it "returns true once ORM is registred" do
+    use_orm(:sequel)
+
+    registred_orm?(:sequel).should be(false)
+  end
+end
+
+
+
+
+describe "Plugins", "register_test_framework" do
+  before(:each) do
+    Merb.generator_scope.replace [:merb_default, :merb, :rspec]
+    Kernel.stub!(:dependency)
+  end
+
+  it "registers test framework at generator scope" do
+    register_test_framework(:test_unit)
+
+    Merb.generator_scope.should include(:test_unit)
+  end
+end
+
+
+
+describe "Plugins", "supported_test_framework?" do
+  before(:each) do
+    Merb.generator_scope.replace [:merb_default, :merb, :rspec]
+    Kernel.stub!(:dependency)
+  end
+
+  it "supports RSpec" do
+    supported_test_framework?(:rspec).should be(true)
+  end
+
+  it "supports Test::Unit" do
+    supported_test_framework?(:rspec).should be(true)
+  end
+
+  it "DOES NOT yet support MSpec (of Rubinius fame)" do
+    supported_test_framework?(:mspec).should be(false)
+  end
+end

data/spec/private/rack/application_spec.rb

@@ -11,7 +11,7 @@ describe Merb::Rack::Application do
   
   it "should return a MockResponse" do
     res = Rack::MockRequest.new(@app).get("")
-    res.should be_kind_of Rack::MockResponse
+    res.should be_kind_of(Rack::MockResponse)
   end
   
 end  

data/spec/public/abstract_controller/controllers/filters.rb

@@ -163,5 +163,31 @@ module Merb::Test::Fixtures
         "index action"
       end
     end
+    
+    class TestBeforeFilterWithArgument < Testing
+      before :foo, :with => "bar"
+      
+      def index
+        "index action"
+      end
+      
+      private
+      def foo(bar)
+        bar == "bar"
+      end
+    end
+    
+    class TestBeforeFilterWithArguments < Testing
+      before :foo, :with => ["bar", "baz"]
+      
+      def index
+        "index action"
+      end
+      
+      private
+      def foo(bar,baz)
+        bar == "bar" && baz == "baz"
+      end
+    end    
   end
 end

data/spec/public/abstract_controller/controllers/helpers.rb

@@ -4,8 +4,8 @@ module Merb::Test::Fixtures
     class HelperTesting < Merb::AbstractController
       self._template_root = File.dirname(__FILE__) / "views"
       
-      def _template_location(action, type = nil, controller = controller_name)
-        "helpers/#{File.basename(controller)}/#{action}"
+      def _template_location(context, type = nil, controller = controller_name)
+        "helpers/#{File.basename(controller)}/#{context}"
       end
     end
     

data/spec/public/abstract_controller/controllers/partial.rb

@@ -7,8 +7,8 @@ module Merb::Test::Fixtures
     class RenderIt < Merb::AbstractController
       self._template_root = File.dirname(__FILE__) / "views"
 
-      def _template_location(action, type = nil, controller = controller_name)
-        "partial/#{File.basename(controller)}/#{action}"
+      def _template_location(context, type = nil, controller = controller_name)
+        "partial/#{File.basename(controller)}/#{context}"
       end
     end
 

data/spec/public/abstract_controller/controllers/render.rb

@@ -58,9 +58,21 @@ module Merb::Test::Fixtures
       self._template_root = File.dirname(__FILE__) / "alt_views"      
     end  
     
+    class RenderNoDefaultAppLayout < RenderString
+      self._template_root = File.dirname(__FILE__) / "alt_views"
+      self.layout false
+    end
+    
+    class RenderNoDefaultAppLayoutInherited < RenderNoDefaultAppLayout
+    end
+    
+    class RenderDefaultAppLayoutInheritedOverride < RenderNoDefaultAppLayout
+      self.default_layout
+    end
+    
     class RenderTemplateCustomLocation < RenderTemplate      
-      def _template_location(action, type = nil, controller = controller_name)  
-        "wonderful/#{action}"
+      def _template_location(context, type = nil, controller = controller_name)  
+        "wonderful/#{context}"
       end
     end
     
@@ -75,8 +87,8 @@ module Merb::Test::Fixtures
     class RenderTemplateMultipleRootsAndCustomLocation < RenderTemplate
       self._template_roots = [[File.dirname(__FILE__) / "alt_views", :_custom_template_location]]
       
-      def _custom_template_location(action, type = nil, controller = controller_name)
-        "#{self.class.name.split('::')[-1].to_const_path}/#{action}"
+      def _custom_template_location(context, type = nil, controller = controller_name)
+        "#{self.class.name.split('::')[-1].to_const_path}/#{context}"
       end
     end