merb-core 0.9.2 → 0.9.3

data/spec/public/abstract_controller/filter_spec.rb

@@ -77,4 +77,12 @@ describe Merb::AbstractController, " should support before and after filters" do
   it "should throw an error" do
     running { dispatch_should_make_body("TestConditionalFilterWithNoProcOrSymbol", "") }.should raise_error(ArgumentError, /a Symbol or a Proc/)
   end
+  
+  it "should support passing an argument to a before filter method" do
+    dispatch_should_make_body("TestBeforeFilterWithArgument", "index action")
+  end
+  
+  it "should support passing arguments to a before filter method" do
+    dispatch_should_make_body("TestBeforeFilterWithArguments", "index action")
+  end
 end

data/spec/public/abstract_controller/render_spec.rb

@@ -46,6 +46,18 @@ describe Merb::AbstractController, " rendering templates" do
   it "should support rendering plain strings with the controller layout" do
     dispatch_should_make_body("RenderTemplateControllerLayout", "Controller: the index")
   end
+  
+  it "should support rendering templates without any layout (even if the default layout exists)" do
+    dispatch_should_make_body("RenderNoDefaultAppLayout", "the index")
+  end
+  
+  it "should inherit the layout setting from a parent controller class" do
+    dispatch_should_make_body("RenderNoDefaultAppLayoutInherited", "the index")
+  end
+
+  it "should support reverting to the default layout" do
+    dispatch_should_make_body("RenderDefaultAppLayoutInheritedOverride", "App: the index")
+  end  
 
   it "should support rendering templates with a custom location" do
     dispatch_should_make_body("RenderTemplateCustomLocation", "Wonderful")

data/spec/public/controller/authentication_spec.rb

@@ -0,0 +1,103 @@
+require File.join(File.dirname(__FILE__), "spec_helper")
+
+describe "basic_authentication in general", :shared => true do
+
+  it "should halt the filter chain and return a 401 status code if no authentication is sent" do
+    response = dispatch_to(Merb::Test::Fixtures::Controllers::BasicAuthentication, :index)
+    response.body.should == "HTTP Basic: Access denied.\n"
+    response.status.should == 401
+  end
+
+  it "should halt the filter chain and return a 401 status code on invalid username and password" do
+    u, p = "John", "password"
+    response = dispatch_with_basic_authentication_to(Merb::Test::Fixtures::Controllers::BasicAuthentication, :index, u, p)
+    response.body.should == "HTTP Basic: Access denied.\n"
+    response.status.should == 401
+  end
+
+  it "should halt the filter chain and return a 401 status code on invalid username and valid password" do
+    u, p = "John", "secret"
+    response = dispatch_with_basic_authentication_to(Merb::Test::Fixtures::Controllers::BasicAuthentication, :index, u, p)
+    response.body.should == "HTTP Basic: Access denied.\n"
+    response.status.should == 401
+  end
+
+  it "should halt the filter chain and return a 401 status code on valid username and invalid password" do
+    u, p = "Fred", "password"
+    response = dispatch_with_basic_authentication_to(Merb::Test::Fixtures::Controllers::BasicAuthentication, :index, u, p)
+    response.body.should == "HTTP Basic: Access denied.\n"
+    response.status.should == 401
+  end
+
+  it "should call the action on valid username and password" do
+    u, p = "Fred", "secret"
+    response = dispatch_with_basic_authentication_to(Merb::Test::Fixtures::Controllers::BasicAuthentication, :index, u, p)
+    response.body.should == "authenticated"
+    response.status.should == 200
+  end
+
+end
+
+describe Merb::Controller, "#basic_authentication with no realm" do
+
+  it_should_behave_like "basic_authentication in general"
+
+  it "should have a default WWW-Authenticate realm of 'Application' if no authentication is sent" do
+    response = dispatch_to(Merb::Test::Fixtures::Controllers::BasicAuthentication, :index)
+    response.headers['WWW-Authenticate'] = 'Basic realm="Application"'
+  end
+
+  it "should have a default WWW-Authenticate realm of 'Application' if incorrect authentication is sent" do
+    u, p = "John", "password"
+    response = dispatch_with_basic_authentication_to(Merb::Test::Fixtures::Controllers::BasicAuthentication, :index, u, p)
+    response.headers['WWW-Authenticate'] = 'Basic realm="Application"'
+  end
+
+end
+
+describe Merb::Controller, "#basic_authentication with realm" do
+
+  it_should_behave_like "basic_authentication in general"
+
+  it "should set the WWW-Authenticate realm if no authentication is sent" do
+    response = dispatch_to(Merb::Test::Fixtures::Controllers::BasicAuthenticationWithRealm, :index)
+    response.headers['WWW-Authenticate'] = 'Basic realm="My SuperApp"'
+  end
+
+  it "should set the WWW-Authenticate realm if incorrect authentication is sent" do
+    u, p = "John", "password"
+    response = dispatch_with_basic_authentication_to(Merb::Test::Fixtures::Controllers::BasicAuthenticationWithRealm, :index, u, p)
+    response.headers['WWW-Authenticate'] = 'Basic realm="My SuperApp"'
+  end
+
+end
+
+describe Merb::Controller, "#basic_authentication.authenticate" do
+
+  it "should pass in the username and password and return the result of the block" do
+    u, p = "Fred", "secret"
+    response = dispatch_with_basic_authentication_to(Merb::Test::Fixtures::Controllers::AuthenticateBasicAuthentication, :index, u, p)
+    response.body.should == "Fred:secret"
+  end
+
+end
+
+describe Merb::Controller, "#basic_authentication.request" do
+
+  it "should halt the filter chain and return a 401 status code" do
+    response = dispatch_to(Merb::Test::Fixtures::Controllers::RequestBasicAuthentication, :index)
+    response.body.should == "HTTP Basic: Access denied.\n"
+    response.status.should == 401
+  end
+
+  it "should have a default WWW-Authenticate realm of 'Application'" do
+    response = dispatch_to(Merb::Test::Fixtures::Controllers::RequestBasicAuthentication, :index)
+    response.headers['WWW-Authenticate'].should == 'Basic realm="Application"'
+  end
+
+  it "should set the WWW-Authenticate realm" do
+    response = dispatch_to(Merb::Test::Fixtures::Controllers::RequestBasicAuthenticationWithRealm, :index)
+    response.headers['WWW-Authenticate'].should == 'Basic realm="My SuperApp"'
+  end
+
+end

