merb-core 0.9.2 → 0.9.3

data/spec/public/logger/logger_spec.rb

@@ -22,9 +22,9 @@ describe Merb::Logger do
 
   describe "#new" do
     it "should call set_log with the arguments it was passed." do
-      pending("How do we catch an initialize in a spec?")
-      # Merb::Logger.should_receive(:set_log).with(Merb.log_file).and_return(true)
-      # Merb::Logger.new(Merb.log_file)
+      logger = Merb::Logger.allocate # create an object sans initialization
+      logger.should_receive(:set_log).with('a partridge', 'a pear tree', 'a time bomb').and_return(true)
+      logger.send(:initialize, 'a partridge', 'a pear tree', 'a time bomb')
     end
   end
   
@@ -102,6 +102,12 @@ describe Merb::Logger do
       @logger.close
     end
 
+    it "shouldn't call the close method if the log is a terminal" do
+      @logger.log.should_receive(:tty?).and_return(true)
+      @logger.log.should_not_receive(:close)
+      @logger.close
+    end
+
     it "should set the stored log attribute to nil" do
       @logger.close
       @logger.log.should eql(nil)
@@ -172,4 +178,4 @@ describe Merb::Logger do
 
   end
 
-end
+end

data/spec/public/reloading/directory/app/controllers/reload.rb

@@ -1,4 +1,4 @@
-        
+
         class Reloader < Application
         end
 

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

@@ -57,3 +57,16 @@ Mon, 25 Feb 2008 23:13:22 GMT ~ Not Using Sessions
  ~ Not Using Sessions
  ~ Not Using Sessions
  ~ Not Using Sessions
+ ~ Not Using Sessions
+ ~ Not Using Sessions
+ ~ Not Using Sessions
+ ~ Not Using Sessions
+ ~ Not Using Sessions
+ ~ Not Using Sessions
+ ~ Not Using Sessions
+ ~ Not Using Sessions
+ ~ Not Using Sessions
+ ~ Not Using Sessions
+ ~ Not Using Sessions
+ ~ Not Using Sessions
+ ~ Not Using Sessions

data/spec/public/reloading/reload_spec.rb

@@ -1,18 +1,19 @@
 require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
 Merb.start :environment => 'test',
            :merb_root => File.dirname(__FILE__) / "directory"
-           
+
 describe "The reloader" do
+  SLEEP_TIME = 0.5
 
   def reload!
     Merb::BootLoader::ReloadClasses.reload
   end
-  
+
   before :all do
     @reload_file = File.dirname(__FILE__) / "directory" / "app" / "controllers" / "reload.rb"
     File.open(@reload_file, "w") do |f|
       @text = <<-END
-        
+
         class Reloader < Application
         end
 
@@ -21,20 +22,20 @@ describe "The reloader" do
       END
       f.puts @text
     end
-    
-    sleep 0.6
+
+    sleep SLEEP_TIME
   end
-  
+
   it "should reload files that were changed" do
     defined?(Hello).should_not be_nil
     defined?(Reloader).should_not be_nil
     defined?(Reloader2).should be_nil
-    
-    sleep 0.6
-    
+
+    sleep SLEEP_TIME
+
     File.open(@reload_file, "w") do |f|
       f.puts <<-END
-        
+
         class Reloader < Application
         end
 
@@ -43,17 +44,17 @@ describe "The reloader" do
       END
     end
 
-    sleep 0.6
-    
+    sleep SLEEP_TIME
+
     defined?(Hello).should be_nil
     defined?(Reloader).should_not be_nil
     defined?(Reloader2).should_not be_nil
   end
-  
+
   it "should remove classes for _abstract_subclasses" do
     File.open(@reload_file, "w") do |f|
       f.puts <<-END
-        
+
         class Reloader < Application
         end
 
@@ -61,20 +62,20 @@ describe "The reloader" do
         end
       END
     end
