mongoid_session_store 1.1.2 → 2.0.0.beta1

data/{LICENSE → MIT-LICENSE}

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Ryan Fitzgerald
+Copyright 2011 YOURNAME
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -3,7 +3,7 @@
 store rails 3 sessions in mongoDB using mongoid.
 
 == Installation
-This gem only works with rails 3 and mongoid 2.0
+This gem supports rails 3, rails 3.1 and mongoid 2.0
 
   gem install mongoid_session_store
   
@@ -11,8 +11,8 @@ This gem only works with rails 3 and mongoid 2.0
 
 In your Gemfile:
 
-  gem "mongoid", :git => "http://github.com/mongoid/mongoid.git"
-  gem "bson_ext", "1.0.4"
+  gem "mongoid", "~> 2.0"
+  gem "bson_ext", "~> 1.3"
   gem "mongoid_session_store"
 
 In the session_store initializer (config/initializers/session_store.rb) you can comment out every line as
@@ -39,4 +39,4 @@ Mongoid Session Store comes with a rake task to clear out the sessions it stores
 
 == Copyright
 
-Copyright (c) 2010 Ryan Fitzgerald. See LICENSE for details.
+Copyright (c) 2010 Ryan Fitzgerald. See MIT-LICENSE for details.

data/Rakefile

@@ -1,55 +1,35 @@
-require 'rubygems'
-require 'rake'
-require 'bundler'
-
+#!/usr/bin/env rake
 begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "mongoid_session_store"
-    gem.summary = %Q{store rails 3 sessions in mongoDB}
-    gem.description = %Q{store rails 3 sessions in mongoDB}
-    gem.email = "ryan@codebrewstudios.com"
-    gem.homepage = "https://github.com/codebrew/mongoid_session_store"
-    gem.authors = ["Ryan Fitzgerald"]
-    gem.add_bundler_dependencies
-    
-    gem.files.exclude 'example/**/*'  
-  end
-  Jeweler::GemcutterTasks.new
+  require 'bundler/setup'
+  require 'bundler/gem_tasks'
 rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
-
 begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
+  require 'rdoc/task'
 rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
+  require 'rdoc/rdoc'
+  require 'rake/rdoctask'
+  RDoc::Task = Rake::RDocTask
 end
 
-task :test
+RDoc::Task.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'MongoidSessionStore'
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
 
-task :default => :test
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+require 'rake/testtask'
 
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "mongoid_session_store #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = false
 end
+
+
+task :default => :test

data/lib/mongoid_session_store.rb

@@ -1,3 +1,16 @@
-$:.unshift File.dirname(__FILE__)
+require 'rails'
 
-require "mongoid_session_store/railtie"
+module MongoidSessionStore
+  
+  class Railtie < Rails::Railtie
+    rake_tasks do
+      load "tasks/mongoid_session_store_tasks.rake"
+    end
+          
+    initializer "setup mongoid session store" do |app|
+      require 'mongoid_session_store/mongoid_store'
+      app.config.session_store :mongoid_store
+    end  
+  end
+  
+end

data/lib/mongoid_session_store/mongoid_store.rb

@@ -4,22 +4,20 @@ module ActionDispatch
 
       class Session
         include Mongoid::Document
-        include Mongoid::Timestamps
-
+        
         store_in :sessions
 
         identity :type => String
 
         field :data, :type => String, :default => [Marshal.dump({})].pack("m*")
-
-        index :updated_at
       end
 
       # The class used for session storage.
       cattr_accessor :session_class
       self.session_class = Session
-
-      SESSION_RECORD_KEY = 'rack.session.record'.freeze
+      
+      SESSION_RECORD_KEY = 'rack.session.record'
+      ENV_SESSION_OPTIONS_KEY = Rack::Session::Abstract::ENV_SESSION_OPTIONS_KEY
 
       private
 
@@ -30,7 +28,7 @@ module ActionDispatch
           [sid, unpack(session.data)]
         end
 
-        def set_session(env, sid, session_data)
+        def set_session(env, sid, session_data, options = nil)
           record = get_session_model(env, sid)
           record.data = pack(session_data)
 
