activerecord-session_store 0.1.0 → 0.1.1.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ea10b5f92d5818f9ae6951c3f54116acb119eae
-  data.tar.gz: ce9c39fbef8fbdc82ca36a732948bee2939e8a64
+  metadata.gz: adf05ad9dc9399cb9ff6b312bf79b0da4119f7f4
+  data.tar.gz: b2bf84d11f05d675b4e68fc3cc96c5fa71a52775
 SHA512:
-  metadata.gz: 0dedb0c1303059ef56c5181b2a284eb051acb0103b2d71f14440c61f042bba754563fd3a2d38d6e5f9eeab35c14968377c9cbb7534c7cabda72c22a77549a72c
-  data.tar.gz: 2b72be9257bf89fbac1eef9f82f9a703e29f5dc83a9021c0a0ad8baf4c9496cf3f8ab8dea5ab80592822d03222b4e1b005968c47e4a2bb6f677c0037b840be1c
+  metadata.gz: af07b4aeddd875b6e9c1d05cb98ed12bfc5b2dfef08c9254d18654ff462821bd073e47e90c733026c8da40034861824d3560f11feb436296e818c62771c85951
+  data.tar.gz: a926c8686c220de2636287b575238d694be509deb46181abe510080849b50aa44bc57bbc857495dbb558a8ec3948d7f8caac9bad560ac4cf1121e8018a58a80a

data/README.md

@@ -10,7 +10,9 @@ Installation
 
 Include this gem into your Gemfile:
 
-    gem 'activerecord-session_store', github: 'rails/activerecord-session_store'
+```ruby
+gem 'activerecord-session_store'
+```
 
 Run the migration generator:
 
@@ -18,7 +20,9 @@ Run the migration generator:
 
 Then, set your session store in `config/initializers/session_store.rb`:
 
-    Foo::Application.config.session_store :active_record_store
+```ruby
+Foo::Application.config.session_store :active_record_store
+```
 
 Configuration
 --------------
@@ -37,9 +41,11 @@ ActionController::SessionOverflowError will be raised.
 You may configure the table name, primary key, and data column.
 For example, at the end of `config/application.rb`:
 
-    ActiveRecord::SessionStore::Session.table_name = 'legacy_session_table'
-    ActiveRecord::SessionStore::Session.primary_key = 'session_id'
-    ActiveRecord::SessionStore::Session.data_column_name = 'legacy_session_data'
+```ruby
+ActiveRecord::SessionStore::Session.table_name = 'legacy_session_table'
+ActiveRecord::SessionStore::Session.primary_key = 'session_id'
+ActiveRecord::SessionStore::Session.data_column_name = 'legacy_session_data'
+```
 
 Note that setting the primary key to the `session_id` frees you from
 having a separate `id` column if you don't want it. However, you must
@@ -53,8 +59,10 @@ the `sessions` table, making periodic session expiration a snap.
 You may provide your own session class implementation, whether a
 feature-packed Active Record or a bare-metal high-performance SQL
 store, by setting
-    
-    ActionDispatch::Session::ActiveRecordStore.session_class = MySessionClass
+
+```ruby
+ActionDispatch::Session::ActiveRecordStore.session_class = MySessionClass
+```
 
 You must implement these methods:
 

data/lib/action_dispatch/session/active_record_store.rb

@@ -61,7 +61,7 @@ module ActionDispatch
 
       private
         def get_session(env, sid)
-          ActiveRecord::Base.logger.quietly do
+          logger.silence do
             unless sid and session = @@session_class.find_by_session_id(sid)
               # If the sid was nil or if there is no pre-existing session under the sid,
               # force the generation of a new sid and associate a new session associated with the new sid
@@ -74,7 +74,7 @@ module ActionDispatch
         end
 
         def set_session(env, sid, session_data, options)
-          ActiveRecord::Base.logger.quietly do
+          logger.silence do
             record = get_session_model(env, sid)
             record.data = session_data
             return false unless record.save
@@ -85,20 +85,20 @@ module ActionDispatch
                 obj.clear_association_cache if obj.respond_to?(:clear_association_cache)
               end
             end
-          end
 
-          sid
+            sid
+          end
         end
 
         def destroy_session(env, session_id, options)