-    
-    sleep 0.6
-    
+
+    sleep SLEEP_TIME
+
     Merb::AbstractController._abstract_subclasses.should include("Reloader")
-    Merb::AbstractController._abstract_subclasses.should include("Reloader2")    
+    Merb::AbstractController._abstract_subclasses.should include("Reloader2")
     defined?(Hello).should be_nil
     defined?(Reloader).should_not be_nil
-    defined?(Reloader2).should_not be_nil    
+    defined?(Reloader2).should_not be_nil
   end
-  
+
   after :each do
-    sleep 0.6
+    sleep SLEEP_TIME
     File.open(@reload_file, "w") do |f|
       f.puts @text
     end
   end
-end
+end

data/spec/public/request/request_spec.rb

@@ -45,6 +45,8 @@ describe Merb::Request, " query and body params" do
   
   {"foo=bar&baz=bat"        => {"foo" => "bar", "baz" => "bat"},
    "foo[]=bar&foo[]=baz"    => {"foo" => ["bar", "baz"]},
+   "foo[][bar]=1&foo[][bar]=2"  => {"foo" => [{"bar" => "1"},{"bar" => "2"}]},
+   "foo[bar][][baz]=1&foo[bar][][baz]=2"  => {"foo" => {"bar" => [{"baz" => "1"},{"baz" => "2"}]}},
    "foo[1]=bar&foo[2]=baz"  => {"foo" => {"1" => "bar", "2" => "baz"}}}.each do |query, parse|
 
      it "should convert #{query.inspect} to #{parse.inspect} in the query string" do

data/spec/public/router/nested_resources_spec.rb

@@ -12,6 +12,9 @@ Merb::Router.prepare do |r|
   r.resource :foo do |f|
     f.resources :comments
   end
+  r.resources :domains, :keys => [:domain] do |d|
+    d.resources :emails, :keys => [:username]
+  end
 end
 
 describe "nested resources routes" do
@@ -31,4 +34,8 @@ describe "nested resources routes" do
   it "should match a get to /foo/comments to the comments controller and index action" do
     route_to('/foo/comments', :method => :get).should have_route(:controller => 'comments', :action => 'index', :id => nil)
   end
+  
+  it "should match a get to /domains/merbivore_com/emails to the emails controller and index action with domain => 'merbivore_com" do
+     route_to('/domains/merbivore_com/emails', :method => :get).should have_route(:controller => 'emails', :action => 'index', :username => nil, :domain => 'merbivore_com')
+  end
 end

data/spec/public/router/resources_spec.rb

@@ -54,4 +54,49 @@ describe "resources routes" do
   it "should match a get to /blogposts/1/delete to the blogposts controller and the delete action with id 1" do
     route_to('/blogposts/1/delete', :method => :get).should have_route(:controller => 'blogposts', :action => 'delete', :id => "1")
   end
