merb-core 0.9.5 → 0.9.6

data/spec/private/router/route_spec.rb

@@ -307,6 +307,10 @@ describe Merb::Router::Route, "#generate" do
   it "calls #to_param on segments that respond to it" do
     @non_regexp_route.generate({ :name => stub('US', :to_param => 'USA') }).should == "/world/countries/USA"
   end
+  
+  it "adds fragment after ?" do
+    @non_regexp_route.generate({:name => 101, :area => 10101, :fragment => :a_fragment}).should == "/world/countries/101?area=10101#a_fragment"
+  end
 end
 
 

data/spec/private/router/router_spec.rb

@@ -136,6 +136,10 @@ describe Merb::Router, ".generate", "given a Hash" do
   it "respects format parameter" do
     Merb::Router.generate({ :controller => "elements", :action => "show", :id => "fire", :format => :json }).should == "/elements/show/fire.json"
   end
+  
+  it "respects fragment parameter" do
+    Merb::Router.generate({ :controller => "elements", :action => "search", :fragment => :a_fragment }, { :q => "water" }).should == "/elements/search?q=water#a_fragment"
+  end
 end
 
 
@@ -154,6 +158,10 @@ describe Merb::Router, ".generate_for_default_route", "given a Hash" do
   it "respects format parameter" do
     Merb::Router.generate({ :controller => "elements", :action => "show", :id => "fire", :format => :json }).should == "/elements/show/fire.json"
   end
