Remove all code to support old Rails versions

Author: rafaelfranca

lib/action_dispatch/session/active_record_store.rb

@@ -58,11 +58,7 @@ class ActiveRecordStore < ActionDispatch::Session::AbstractStore
       cattr_accessor :session_class
 
       SESSION_RECORD_KEY = 'rack.session.record'
-      if Rack.const_defined?(:RACK_SESSION_OPTIONS)
-        ENV_SESSION_OPTIONS_KEY = Rack::RACK_SESSION_OPTIONS
-      else
-        ENV_SESSION_OPTIONS_KEY = Rack::Session::Abstract::ENV_SESSION_OPTIONS_KEY
-      end
+      ENV_SESSION_OPTIONS_KEY = Rack::RACK_SESSION_OPTIONS
 
     private
       def get_session(request, sid)
@@ -148,7 +144,3 @@ def logger
   end
 end
 
-if ActiveRecord::VERSION::MAJOR == 4
-  require 'action_dispatch/session/legacy_support'
-  ActionDispatch::Session::ActiveRecordStore.send(:include, ActionDispatch::Session::LegacySupport)
-end

lib/action_dispatch/session/legacy_support.rb

@@ -21,20 +21,12 @@ def deserialize(data)
       end
 
       def drop_table!
-        if connection.schema_cache.respond_to?(:clear_data_source_cache!)
-          connection.schema_cache.clear_data_source_cache!(table_name)
-        else
-          connection.schema_cache.clear_table_cache!(table_name)
-        end
+        connection.schema_cache.clear_data_source_cache!(table_name)
         connection.drop_table table_name
       end
 
       def create_table!
-        if connection.schema_cache.respond_to?(:clear_data_source_cache!)
-          connection.schema_cache.clear_data_source_cache!(table_name)
-        else
-          connection.schema_cache.clear_table_cache!(table_name)
-        end
+        connection.schema_cache.clear_data_source_cache!(table_name)
         connection.create_table(table_name) do |t|
           t.string session_id_column, :limit => 255
           t.text data_column_name

lib/active_record/session_store.rb

@@ -17,13 +17,6 @@ class Session < ActiveRecord::Base
       before_save :serialize_data!
       before_save :raise_on_session_data_overflow!
 
-      # This method is defiend in `protected_attributes` gem. We can't check for
-      # `attr_accessible` as Rails also define this and raise `RuntimeError`
-      # telling you to use the gem.
-      if respond_to?(:accessible_attributes)
-        attr_accessible :session_id, :data
-      end
-
       class << self
         def data_column_size_limit
           @data_column_size_limit ||= columns_hash[data_column_name].limit
@@ -81,7 +74,6 @@ def loaded?
       private
         def serialize_data!
           unless loaded?
-            return false if Rails::VERSION::MAJOR < 5
             throw :abort
           end
           write_attribute(@@data_column_name, self.class.serialize(data))
@@ -92,7 +84,6 @@ def serialize_data!
         # ActionController::SessionOverflowError.
         def raise_on_session_data_overflow!
           unless loaded?
-            return false if Rails::VERSION::MAJOR < 5
             throw :abort
           end
           limit = self.class.data_column_size_limit

lib/active_record/session_store/session.rb

@@ -21,7 +21,7 @@ def session_table_name
         end
 
         def migration_version
-          "[#{ActiveRecord::Migration.current_version}]" if ActiveRecord::Migration.respond_to?(:current_version)
+          "[#{ActiveRecord::Migration.current_version}]"
         end
     end
   end

lib/generators/active_record/session_migration_generator.rb

@@ -14,19 +14,11 @@ def set_session_value
     end
 
     def get_session_value
-      if ActiveRecord::VERSION::MAJOR == 4
-        render :text => "foo: #{session[:foo].inspect}"
-      else
-        render :plain => "foo: #{session[:foo].inspect}"
-      end
+      render :plain => "foo: #{session[:foo].inspect}"
     end
 
     def get_session_id
-      if ActiveRecord::VERSION::MAJOR == 4
-        render :text => "#{request.session.id}"
-      else
-        render :plain => "#{request.session.id}"
-      end
+      render :plain => "#{request.session.id}"
     end
 
     def call_reset_session