-end
+end
+
+
+describe "resources routes with named keys" do
+ before :each do
+   Merb::Router.prepare do |r|
+     r.resources :emails, :keys => ["username", "domain"]
+   end 
+ end
+ 
+ it "should match a get to /emails/bidule/merbivore_com to the  emails controller and the show action with username => 'bidule', domain => 'merbivore_com'" do
+   route_to('/emails/bidule/merbivore_com', :method => :get).should have_route(:controller => 'emails', :action => 'show', :username => "bidule", :domain => "merbivore_com")
+ end
+ 
+ it "should match a put to /emails/bidule/merbivore_com to the  emails controller and the update action with username => 'bidule', domain => 'merbivore_com'" do
+   route_to('/emails/bidule/merbivore_com', :method => :put).should have_route(:controller => 'emails', :action => 'update', :username => "bidule", :domain => "merbivore_com")
+ end
+ 
+ it "should match a delete to /emails/bidule/merbivore_com to the  emails controller and the destroy action with username => 'bidule', domain => 'merbivore_com'" do
+   route_to('/emails/bidule/merbivore_com', :method => :delete).should have_route(:controller => 'emails', :action => 'destroy', :username => "bidule", :domain => "merbivore_com")
+ end
+ 
+ it "should match a get to /emails/bidule/merbivore_com/edit to the  emails controller and the destroy action with username => 'bidule', domain => 'merbivore_com'" do
+   route_to('/emails/bidule/merbivore_com/edit', :method => :get).should have_route(:controller => 'emails', :action => 'edit', :username => "bidule", :domain => "merbivore_com")
+ end
+ 
+ it "should match a get to /emails/bidule/merbivore_com;edit to the  emails controller and the destroy action with username => 'bidule', domain => 'merbivore_com'" do
+   route_to('/emails/bidule/merbivore_com;edit', :method => :get).should have_route(:controller => 'emails', :action => 'edit', :username => "bidule", :domain => "merbivore_com")
+ end
+
+ it "should not match a put to /emails/bidule/merbivore_com/edit" do
+   # not sure which of these is the best way to specify what I mean - so they're both in...
+   route_to('/emails/bidule/merbivore_com/edit', :method => :put).should have_nil_route
+   route_to('/emails/bidule/merbivore_com/edit', :method => :put).should_not have_route(:controller => 'emails', :action => 'edit', :username => "bidule", :domain => "merbivore_com")
+ end
+ 
+ it "should not match a put to /emails/bidule/merbivore_com;edit" do
+   # not sure which of these is the best way to specify what I mean - so they're both in...
+   route_to('/emails/bidule/merbivore_com;edit', :method => :put).should have_nil_route
+   route_to('/emails/bidule/merbivore_com;edit', :method => :put).should_not have_route(:controller => 'emails', :action => 'edit', :username => "bidule", :domain => "merbivore_com")
+ end
+ 
+ it "should match a get to /emails/bidule/merbivore_com/delete to the emails controller and the delete action with username => 'bidule', domain => 'merbivore_com'" do
+   route_to('/emails/bidule/merbivore_com/delete', :method => :get).should have_route(:controller => 'emails', :action => 'delete', :username => "bidule", :domain => "merbivore_com")
+ end
+end

data/spec/public/router/special_spec.rb

@@ -24,12 +24,16 @@ describe "Routes that are restricted based on incoming params" do
   
   it "should allow you to restrict routes to POST requests" do
     Merb::Router.prepare do |r|
-      r.match("/:controller/create/:id").
+      r.match("/:controller/create/:id", :method => :post).
         to(:action => "create")
     end
     route_to("/foo/create/12", :method => "post").should have_route(
       :controller => "foo", :action => "create", :id => "12"
     )
+    
+    route_to("/foo/create/12", :method => "get").should_not have_route(
+      :controller => "foo", :action => "create", :id => "12"
+    )
   end
   
   it "should allow you to restrict routes based on protocol" do

data/spec/public/test/controller_matchers_spec.rb

@@ -374,5 +374,29 @@ module Merb::Test::Rspec
         end
       end
     end
+
+    describe Provide do
+      class TestController < Merb::Controller
+        provides :xml
+      end
+
+      it 'should match for formats a controller class provides' do
+        Provide.new( :xml ).matches?( TestController ).should be_true
+      end
+
+      it 'should match for formats a controller instance provides' do
+        t = TestController.new( fake_request )
+        Provide.new( :xml ).matches?( t ).should be_true
+      end
+
+      it 'should not match for formats a controller class does not provide' do
+        Provide.new( :yaml ).matches?( TestController ).should be_false
+      end
+
+      it 'should not match for formats a controller instance does not provide' do
+        t = TestController.new( fake_request )
+        Provide.new( :yaml ).matches?( t ).should be_false
+      end
+    end
   end
-end
+end

data/spec/public/test/controllers/spec_helper_controller.rb

@@ -27,4 +27,12 @@ class SpecHelperController < Merb::Controller
   def destroy
     Merb::Test::ControllerAssertionMock.called(:destroy)
   end  
