riak-sessions 0.9.2 → 0.9.7

data/lib/riak/session_store.rb

@@ -25,6 +25,9 @@ module Riak
   # Usage (Rails):
   #   config.middleware.use Riak::SessionStore
   #
+  # Usage (Rails 2.3), requires you to swap out the default store:
+  #   config.middleware.swap ActionController::Session::CookieStore, Riak::SessionStore
+  #
   # For configuration options, see #initialize.
   class SessionStore < Rack::Session::Abstract::ID
     DEFAULT_OPTIONS = Rack::Session::Abstract::ID::DEFAULT_OPTIONS.merge \
@@ -36,8 +39,8 @@ module Riak
     :dw => 0,
     :rw => 1,
     :n_val => 2,
-    :last_write_wins => false
-
+    :last_write_wins => false,
+    :content_type => "application/x-ruby-marshal"
 
     attr_reader :bucket
 
@@ -47,6 +50,7 @@ module Riak
     # @see Rack::Session::Abstract::ID#initialize
     def initialize(app, options={})
       super
+      @riak_options = options.merge(DEFAULT_OPTIONS)
       @client = Riak::Client.new(@default_options.slice(*Riak::Client::VALID_OPTIONS))
       @bucket = @client.bucket(default_options[:bucket])
       set_bucket_defaults
@@ -63,6 +67,7 @@ module Riak
     private
     def get_session(env, session_id)
       if session_id && robject = (bucket.get(session_id) rescue nil)
+        @session_id = session_id
         if stale?(robject)
           bucket.delete(session_id)
           fresh_session
@@ -79,8 +84,20 @@ module Riak
         bucket.delete(session_id)
         return false if options[:drop]
         session_id = generate_sid
+      elsif session_id.nil?
+        # Rails 2.3 kills the session id from the request when
+        # reset_session is called. Working around that by temp.
+        # storing it in the middleware and explicitly destroying it
+        # as it's not guaranteed that Riak expiry is enabled
+        session_id = if @session_id
+                       destroy_session(env, @session_id, options)
+                     else
+                       generate_sid
+                     end
       end
+
       robject = bucket.get_or_new(session_id)
+      robject.content_type = options[:content_type]
       robject.meta['expire-after'] = (Time.now + options[:expire_after]).httpdate if options[:expire_after]
       robject.data = session
       robject.store
@@ -106,6 +123,7 @@ module Riak
     def fresh_session
       session_id, robject = generate_sid, bucket.new
       robject.key = session_id
+      robject.content_type = @riak_options[:content_type]
       robject.data = {}
       robject.store
       [session_id, robject.data]

data/riak-sessions.gemspec

@@ -2,19 +2,19 @@
 
 Gem::Specification.new do |s|
   s.name = %q{riak-sessions}
-  s.version = "0.9.2"
+  s.version = "0.9.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Sean Cribbs"]
-  s.date = %q{2011-04-11}
+  s.authors = [%q{Sean Cribbs}]
+  s.date = %q{2011-07-26}
   s.description = %q{riak-sessions is a session store backed by Riak, the distributed database by Basho. It includes session implementations for both Rack and Rails 3.}
   s.email = %q{sean@basho.com}
-  s.files = ["Gemfile", "lib/riak/session_store.rb", "lib/riak-sessions.rb", "lib/ripple/session_store.rb", "Rakefile", "riak-sessions.gemspec", "spec/fixtures/session_autoload_test/session_autoload_test/foo.rb", "spec/riak_session_store_spec.rb", "spec/ripple_session_store_spec.rb", "spec/spec_helper.rb", "spec/support/ripple_session_support.rb", "spec/support/rspec-rails-neuter.rb", "spec/support/test_server.rb", "spec/support/test_server.yml.example"]
+  s.files = [%q{Gemfile}, %q{lib/riak/session_store.rb}, %q{lib/riak-sessions.rb}, %q{lib/ripple/session_store.rb}, %q{Rakefile}, %q{riak-sessions.gemspec}, %q{spec/fixtures/session_autoload_test/session_autoload_test/foo.rb}, %q{spec/riak_session_store_spec.rb}, %q{spec/ripple_session_store_spec.rb}, %q{spec/spec_helper.rb}, %q{spec/support/ripple_session_support.rb}, %q{spec/support/rspec-rails-neuter.rb}, %q{spec/support/test_server.rb}, %q{spec/support/test_server.yml.example}]
   s.homepage = %q{http://seancribbs.github.com/ripple}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.7.2}
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.5}
   s.summary = %q{riak-sessions is a session store backed by Riak, the distributed database by Basho.}
