rack-session-file 0.3.0 → 0.4.0

data/README.md

@@ -2,26 +2,36 @@
 
 Rack session store on plain file system.
 
-## Installation
+## Usage in Rack Applications
 
-Add this line to your application's Gemfile:
+On Gemfile:
 
 ```ruby
-gem 'rack-session-file', :git =>
-  'git://github.com/dayflower/rack-session-file.git'
+gem 'rack-session-file'
 ```
 
-And then execute:
-
-    $ bundle install
-
-## Usage
+And use `Rack::Session::File` as Rack Middleware:
 
 ```ruby
 use Rack::Session::File, :storage => ENV['TEMP'],
                          :expire_after => 1800
 ```
 
+## Usage in Rails 3 Applications
+
+On Gemfile:
+
+```ruby
+gem 'rack-session-file', :require => 'rails-session-file'
+```
+
+And modify your config/initializers/session_store.rb to something like:
+
+```ruby
+FooBar::Application.config.session_store :file_store,
+  :key => '_foobar_session', :driver => 'YAML'
+```
+
 ### Options
 
 #### File storage directory (`:storage`)

data/lib/rack/session/file.rb

@@ -3,7 +3,7 @@
 module Rack
   module Session
     module File
-      VERSION = '0.3.0'
+      VERSION = '0.4.0'
 
       autoload :Marshal, 'rack/session/file/marshal'
       autoload :PStore, 'rack/session/file/pstore'

data/lib/rack/session/file/marshal.rb

@@ -25,7 +25,9 @@ module Rack
               end
             rescue Errno::ENOENT
               return nil
-          end
+            rescue TypeError
+              return nil
+            end
           end
 
           def delete_session(sid)

data/lib/rack/session/file/pstore.rb

@@ -27,10 +27,14 @@ module Rack
             ensure_storage_accessible()
 
             data = {}
-            store_for_sid(sid).transaction(true) do |db|
-              db.roots.each do |key|
-                data[key] = db[key]
+            begin
+              store_for_sid(sid).transaction(true) do |db|
+                db.roots.each do |key|
+                  data[key] = db[key]
+                end
               end
+            rescue TypeError
+              return nil
             end
             return data
           end

data/lib/rack/session/file/yaml.rb

@@ -37,10 +37,14 @@ module Rack
             ensure_storage_accessible()
 
             data = {}
-            store_for_sid(sid).transaction(true) do |db|
-              db.roots.each do |key|
-                data[key] = db[key]
+            begin
+              store_for_sid(sid).transaction(true) do |db|
+                db.roots.each do |key|
+                  data[key] = db[key]
+                end
               end
+            rescue Psych::SyntaxError, Syck::Error, Syck::TypeError
+              return nil
             end
             return data
           end

data/lib/rails-session-file.rb

@@ -0,0 +1,19 @@
+require 'action_dispatch/middleware/session/abstract_store'
+require File.expand_path(File.dirname(__FILE__) + '/rack/session/file')
+require File.expand_path(File.dirname(__FILE__) + '/rack/session/file/abstract')
+
+class Rack::Session::File::Abstract
+  include ActionDispatch::Session::Compatibility
+  include ActionDispatch::Session::StaleSessionCheck
+end
+
+module ActionDispatch
+  module Session
+    class FileStore
+      def self.new(app, options={})
+        options[:expire_after] ||= options[:expires]
+        return Rack::Session::File.new(app, options)
+      end
+    end
+  end
+end

data/rack-session-file.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |gem|
     "README.md",
     "Rakefile",
     "lib/rack-session-file.rb",
+    "lib/rails-session-file.rb",
     "lib/rack/session/file.rb",
     "lib/rack/session/file/abstract.rb",
     "lib/rack/session/file/marshal.rb",
@@ -31,7 +32,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "rack-session-file"
   gem.require_paths = ["lib"]
-  gem.version       = '0.3.0'
+  gem.version       = '0.4.0'
 
   if gem.respond_to? :specification_version then
     gem.specification_version = 3

data/spec/common.rb

@@ -74,6 +74,19 @@ shared_examples_for Rack::Session::File do
     cookie.should_not match(/#{bad_cookie}/)
   end
 
+  it 'survives broken session data' do
+    open(::File.join(@storage, 'broken'), 'w') do |f|
+      f.write "\x1\x1o"     # broken data for Marshal, YAML
+    end
+    cookie = 'rack.session=broken'
+    res = Rack::MockRequest.new(pool) \
+            .get('/', 'HTTP_COOKIE' => cookie)
+
+    res.body.should == '{"counter"=>1}'
+    cookie = res['Set-Cookie'][@session_match]
+    cookie.should_not match(/broken/)
+  end
+
   it 'should maintain freshness' do
     pool2 = described_class.new(@increment_mockapp, :storage => @storage, :expire_after => 2)
     expired_time = Time.now + 5

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-session-file
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-11 00:00:00.000000000 Z
+date: 2012-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -56,6 +56,7 @@ files:
 - README.md
 - Rakefile
 - lib/rack-session-file.rb
+- lib/rails-session-file.rb
 - lib/rack/session/file.rb
 - lib/rack/session/file/abstract.rb
 - lib/rack/session/file/marshal.rb
@@ -81,7 +82,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3561167824695945220
+      hash: -4049294331236196458
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -90,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3561167824695945220
+      hash: -4049294331236196458
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23