Merge a75149a into 01a39fd

.travis.yml

@@ -1,25 +1,21 @@
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.2
   - 2.2.2
   - 2.3.0
+  - 2.4.3
+  - 2.5.0
 
 gemfile:
-  - Gemfile.activerecord32
-  - Gemfile.activerecord40
-  - Gemfile.activerecord41
-  - Gemfile.activerecord42
-  - Gemfile.activerecord50
+  - gemfiles/Gemfile.activerecord50
+  - gemfiles/Gemfile.activerecord51
+  - gemfiles/Gemfile.activerecord52
+  - gemfiles/Gemfile.activerecord-edge
 
 matrix:
   exclude:
-    - rvm: 1.9.3
-      gemfile: Gemfile.activerecord50
-    - rvm: 2.0.0
-      gemfile: Gemfile.activerecord50
-    - rvm: 2.1.2
-      gemfile: Gemfile.activerecord50
+    - rvm: 2.2.2
+      gemfile: gemfiles/Gemfile.activerecord-edge
+    - rvm: 2.3.0
+      gemfile: gemfiles/Gemfile.activerecord-edge
 
 before_script:
   - mysql -e 'create database pedant_mysql2_test;'

activerecord-pedantmysql2-adapter.gemspec

@@ -13,12 +13,14 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/Shopify/activerecord-pedantmysql2-adapter'
   spec.license       = 'MIT'
 
+  spec.required_ruby_version = '>= 2.2.2'
+
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activerecord', '>= 3.2'
+  spec.add_dependency 'activerecord', '>= 5.0'
   spec.add_dependency 'mysql2', '>= 0.3.12'
   spec.add_development_dependency 'bundler', '~> 1.5'
   spec.add_development_dependency 'rake'

gemfiles/Gemfile.activerecord-edge

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+gemspec path: '..'
+
+gem 'activerecord', github: 'rails/rails', branch: 'master'

Gemfile.activerecord50 → gemfiles/Gemfile.activerecord50

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
-gemspec
+gemspec path: '..'
 
 gem 'activerecord', '~> 5.0.0'

gemfiles/Gemfile.activerecord51

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+gemspec path: '..'
+
+gem 'activerecord', '~> 5.1.0'

gemfiles/Gemfile.activerecord52

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+gemspec path: '..'
+
+gem 'activerecord', github: 'rails/rails', branch: '5-2-stable'

spec/support/database.rb

@@ -1,11 +1,12 @@
 ActiveRecord::Base.configurations = {
   'test' => {
-    adapter: 'pedant_mysql2',
-    database: 'pedant_mysql2_test',
-    username: 'travis',
-    encoding: 'utf8',
-    strict: false,
-    pool: 5,
-  },
+    'adapter' => 'pedant_mysql2',
+    'database' => 'pedant_mysql2_test',
+    'username' => 'travis',
+    'encoding' => 'utf8',
+    'strict' => false,
+    'pool' => 5,
+  }
 }
+
 ActiveRecord::Base.establish_connection(:test)