Merge pull request rails#159 from casperisfine/ruby-head-fixes

Fix ruby-head compatibility

Author: rafaelfranca

lib/action_dispatch/session/active_record_store.rb

@@ -66,7 +66,7 @@ class ActiveRecordStore < ActionDispatch::Session::AbstractStore
 
     private
       def get_session(request, sid)
-        logger.silence_logger 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
@@ -79,7 +79,7 @@ def get_session(request, sid)
       end
 
       def write_session(request, sid, session_data, options)
-        logger.silence_logger do
+        logger.silence do
           record = get_session_model(request, sid)
           record.data = session_data
           return false unless record.save
@@ -96,7 +96,7 @@ def write_session(request, sid, session_data, options)
       end
 
       def delete_session(request, session_id, options)
-        logger.silence_logger do
+        logger.silence do
           if sid = current_session_id(request)
             if model = @@session_class.find_by_session_id(sid)
               data = model.data
@@ -120,7 +120,7 @@ def delete_session(request, session_id, options)
       end
 
       def get_session_model(request, id)
-        logger.silence_logger do
+        logger.silence do
           model = @@session_class.find_by_session_id(id)
           if !model
             id = generate_sid
@@ -141,8 +141,14 @@ def find_session(request, id)
         [model.session_id, model.data]
       end
 
+      module NilLogger
+        def self.silence
+          yield
+        end
+      end
+
       def logger
-        ActiveRecord::Base.logger || ActiveRecord::SessionStore::NilLogger
+        ActiveRecord::Base.logger || NilLogger
       end
     end
   end

lib/active_record/session_store.rb

@@ -1,7 +1,6 @@
 require 'active_record'
 require 'active_record/session_store/version'
 require 'action_dispatch/session/active_record_store'
-require "active_record/session_store/extension/logger_silencer"
 require 'active_support/core_ext/hash/keys'
 require 'multi_json'
 
@@ -117,10 +116,3 @@ def self.dump(value)
 
 require 'active_record/session_store/sql_bypass'
 require 'active_record/session_store/railtie' if defined?(Rails)
-
-Logger.send :include, ActiveRecord::SessionStore::Extension::LoggerSilencer
-
-begin
-  require "syslog/logger"
-  Syslog::Logger.send :include, ActiveRecord::SessionStore::Extension::LoggerSilencer
-rescue LoadError; end

lib/active_record/session_store/extension/logger_silencer.rb

@@ -41,25 +41,13 @@ def setup
   end
 
   def test_log_silencer_with_logger_not_raise_exception
-    with_logger Logger.new(Tempfile.new("tempfile")) do
+    with_logger ActiveSupport::Logger.new(Tempfile.new("tempfile")) do
       with_test_route_set do
         get "/set_session_value"
       end
     end
   end
 
-  begin
-    require "syslogger/logger"
-
-    def test_log_silencer_with_syslog_logger_not_raise_exception
-      with_logger Syslog::Logger.new("ar_session_store_test") do
-        with_test_route_set do
-          get "/set_session_value"
-        end
-      end
-    end
-  rescue LoadError; end
-
   private
 
     def with_logger(logger)
@@ -71,7 +59,7 @@ def with_logger(logger)
     end
 
     def with_fake_logger(&block)
-      with_logger(Logger.new(fake_logger), &block)
+      with_logger(ActiveSupport::Logger.new(fake_logger), &block)
     end
 
     def fake_logger