merb-core 0.9.5 → 0.9.6

data/spec/public/session/controllers/sessions.rb

@@ -0,0 +1,52 @@
+module Merb::Test::Fixtures
+  
+  module Controllers
+
+    class Testing < Merb::Controller
+      self._template_root = File.dirname(__FILE__) / "views"
+    end
+
+    class SessionsController < Testing
+    
+      def index
+        request.session[:foo] = params[:foo]
+        Merb::Config[:session_store]
+      end
+      
+      def regenerate
+        request.session.regenerate
+      end
+      
+      def retrieve
+      end
+    
+    end
+    
+    class MultipleSessionsController < Testing
+    
+      def store_in_cookie
+        request.session(:cookie)[:foo] = 'cookie-bar'
+      end
+      
+      def store_in_memory
+        request.session(:memory)[:foo] = 'memory-bar'
+      end
+      
+      def store_in_memcache
+        request.session(:memcache)[:foo] = 'memcache-bar'
+      end
+      
+      def store_in_multiple
+        request.session(:memcache)[:foo] = 'memcache-baz'
+        request.session(:memory)[:foo] = 'memory-baz'
+        request.session(:cookie)[:foo] = 'cookie-baz'
+      end
+      
+      def retrieve
+      end
+      
+    end
+  
+  end
+  
+end

data/spec/public/session/cookie_session_spec.rb

@@ -0,0 +1,73 @@
+$START_OPTIONS = { :session_store => "cookie", :session_secret_key => "session-secret-key-here" }
+
+require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
+require File.join(File.dirname(__FILE__), "session_spec")
+require File.join(File.dirname(__FILE__), "controllers", "sessions")
+
+describe Merb::CookieSession do
+  
+  before do 
+    @session_class = Merb::CookieSession
+    @session = @session_class.generate
+  end
+  
+  it_should_behave_like "All session-store backends"
+  
+  it "should have a session_store_type class attribute" do
+    @session.class.session_store_type.should == :cookie
+  end
+  
+end
+
+describe Merb::CookieSession, "mixed into Merb::Controller" do
+  
+  before(:all) { @controller_klass = Merb::Test::Fixtures::Controllers::SessionsController }
+  
+  it "should represent the controller session" do
+    controller = dispatch_to(@controller_klass, :index)
+    controller.body.should == "cookie"
+    controller.request.session.should be_kind_of(Merb::CookieSession)
+  end
+  
+  it "should store and retrieve session data" do
+    with_cookies(@controller_klass) do
+      controller = dispatch_to(@controller_klass, :index, :foo => "cookie")
+      controller.request.session[:foo].should == "cookie"
+    
+      controller = dispatch_to(@controller_klass, :retrieve)
+      controller.request.session[:foo].should == "cookie"
+    end
+  end
+  
+  it "should allow regeneration of the session" do
+    with_cookies(@controller_klass) do
+      controller = dispatch_to(@controller_klass, :index, :foo => "cookie")
+      controller = dispatch_to(@controller_klass, :regenerate)
+      controller = dispatch_to(@controller_klass, :retrieve)
+      controller.request.session[:foo].should == "cookie"
+    end    
+  end
+    
+  it "shouldn't allow tampering with cookie data" do
+    with_cookies(@controller_klass) do |cookie_jar|
+      controller = dispatch_to(@controller_klass, :index, :foo => "cookie")
+      cookie_data, cookie_checksum = controller.cookies[Merb::Request._session_id_key].split('--')
+      cookie_data = 'tampered-with-data'
+      cookie_jar[Merb::Request._session_id_key] = "#{cookie_data}--#{cookie_checksum}"
+      controller = dispatch_to(@controller_klass, :retrieve)
+      lambda { controller.request.session }.should raise_error(Merb::CookieSession::TamperedWithCookie)
+    end
+  end
+    
+  it "shouldn't allow tampering with cookie fingerprints" do
+    with_cookies(@controller_klass) do |cookie_jar|
+      controller = dispatch_to(@controller_klass, :index, :foo => "cookie")
+      cookie_data, cookie_checksum = controller.cookies[Merb::Request._session_id_key].split('--')
+      cookie_checksum = 'tampered-with-checksum'
+      cookie_jar[Merb::Request._session_id_key] = "#{cookie_data}--#{cookie_checksum}"
+      controller = dispatch_to(@controller_klass, :retrieve)
+      lambda { controller.request.session }.should raise_error(Merb::CookieSession::TamperedWithCookie)
+    end
+  end
+  
+end