data/spec/public/controller/base_spec.rb

@@ -10,7 +10,9 @@ describe Merb::Controller, " callable actions" do
   end
   
   it "should dispatch to callable actions" do
-    dispatch_to(Merb::Test::Fixtures::Controllers::Base, :index).body.should == "index"
+    controller = dispatch_to(Merb::Test::Fixtures::Controllers::Base, :index)
+    controller.body.should == "index"
+    controller.status.should == 200
   end
 
   it "should not dispatch to hidden actions" do
@@ -26,6 +28,5 @@ describe Merb::Controller, " callable actions" do
     calling { dispatch_to(Merb::Test::Fixtures::Controllers::Base, :bat) }.
       should raise_error(Merb::ControllerExceptions::ActionNotFound)
   end
-
-    
+ 
 end

data/spec/public/controller/controllers/authentication.rb

@@ -0,0 +1,47 @@
+module Merb::Test::Fixtures::Controllers
+  
+  class Testing < Merb::Controller
+    self._template_root = File.dirname(__FILE__) / "views"
+  end
+
+  class BasicAuthentication < Testing
+
+    before :authenticate, :only => :index
+
+    def index
+      "authenticated"
+    end
+    
+    protected
+  
+    def authenticate
+      basic_authentication { |u, p| u == "Fred" && p == "secret" }
+    end
+    
+  end
+  
+  class BasicAuthenticationWithRealm < BasicAuthentication
+    def authenticate
+      basic_authentication("My Super App") { |u, p| u == "Fred" && p == "secret" }
+    end
+  end
+  
+  class AuthenticateBasicAuthentication < Testing
+    def index
+      basic_authentication.authenticate { |u, p| "Fred:secret" }
+    end
+  end
+  
+  class RequestBasicAuthentication < BasicAuthentication
+    def authenticate
+      basic_authentication.request
+    end
+  end
+  
+  class RequestBasicAuthenticationWithRealm < BasicAuthentication
+    def authenticate
+      basic_authentication("My SuperApp").request
+    end
+  end
+  
+end

data/spec/public/controller/controllers/base.rb

@@ -28,6 +28,7 @@ module Merb::Test::Fixtures
       include Inclusion
       
       def index
+        self.status = :ok
         "index"
       end
 

data/spec/public/controller/controllers/display.rb

@@ -4,6 +4,11 @@ module Merb::Test::Fixtures::Controllers
   
   class SomeModel
     def to_xml; "<XML:Model />" end
+    def to_json(options = {})
+      includes = options[:include].join(', ') rescue ""
+      excludes = options[:except].first rescue ""
+      "{ 'include': '#{includes}', 'exclude': '#{excludes}' }"
+    end
   end
   
   class Testing < Merb::Controller
