riak-sessions 0.9.0.beta → 0.9.0.beta2

data/Gemfile

@@ -1,17 +1,18 @@
-source "http://rubygems.org/"
+source :rubygems
 
 gem 'bundler'
 gem 'riak-client', :path => "../riak-client"
 gem 'rack'
 gem 'rails', '~>3.0.0'
-gem 'rspec', '~>2.0.0'
-gem 'rspec-rails', '~>2.0.0'
+gem 'rspec', '~>2.4.0'
+gem 'rspec-rails', '~>2.4.0'
 gem 'rake'
 
-if defined? JRUBY_VERSION
+platforms :mri do
+  gem 'yajl-ruby'
+end
+
+platforms :jruby do
   gem 'json'
   gem 'jruby-openssl'
-else
-  gem 'curb', '>0.6'
-  gem 'yajl-ruby'
 end

data/Rakefile

@@ -11,8 +11,8 @@ gemspec = Gem::Specification.new do |gem|
   gem.email = "sean@basho.com"
   gem.homepage = "http://seancribbs.github.com/ripple"
   gem.authors = ["Sean Cribbs"]
-  gem.add_development_dependency "rspec", "~>2.0.0"
-  gem.add_development_dependency "rspec-rails", "~>2.0.0"
+  gem.add_development_dependency "rspec", "~>2.4.0"
+  gem.add_development_dependency "rspec-rails", "~>2.4.0"
   gem.add_development_dependency "yajl-ruby"
   gem.add_development_dependency "rails", "~>3.0.0"
   gem.add_development_dependency "rake"

data/lib/riak/session_store.rb

@@ -28,15 +28,15 @@ module Riak
   # For configuration options, see #initialize.
   class SessionStore < Rack::Session::Abstract::ID
     DEFAULT_OPTIONS = Rack::Session::Abstract::ID::DEFAULT_OPTIONS.merge \
-      :host => "127.0.0.1",
-      :port => 8098,
-      :bucket => "_sessions",
-      :r => 1,
-      :w => 1,
-      :dw => 0,
-      :rw => 1,
-      :n_val => 2,
-      :last_write_wins => false
+    :host => "127.0.0.1",
+    :port => 8098,
+    :bucket => "_sessions",
+    :r => 1,
+    :w => 1,
+    :dw => 0,
+    :rw => 1,
+    :n_val => 2,
+    :last_write_wins => false
 
 
     attr_reader :bucket
@@ -68,13 +68,16 @@ module Riak
 
     private
     def get_session(env, session_id)
-      unless session_id && robject = (bucket.get(session_id) rescue nil)
-        session_id, robject = generate_sid, bucket.new
-        robject.key = session_id
-        robject.data = {}
-        robject.store
+      if session_id && robject = (bucket.get(session_id) rescue nil)
+        if stale?(robject)
+          bucket.delete(session_id)
+          fresh_session
+        else
+          [session_id, robject.data]
+        end
+      else
+        fresh_session
       end
-      [session_id, robject.data]
     end
 
     def set_session(env, session_id, session, options)
@@ -84,6 +87,7 @@ module Riak
         session_id = generate_sid
       end
       robject = bucket.get_or_new(session_id)
+      robject.meta['expire-after'] = (Time.now + options[:expire_after]).httpdate if options[:expire_after]
       robject.data = session
       robject.store
       session_id
@@ -91,5 +95,26 @@ module Riak
       env['rack.errors'].puts $!.inspect
       false
     end
+
+    def destroy_session(env, sid, options)
+      bucket.delete(sid)
+      generate_sid unless options[:drop]
+    end
+
+    def stale?(robject)
+      if robject.meta['expire-after'] && threshold = (Time.httpdate(robject.meta['expire-after'].first) rescue nil)
+        threshold < Time.now
+      else
+        false
+      end
+    end
+
+    def fresh_session
+      session_id, robject = generate_sid, bucket.new
+      robject.key = session_id
+      robject.data = {}
+      robject.store
+      [session_id, robject.data]
+    end
   end
 end

data/lib/ripple/session_store.rb

@@ -47,7 +47,7 @@ module Ripple
       begin
         session = @bucket.get(sid).data
       rescue Riak::FailedRequest => fr
-        raise fr unless fr.code.to_i == 404
+        raise fr unless fr.not_found?
       end
       [sid, session]
     end

data/riak-sessions.gemspec

@@ -2,48 +2,47 @@
 
 Gem::Specification.new do |s|
   s.name = %q{riak-sessions}