data/spec/public/session/memcached_session_spec.rb

@@ -0,0 +1,31 @@
+$START_OPTIONS = { :session_store => "memcache" }
+
+require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
+require File.join(File.dirname(__FILE__), "session_spec")
+require File.join(File.dirname(__FILE__), "controllers", "sessions")
+
+require 'memcached'
+Merb::MemcacheSession.store = Memcached.new('127.0.0.1:11211', { :namespace => 'my_app' })
+
+describe Merb::MemcacheSession do
+  
+  before do 
+    @session_class = Merb::MemcacheSession
+    @session = @session_class.generate
+  end
+  
+  it_should_behave_like "All session-store backends"
+  
+  it "should have a session_store_type class attribute" do
+    @session.class.session_store_type.should == :memcache
+  end
+  
+end
+
+describe Merb::MemcacheSession, "mixed into Merb::Controller" do
+  
+  before(:all) { @session_class = Merb::MemcacheSession }
+  
+  it_should_behave_like "All session-stores mixed into Merb::Controller"
+  
+end

data/spec/public/session/memory_session_spec.rb

@@ -0,0 +1,28 @@
+$START_OPTIONS = { :session_store => "memory" }
+
+require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
+require File.join(File.dirname(__FILE__), "session_spec")
+require File.join(File.dirname(__FILE__), "controllers", "sessions")
+
+describe Merb::MemorySession do
+  
+  before do 
+    @session_class = Merb::MemorySession
+    @session = @session_class.generate
+  end
+  
+  it_should_behave_like "All session-store backends"
+  
+  it "should have a session_store_type class attribute" do
+    @session.class.session_store_type.should == :memory
+  end
+  
+end
+
+describe Merb::MemorySession, "mixed into Merb::Controller" do
+
+  before(:all) { @session_class = Merb::MemorySession }
+  
+  it_should_behave_like "All session-stores mixed into Merb::Controller"
+
+end

data/spec/public/session/multiple_sessions_spec.rb

