Fix build and test against Rails 5.1 and 5.2

.travis.yml

@@ -17,12 +17,24 @@ gemfile:
   - gemfiles/Gemfile.rails-4.1.rb
   - gemfiles/Gemfile.rails-4.2.rb
   - gemfiles/Gemfile.rails-5.0.rb
+  - gemfiles/Gemfile.rails-5.1.rb
+  - gemfiles/Gemfile.rails-5.2.rb
 
 before_install:
   - gem update bundler
 
 matrix:
   exclude:
+    - rvm: 2.1.0
+      gemfile: gemfiles/Gemfile.rails-5.2.rb
+    - rvm: 2.2.0
+      gemfile: gemfiles/Gemfile.rails-5.2.rb
+    - rvm: jruby-9.1.13.0
+      gemfile: gemfiles/Gemfile.rails-5.2.rb
+    - rvm: 2.1.0
+      gemfile: gemfiles/Gemfile.rails-5.1.rb
+    - rvm: 2.2.0
+      gemfile: gemfiles/Gemfile.rails-5.1.rb
     - rvm: 2.1.0
       gemfile: gemfiles/Gemfile.rails-5.0.rb
     - rvm: 2.2.0
@@ -31,6 +43,11 @@ matrix:
       gemfile: gemfiles/Gemfile.rails-4.0.rb
     - rvm: 2.4.0
       gemfile: gemfiles/Gemfile.rails-4.1.rb
+  allow_failures:
+    - rvm: jruby-9.1.13.0
+      gemfile: gemfiles/Gemfile.rails-5.1.rb
+    - rvm: jruby-9.1.13.0
+      gemfile: gemfiles/Gemfile.rails-5.0.rb
 
 sudo: false
 

gemfiles/Gemfile.rails-4.0.rb

@@ -18,7 +18,7 @@
   platforms :ruby, :rbx do
     gem 'sqlite3'
     gem 'mysql2', '~> 0.3.10'
-    gem 'pg'
+    gem 'pg', '~> 0.15'
     gem 'redcarpet'
   end
 

gemfiles/Gemfile.rails-4.1.rb

@@ -17,7 +17,7 @@
   platforms :ruby, :rbx do
     gem 'sqlite3'
     gem 'mysql2', '~> 0.3.13'
-    gem 'pg'
+    gem 'pg', '~> 0.15'
     gem 'redcarpet'
   end
 

gemfiles/Gemfile.rails-4.2.rb

@@ -16,8 +16,8 @@
 
   platforms :ruby, :rbx do
     gem 'sqlite3'
-    gem 'mysql2'
-    gem 'pg'
+    gem 'mysql2', '~> 0.4.10'
+    gem 'pg', '~> 0.15'
     gem 'redcarpet'
   end
 

gemfiles/Gemfile.rails-5.0.rb

@@ -9,8 +9,8 @@
 # Database Configuration
 group :development, :test do
   platforms :jruby do
-    gem 'activerecord-jdbcmysql-adapter', git: 'https://github.com/jruby/activerecord-jdbc-adapter.git', branch: 'rails-5'
-    gem 'activerecord-jdbcpostgresql-adapter', git: 'https://github.com/jruby/activerecord-jdbc-adapter.git', branch: 'rails-5'
+    gem 'activerecord-jdbcmysql-adapter', git: 'https://github.com/jruby/activerecord-jdbc-adapter', branch: '50-stable'
+    gem 'activerecord-jdbcpostgresql-adapter', git: 'https://github.com/jruby/activerecord-jdbc-adapter', branch: '50-stable'
     gem 'kramdown'
   end
 

gemfiles/Gemfile.rails-5.1.rb

@@ -0,0 +1,27 @@
+source 'https://rubygems.org'
+
+gemspec path: '../'
+
+gem 'activerecord', '~> 5.1.0'
+gem 'railties', '~> 5.1.0'
+
+# Database Configuration
+group :development, :test do
+  platforms :jruby do
+    gem 'activerecord-jdbcmysql-adapter', git: 'https://github.com/jruby/activerecord-jdbc-adapter', branch: 'master'
+    gem 'activerecord-jdbcpostgresql-adapter', git: 'https://github.com/jruby/activerecord-jdbc-adapter', branch: 'master'
+    gem 'kramdown'
+  end
+
+  platforms :ruby, :rbx do
+    gem 'sqlite3'
+    gem 'mysql2'
+    gem 'pg'
+    gem 'redcarpet'
+  end
+
+  platforms :rbx do
+    gem 'rubysl', '~> 2.0'
+    gem 'rubinius-developer_tools'
+  end
+end

gemfiles/Gemfile.rails-5.2.rb

@@ -0,0 +1,27 @@
+source 'https://rubygems.org'
+
+gemspec path: '../'
+
+gem 'activerecord', '~> 5.2.0'
+gem 'railties', '~> 5.2.0'
+
+# Database Configuration
+group :development, :test do
+  platforms :jruby do
+    gem 'activerecord-jdbcmysql-adapter', git: 'https://github.com/jruby/activerecord-jdbc-adapter', branch: 'master'
+    gem 'activerecord-jdbcpostgresql-adapter', git: 'https://github.com/jruby/activerecord-jdbc-adapter', branch: 'master'
+    gem 'kramdown'
+  end
+
+  platforms :ruby, :rbx do
+    gem 'sqlite3'
+    gem 'mysql2'
+    gem 'pg'
+    gem 'redcarpet'
+  end
+
+  platforms :rbx do
+    gem 'rubysl', '~> 2.0'
+    gem 'rubinius-developer_tools'
+  end
+end

lib/friendly_id.rb

@@ -4,7 +4,6 @@
 require "friendly_id/object_utils"
 require "friendly_id/configuration"
 require "friendly_id/finder_methods"
-require 'friendly_id/railtie' if defined?(Rails)
 
 =begin
 

lib/friendly_id/object_utils.rb

@@ -70,3 +70,7 @@ def self.mark_as_unfriendly(klass)
 # one of its descendants.
 
 FriendlyId::UNFRIENDLY_CLASSES.each { |klass| FriendlyId.mark_as_unfriendly(klass) }
+
+ActiveSupport.on_load(:active_record) do
+  FriendlyId.mark_as_unfriendly(ActiveRecord::Base)
+end