+end
+
+module Namespaced
+  class SpecHelperController < Merb::Controller
+    def index
+      Merb::Test::ControllerAssertionMock.called(:index)
+    end
+  end
 end

data/spec/public/test/request_helper_spec.rb

@@ -26,11 +26,46 @@ describe Merb::Test::RequestHelper do
       controller.params[:name].should == "Fred"
     end
 
-    it "should not hit the router to match it's route" do
+    it "should not hit the router to match its route" do
       Merb::Router.should_not_receive(:match)
       dispatch_to(@controller_klass, :index)
     end
   end
+  
+  describe "#dispatch_with_basic_authentication_to" do
+
+    before(:all) do
+      @controller_klass = Merb::Test::DispatchController
+    end
+
+    it "should dispatch to the given controller and action" do
+      Merb::Test::ControllerAssertionMock.should_receive(:called).with(:index)
+
+      dispatch_with_basic_authentication_to(@controller_klass, :index, "Fred", "secret")
+    end
+
+    it "should dispatch to the given controller and action with authentication token" do
+      Merb::Test::ControllerAssertionMock.should_receive(:called).with(:show)
+
+      controller = dispatch_with_basic_authentication_to(@controller_klass, :show, "Fred", "secret")
+
+      controller.request.env["X_HTTP_AUTHORIZATION"].should == "Basic #{Base64.encode64("Fred:secret")}"
+    end
+    
+    it "should dispatch to the given controller and action with authentication token and params" do
+      Merb::Test::ControllerAssertionMock.should_receive(:called).with(:show)
+
+      controller = dispatch_with_basic_authentication_to(@controller_klass, :show, "Fred", "secret", :name => "Fred")
+
+      controller.request.env["X_HTTP_AUTHORIZATION"].should == "Basic #{Base64.encode64("Fred:secret")}"
+      controller.params[:name].should == "Fred"
+    end
+
+    it "should not hit the router to match its route" do
+      Merb::Router.should_not_receive(:match)
+      dispatch_with_basic_authentication_to(@controller_klass, :index, "Fred", "secret")
+    end
+  end
 
   describe "#get" do
     before(:each) do 
@@ -125,6 +160,22 @@ describe Merb::Test::RequestHelper do
       controller.params[:id].should   == "my_id"
     end
   end
+  
+  describe "#request" do
+    before(:each) do 
+      Merb::Router.prepare do |r| 
+        r.namespace :namespaced do |namespaced|
+          namespaced.resources :spec_helper_controller
+        end
+      end
+    end
+    
+    it "should get namespaced index action" do
+      Merb::Test::ControllerAssertionMock.should_receive(:called).with(:index)
+      controller = request("/namespaced/spec_helper_controller")
+      controller.class.should == Namespaced::SpecHelperController
+    end
+  end
 end
 
 module Merb::Test::RequestHelper

data/spec/public/test/route_matchers_spec.rb

@@ -10,7 +10,7 @@ end
 class IDish
   attr_accessor :id
   alias_method :to_param, :id
-  
+
   def initialize(id)
     @id = id
   end
@@ -18,7 +18,7 @@ end
 
 describe Merb::Test::Rspec::RouteMatchers do
   include Merb::Test::RouteHelper
-  
+
   before(:each) do
     Merb::Router.prepare do |r|
       r.match("/", :method => :get).to(:controller => "test_controller", :action => "get").name(:getter)
@@ -26,94 +26,96 @@ describe Merb::Test::Rspec::RouteMatchers do
       r.match("/:id").to(:controller => "test_controller", :action => "get").name(:with_id)
     end
   end
-  
+
   describe "#route_to" do
     it "should work with the request_to helper" do
       request_to("/", :get).should route_to(TestController, :get)
       request_to("/", :post).should_not route_to(TestController, :get)
     end