@@ -0,0 +1,74 @@
+$START_OPTIONS = { :session_stores => ["cookie", "memory", "memcache"], :session_secret_key => "session-secret-key-here" }
+
+require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
+require File.join(File.dirname(__FILE__), "session_spec")
+require File.join(File.dirname(__FILE__), "controllers", "sessions")
+
+require 'memcached'
+Merb::MemcacheSession.store = Memcached.new('127.0.0.1:11211', { :namespace => 'my_app' })
+
+describe "An app with multiple session stores configured" do
+  
+  before(:all) { @controller_klass = Merb::Test::Fixtures::Controllers::MultipleSessionsController }
+  
+  it "should store cookie-based session data" do
+    with_cookies(@controller_klass) do
+      controller = dispatch_to(@controller_klass, :store_in_cookie)
+      controller.request.session(:cookie)[:foo].should == "cookie-bar"
+      controller.request.session[:foo].should == "cookie-bar" # defaults to the first registered store
+    end
+  end
+  
+  it "should retrieve cookie-based session data" do
+    with_cookies(@controller_klass) do
+      controller = dispatch_to(@controller_klass, :store_in_cookie)
+      controller = dispatch_to(@controller_klass, :retrieve)
+      controller.request.session(:cookie)[:foo].should == "cookie-bar"
+      controller.request.session[:foo].should == "cookie-bar" # defaults to the first registered store
+    end
+  end
+  
+  it "should store memory-based session data" do
+    with_cookies(@controller_klass) do
+      controller = dispatch_to(@controller_klass, :store_in_memory)
+      controller.request.session(:memory)[:foo].should == "memory-bar"
+    end
+  end
+  
+  it "should retrieve memory-based session data" do
+    with_cookies(@controller_klass) do
+      controller = dispatch_to(@controller_klass, :store_in_memory)
+      controller = dispatch_to(@controller_klass, :retrieve)    
+      controller.request.session(:memory)[:foo].should == "memory-bar"
+    end
+  end
+  
+  it "should store memcache-based session data" do
+    with_cookies(@controller_klass) do
+      controller = dispatch_to(@controller_klass, :store_in_memcache)
+      controller.request.session(:memcache)[:foo].should == "memcache-bar"
+    end
+  end
+  
+  it "should retrieve memcache-based session data" do
+    with_cookies(@controller_klass) do
+      controller = dispatch_to(@controller_klass, :store_in_memcache)
+      controller = dispatch_to(@controller_klass, :retrieve)
+      controller.request.session(:memcache)[:foo].should == "memcache-bar"
+    end
+  end
+   
+  # TODO - _session_id cookies are clobbered atm - so this doesn't work yet
+  # it "should allow you to use them simultaneously" do
+  #   with_cookies(@controller_klass) do
+  #     controller = dispatch_to(@controller_klass, :store_in_multiple)
+  #     controller.request.session(:cookie)[:foo].should == "cookie-baz"
+  #     
+  #     controller = dispatch_to(@controller_klass, :retrieve)
+  #     controller.request.session(:cookie)[:foo].should =="cookie-baz"
+  #     controller.request.session(:memory)[:foo].should == "memory-baz"  
+  #     controller.request.session(:memcache)[:foo].should == "memcache-baz"
+  #   end
+  # end
+    
+end

data/spec/public/session/no_session_spec.rb

@@ -0,0 +1,12 @@
+require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
+require File.join(File.dirname(__FILE__), "controllers", "sessions")
+
+describe "An app without sessions enabled" do
+  
+  it "should raise an exception when accessing request.session" do
+    lambda {
+      controller = dispatch_to(Merb::Test::Fixtures::Controllers::SessionsController, :index)
+    }.should raise_error(Merb::SessionMixin::NoSessionContainer)
+  end
+  
+end

data/spec/public/session/session_spec.rb

@@ -0,0 +1,91 @@
+require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
+require File.join(File.dirname(__FILE__), "controllers", "sessions")
+
+# The Merb::Session module gets mixed into Merb::SessionContainer to allow 
+# app-level functionality (usually found in app/models/merb/session.rb)
+module Merb
+  module Session
+    
+    def awesome?
+      self[:foo] == 'awesome'
+    end
+    
+  end
+end
+
+describe "All session-store backends", :shared => true do
+  
+  it "should be instanciated using the 'generate' method" do
+    @session_class.generate.should be_kind_of(@session_class)
+  end
+      
+  it "should store the session_id" do
+    @session.session_id.should match(/^[0-9a-f]{32}$/)
+  end
+  
+  it "should have bracket accessors for setting data" do
+    @session.should respond_to(:[]=)
+    @session.should respond_to(:[])
+    @session[:foo] = 'bar'
+    @session[:foo].should == 'bar'
+  end
+
+end
+
+describe "All session-stores mixed into Merb::Controller", :shared => true do
+  
+  before(:all) { @controller_klass = Merb::Test::Fixtures::Controllers::SessionsController }
+  
+  it "should represent the controller session" do
+    with_cookies(@controller_klass) do
+      controller = dispatch_to(@controller_klass, :index)
+      controller.request.session.should be_kind_of(@session_class)
+    end
+  end
+  
+  it "should store session data" do
+    session_store_type = @session_class.session_store_type.to_s
+    with_cookies(@controller_klass) do
+      controller = dispatch_to(@controller_klass, :index, :foo => session_store_type)
+      controller.request.session[:foo].should == session_store_type
+    end
+  end
+  
+  it "should retrieve session data" do
+    session_store_type = @session_class.session_store_type.to_s
+    with_cookies(@controller_klass) do
+      controller = dispatch_to(@controller_klass, :index, :foo => session_store_type)
+      controller = dispatch_to(@controller_klass, :retrieve)
+      controller.request.session[:foo].should == session_store_type
+    end    
+  end
+  
+  it "should allow regeneration of the session" do
+    session_store_type = @session_class.session_store_type.to_s
+    with_cookies(@controller_klass) do
+      controller = dispatch_to(@controller_klass, :index, :foo => session_store_type)
+      controller = dispatch_to(@controller_klass, :regenerate)
+      controller = dispatch_to(@controller_klass, :retrieve)
+      controller.request.session[:foo].should == session_store_type
+    end    
+  end
+  
+  it "should not set the Set-Cookie header when the session(_id) didn't change" do
+    session_store_type = @session_class.session_store_type.to_s
+    with_cookies(@controller_klass) do
+      controller = dispatch_to(@controller_klass, :index, :foo => session_store_type)
+      controller.headers["Set-Cookie"].should_not be_blank
+      controller = dispatch_to(@controller_klass, :retrieve)
+      controller.headers["Set-Cookie"].should be_blank
+    end
+  end
+  
+  it "should have mixed in Merb::Session methods" do
+    with_cookies(@controller_klass) do
+      controller = dispatch_to(@controller_klass, :index, :foo => 'awesome')
+      controller.request.session.should respond_to(:awesome?)
+      controller.request.session.should be_awesome
+    end
+  end
+    
+end

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