@@ -37,4 +42,29 @@ module Merb::Test::Fixtures::Controllers
     layout :custom
   end
   
+  class DisplayWithTemplateArgument < Display
+    def index
+      @obj = SomeModel.new
+      display @obj, :layout => :custom_arg
+    end
+    
+    def index_by_arg
+      @obj = SomeModel.new
+      display @obj, "merb/test/fixtures/controllers/display_with_template_argument/index.html"
+    end
+  end
+  
+  class DisplayWithSerializationOptions < Display
+    provides :json
+    
+    def index
+      @obj = SomeModel.new
+      display @obj, :include => [:beer, :jazz], :except => [:idiots]
+    end
+    
+    def index_that_passes_empty_hash
+      @obj = SomeModel.new
+      display @obj, {}
+    end
+  end
 end

data/spec/public/controller/controllers/views/layout/custom_arg.html.erb

@@ -0,0 +1 @@
+Custom Arg: <%= catch_content(:for_layout) %>

data/spec/public/controller/controllers/views/merb/test/fixtures/controllers/display_with_template_argument/index.html.erb

@@ -0,0 +1 @@
+Template

data/spec/public/controller/display_spec.rb

@@ -15,6 +15,14 @@ describe Merb::Controller, " displaying objects based on mime type" do
   it "should use a template if specified" do
     dispatch_to(Merb::Test::Fixtures::Controllers::DisplayWithTemplate, :index).body.should == "Custom: Template"
   end
+  
+  it "should accept a layout argument" do
+    dispatch_to(Merb::Test::Fixtures::Controllers::DisplayWithTemplateArgument, :index).body.should == "Custom Arg: Template"
+  end
+  
+  it "should accept a template path argument" do
+    dispatch_to(Merb::Test::Fixtures::Controllers::DisplayWithTemplateArgument, :index_by_arg).body.should == "Template"
+  end
 
   it "should use other mime-types if they are provided on the class level" do
     controller = dispatch_to(Merb::Test::Fixtures::Controllers::DisplayClassProvides, :index, {}, :http_accept => "application/xml")
@@ -31,4 +39,13 @@ describe Merb::Controller, " displaying objects based on mime type" do
     controller.body.should == "<XML:Model />"    
   end
   
+  it "passes all options to serialization method like :to_json" do
+    controller = dispatch_to(Merb::Test::Fixtures::Controllers::DisplayWithSerializationOptions, :index, {}, :http_accept => "application/json")
+    controller.body.should == "{ 'include': 'beer, jazz', 'exclude': 'idiots' }"
+  end
+  
+  it "passes single argument to serialization method like :to_json" do
+    controller = dispatch_to(Merb::Test::Fixtures::Controllers::DisplayWithSerializationOptions, :index_that_passes_empty_hash, {}, :http_accept => "application/json")
+    controller.body.should == "{ 'include': '', 'exclude': '' }"
+  end
 end

data/spec/public/controller/spec_helper.rb

@@ -5,5 +5,6 @@ require File.join(__DIR__, "..", "..", "spec_helper")
 require File.join(__DIR__, "controllers", "base")
 require File.join(__DIR__, "controllers", "responder")
 require File.join(__DIR__, "controllers", "display")
+require File.join(__DIR__, "controllers", "authentication")
 
 Merb.start :environment => 'test'

data/spec/public/controller/url_spec.rb

@@ -74,6 +74,14 @@ describe Merb::Controller, " url" do
     @controller.url(:person, :name => 'david', :color => 'blue').should eql("/people/david?color=blue")
   end
   
+  it "should match with a :format" do
+    @controller.url(:person, :name => 'david', :format => :xml).should eql("/people/david.xml")
+  end
+  
+  it "should match with an additional param and :format" do
+    @controller.url(:person, :name => 'david', :color => 'blue', :format => :xml).should eql("/people/david.xml?color=blue")
+  end
+  
   it "should match with additional params" do
     url = @controller.url(:person, :name => 'david', :smell => 'funky', :color => 'blue')
     url.should match(%r{/people/david?.*color=blue})
@@ -96,6 +104,16 @@ describe Merb::Controller, " url" do
   it "should match with a fixnum as second arg" do
     @controller.url(:monkey, 3).should == "/monkeys/3"
   end
+  
+  it "should match with an object and :format" do
+    @monkey = Monkey.new
+    @controller.url(:monkey, :id => @monkey, :format => :xml).should == "/monkeys/45.xml"
+  end
+  
+  it "should match with an object, :format and additional options" do
+    @monkey = Monkey.new
+    @controller.url(:monkey, :id => @monkey, :format => :xml, :color => "blue").should == "/monkeys/45.xml?color=blue"
+  end
 
   it "should match the delete_monkey route" do
     @monkey = Monkey.new