@@ -44,10 +42,19 @@ module ActionDispatch
           @@session_class.find_or_create_by(:id => id)
         end
 
-        def destroy(env)
+        # def destroy(env)
+        #   if sid = current_session_id(env)
+        #     find_session(sid).destroy
+        #   end
+        # end
+        
+        def destroy_session(env, session_id, options)
           if sid = current_session_id(env)
-            find_session(sid).destroy
+            get_session_model(env, sid).destroy
+            env[SESSION_RECORD_KEY] = nil
           end
+
+          generate_sid unless options[:drop]
         end
 
         def get_session_model(env, sid)

metadata

@@ -1,133 +1,59 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid_session_store
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.1.2
+  prerelease: 6
+  version: 2.0.0.beta1
 platform: ruby
 authors: 
 - Ryan Fitzgerald
+- Code Brew Studios
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-03-25 00:00:00 -04:00
+date: 2011-06-21 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: actionpack
+  name: rails
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: activemodel
+  name: mongoid
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 3.0.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mongoid
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.0.0.pre
-  type: :runtime
-  prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: jeweler
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: actionpack
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 3.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: activemodel
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 3.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: mongoid
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.0.0.pre
-  type: :runtime
-  prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: jeweler
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id008
-description: store rails 3 sessions in mongoDB
-email: ryan@codebrewstudios.com
+description: Store rails 3 sessions in mongoDB.
+email: 
+- ryan@codebrewstudios.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
-- .document
-- Gemfile
-- Gemfile.lock
-- LICENSE
-- README.rdoc
-- Rakefile
-- VERSION
-- example/.gitignore
-- lib/mongoid_session_store.rb
 - lib/mongoid_session_store/mongoid_store.rb
-- lib/mongoid_session_store/railtie.rb
-- lib/mongoid_session_store/railties/sessions.rake
-- mongoid_session_store.gemspec
-- test/helper.rb
-- test/test_mongoid_session_store.rb
+- lib/mongoid_session_store.rb
+- lib/tasks/mongoid_session_store_tasks.rake
+- MIT-LICENSE
+- Rakefile
+- README.rdoc
 has_rdoc: true
-homepage: https://github.com/codebrew/mongoid_session_store
+homepage: http://github.com/codebrew/mongoid_session_store
 licenses: []
 
 post_install_message: 
@@ -140,20 +66,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 545154848138212417
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: store rails 3 sessions in mongoDB
-test_files: 
-- test/helper.rb
-- test/test_mongoid_session_store.rb
+summary: Store rails 3 sessions in mongoDB.
+test_files: []
+

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE

data/Gemfile

@@ -1,19 +0,0 @@
-# A sample Gemfile
-source :gemcutter
-
-#
-# gem "rails"
-
-gem 'actionpack', "~> 3.0.0"
-gem 'activemodel', "~> 3.0.0"
-
-gem "mongoid", "~> 2.0.0.pre"
-# gem "mongoid", :git => "http://github.com/mongoid/mongoid.git"
-
-group :test do
-  gem 'shoulda'
-end
-
-group :development do
-  gem 'jeweler'
-end

data/Gemfile.lock