@@ -35,4 +35,5 @@ module Namespaced
       Merb::Test::ControllerAssertionMock.called(:index)
     end
   end
-end
+end  
+        

data/spec/public/test/request_helper_spec.rb

@@ -7,6 +7,20 @@ Dir[File.join(File.dirname(__FILE__), "controllers/**/*.rb")].each do |f|
 end
 
 describe Merb::Test::RequestHelper do
+  
+  describe Merb::Test::RequestHelper::CookieJar do
+    
+    it "should update its values from a request object" do
+      cookie_jar = Merb::Test::RequestHelper::CookieJar.new
+      cookie_jar.should be_empty
+      request = fake_request
+      request.cookies[:foo] = "bar+baz" # escaped by default
+      cookie_jar.update_from_request request
+      cookie_jar[:foo].should == 'bar baz'
+    end
+    
+  end  
+  
   describe "#dispatch_to" do
 
     before(:all) do
@@ -205,6 +219,7 @@ describe Merb::Test::RequestHelper do
       controller.class.should == Namespaced::SpecHelperController
     end
   end
+  
 end
 
 module Merb::Test::RequestHelper

data/spec/spec_helper.rb

@@ -5,7 +5,7 @@ require File.join(File.dirname(__FILE__), "..", "lib", "merb-core")
 
 default_options = {:environment => 'test', :adapter => 'runner'}
 options = default_options.merge($START_OPTIONS || {})
-Merb.start options
+Merb.start_environment(options)
 
 # -- Global custom matchers --
 
@@ -92,10 +92,10 @@ module Merb
   end
 end
 
-
 Spec::Runner.configure do |config|
   config.include Merb::Test::Helper
   config.include Merb::Test::RspecMatchers
+  config.include Merb::Test::Rspec::ViewMatchers
   config.include Merb::Test::RequestHelper
 
   def with_level(level)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-core
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-26 00:00:00 +03:00
+date: 2008-09-09 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.4
+        version: 0.9.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: erubis
@@ -127,6 +127,9 @@ files:
 - README
 - Rakefile
 - TODO
+- CHANGELOG
+- PUBLIC_CHANGELOG
+- CONTRIBUTORS
 - docs/bootloading.dox
 - docs/documentation_standards
 - docs/merb-core-call-stack-diagram.mmap
@@ -146,7 +149,6 @@ files:
 - spec/private/core_ext/kernel_spec.rb
 - spec/private/dispatch
 - spec/private/dispatch/bootloader_spec.rb
-- spec/private/dispatch/cookies_spec.rb
 - spec/private/dispatch/fixture
 - spec/private/dispatch/fixture/app
 - spec/private/dispatch/fixture/app/controllers