@@ -114,23 +132,23 @@ describe Merb::Controller, " url" do
  
   it "should match a nested resources show action" do
     @blue = Blue.new
-    @controller.url(:monkey_blue,@blue).should == "/monkeys/45/blues/13"
+    @controller.url(:monkey_blue, @blue).should == "/monkeys/45/blues/13"
   end
   
   it "should match the index action of nested resource with parent object" do
     @blue = Blue.new
     @monkey = Monkey.new
-    @controller.url(:monkey_blues,:monkey_id => @monkey).should == "/monkeys/45/blues"
+    @controller.url(:monkey_blues, :monkey_id => @monkey).should == "/monkeys/45/blues"
   end
   
   it "should match the index action of nested resource with parent id as string" do
     @blue = Blue.new
-    @controller.url(:monkey_blues,:monkey_id => '1').should == "/monkeys/1/blues"
+    @controller.url(:monkey_blues, :monkey_id => '1').should == "/monkeys/1/blues"
   end
   
   it "should match the edit action of nested resource" do
     @blue = Blue.new
-    @controller.url(:edit_monkey_blue,@blue).should == "/monkeys/45/blues/13/edit"
+    @controller.url(:edit_monkey_blue, @blue).should == "/monkeys/45/blues/13/edit"
   end
   
   it "should match the index action of resources nested under a resource" do
@@ -140,13 +158,13 @@ describe Merb::Controller, " url" do
   
   it "should match resource that has been nested multiple times" do
     @blue = Blue.new
-    @controller.url(:donkey_blue,@blue).should == "/donkeys/19/blues/13"
-    @controller.url(:monkey_blue,@blue).should == "/monkeys/45/blues/13"
+    @controller.url(:donkey_blue, @blue).should == "/donkeys/19/blues/13"
+    @controller.url(:monkey_blue, @blue).should == "/monkeys/45/blues/13"
   end
   
   it "should match resources nested more than one level deep" do
     @pink = Pink.new
-    @controller.url(:monkey_blue_pink,@pink).should == "/monkeys/45/blues/13/pinks/22"
+    @controller.url(:monkey_blue_pink, @pink).should == "/monkeys/45/blues/13/pinks/22"
   end
 
 end

data/spec/public/core/merb_core_spec.rb

@@ -0,0 +1,34 @@
+require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
+
+describe "Merb.env helpers" do
+  before(:all) do
+    @orig_env = Merb.environment
+  end
+  after(:all) do
+    Merb.environment = @orig_env
+  end
+  
+  it "should pickup the environment from env" do
+    %w(development test production staging demo).each do |e|
+      Merb.environment = e
+      Merb.env.should == e
+    end
+  end
+  
+  it "should correctly answer the question about which env it's in with symbol or string" do
+    %w(development test production staging demo custom).each do |e|
+      Merb.environment = e
+      Merb.env?(e).should be true
+      Merb.env?(e.to_sym).should be_true
+    end
+  end
+  
+  it "should answer false if asked for an environment that is not current" do
+    %w(development test production staging demo custom).each do |e|
+      Merb.environment = e
+      Merb.env?(:not_it).should be_false
+    end
+  end
+  
+  
+end

data/spec/public/directory_structure/directory/app/controllers/custom.rb

@@ -12,8 +12,8 @@ class Custom < Application
   
   private
   
-  def _template_location(action, type = nil, controller = controller_name)  
-    "wonderful/#{action}"
+  def _template_location(context, type = nil, controller = controller_name)  
+    "wonderful/#{context}"
   end
   
 end

data/spec/public/directory_structure/directory/log/merb_test.log

