Merge 564860a into a27fb52

.ruby-version

@@ -1 +1 @@
-ruby-2.0.0
+ruby-2.2.2

.travis.yml

@@ -1,8 +1,6 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
+  - 2.2.2
 gemfile:
-  - gemfiles/rails_3.gemfile
-  - gemfiles/rails_4.gemfile
+  - gemfiles/rails_5.gemfile
 services: mongodb

Appraisals

@@ -1,9 +1,4 @@
-appraise 'rails-3' do
-  gem 'rails', '~> 3.2.21'
-  gem 'mongoid', '~> 3.1.6'
-end
-
-appraise 'rails-4' do
-  gem 'rails', '~> 4.0'
-  gem 'mongoid', '~> 4'
+appraise 'rails-5' do
+  gem 'rails', '~> 5.0'
+  gem 'mongoid', '~> 6'
 end

gemfiles/rails_4.gemfile → gemfiles/rails_5.gemfile

@@ -5,7 +5,7 @@ source "https://rubygems.org/"
 gem "jquery-rails"
 gem "responders"
 gem "test-unit", "~> 3.0"
-gem "rails", "~> 4.0"
-gem "mongoid", "~> 4"
+gem "rails", "~> 5.0"
+gem "mongoid", "~> 6"
 
 gemspec path: "../"

lib/re_track/sweeper.rb

@@ -5,7 +5,7 @@ module Sweeper
     mattr_accessor :rt_model_instance_names
 
     included do
-      after_filter :rt_after_filter, only: :create
+      after_action :rt_after_action, only: :create
     end
 
     module ClassMethods
@@ -20,7 +20,7 @@ def rt_record_instance_names
 
     private
 
-      def rt_after_filter
+      def rt_after_action
         rt_records.each { |record| rt_after_create record }
         true
       end

lib/re_track/tracker.rb

@@ -3,7 +3,7 @@ module Tracker
     extend ActiveSupport::Concern
 
     included do
-      before_filter :rt_track_referer
+      before_action :rt_track_referer
     end
 
     private

lib/re_track/version.rb

@@ -1,3 +1,3 @@
 module ReTrack
-  VERSION = '0.7.4'
+  VERSION = '0.7.5'
 end

re_track.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_runtime_dependency 'rails'
-  s.add_runtime_dependency 'mongoid', '>= 3'
+  s.add_runtime_dependency 'mongoid', '>= 6'
   s.add_runtime_dependency 'activesupport'
 
   s.add_development_dependency 'rspec-rails'

spec/dummy/app/controllers/users_controller.rb

@@ -3,7 +3,7 @@ class UsersController < ApplicationController
   re_track :user
 
   respond_to :html
-  before_filter :get_user, only: [:show, :edit, :update, :destroy]
+  before_action :get_user, only: [:show, :edit, :update, :destroy]
 
   def index
     @users = User.all

spec/dummy/config/mongoid.yml

@@ -1,16 +1,22 @@
-development:
-  sessions:
-    default:
-      database: retrack_dummy_development
-      hosts:
-        - localhost:27017
+default_session: &default_session
+  hosts:
+    - localhost:27017
+  database: retrack_dummy_development
   options:
+
+defaults: &defaults
+  clients:
+    default:
+      <<: *default_session
+
+development:
+  <<: *defaults
+
 test:
-  sessions:
+  clients:
     default:
+      <<: *default_session
       database: retrack_dummy_test
-      hosts:
-        - localhost:27017
       options:
         # consistency: :strong
         # In the test environment we lower the retries and retry interval to