@@ -183,7 +185,6 @@ files:
 - spec/private/dispatch/fixture/public/stylesheets
 - spec/private/dispatch/fixture/public/stylesheets/master.css
 - spec/private/dispatch/route_params_spec.rb
-- spec/private/dispatch/session_mixin_spec.rb
 - spec/private/dispatch/spec_helper.rb
 - spec/private/router
 - spec/private/router/behavior_spec.rb
@@ -324,11 +325,13 @@ files:
 - spec/public/controller
 - spec/public/controller/authentication_spec.rb
 - spec/public/controller/base_spec.rb
+- spec/public/controller/conditional_get_spec.rb
 - spec/public/controller/config
 - spec/public/controller/config/init.rb
 - spec/public/controller/controllers
 - spec/public/controller/controllers/authentication.rb
 - spec/public/controller/controllers/base.rb
+- spec/public/controller/controllers/conditional_get.rb
 - spec/public/controller/controllers/cookies.rb
 - spec/public/controller/controllers/dispatcher.rb
 - spec/public/controller/controllers/display.rb
@@ -402,6 +405,7 @@ files:
 - spec/public/logger/spec_helper.rb
 - spec/public/rack
 - spec/public/rack/conditinal_get_middleware_spec.rb
+- spec/public/rack/csrf_middleware_spec.rb
 - spec/public/rack/rack_middleware_spec.rb
 - spec/public/rack/shared_example_groups.rb
 - spec/public/reloading
@@ -433,6 +437,15 @@ files:
 - spec/public/router/spec_helper.rb
 - spec/public/router/special_spec.rb
 - spec/public/router/string_spec.rb
+- spec/public/session
+- spec/public/session/controllers
+- spec/public/session/controllers/sessions.rb
+- spec/public/session/cookie_session_spec.rb
+- spec/public/session/memcached_session_spec.rb
+- spec/public/session/memory_session_spec.rb
+- spec/public/session/multiple_sessions_spec.rb
+- spec/public/session/no_session_spec.rb
+- spec/public/session/session_spec.rb
 - spec/public/template
 - spec/public/template/template_spec.rb
 - spec/public/template/templates
@@ -465,6 +478,7 @@ files:
 - lib/merb-core/controller/mime.rb
 - lib/merb-core/controller/mixins
 - lib/merb-core/controller/mixins/authentication.rb
+- lib/merb-core/controller/mixins/conditional_get.rb
 - lib/merb-core/controller/mixins/controller.rb
 - lib/merb-core/controller/mixins/render.rb
 - lib/merb-core/controller/mixins/responder.rb
@@ -489,9 +503,11 @@ files:
 - lib/merb-core/dispatch/router/route.rb
 - lib/merb-core/dispatch/router.rb
 - lib/merb-core/dispatch/session
+- lib/merb-core/dispatch/session/container.rb
 - lib/merb-core/dispatch/session/cookie.rb
 - lib/merb-core/dispatch/session/memcached.rb
 - lib/merb-core/dispatch/session/memory.rb
+- lib/merb-core/dispatch/session/store_container.rb
 - lib/merb-core/dispatch/session.rb
 - lib/merb-core/dispatch/worker.rb
 - lib/merb-core/gem_ext
@@ -517,12 +533,14 @@ files:
 - lib/merb-core/rack/middleware
 - lib/merb-core/rack/middleware/conditional_get.rb
 - lib/merb-core/rack/middleware/content_length.rb
+- lib/merb-core/rack/middleware/csrf.rb
 - lib/merb-core/rack/middleware/path_prefix.rb
 - lib/merb-core/rack/middleware/profiler.rb
 - lib/merb-core/rack/middleware/static.rb
 - lib/merb-core/rack/middleware/tracer.rb
 - lib/merb-core/rack/middleware.rb
 - lib/merb-core/rack.rb
+- lib/merb-core/script.rb
 - lib/merb-core/server.rb
 - lib/merb-core/tasks
 - lib/merb-core/tasks/audit.rake