-  s.test_files = ["spec/riak_session_store_spec.rb", "spec/ripple_session_store_spec.rb"]
+  s.test_files = [%q{spec/riak_session_store_spec.rb}, %q{spec/ripple_session_store_spec.rb}]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<yajl-ruby>, [">= 0"])
       s.add_development_dependency(%q<rails>, ["~> 3.0.0"])
       s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_runtime_dependency(%q<riak-client>, ["~> 0.9.2"])
+      s.add_runtime_dependency(%q<riak-client>, ["~> 0.9.7"])
       s.add_runtime_dependency(%q<rack>, [">= 1.0"])
     else
       s.add_dependency(%q<rspec>, ["~> 2.4.0"])
@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<yajl-ruby>, [">= 0"])
       s.add_dependency(%q<rails>, ["~> 3.0.0"])
       s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<riak-client>, ["~> 0.9.2"])
+      s.add_dependency(%q<riak-client>, ["~> 0.9.7"])
       s.add_dependency(%q<rack>, [">= 1.0"])
     end
   else
@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<yajl-ruby>, [">= 0"])
     s.add_dependency(%q<rails>, ["~> 3.0.0"])
     s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<riak-client>, ["~> 0.9.2"])
+    s.add_dependency(%q<riak-client>, ["~> 0.9.7"])
     s.add_dependency(%q<rack>, [">= 1.0"])
   end
 end

data/spec/riak_session_store_spec.rb

@@ -36,6 +36,11 @@ describe Riak::SessionStore do
     env['rack.session.options'][:defer] = true
     incrementor.call(env)
   end
+  reset_session = proc do |env|
+    env['rack.session.options'].delete(:id)
+    env['rack.session'] = {}
+    incrementor.call(env)
+  end
 
   it "creates a new cookie" do
     pool = Riak::SessionStore.new(incrementor)
@@ -56,7 +61,7 @@ describe Riak::SessionStore do
   end
 
   it "survives nonexistant cookies" do
-    bad_cookie = "rack.session=blarghfasel"
+    bad_cookie = "rack.session=#{Digest::SHA1.hexdigest(Time.now.to_s)}"
     pool = Riak::SessionStore.new(incrementor)
     res = Rack::MockRequest.new(pool).
       get("/", "HTTP_COOKIE" => bad_cookie)
@@ -102,6 +107,7 @@ describe Riak::SessionStore do
     res3["Set-Cookie"][session_match].should_not == session
     res3.body.should == '{"counter"=>1}'
   end
+
   it "provides new session id with :renew option" do
     pool = Riak::SessionStore.new(incrementor)
     req = Rack::MockRequest.new(pool)
@@ -149,4 +155,55 @@ describe Riak::SessionStore do
     res3["Set-Cookie"][session_match].should == session
     res3.body.should == '{"counter"=>4}'
   end