-    
+
     it "should work with the url helper and ParamMatcher" do
       idish = IDish.new(rand(1000).to_s)
       request_to(url(:with_id, idish)).should route_to(TestController, :get).with(idish)
     end
   end
-  
+
   module Merb::Test::Rspec::RouteMatchers
-  
+
     describe RouteToMatcher do
-      
+
       it "should work with snake cased controllers" do
         RouteToMatcher.new(TestController, :get).matches?(:controller => "test_controller", :action => "get").should be_true
       end
-      
+
       it "should work with camel cased controllers" do
         RouteToMatcher.new(TestController, :get).matches?(:controller => "TestController", :action => "get").should be_true
       end
-      
+
       it "should work with symbol or string controller name" do
         RouteToMatcher.new(TestController, :get).matches?(:controller => "test_controller", :action => "get").should be_true
         RouteToMatcher.new(TestController, :get).matches?(:controller => :test_controller, :action => :get)
       end
-      
+
       it "should not pass if the controllers do not match" do
         RouteToMatcher.new(TestController, :get).matches?(:controller => "other_controller", :action => "get").should be_false
       end
-      
+
       it "should not pass if the actions do not match" do
         RouteToMatcher.new(TestController, :get).matches?(:controller => "test_controller", :action => "post").should be_false
       end
-      
+
       it "should not pass if the parameters do not the ParameterMatcher" do
         route_matcher = RouteToMatcher.new(TestController, :get)
         route_matcher.with(:id => "123")
-        
+
         route_matcher.matches?(:controller => "test_case", :action => "get", :id => "456").should be_false
       end
-      
+
       describe "#with" do
         it "should add a ParameterMatcher" do
           ParameterMatcher.should_receive(:new).with(:id => "123")
-          
+
           route_matcher = RouteToMatcher.new(TestController, :get)
           route_matcher.with(:id => "123")
         end
       end
-      
+
       describe "#failure_message" do
         it "should include the expected controller and action" do
-          RouteToMatcher.new(TestController, :any_action).failure_message.should include("TestController#any_action")
+          matcher = RouteToMatcher.new(TestController, :any_action)
+          matcher.matches?(:controller => "target_controller", :action => "target_action")
+          matcher.failure_message.should include("TestController#any_action")
         end
-        
+
         it "should include the target controller and action in camel case" do
           matcher = RouteToMatcher.new(TestController, :any_action)
           matcher.matches?(:controller => "target_controller", :action => "target_action")
           matcher.failure_message.should include("TargetController#target_action")
         end
       end
-      
+
       describe "#negative_failure_message" do
         it "should include the expected controller and action" do
           RouteToMatcher.new(TestController, :any_action).negative_failure_message.should include("TestController#any_action")
         end
       end
     end
-  
+
     describe ParameterMatcher do
       it "should work with a Hash as the parameter argument" do
         ParameterMatcher.new(:param => "abc").matches?(:param => "abc").should be_true
       end
-      
+
       it "should work with an object as the parameter argument" do
         ParameterMatcher.new(IDish.new(1234)).matches?(:id => 1234).should be_true
       end
-      
+
       describe "#failure_message" do
         it "should include the expected parameters hash" do
           parameter_hash = {:parent_id => "123", :child_id => "abc"}
           ParameterMatcher.new(parameter_hash).failure_message.should include(parameter_hash.inspect)
         end
-        
+
         it "should include the actual parameters hash" do
           parameter_hash = {:parent_id => "123", :child_id => "abc"}
           matcher = ParameterMatcher.new(:id => 123)
@@ -121,7 +123,7 @@ describe Merb::Test::Rspec::RouteMatchers do
           matcher.failure_message.should include(parameter_hash.inspect)
         end
       end
-      
+
       describe "#negative_failure_message" do
         it "should include the expected parameters hash" do
           parameter_hash = {:parent_id => "123", :child_id => "abc"}
@@ -130,4 +132,4 @@ describe Merb::Test::Rspec::RouteMatchers do
       end
     end
   end
-end
+end