@@ -1,55 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    abstract (1.0.0)
-    actionpack (3.0.4)
-      activemodel (= 3.0.4)
-      activesupport (= 3.0.4)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.4)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.4)
-      activesupport (= 3.0.4)
-      builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activesupport (3.0.4)
-    bson (1.2.1)
-    builder (2.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    git (1.2.5)
-    i18n (0.5.0)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
-    mongo (1.2.1)
-      bson (>= 1.2.1)
-    mongoid (2.0.0.rc.7)
-      activemodel (~> 3.0)
-      mongo (~> 1.2)
-      tzinfo (~> 0.3.22)
-      will_paginate (~> 3.0.pre)
-    rack (1.2.1)
-    rack-mount (0.6.13)
-      rack (>= 1.0.0)
-    rack-test (0.5.7)
-      rack (>= 1.0)
-    rake (0.8.7)
-    shoulda (2.11.3)
-    tzinfo (0.3.24)
-    will_paginate (3.0.pre2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  actionpack (~> 3.0.0)
-  activemodel (~> 3.0.0)
-  jeweler
-  mongoid (~> 2.0.0.pre)
-  shoulda

data/VERSION

@@ -1 +0,0 @@
-1.1.2

data/example/.gitignore

@@ -1,4 +0,0 @@
-.bundle
-db/*.sqlite3
-log/*.log
-tmp/**/*

data/lib/mongoid_session_store/railtie.rb

@@ -1,17 +0,0 @@
-require 'mongoid_session_store'
-require "rails"
-
-module MongoidSessionStore
-  
-  class Railtie < Rails::Railtie
-    rake_tasks do
-      load "mongoid_session_store/railties/sessions.rake"
-    end
-          
-    initializer "setup mongoid session store" do |app|
-      require 'mongoid_session_store/mongoid_store'
-      app.config.session_store :mongoid_store
-    end  
-  end
-  
-end

data/mongoid_session_store.gemspec

@@ -1,78 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{mongoid_session_store}
-  s.version = "1.1.2"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Ryan Fitzgerald"]
-  s.date = %q{2011-03-25}
-  s.description = %q{store rails 3 sessions in mongoDB}
-  s.email = %q{ryan@codebrewstudios.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "example/.gitignore",
-    "lib/mongoid_session_store.rb",
-    "lib/mongoid_session_store/mongoid_store.rb",
-    "lib/mongoid_session_store/railtie.rb",
-    "lib/mongoid_session_store/railties/sessions.rake",
-    "mongoid_session_store.gemspec",
-    "test/helper.rb",
-    "test/test_mongoid_session_store.rb"
-  ]
-  s.homepage = %q{https://github.com/codebrew/mongoid_session_store}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{store rails 3 sessions in mongoDB}
-  s.test_files = [
-    "test/helper.rb",
-    "test/test_mongoid_session_store.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<actionpack>, ["~> 3.0.0"])
-      s.add_runtime_dependency(%q<activemodel>, ["~> 3.0.0"])
-      s.add_runtime_dependency(%q<mongoid>, ["~> 2.0.0.pre"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_runtime_dependency(%q<actionpack>, ["~> 3.0.0"])
-      s.add_runtime_dependency(%q<activemodel>, ["~> 3.0.0"])
-      s.add_runtime_dependency(%q<mongoid>, ["~> 2.0.0.pre"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-    else
-      s.add_dependency(%q<actionpack>, ["~> 3.0.0"])
-      s.add_dependency(%q<activemodel>, ["~> 3.0.0"])
-      s.add_dependency(%q<mongoid>, ["~> 2.0.0.pre"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<actionpack>, ["~> 3.0.0"])
-      s.add_dependency(%q<activemodel>, ["~> 3.0.0"])
-      s.add_dependency(%q<mongoid>, ["~> 2.0.0.pre"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<actionpack>, ["~> 3.0.0"])
-    s.add_dependency(%q<activemodel>, ["~> 3.0.0"])
-    s.add_dependency(%q<mongoid>, ["~> 2.0.0.pre"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<actionpack>, ["~> 3.0.0"])
-    s.add_dependency(%q<activemodel>, ["~> 3.0.0"])
-    s.add_dependency(%q<mongoid>, ["~> 2.0.0.pre"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-  end
-end
-

data/test/helper.rb

@@ -1,23 +0,0 @@
-require 'rubygems'
-require 'test/unit'
-require 'shoulda'
-
-require 'mongoid'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-
-Mongoid.configure do |config|
-  name = "mongoid_test"
-  host = "localhost"
-  config.master = Mongo::Connection.new.db(name)
-  # config.logger = nil
-  # config.slaves = [
-    # Mongo::Connection.new(host, 27018, :slave_ok => true).db(name)
-  # ]
-end
-
-require 'mongoid_session_store'
-
-class Test::Unit::TestCase
-end

data/test/test_mongoid_session_store.rb

@@ -1,11 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/helper')
-
-class TestMongoidSessionStore < Test::Unit::TestCase
-  def setup
-    Mongoid.master.collections.select {|c| c.name !~ /system/ }.each(&:drop)
-  end
-  
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end