+
+  it "should store the session as marshaled Ruby" do
+    client = Riak::Client.new(Riak::SessionStore::DEFAULT_OPTIONS.slice(*Riak::Client::VALID_OPTIONS))
+    pool = Riak::SessionStore.new(incrementor)
+    res = Rack::MockRequest.new(pool).get("/")
+    session_id = res["Set-Cookie"].gsub(/rack\.session=([a-z0-9]+);.+$/, '\1')
+    session = client.bucket('_sessions').get(session_id)
+    session.content_type.should == "application/x-ruby-marshal"
+  end
+
+  it "should create a new session when the session is harshly reset" do
+    pool = Riak::SessionStore.new(incrementor)
+    req = Rack::MockRequest.new(pool)
+    reset_session = Rack::Utils::Context.new(pool, reset_session)
+    reset_req = Rack::MockRequest.new(reset_session)
+
+    res0 = req.get("/")
+    session = (cookie = res0["Set-Cookie"])[session_match]
+    res0.body.should == '{"counter"=>1}'
+
+    res1 = req.get("/", "HTTP_COOKIE" => cookie)
+    res1["Set-Cookie"][session_match].should == session
+    res1.body.should == '{"counter"=>2}'
+
+    res2 = reset_req.get("/", "HTTP_COOKIE" => cookie)
+    res2["Set-Cookie"][session_match].should_not == session
+    res2.body.should == '{"counter"=>1}'
+  end
+
+  it "should delete the old session when the session is harshly reset" do
+    pool = Riak::SessionStore.new(incrementor)
+    req = Rack::MockRequest.new(pool)
+    reset_session = Rack::Utils::Context.new(pool, reset_session)
+    reset_req = Rack::MockRequest.new(reset_session)
+
+    res0 = req.get("/")
+    session = (cookie = res0["Set-Cookie"])[session_match]
+    res0.body.should == '{"counter"=>1}'
+
+    res1 = req.get("/", "HTTP_COOKIE" => cookie)
+    res1["Set-Cookie"][session_match].should == session
+    res1.body.should == '{"counter"=>2}'
+
+    res2 = reset_req.get("/", "HTTP_COOKIE" => cookie)
+
+    client = Riak::Client.new(Riak::SessionStore::DEFAULT_OPTIONS.slice(*Riak::Client::VALID_OPTIONS))
+    expect {
+      client.bucket('_session').get(session)
+    }.to raise_error(Riak::HTTPFailedRequest)
+  end
+
 end

data/spec/spec_helper.rb

@@ -21,7 +21,7 @@ require 'riak'
 require 'riak-sessions'
 require 'rspec'
 
-Dir[File.join(File.dirname(__FILE__), "support", "*.rb")].each {|f| require f }
+Dir[File.join(File.dirname(__FILE__), "support", "*.rb")].sort.each {|f| require f }
 
 RSpec.configure do |config|
   config.mock_with :rspec

metadata

@@ -1,103 +1,100 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: riak-sessions
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.9.7
   prerelease: 
-  version: 0.9.2
 platform: ruby
-authors: 
+authors:
 - Sean Cribbs
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-11 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-07-26 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2156045460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.4.0
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec-rails
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2156045460
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: &2156038140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.4.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: yajl-ruby
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2156038140
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: &2156036520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rails
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2156036520
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: &2156035340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2156035340
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2156034040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: riak-client
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2156034040
+- !ruby/object:Gem::Dependency
+  name: riak-client
+  requirement: &2156031880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.9.2
+      - !ruby/object:Gem::Version
+        version: 0.9.7
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rack
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2156031880
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: &2156030500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "1.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id007
-description: riak-sessions is a session store backed by Riak, the distributed database by Basho. It includes session implementations for both Rack and Rails 3.
+  prerelease: false
+  version_requirements: *2156030500
+description: riak-sessions is a session store backed by Riak, the distributed database
+  by Basho. It includes session implementations for both Rack and Rails 3.
 email: sean@basho.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - Gemfile
 - lib/riak/session_store.rb
 - lib/riak-sessions.rb
@@ -114,31 +111,29 @@ files:
 - spec/support/test_server.yml.example
 homepage: http://seancribbs.github.com/ripple
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
-summary: riak-sessions is a session store backed by Riak, the distributed database by Basho.
-test_files: 
+summary: riak-sessions is a session store backed by Riak, the distributed database
+  by Basho.
+test_files:
 - spec/riak_session_store_spec.rb
 - spec/ripple_session_store_spec.rb