Rails 5 Support

README.md

@@ -2,9 +2,10 @@
 
 [![Gem Version](https://badge.fury.io/rb/postamt.png)](http://rubygems.org/gems/postamt)
 
-Postamt is a sane, solution for performing database reads against a hot standby server with Rails 4.1 and 4.2.
+Postamt is a sane solution for performing database reads against a hot standby server with Rails.
 
-If you use Rails 3.2 or 4.0, use Postamt version 0.9.2.
+For Rails 4.1 and above, the current Postamt version is `0.10.0`.
+If you use Rails 3.2 or 4.0, use Postamt version `0.9.2`.
 
 Choose per model and/or controller&action whether a read-only query
 should be sent to master or a hot standby.<br />
@@ -20,8 +21,6 @@ through [officially-supported Rails
 APIs](https://github.com/rails/rails/commit/ba1544d71628abff2777c9c514142d7e9a159111#commitcomment-2106059).
 That's why there's so little code compared to similar gems.
 
-Postamt requires Rails 3.2+ and works with Rails 4.
-
 ## Installation
 
 Add this line to your application's Gemfile:

lib/postamt.rb

@@ -44,11 +44,7 @@ def self.overwritten_default_connections
 
   # Called by Postamt::Railtie
   def self.hook!
-    if Rails::VERSION::MAJOR == 4 and Rails::VERSION::MINOR <= 2
-      ActiveRecord::Base.default_connection_handler = Postamt::ConnectionHandler.new
-    elsif Rails::VERSION::MAJOR == 3 and Rails::VERSION::MINOR == 2
-      ActiveRecord::Base.connection_handler = Postamt::ConnectionHandler.new
-    end
+    ActiveRecord::Base.default_connection_handler = Postamt::ConnectionHandler.new
 
     ActiveRecord::Base.instance_eval do
       class_attribute :default_connection
@@ -73,7 +69,7 @@ def transaction(options = {}, &block)
       def use_db_connection(connection, args)
         klass_names = args.delete(:for)
         if klass_names == :all
-          around_filter(args) do |controller|
+          around_action(args) do |controller|
             Postamt.on(connection) { yield }
           end
         else
@@ -82,13 +78,13 @@ def use_db_connection(connection, args)
             default_connections[klass_name] = connection
           end
 
-          before_filter(args) do |controller|
+          before_action(args) do |controller|
             Postamt.overwritten_default_connections.merge!(default_connections)
           end
         end
       end
 
-      after_filter do
+      after_action do
         Postamt.overwritten_default_connections.clear
       end
     end

lib/postamt/connection_handler.rb

@@ -110,18 +110,8 @@ def pool_for(klass)
       @pools[connection] ||= begin
         Postamt.configurations[connection.to_s] ||= Postamt.configurations['master']
 
-        spec = if Rails::VERSION::MAJOR == 4 and Rails::VERSION::MINOR <= 2
-          resolver = ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.new Postamt.configurations
-          resolver.spec(connection)
-        elsif Rails::VERSION::MAJOR == 4 and Rails::VERSION::MINOR == 0
-          resolver = ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.new connection, Postamt.configurations
-          resolver.spec
-        elsif Rails::VERSION::MAJOR == 3 and Rails::VERSION::MINOR == 2
-          resolver = ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.new connection, Postamt.configurations
-          resolver.spec
-        else
-          abort "Postamt doesn't support Rails version #{Rails.version}"
-        end
+        resolver = ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.new(Postamt.configurations)
+        spec = resolver.spec(connection)
 
         unless ActiveRecord::Base.respond_to?(spec.adapter_method)
           raise ActiveRecord::AdapterNotFound, "database configuration specifies nonexistent #{spec.config[:adapter]} adapter"

lib/postamt/version.rb

@@ -1,3 +1,3 @@
 module Postamt
-  VERSION = "0.9.7"
+  VERSION = "0.10.0"
 end

postamt.gemspec

@@ -18,9 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 2.1.1'
-  spec.add_dependency "railties", ["~> 4.1", "< 4.3"]
-  spec.add_dependency "activerecord", ["~> 4.1", "< 4.3"]
+  spec.required_ruby_version = '>= 2.2.0'
+  spec.add_dependency "railties", [">= 4.1", "< 5.1"]
+  spec.add_dependency "activerecord", [">= 4.1", "< 5.1"]
   spec.add_dependency "thread_safe", [">= 0.3.3"]
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

testapp42/.gitignore → testapp50/.gitignore

@@ -1,4 +1,4 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
+# See https://help.github.com/articles/ignoring-files for more about ignoring files.
 #
 # If you find yourself ignoring temporary files generated by your text editor
 # or operating system, you probably want to add a global ignore instead:
@@ -7,6 +7,15 @@
 # Ignore bundler config.
 /.bundle
 
+# Ignore the default SQLite database.
+/db/*.sqlite3
+/db/*.sqlite3-journal
+
 # Ignore all logfiles and tempfiles.
-/log/*.log
-/tmp
+/log/*
+/tmp/*
+!/log/.keep
+!/tmp/.keep
+
+# Ignore Byebug command history file.
+.byebug_history