-  s.version = "0.9.0.beta"
+  s.version = "0.9.0.beta2"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sean Cribbs"]
-  s.date = %q{2010-12-29}
+  s.date = %q{2011-03-28}
   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.homepage = %q{http://seancribbs.github.com/ripple}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.1}
   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"]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, ["~> 2.0.0"])
-      s.add_development_dependency(%q<rspec-rails>, ["~> 2.0.0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.4.0"])
+      s.add_development_dependency(%q<rspec-rails>, ["~> 2.4.0"])
       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.0.beta"])
+      s.add_runtime_dependency(%q<riak-client>, ["~> 0.9.0.beta2"])
       s.add_runtime_dependency(%q<rack>, [">= 1.0"])
     else
-      s.add_dependency(%q<rspec>, ["~> 2.0.0"])
-      s.add_dependency(%q<rspec-rails>, ["~> 2.0.0"])
+      s.add_dependency(%q<rspec>, ["~> 2.4.0"])
+      s.add_dependency(%q<rspec-rails>, ["~> 2.4.0"])
       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.0.beta"])
+      s.add_dependency(%q<riak-client>, ["~> 0.9.0.beta2"])
       s.add_dependency(%q<rack>, [">= 1.0"])
     end
   else
-    s.add_dependency(%q<rspec>, ["~> 2.0.0"])
-    s.add_dependency(%q<rspec-rails>, ["~> 2.0.0"])
+    s.add_dependency(%q<rspec>, ["~> 2.4.0"])
+    s.add_dependency(%q<rspec-rails>, ["~> 2.4.0"])
     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.0.beta"])
+    s.add_dependency(%q<riak-client>, ["~> 0.9.0.beta2"])
     s.add_dependency(%q<rack>, [">= 1.0"])
   end
 end

data/spec/riak_session_store_spec.rb

@@ -65,20 +65,20 @@ describe Riak::SessionStore do
     cookie.should_not match(/#{bad_cookie}/)
   end
   
-  # it "maintains freshness" do
-  #   pool = Riak::SessionStore.new(incrementor, :expire_after => 3)
-  #   res = Rack::MockRequest.new(pool).get('/')
-  #   res.body.should include '"counter"=>1'
-  #   cookie = res["Set-Cookie"]
-  #   res = Rack::MockRequest.new(pool).get('/', "HTTP_COOKIE" => cookie)
-  #   res["Set-Cookie"].should == cookie
-  #   res.body.should include '"counter"=>2'
-  #   puts 'Sleeping to expire session' if $DEBUG
-  #   sleep 4
-  #   res = Rack::MockRequest.new(pool).get('/', "HTTP_COOKIE" => cookie)
-  #   res["Set-Cookie"].should_not == cookie
-  #   res.body.should include '"counter"=>1'
-  # end
+  it "maintains freshness" do
+    pool = Riak::SessionStore.new(incrementor, :expire_after => 3)
+    res = Rack::MockRequest.new(pool).get('/')
+    res.body.should include '"counter"=>1'
+    cookie = res["Set-Cookie"]
+    res = Rack::MockRequest.new(pool).get('/', "HTTP_COOKIE" => cookie)
+    res["Set-Cookie"].should == cookie
+    res.body.should include '"counter"=>2'
+    puts 'Sleeping to expire session' if $DEBUG
+    sleep 4
+    res = Rack::MockRequest.new(pool).get('/', "HTTP_COOKIE" => cookie)
+    res["Set-Cookie"].should_not == cookie
+    res.body.should include '"counter"=>1'
+  end
 
   it "deletes cookies with :drop option" do
     pool = Riak::SessionStore.new(incrementor)

data/spec/support/ripple_session_support.rb

@@ -12,7 +12,9 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
+require 'action_mailer' # Bah, fails on MailerExampleGroup
 require 'support/rspec-rails-neuter'
+require 'rspec/rails/example/rails_example_group'
 require 'rspec/rails/example/request_example_group'
 
 class RoutedRackApp

data/spec/support/rspec-rails-neuter.rb

@@ -12,12 +12,13 @@ module RSpec
   end
 end
 
+require 'rspec/core'
+
 RSpec::configure do |c|
   c.backtrace_clean_patterns << /vendor\//
   c.backtrace_clean_patterns << /lib\/rspec\/rails/
 end
 
-require 'rspec/core'
 require 'rspec/rails/extensions'
 require 'rspec/rails/view_rendering'
 require 'rspec/rails/adapters'

metadata

@@ -1,14 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: riak-sessions
 version: !ruby/object:Gem::Version 
-  hash: 31098121
-  prerelease: true
-  segments: 
-  - 0
-  - 9
-  - 0
-  - beta
-  version: 0.9.0.beta
+  prerelease: 6
+  version: 0.9.0.beta2
 platform: ruby
 authors: 
 - Sean Cribbs
@@ -16,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-29 00:00:00 -06:00
+date: 2011-03-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +21,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
-        version: 2.0.0
+        version: 2.4.0
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -43,12 +32,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
-        version: 2.0.0
+        version: 2.4.0
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -59,9 +43,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id003
@@ -73,11 +54,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
         version: 3.0.0
   type: :development
   version_requirements: *id004
@@ -89,9 +65,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id005
@@ -103,13 +76,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31098121
-        segments: 
-        - 0
-        - 9
-        - 0
-        - beta
-        version: 0.9.0.beta
+        version: 0.9.0.beta2
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -120,10 +87,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
         version: "1.0"
   type: :runtime
   version_requirements: *id007
@@ -164,25 +127,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
       version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: riak-sessions is a session store backed by Riak, the distributed database by Basho.