@@ -60,11 +52,7 @@ def setup
           assert_response :success
           assert_equal 'foo: "bar"', response.body
 
-          if ActiveRecord::VERSION::MAJOR == 4
-            get '/set_session_value', :foo => "baz"
-          else
-            get '/set_session_value', :params => { :foo => "baz" }
-          end
+          get '/set_session_value', :params => { :foo => "baz" }
           assert_response :success
           assert cookies['_session_id']
 
@@ -104,11 +92,7 @@ def test_getting_nil_session_value
 
   def test_calling_reset_session_twice_does_not_raise_errors
     with_test_route_set do
-      if ActiveRecord::VERSION::MAJOR == 4
-        get '/call_reset_session', :twice => "true"
-      else
-        get '/call_reset_session', :params => { :twice => "true" }
-      end
+      get '/call_reset_session', :params => { :twice => "true" }
       assert_response :success
 
       get '/get_session_value'
@@ -205,11 +189,7 @@ def test_prevents_session_fixation
 
       reset!
 
-      if ActiveRecord::VERSION::MAJOR == 4
-        get '/get_session_value', :_session_id => session_id
-      else
-        get '/get_session_value', :params => { :_session_id => session_id }
-      end
+      get '/get_session_value', :params => { :_session_id => session_id }
       assert_response :success
       assert_equal 'foo: nil', response.body
       assert_not_equal session_id, cookies['_session_id']
@@ -230,11 +210,7 @@ def test_allows_session_fixation
 
       reset!
 
-      if ActiveRecord::VERSION::MAJOR == 4
-        get '/set_session_value', :_session_id => session_id, :foo => "baz"
-      else
-        get '/set_session_value', :params => { :_session_id => session_id, :foo => "baz" }
-      end
+      get '/set_session_value', :params => { :_session_id => session_id, :foo => "baz" }
       assert_response :success
       assert_equal session_id, cookies['_session_id']
 
@@ -264,11 +240,7 @@ def test_incoming_invalid_session_id_via_cookie_should_be_ignored
   def test_incoming_invalid_session_id_via_parameter_should_be_ignored
     with_test_route_set(:cookie_only => false) do
       open_session do |sess|
-        if ActiveRecord::VERSION::MAJOR == 4
-          sess.get '/set_session_value', :_session_id => 'INVALID'
-        else
-          sess.get '/set_session_value', :params => { :_session_id => 'INVALID' }
-        end
+        sess.get '/set_session_value', :params => { :_session_id => 'INVALID' }
         new_session_id = sess.cookies['_session_id']
         assert_not_equal 'INVALID', new_session_id
 

test/action_controller_test.rb

@@ -22,7 +22,7 @@ def test_destroy_without_renew
           s['set_something_so_it_loads'] = true
 
           session_model = req.env[record_key]
-          session_model.update_attributes(:data => {'rails' => 'ftw'})
+          session_model.update(:data => {'rails' => 'ftw'})
 
           s.destroy
 
@@ -35,7 +35,7 @@ def test_destroy_with_renew
           s['set_something_so_it_loads'] = true
 
           session_model = req.env[record_key]
-          session_model.update_attributes(:data => {'rails' => 'ftw'})
+          session_model.update(:data => {'rails' => 'ftw'})
 
           s.destroy
 

test/destroy_session_test.rb

@@ -76,6 +76,4 @@ def call(env)
   end
 end
 
-if ActiveSupport::TestCase.respond_to?(:test_order=)
-  ActiveSupport::TestCase.test_order = :random
-end
+ActiveSupport::TestCase.test_order = :random

test/helper.rb

@@ -10,11 +10,7 @@ def set_session_value
     end
 
     def get_session_value
-      if ActiveRecord::VERSION::MAJOR == 4
-        render :text => "foo: #{session[:foo].inspect}"
-      else
-        render :plain => "foo: #{session[:foo].inspect}"
-      end
+      render :plain => "foo: #{session[:foo].inspect}"
     end
   end