@@ -263,3 +263,51 @@ Mon, 25 Feb 2008 23:13:20 GMT ~ {:action_time=>0.000562, :after_filters_time=>6.
  ~ {:before_filters_time=>7.0e-06, :after_filters_time=>5.0e-06, :action_time=>7.4e-05}
  ~ {:before_filters_time=>5.0e-06, :after_filters_time=>5.0e-06, :action_time=>0.000615}
  ~ {:before_filters_time=>6.0e-06, :after_filters_time=>7.0e-06, :action_time=>0.000601}
+ ~ Not Using Sessions
+ ~ {:before_filters_time=>8.0e-06, :after_filters_time=>6.0e-06, :action_time=>7.5e-05}
+ ~ {:before_filters_time=>5.0e-06, :after_filters_time=>5.0e-06, :action_time=>0.000618}
+ ~ {:before_filters_time=>6.0e-06, :after_filters_time=>6.0e-06, :action_time=>0.000588}
+ ~ Not Using Sessions
+ ~ {:before_filters_time=>7.0e-06, :after_filters_time=>6.0e-06, :action_time=>7.8e-05}
+ ~ {:before_filters_time=>6.0e-06, :after_filters_time=>5.0e-06, :action_time=>0.000597}
+ ~ {:before_filters_time=>6.0e-06, :after_filters_time=>5.0e-06, :action_time=>0.000574}
+ ~ Not Using Sessions
+ ~ {:before_filters_time=>7.0e-06, :after_filters_time=>6.0e-06, :action_time=>7.3e-05}
+ ~ {:before_filters_time=>5.0e-06, :after_filters_time=>5.0e-06, :action_time=>0.000596}
+ ~ {:before_filters_time=>7.0e-06, :after_filters_time=>6.0e-06, :action_time=>0.000571}
+ ~ Not Using Sessions
+ ~ {:before_filters_time=>7.0e-06, :after_filters_time=>6.0e-06, :action_time=>7.5e-05}
+ ~ {:before_filters_time=>5.0e-06, :after_filters_time=>5.0e-06, :action_time=>0.000594}
+ ~ {:before_filters_time=>6.0e-06, :after_filters_time=>6.0e-06, :action_time=>0.000576}
+ ~ Not Using Sessions
+ ~ {:before_filters_time=>7.0e-06, :after_filters_time=>6.0e-06, :action_time=>7.5e-05}
+ ~ {:before_filters_time=>6.0e-06, :after_filters_time=>5.0e-06, :action_time=>0.000843}
+ ~ {:before_filters_time=>8.0e-06, :after_filters_time=>5.0e-06, :action_time=>0.000735}
+ ~ Not Using Sessions
+ ~ {:before_filters_time=>7.0e-06, :after_filters_time=>6.0e-06, :action_time=>7.9e-05}
+ ~ {:before_filters_time=>5.0e-06, :after_filters_time=>5.0e-06, :action_time=>0.000935}
+ ~ {:before_filters_time=>6.0e-06, :after_filters_time=>6.0e-06, :action_time=>0.000656}
+ ~ Not Using Sessions
+ ~ {:before_filters_time=>9.0e-06, :after_filters_time=>6.0e-06, :action_time=>8.9e-05}
+ ~ {:before_filters_time=>6.0e-06, :after_filters_time=>6.0e-06, :action_time=>0.000826}
+ ~ {:before_filters_time=>3.5e-05, :after_filters_time=>7.0e-06, :action_time=>0.000879}
+ ~ Not Using Sessions
+ ~ {:before_filters_time=>8.0e-06, :after_filters_time=>6.0e-06, :action_time=>8.8e-05}
+ ~ {:before_filters_time=>6.0e-06, :after_filters_time=>6.0e-06, :action_time=>0.000823}
+ ~ {:before_filters_time=>7.0e-06, :after_filters_time=>7.0e-06, :action_time=>0.000841}
+ ~ Not Using Sessions
+ ~ {:action_time=>8.9e-05, :before_filters_time=>8.0e-06, :after_filters_time=>7.0e-06}
+ ~ {:action_time=>0.000828, :before_filters_time=>6.0e-06, :after_filters_time=>6.0e-06}
+ ~ {:action_time=>0.00083, :before_filters_time=>8.0e-06, :after_filters_time=>7.0e-06}
+ ~ Not Using Sessions
+ ~ {:action_time=>0.000145, :before_filters_time=>8.0e-06, :after_filters_time=>5.0e-06}
+ ~ {:action_time=>0.000796, :before_filters_time=>5.0e-06, :after_filters_time=>5.0e-06}
+ ~ {:action_time=>0.000761, :before_filters_time=>7.0e-06, :after_filters_time=>5.0e-06}
+ ~ Not Using Sessions
+ ~ {:action_time=>0.000146, :before_filters_time=>8.0e-06, :after_filters_time=>5.0e-06}
+ ~ {:action_time=>0.000797, :before_filters_time=>5.0e-06, :after_filters_time=>6.0e-06}
+ ~ {:action_time=>0.000771, :before_filters_time=>6.0e-06, :after_filters_time=>5.0e-06}
+ ~ Not Using Sessions
+ ~ {:action_time=>0.000149, :before_filters_time=>7.0e-06, :after_filters_time=>5.0e-06}
+ ~ {:action_time=>0.000813, :before_filters_time=>6.0e-06, :after_filters_time=>5.0e-06}
+ ~ {:action_time=>0.000787, :before_filters_time=>5.0e-06, :after_filters_time=>6.0e-06}