+  
+  it "respects fragment parameter" do
+    Merb::Router.generate({ :controller => "elements", :action => "show", :id => "fire", :format => :json, :fragment => :a_fragment }).should == "/elements/show/fire.json#a_fragment"
+  end
 
   it "requires both parameters to be present" do
     lambda {

data/spec/private/vendor/facets/plural_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
-describe Language::English::Inflect, "#singular" do
+describe English::Inflect, "#singular" do
   it "pluralizes equipment => equipment" do
     "equipment".plural.should == "equipment"
   end

data/spec/private/vendor/facets/singular_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
-describe Language::English::Inflect, "#singular" do
+describe English::Inflect, "#singular" do
   # ==== exceptional cases
 
   it "singularizes equipment => equipment" do

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

@@ -30,7 +30,13 @@ module Merb::Test::Fixtures
         display @obj, "test_display/foo.html"
       end
     end
-    
+
+    class DisplayObjectWithPathViaOpts < Testing
+      def index
+        @obj = SomeModel.new
+        display @obj, :template => "test_display/foo.html"
+      end
+    end
     
     class DisplayObjectWithMultipleRoots < DisplayObject
       self._template_roots << [File.dirname(__FILE__) / "alt_views", :_template_location]
@@ -51,4 +57,4 @@ module Merb::Test::Fixtures
     end
   end
 
-end
+end

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

@@ -79,6 +79,24 @@ module Merb::Test::Fixtures
         "#{@x} #{@y}"
       end
     end
+    
+    class TestProcFilterViaMethod < Testing
+      def self.my_before(data)
+        before proc { add_string(data) }
+      end
+      
+      my_before("one")
+      my_before("two")
+
+      def index
+        @text
+      end
+      protected
+        def add_string(str)
+          @text ||= ""
+          @text << str
+        end
+    end
 
     class TestExcludeFilter < Testing
       before :foo, :exclude => :index

data/spec/public/abstract_controller/display_spec.rb

@@ -17,7 +17,11 @@ describe Merb::AbstractController, " displaying objects with templates" do
   it "should allow you to pass an object with a path specified for the template" do
     dispatch_should_make_body("DisplayObjectWithPath", "fooness")
   end
-  
+ 
+  it "should allow you to pass an object with a path specified for the template via opts" do
+    dispatch_should_make_body("DisplayObjectWithPathViaOpts", "fooness")
+  end
+
   it "should allow you to pass an object using multiple template root" do
     dispatch_should_make_body("DisplayObjectWithMultipleRoots", "App: new index")
   end
@@ -30,4 +34,4 @@ describe Merb::AbstractController, " displaying objects with templates" do
     dispatch_should_make_body("DisplayObjectWithMultipleRoots", "fooness", "another")
   end
 
-end
+end

data/spec/public/abstract_controller/filter_spec.rb

@@ -37,6 +37,10 @@ describe Merb::AbstractController, " should support before and after filters" do
     dispatch_should_make_body("TestProcFilter", "proc filter1 proc filter2")
   end
   
+  it "should support proc arguments to filters when called inside a class method" do
+    dispatch_should_make_body("TestProcFilterViaMethod", "onetwo")
+  end
+  
   it "should support filters that skip specific actions via :exclude" do
     dispatch_should_make_body("TestExcludeFilter", " ", :index)
     dispatch_should_make_body("TestExcludeFilter", "foo filter bar filter", :show)    

data/spec/public/controller/authentication_spec.rb

@@ -38,66 +38,137 @@ describe "basic_authentication in general", :shared => true do
 
 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"'
+describe Merb::Controller do
+  MTFC = Merb::Test::Fixtures::Controllers
+  
+  describe "#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(MTFC::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(MTFC::BasicAuthentication, :index, u, p)
+      response.headers['WWW-Authenticate'] = 'Basic realm="Application"'
+    end
   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
+  describe "#basic_authentication with realm" do
 
-end
+    it_should_behave_like "basic_authentication in general"
 
-describe Merb::Controller, "#basic_authentication with realm" do
+    it "should set the WWW-Authenticate realm if no authentication is sent" do
+      response = dispatch_to(MTFC::BasicAuthenticationWithRealm, :index)
+      response.headers['WWW-Authenticate'] = 'Basic realm="My SuperApp"'
+    end
 
-  it_should_behave_like "basic_authentication in general"
+    it "should set the WWW-Authenticate realm if incorrect authentication is sent" do
+      u, p = "John", "password"
+      response = dispatch_with_basic_authentication_to(MTFC::BasicAuthenticationWithRealm, :index, u, p)
+      response.headers['WWW-Authenticate'] = 'Basic realm="My SuperApp"'
+    end
 
-  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
+  describe  "#basic_authentication.authenticate" do
 
-end
+    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(MTFC::AuthenticateBasicAuthentication, :index, u, p)
+      response.body.should == "Fred:secret"
+    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
+  
+  describe "#basic_authentication.request" do
 
-end
+    it "should halt the filter chain and return a 401 status code" do
+      response = dispatch_to(MTFC::RequestBasicAuthentication, :index)
+      response.body.should == "HTTP Basic: Access denied.\n"
+      response.status.should == 401
+    end
 
-describe Merb::Controller, "#basic_authentication.request" do
+    it "should have a default WWW-Authenticate realm of 'Application'" do
+      response = dispatch_to(MTFC::RequestBasicAuthentication, :index)
+      response.headers['WWW-Authenticate'].should == 'Basic realm="Application"'
+    end
 
-  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 set the WWW-Authenticate realm" do
+      response = dispatch_to(MTFC::RequestBasicAuthenticationWithRealm, :index)
+      response.headers['WWW-Authenticate'].should == 'Basic realm="My SuperApp"'
+    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"'
+  describe "#basic_authentication.request!" do
+    
+    it "should not halt the filter chain and provide a 401 status code" do
+      response = dispatch_to(MTFC::PassiveBasicAuthentication, :index)
+      response.status = 401
+    end
+    
+    it "should have a default WWW=Authentication realm of 'Application'" do
+      response = dispatch_to(MTFC::PassiveBasicAuthentication, :index)
+      response.headers['WWW-Authenticate'].should == 'Basic realm="Application"'
+    end
+    
+    it "should set the WWW-Authenticate realm" do
+      response = dispatch_to(MTFC::PassiveBasicAuthenticationWithRealm, :index)
+      response.headers['WWW-Authenticate'].should == 'Basic realm="My Super App"'
+    end
+    
+    it "should allow the action to render it's output" do
+      response = dispatch_to(MTFC::PassiveBasicAuthentication, :index)
+      response.body.should == "My Output"
+    end
+
+    it "should be callable from within an action" do
+      response = dispatch_to(MTFC::PassiveBasicAuthenticationInAction, :index)
+      response.body.should == "In Action"
+      response.status.should == 401
+    end
+
+  end
+  
+  describe "basic_authentication.provided?" do
+    
+    it "should return true when basic authentication credentials have been supplied" do
+      u, p = "Fred", "secret"
+      response = dispatch_with_basic_authentication_to(MTFC::PassiveBasicAuthentication, :index, u, p)
+      response.basic_authentication.provided?.should be_true
+    end
+    
+    it "should return false when basic authentication credentials have not been supplied" do
+      response = dispatch_to(MTFC::PassiveBasicAuthentication, :index)
+      response.basic_authentication.provided?.should be_false
+    end
+  end
+  
+  describe "basic_authentication.username and password" do
+    it "return username if set" do
+      u, p = "Fred", "secret"
+      response = dispatch_with_basic_authentication_to(MTFC::PassiveBasicAuthentication, :index, u, p)
+      response.basic_authentication.username.should == "Fred"
+    end
+    
+    it "should return nil if the username is not set" do
+      response = dispatch_to(MTFC::PassiveBasicAuthentication, :index)
+      response.basic_authentication.username.should be_nil
+    end
+    
+    it "should return password if set" do
+      u, p = "Fred", "secret"
+      response = dispatch_with_basic_authentication_to(MTFC::PassiveBasicAuthentication, :index, u, p)
+      response.basic_authentication.password.should == "secret"
+    end
+    
+    it "shoudl return nil for the password if not set" do
+      response = dispatch_to(MTFC::PassiveBasicAuthentication, :index)
+      response.basic_authentication.password.should be_nil
+    end
   end
 
 end

data/spec/public/controller/base_spec.rb

@@ -77,4 +77,12 @@ describe Merb::Controller, "handles invalid status codes" do
     calling { dispatch_to(Controllers::SetStatus, :index) }.
       should raise_error(ArgumentError, /was.*String/)
   end
+end
+
+describe Merb::Controller, "before/after dispatch callbacks" do
+  it "are used for internal purposes" do
+    controller = dispatch_to(Controllers::DispatchCallbacks, :index)
+    controller.called_before.should be_true
+    controller.called_after.should be_true
+  end  
 end

data/spec/public/controller/conditional_get_spec.rb

@@ -0,0 +1,100 @@
+require File.join(File.dirname(__FILE__), "spec_helper")
+Controllers = Merb::Test::Fixtures::Controllers
+
+describe Merb::Controller, "#etag=" do
+  
+  before do
+    Merb.push_path(:layout, File.dirname(__FILE__) / "controllers" / "views" / "layouts")    
+    Merb::Router.prepare do |r|
+      r.default_routes
+    end
+  end
+
+  it 'sets ETag header' do
+    controller = dispatch_to(Merb::Test::Fixtures::Controllers::ConditionalGet, :sets_etag)
+    controller.headers['ETag'].should == '"39791e6fb09"'
+  end
+end
+
+
+
+describe Merb::Controller, "#last_modified=" do
+  before do
+    Merb.push_path(:layout, File.dirname(__FILE__) / "controllers" / "views" / "layouts")    
+    Merb::Router.prepare do |r|
+      r.default_routes
+    end
+  end
+
+  it 'sets Last-Modified header' do
+    controller = dispatch_to(Merb::Test::Fixtures::Controllers::ConditionalGet, :sets_last_modified)
+    controller.headers['Last-Modified'].should == Time.at(7000).httpdate
+  end
+end
+
+
+describe Merb::Controller, "#etag_matches?" do
+  it 'returns true when response ETag header equals to request If-None-Match header' do
+    controller = dispatch_to(Merb::Test::Fixtures::Controllers::ConditionalGet, :sets_etag, {}, { Merb::Const::HTTP_IF_NONE_MATCH => '"39791e6fb09"' } )
+    controller.etag_matches?('"39791e6fb09"').should be(true)
+  end
+
+  it 'returns false when response ETag header DOES NOT equal to request If-None-Match header' do
+    controller = dispatch_to(Merb::Test::Fixtures::Controllers::ConditionalGet, :sets_etag, {}, { Merb::Const::HTTP_IF_NONE_MATCH => '"6fb91e09793"' } )
+    controller.etag_matches?('"55789a6fb09"').should be(false)
+  end
+end
+
+
+
+describe Merb::Controller, "#modified_since?" do
+  before(:each) do
+    @controller = dispatch_to(Merb::Test::Fixtures::Controllers::ConditionalGet,
+                              :sets_last_modified, {}, { Merb::Const::HTTP_IF_MODIFIED_SINCE => Time.at(7000).httpdate })
+  end
+  
+  it 'return true when response Last-Modified header value <= request If-Modified-Since header' do
+    @controller.not_modified?(Time.at(5000)).should be(true)
+    @controller.not_modified?(Time.at(6999)).should be(true)
+  end
+
+  it 'return false when response Last-Modified header value > request If-Modified-Since header' do
+    @controller.not_modified?(Time.at(7003)).should be(false)
+    @controller.not_modified?(Time.at(16999)).should be(false)
+  end
+end
+
+
+describe Merb::Controller, "#request_fresh?" do
+  it 'return true when ETag matches' do
+    env = { 'HTTP_IF_MODIFIED_SINCE' => Time.at(8000).httpdate, Merb::Const::HTTP_IF_NONE_MATCH => '"39791e6fb09"' }
+    @controller = dispatch_to(Merb::Test::Fixtures::Controllers::ConditionalGet,
+                              :sets_etag, {}, env)
+
+    @controller.request_fresh?.should be(true)
+  end
+
+  it 'return true when entity is not modified since date given in request header' do
+    env = { Merb::Const::HTTP_IF_MODIFIED_SINCE => Time.at(7000).httpdate }
+    @controller = dispatch_to(Merb::Test::Fixtures::Controllers::ConditionalGet,
+                              :sets_last_modified, {}, env)
+    
+    @controller.request_fresh?.should be(true)
+  end
+
+  it 'return true when both etag and last modification date satisfy request freshness' do
+    env = { 'HTTP_IF_MODIFIED_SINCE' => Time.at(7000).httpdate, Merb::Const::HTTP_IF_NONE_MATCH => '"39791e6fb09"' }    
+    @controller = dispatch_to(Merb::Test::Fixtures::Controllers::ConditionalGet,
+                              :superfresh, {}, env)
+    
+    @controller.request_fresh?.should be(true)
+  end
+
+  it 'return false when neither etag nor last modification date satisfy request freshness' do
+    env = { 'HTTP_IF_MODIFIED_SINCE' => Time.at(7000).httpdate, Merb::Const::HTTP_IF_NONE_MATCH => '"39791e6fb09"' }    
+    @controller = dispatch_to(Merb::Test::Fixtures::Controllers::ConditionalGet,
+                              :stale, {}, env)
+    
+    @controller.request_fresh?.should be(false)
+  end  
+end

data/spec/public/controller/config/init.rb

@@ -1,5 +1,5 @@
 Merb::Config.use do |c|
-  c[:session_cookie_domain] = "specs.merbivore.com"
+  c[:default_cookie_domain] = "specs.merbivore.com"
   c[:session_id_key]        = "some_meaningless_id_key"
   c[:session_secret_key]    = "some_super_hyper_secret_key"
   c[:session_expiry]        = Merb::Const::WEEK * 4

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

@@ -41,5 +41,34 @@ module Merb::Test::Fixtures::Controllers
       basic_authentication("My SuperApp").request
     end
   end
+  
+  class PassiveBasicAuthentication < BasicAuthentication
+        
+    def index
+      "My Output"
+    end
+    
+    def authenticate
+      basic_authentication.request!
+    end
+  end
+  
+  class PassiveBasicAuthenticationWithRealm < BasicAuthentication
+    def authenticate
+      basic_authentication("My Super App").request!
+    end
+  end
+  
+  class PassiveBasicAuthenticationInAction < BasicAuthentication
+    
+    def index
+      basic_authentication.request!
+      "In Action"
+    end
+    
+    def authenticate
+      true
+    end
+  end
 
 end

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

@@ -47,6 +47,19 @@ module Merb::Test::Fixtures
         self.status = "awesome"
       end
     end
+    
+    class DispatchCallbacks < Testing
+      
+      attr_accessor :called_before, :called_after
+      
+      self._before_dispatch_callbacks << lambda { |c| c.called_before = true }
+      self._after_dispatch_callbacks  << lambda { |c| c.called_after  = true }
+      
+      def index
+        "index"
+      end
+      
+    end
 
   end
 end

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

@@ -0,0 +1,35 @@
+require "time"
+
+module Merb::Test::Fixtures
+  module Controllers
+    class Testing < Merb::Controller
+      self._template_root = File.dirname(__FILE__) / "views"
+    end
+
+    class ConditionalGet < Testing
+      def sets_etag
+        self.etag = "39791e6fb09"
+        "can has etag"
+      end
+
+      def sets_last_modified
+        self.last_modified = Time.at(7000)
+        "can has last-modified"
+      end
+
+      def superfresh
+        self.etag          = "39791e6fb09"
+        self.last_modified = Time.at(7000)
+        
+        "can has fresh request"
+      end
+
+      def stale
+        self.etag          = "1234567678"
+        self.last_modified = Time.at(9000)
+        
+        "can has stale request"
+      end
+    end
+  end
+end

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

@@ -5,10 +5,19 @@ module Merb::Test::Fixtures::Controllers
   end
 
   class CookiesController < Testing
+    
+    def store_cookies
+      cookies[:foo] = 'bar'
+      cookies.set_cookie(:awesome, 'super-cookie', :domain => 'blog.merbivore.com')
+    end
+    
+    def retrieve_cookies
+    end
+    
   end
   
   class OverridingSessionCookieDomain < CookiesController
-    self._session_cookie_domain = "overridden.merbivore.com"
+    self._default_cookie_domain = "overridden.merbivore.com"
   end
 
   class NotOverridingSessionCookieDomain < CookiesController

data/spec/public/controller/cookies_spec.rb

@@ -1,23 +1,52 @@
 require File.join(File.dirname(__FILE__), "spec_helper")
 
-describe Merb::Controller, "._session_cookie_domain" do
+describe Merb::Controller, "._default_cookie_domain" do
+    
   before(:each) do
-    Merb::Config[:session_cookie_domain].should_not be(nil)
+    Merb::Config[:default_cookie_domain].should_not be(nil)
   end
   
-  it 'is set to Merb::Config[:session_cookie_domain] by default' do
-    Merb::Controller._session_cookie_domain.should == Merb::Config[:session_cookie_domain]
-    Merb::Test::Fixtures::Controllers::CookiesController._session_cookie_domain.should ==
-      Merb::Config[:session_cookie_domain]
+  it 'is set to Merb::Config[:default_cookie_domain] by default' do
+    Merb::Controller._default_cookie_domain.should == Merb::Config[:default_cookie_domain]
+    Merb::Test::Fixtures::Controllers::CookiesController._default_cookie_domain.should ==
+      Merb::Config[:default_cookie_domain]
   end
 
   it "can be overridden for particular controller" do
-    Merb::Test::Fixtures::Controllers::OverridingSessionCookieDomain._session_cookie_domain.should ==
+    Merb::Test::Fixtures::Controllers::OverridingSessionCookieDomain._default_cookie_domain.should ==
       "overridden.merbivore.com"
   end
 
   it 'is inherited by subclasses unless overriden' do
-    Merb::Test::Fixtures::Controllers::NotOverridingSessionCookieDomain._session_cookie_domain.should ==
-      Merb::Config[:session_cookie_domain]
+    Merb::Test::Fixtures::Controllers::NotOverridingSessionCookieDomain._default_cookie_domain.should ==
+      Merb::Config[:default_cookie_domain]
   end
 end
+
+describe Merb::Controller, "#cookies" do
+  
+  it "sets the Set-Cookie response header" do
+    controller_klass = Merb::Test::Fixtures::Controllers::CookiesController
+    with_cookies(controller_klass) do |cookie_jar|
+      controller = dispatch_to(controller_klass, :store_cookies)
+      cookies = controller.headers['Set-Cookie'].sort
+      cookies.length.should == 2
+      cookies[0].should match(/awesome=super-cookie;/)
+      cookies[0].should match(/domain=blog.merbivore.com;/)
+      cookies[1].should match(/foo=bar;/)
+      cookies[1].should match(/domain=specs.merbivore.com;/)
+    end
+  end
+    
+  it "it gives access to cookie values" do
+    controller_klass = Merb::Test::Fixtures::Controllers::CookiesController
+    with_cookies(controller_klass) do |cookie_jar|
+      controller = dispatch_to(controller_klass, :store_cookies)
+      controller = dispatch_to(controller_klass, :retrieve_cookies)
+      controller.cookies['awesome'].should == 'super-cookie'
+      controller.cookies['foo'].should == 'bar'
+      controller.cookies.should == cookie_jar
+    end
+  end
+  
+end

data/spec/public/controller/spec_helper.rb

@@ -8,5 +8,6 @@ require File.join(__DIR__, "controllers", "display")
 require File.join(__DIR__, "controllers", "authentication")
 require File.join(__DIR__, "controllers", "redirect")
 require File.join(__DIR__, "controllers", "cookies")
+require File.join(__DIR__, "controllers", "conditional_get")
 
 Merb.start :environment => 'test', :init_file => File.join(__DIR__, 'config', 'init')