-          if sid = current_session_id(env)
-            ActiveRecord::Base.logger.quietly do
+          logger.silence do
+            if sid = current_session_id(env)
               get_session_model(env, sid).destroy
               env[SESSION_RECORD_KEY] = nil
             end
-          end
 
-          generate_sid unless options[:drop]
+            generate_sid unless options[:drop]
+          end
         end
 
         def get_session_model(env, sid)
@@ -113,6 +113,10 @@ module ActionDispatch
           @@session_class.find_by_session_id(id) ||
             @@session_class.new(:session_id => id, :data => {})
         end
+
+        def logger
+          ActiveRecord::Base.logger || ActiveRecord::SessionStore::NilLogger
+        end
     end
   end
 end

data/lib/active_record/session_store.rb

@@ -1,4 +1,5 @@
 require 'action_dispatch/session/active_record_store'
+require "active_record/session_store/extension/logger_silencer"
 
 module ActiveRecord
   module SessionStore
@@ -32,5 +33,5 @@ require 'active_record/session_store/session'
 require 'active_record/session_store/sql_bypass'
 require 'active_record/session_store/railtie' if defined?(Rails)
 
-
 ActionDispatch::Session::ActiveRecordStore.session_class = ActiveRecord::SessionStore::Session
+Logger.send :include, ActiveRecord::SessionStore::Extension::LoggerSilencer

data/lib/active_record/session_store/extension/logger_silencer.rb

@@ -0,0 +1,72 @@
+require "thread"
+require "active_support/core_ext/class/attribute_accessors"
+require "active_support/core_ext/module/aliasing"
+require "active_support/concern"
+
+module ActiveRecord
+  module SessionStore
+    module Extension
+      module LoggerSilencer
+        extend ActiveSupport::Concern
+
+        included do
+          cattr_accessor :silencer
+          self.silencer = true
+          alias_method_chain :level, :threadsafety
+          alias_method_chain :add, :threadsafety
+        end
+
+        def thread_level
+          Thread.current[thread_hash_level_key]
+        end
+
+        def thread_level=(level)
+          Thread.current[thread_hash_level_key] = level
+        end
+
+        def level_with_threadsafety
+          thread_level || level_without_threadsafety
+        end
+
+        def add_with_threadsafety(severity, message = nil, progname = nil, &block)
+          return true if @logdev.nil? or (severity || UNKNOWN) < level
+          add_without_threadsafety(severity, message, progname, &block)
+        end
+
+        # Silences the logger for the duration of the block.
+        def silence(temporary_level = Logger::ERROR)
+          if silencer
+            begin
+              self.thread_level = temporary_level
+              yield self
+            ensure
+              self.thread_level = nil
+            end
+          else
+            yield self
+          end
+        end
+
+        for severity in Logger::Severity.constants
+          class_eval <<-EOT, __FILE__, __LINE__ + 1
+            def #{severity.downcase}?                # def debug?
+              Logger::#{severity} >= level           #   DEBUG >= level
+            end                                      # end
+          EOT
+        end
+
+        private
+
+        def thread_hash_level_key
+          @thread_hash_level_key ||= :"ThreadSafeLogger##{object_id}@level"
+        end
+      end
+    end
+
+    class NilLogger
+      def self.silence
+        yield
+      end
+    end
+  end
+end

metadata

@@ -1,87 +1,101 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-session_store
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1.pre
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-24 00:00:00.000000000 Z
+date: 2015-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -93,10 +107,11 @@ extra_rdoc_files:
 files:
 - README.md
 - lib/action_dispatch/session/active_record_store.rb
+- lib/active_record/session_store.rb
+- lib/active_record/session_store/extension/logger_silencer.rb
 - lib/active_record/session_store/railtie.rb
 - lib/active_record/session_store/session.rb
 - lib/active_record/session_store/sql_bypass.rb
-- lib/active_record/session_store.rb
 - lib/activerecord/session_store.rb
 - lib/generators/active_record/session_migration_generator.rb
 - lib/generators/active_record/templates/migration.rb
@@ -107,24 +122,25 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: An Action Dispatch session store backed by an Active Record class.
 test_files: []
+has_rdoc: