Update build matrix

.travis.yml

@@ -19,14 +19,15 @@ env:
     - JRUBY_OPTS="$JRUBY_OPTS --debug"
 
 rvm:
-  - 2.3.4
+  - 2.3.6
 
 gemfile:
   - gemfiles/rails_4.0.gemfile
   - gemfiles/rails_4.1.gemfile
   - gemfiles/rails_4.2.gemfile
   - gemfiles/rails_5.0.gemfile
   - gemfiles/rails_5.1.gemfile
+  - gemfiles/rails_5.2.gemfile
 
 services:
   - mongodb
@@ -37,57 +38,60 @@ sudo: false
 
 matrix:
   include:
-    - rvm: 2.1.10
-      env: CI_ORM=active_record CI_DB_ADAPTER=sqlite3
-      gemfile: gemfiles/rails_4.2.gemfile
     - rvm: 2.1.10
       env: CI_ORM=mongoid
       gemfile: gemfiles/rails_4.2.gemfile
-    - rvm: 2.2.7
+    - rvm: 2.1.10
       env: CI_ORM=active_record CI_DB_ADAPTER=sqlite3
-      gemfile: gemfiles/rails_5.0.gemfile
-    - rvm: 2.2.7
-      env: CI_ORM=mongoid
       gemfile: gemfiles/rails_4.2.gemfile
-    - rvm: 2.3.4
+    - rvm: 2.2.9
+      env: CI_ORM=mongoid
+      gemfile: gemfiles/rails_5.1.gemfile
+    - rvm: 2.2.9
+      env: CI_ORM=active_record CI_DB_ADAPTER=sqlite3
+      gemfile: gemfiles/rails_5.1.gemfile
+    - rvm: 2.3.6
       env: CI_ORM=active_record CI_DB_ADAPTER=mysql2
-      gemfile: gemfiles/rails_5.0.gemfile
-    - rvm: 2.3.4
+      gemfile: gemfiles/rails_5.1.gemfile
+    - rvm: 2.3.6
       env: CI_ORM=active_record CI_DB_ADAPTER=postgresql CI_DB_USERNAME=postgres
-      gemfile: gemfiles/rails_5.0.gemfile
-    - rvm: 2.4.1
+      gemfile: gemfiles/rails_5.1.gemfile
+    - rvm: 2.4.3
+      env: CI_ORM=mongoid
+      gemfile: gemfiles/rails_5.1.gemfile
+    - rvm: 2.4.3
       env: CI_ORM=active_record CI_DB_ADAPTER=sqlite3
-      gemfile: gemfiles/rails_5.0.gemfile
-    - rvm: 2.4.1
+      gemfile: gemfiles/rails_5.1.gemfile
+    - rvm: 2.5.0
+      env: CI_ORM=mongoid
+      gemfile: gemfiles/rails_5.1.gemfile
+    - rvm: 2.5.0
       env: CI_ORM=active_record CI_DB_ADAPTER=sqlite3
       gemfile: gemfiles/rails_5.1.gemfile
     - rvm: ruby-head
       env: CI_ORM=mongoid
-      gemfile: gemfiles/rails_4.2.gemfile
+      gemfile: gemfiles/rails_5.1.gemfile
     - rvm: ruby-head
       env: CI_ORM=active_record CI_DB_ADAPTER=sqlite3
-      gemfile: gemfiles/rails_5.0.gemfile
+      gemfile: gemfiles/rails_5.1.gemfile
     - rvm: rbx-2.2.7
       env: CI_ORM=active_record CI_DB_ADAPTER=sqlite3
       gemfile: gemfiles/rails_4.2.gemfile
     - rvm: jruby-9.1.9.0
       env: CI_ORM=mongoid
-      gemfile: gemfiles/rails_4.2.gemfile
+      gemfile: gemfiles/rails_5.0.gemfile
     - rvm: jruby-9.1.9.0
       env: CI_ORM=active_record CI_DB_ADAPTER=sqlite3
-      gemfile: gemfiles/rails_4.2.gemfile
+      gemfile: gemfiles/rails_5.0.gemfile
     - rvm: jruby-head
       env: CI_ORM=active_record CI_DB_ADAPTER=sqlite3
-      gemfile: gemfiles/rails_5.0.gemfile
+      gemfile: gemfiles/rails_5.1.gemfile
   allow_failures:
-    - rvm: 2.4.1
-    - rvm: jruby-head
-    - rvm: rbx-2.2.7
+    - rvm: 2.4.3
     - rvm: ruby-head
-    - env: CI_ORM=mongoid
-      gemfile: gemfiles/rails_5.0.gemfile
-    - env: CI_ORM=mongoid
-      gemfile: gemfiles/rails_5.1.gemfile
+    - rvm: rbx-2.2.7
+    - rvm: jruby-head
+    - gemfile: gemfiles/rails_5.2.gemfile
   fast_finish: true
 
 notifications:

Appraisals

@@ -21,10 +21,10 @@ appraise "rails-4.0" do
     gem 'kaminari-mongoid', '~> 0.1'
     gem 'mongoid-paperclip', '>= 0.0.8', require: 'mongoid_paperclip'
     gem 'carrierwave-mongoid', '>= 0.6.3', require: 'carrierwave/mongoid'
-    gem 'refile-mongoid', github: 'DimaSamodurov/refile-mongoid', platforms: [:ruby_21, :ruby_22, :ruby_23]
+    gem 'refile-mongoid', github: 'DimaSamodurov/refile-mongoid', platforms: :ruby
   end
 
-  platforms :ruby_21, :ruby_22, :ruby_23 do
+  platforms :ruby do
     gem 'refile', '~> 0.5', require: 'refile/rails'
     gem 'refile-mini_magick', '>= 0.1.0'
   end
@@ -50,10 +50,10 @@ appraise "rails-4.1" do
     gem 'kaminari-mongoid'
     gem 'mongoid-paperclip', '>= 0.0.8', require: 'mongoid_paperclip'
     gem 'carrierwave-mongoid', '>= 0.6.3', require: 'carrierwave/mongoid'
-    gem 'refile-mongoid', github: 'DimaSamodurov/refile-mongoid', platforms: [:ruby_21, :ruby_22, :ruby_23]
+    gem 'refile-mongoid', github: 'DimaSamodurov/refile-mongoid', platforms: :ruby
   end
 
-  platforms :ruby_21, :ruby_22, :ruby_23 do
+  platforms :ruby do
     gem 'refile', '~> 0.5', require: 'refile/rails'
     gem 'refile-mini_magick', '>= 0.1.0'
   end
@@ -80,10 +80,10 @@ appraise "rails-4.2" do
     gem 'kaminari-mongoid'
     gem 'mongoid-paperclip', '>= 0.0.8', require: 'mongoid_paperclip'
     gem 'carrierwave-mongoid', '>= 0.6.3', require: 'carrierwave/mongoid'
-    gem 'refile-mongoid', github: 'DimaSamodurov/refile-mongoid', platforms: [:ruby_21, :ruby_22, :ruby_23]
+    gem 'refile-mongoid', github: 'DimaSamodurov/refile-mongoid', platforms: :ruby
   end
 
-  platforms :ruby_21, :ruby_22, :ruby_23 do
+  platforms :ruby do
     gem 'refile', '~> 0.5', require: 'refile/rails'
     gem 'refile-mini_magick', '>= 0.1.0'
   end
@@ -115,14 +115,33 @@ end
 appraise "rails-5.1" do
   gem 'rails', '~> 5.1.0'
   gem 'sass-rails', '~> 5.0'
+  gem 'devise', '~> 4.0'
+
+  group :active_record do
+    gem 'pg', '~> 0.14'
+    gem 'paper_trail', '>= 5.0'
+  end
+
+  group :mongoid do
+    gem 'mongoid', '~> 6.0'
+    gem 'kaminari-mongoid'
+    gem 'mongoid-paperclip', '>= 0.0.8', require: 'mongoid_paperclip'
+    gem 'carrierwave-mongoid', '>= 0.6.3', require: 'carrierwave/mongoid'
+  end
+end
+
+appraise "rails-5.2" do
+  gem 'rails', '~> 5.2.0.rc1'
+  gem 'sass-rails', '~> 5.0'
   gem 'devise', github: 'plataformatec/devise'
 
   group :active_record do
+    gem 'pg', '>= 1.0.0'
     gem 'paper_trail', '>= 5.0'
   end
 
   group :mongoid do
-    gem 'mongoid', '>= 6.0.0.beta'
+    gem 'mongoid', '>= 7.0.0.beta'
     gem 'kaminari-mongoid'
     gem 'mongoid-paperclip', '>= 0.0.8', require: 'mongoid_paperclip'
     gem 'carrierwave-mongoid', '>= 0.6.3', require: 'carrierwave/mongoid'

Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 gem 'appraisal', '>= 2.0'
-gem 'rails', '~> 5.0.0'
+gem 'rails', '~> 5.1.0'
 gem 'haml'
 gem 'devise'
 
@@ -10,7 +10,6 @@ group :active_record do
 
   platforms :ruby, :mswin, :mingw do
     gem 'mysql2', '~> 0.3.14'
-    gem 'pg', '>= 0.14'
     gem 'sqlite3', '>= 1.3'
   end
 end

gemfiles/rails_4.0.gemfile

@@ -16,7 +16,6 @@ group :active_record do
 
   platforms :ruby, :mswin, :mingw do
     gem "mysql2", "~> 0.3.14"
-    gem "pg", ">= 0.14"
     gem "sqlite3", ">= 1.3"
   end
 
@@ -61,10 +60,10 @@ group :mongoid do
   gem "kaminari-mongoid", "~> 0.1"
   gem "mongoid-paperclip", ">= 0.0.8", require: "mongoid_paperclip"
   gem "carrierwave-mongoid", ">= 0.6.3", require: "carrierwave/mongoid"
-  gem "refile-mongoid", github: "DimaSamodurov/refile-mongoid", platforms: [:ruby_21, :ruby_22, :ruby_23]
+  gem "refile-mongoid", github: "DimaSamodurov/refile-mongoid", platforms: :ruby
 end
 
-platforms :ruby_21, :ruby_22, :ruby_23 do
+platforms :ruby do
   gem "refile", "~> 0.5", require: "refile/rails"
   gem "refile-mini_magick", ">= 0.1.0"
 end

gemfiles/rails_4.1.gemfile

@@ -13,7 +13,6 @@ group :active_record do
 
   platforms :ruby, :mswin, :mingw do
     gem "mysql2", "~> 0.3.14"
-    gem "pg", ">= 0.14"
     gem "sqlite3", ">= 1.3"
   end
 
@@ -58,10 +57,10 @@ group :mongoid do
   gem "kaminari-mongoid"
   gem "mongoid-paperclip", ">= 0.0.8", require: "mongoid_paperclip"
   gem "carrierwave-mongoid", ">= 0.6.3", require: "carrierwave/mongoid"
-  gem "refile-mongoid", github: "DimaSamodurov/refile-mongoid", platforms: [:ruby_21, :ruby_22, :ruby_23]
+  gem "refile-mongoid", github: "DimaSamodurov/refile-mongoid", platforms: :ruby
 end
 
-platforms :ruby_21, :ruby_22, :ruby_23 do
+platforms :ruby do
   gem "refile", "~> 0.5", require: "refile/rails"
   gem "refile-mini_magick", ">= 0.1.0"
 end

gemfiles/rails_4.2.gemfile

@@ -14,7 +14,6 @@ group :active_record do
 
   platforms :ruby, :mswin, :mingw do
     gem "mysql2", "~> 0.3.14"
-    gem "pg", ">= 0.14"
     gem "sqlite3", ">= 1.3"
   end
 
@@ -59,10 +58,10 @@ group :mongoid do
   gem "kaminari-mongoid"
   gem "mongoid-paperclip", ">= 0.0.8", require: "mongoid_paperclip"
   gem "carrierwave-mongoid", ">= 0.6.3", require: "carrierwave/mongoid"
-  gem "refile-mongoid", github: "DimaSamodurov/refile-mongoid", platforms: [:ruby_21, :ruby_22, :ruby_23]
+  gem "refile-mongoid", github: "DimaSamodurov/refile-mongoid", platforms: :ruby
 end
 
-platforms :ruby_21, :ruby_22, :ruby_23 do
+platforms :ruby do
   gem "refile", "~> 0.5", require: "refile/rails"
   gem "refile-mini_magick", ">= 0.1.0"
 end

gemfiles/rails_5.0.gemfile

@@ -13,7 +13,6 @@ group :active_record do
 
   platforms :ruby, :mswin, :mingw do
     gem "mysql2", "~> 0.3.14"
-    gem "pg", ">= 0.14"
     gem "sqlite3", ">= 1.3"
   end
 

gemfiles/rails_5.1.gemfile

@@ -5,15 +5,15 @@ source "https://rubygems.org"
 gem "appraisal", ">= 2.0"
 gem "rails", "~> 5.1.0"
 gem "haml"
-gem "devise", github: "plataformatec/devise"
+gem "devise", "~> 4.0"
 gem "sass-rails", "~> 5.0"
 
 group :active_record do
   gem "paper_trail", ">= 5.0"
+  gem "pg", "~> 0.14"
 
   platforms :ruby, :mswin, :mingw do
     gem "mysql2", "~> 0.3.14"
-    gem "pg", ">= 0.14"
     gem "sqlite3", ">= 1.3"
   end
 end
@@ -48,7 +48,7 @@ group :test do
 end
 
 group :mongoid do
-  gem "mongoid", ">= 6.0.0.beta"
+  gem "mongoid", "~> 6.0"
   gem "kaminari-mongoid"
   gem "mongoid-paperclip", ">= 0.0.8", require: "mongoid_paperclip"
   gem "carrierwave-mongoid", ">= 0.6.3", require: "carrierwave/mongoid"

gemfiles/rails_5.2.gemfile

@@ -0,0 +1,57 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal", ">= 2.0"
+gem "rails", "~> 5.2.0.rc1"
+gem "haml"
+gem "devise", github: "plataformatec/devise"
+gem "sass-rails", "~> 5.0"
+
+group :active_record do
+  gem "paper_trail", ">= 5.0"
+  gem "pg", ">= 1.0.0"
+
+  platforms :ruby, :mswin, :mingw do
+    gem "mysql2", "~> 0.3.14"
+    gem "sqlite3", ">= 1.3"
+  end
+end
+
+group :development, :test do
+  gem "pry", ">= 0.9"
+end
+
+group :test do
+  gem "cancan", ">= 1.6"
+  gem "cancancan", "~> 1.12.0"
+  gem "carrierwave", ">= 0.8"
+  gem "coveralls"
+  gem "database_cleaner", [">= 1.2", "!= 1.4.0", "!= 1.5.0"]
+  gem "dragonfly", "~> 1.0"
+  gem "factory_girl", ">= 4.2"
+  gem "generator_spec", ">= 0.8"
+  gem "launchy", ">= 2.2"
+  gem "mini_magick", ">= 3.4"
+  gem "paperclip", [">= 3.4", "!= 4.3.0"]
+  gem "poltergeist", "~> 1.5"
+  gem "pundit"
+  gem "rack-cache", require: "rack/cache"
+  gem "rspec-rails", ">= 2.14"
+  gem "rubocop", "~> 0.41.2"
+  gem "simplecov", ">= 0.9", require: false
+  gem "timecop", ">= 0.5"
+
+  platforms :ruby_19 do
+    gem "tins", "~> 1.6.0", require: false
+  end
+end
+
+group :mongoid do
+  gem "mongoid", ">= 7.0.0.beta"
+  gem "kaminari-mongoid"
+  gem "mongoid-paperclip", ">= 0.0.8", require: "mongoid_paperclip"
+  gem "carrierwave-mongoid", ">= 0.6.3", require: "carrierwave/mongoid"
+end
+
+gemspec path: "../"

spec/dummy_app/config/initializers/mongoid.rb

@@ -0,0 +1,9 @@
+if CI_ORM == :mongoid
+  filename =
+    if Mongoid.respond_to?(:belongs_to_required_by_default=)
+      "mongoid6.yml"
+    else
+      "mongoid5.yml"
+    end
+  ::Mongoid.load!(Rails.root.join("config", filename))
+end

spec/dummy_app/config/mongoid.yml → spec/dummy_app/config/mongoid5.yml

@@ -5,28 +5,16 @@ defaults: &defaults
 development:
   <<: *defaults
   database: dummy_app_development
-  sessions:
-    default:
-      database: dummy_app_development
-      hosts:
-        - localhost:27017
   clients:
     default:
       database: dummy_app_development
       hosts:
-        - localhost:27017
-
+        - 127.0.0.1:27017
 
 test:
   <<: *defaults
-  database: dummy_app_test
-  sessions:
-    default:
-      database: dummy_app_test
-      hosts:
-        - localhost:27017
   clients:
     default:
       database: dummy_app_test
       hosts:
-        - localhost:27017
+        - 127.0.0.1:27017