From e262882161185ebe405c18720cd6c6b533312a44 Mon Sep 17 00:00:00 2001 From: Chris Okamoto Date: Mon, 1 Jul 2019 16:23:53 +0200 Subject: [PATCH 1/6] update to rails 5 patterns --- lib/re_track/sweeper.rb | 4 ++-- lib/re_track/tracker.rb | 2 +- lib/re_track/version.rb | 2 +- spec/dummy/app/controllers/users_controller.rb | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/re_track/sweeper.rb b/lib/re_track/sweeper.rb index 359f595..fa0c1c1 100644 --- a/lib/re_track/sweeper.rb +++ b/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 diff --git a/lib/re_track/tracker.rb b/lib/re_track/tracker.rb index 1167b11..677863a 100644 --- a/lib/re_track/tracker.rb +++ b/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 diff --git a/lib/re_track/version.rb b/lib/re_track/version.rb index f195c68..cee9d76 100644 --- a/lib/re_track/version.rb +++ b/lib/re_track/version.rb @@ -1,3 +1,3 @@ module ReTrack - VERSION = '0.7.4' + VERSION = '0.7.5' end diff --git a/spec/dummy/app/controllers/users_controller.rb b/spec/dummy/app/controllers/users_controller.rb index 21f41b3..273a10c 100644 --- a/spec/dummy/app/controllers/users_controller.rb +++ b/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 From 20466f261544cfa0b0ca9616efb96fab270d4a31 Mon Sep 17 00:00:00 2001 From: Chris Okamoto Date: Mon, 1 Jul 2019 17:04:37 +0200 Subject: [PATCH 2/6] add rails_5.gemfile --- .travis.yml | 4 ++-- gemfiles/{rails_3.gemfile => rails_5.gemfile} | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename gemfiles/{rails_3.gemfile => rails_5.gemfile} (75%) diff --git a/.travis.yml b/.travis.yml index 36e0893..ede694a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,8 @@ language: ruby rvm: - - 1.9.3 - 2.0.0 + - 2.2.0 gemfile: - - gemfiles/rails_3.gemfile - gemfiles/rails_4.gemfile + - gemfiles/rails_5.gemfile services: mongodb diff --git a/gemfiles/rails_3.gemfile b/gemfiles/rails_5.gemfile similarity index 75% rename from gemfiles/rails_3.gemfile rename to gemfiles/rails_5.gemfile index 8927a2a..2819f26 100644 --- a/gemfiles/rails_3.gemfile +++ b/gemfiles/rails_5.gemfile @@ -5,7 +5,7 @@ source "https://rubygems.org/" gem "jquery-rails" gem "responders" gem "test-unit", "~> 3.0" -gem "rails", "~> 3.2.21" -gem "mongoid", "~> 3.1.6" +gem "rails", "~> 5.0" +gem "mongoid", "~> 5" gemspec path: "../" From 5e031a7189c8751c16fa199b7bd91f03e05564af Mon Sep 17 00:00:00 2001 From: Chris Okamoto Date: Mon, 1 Jul 2019 17:08:45 +0200 Subject: [PATCH 3/6] update ruby version to 2.2.2 ikn travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ede694a..8de221c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: ruby rvm: - 2.0.0 - - 2.2.0 + - 2.2.2 gemfile: - gemfiles/rails_4.gemfile - gemfiles/rails_5.gemfile From 98db949eb5807ce63bb451e904a45382b4b3fc33 Mon Sep 17 00:00:00 2001 From: Chris Okamoto Date: Tue, 2 Jul 2019 11:09:51 +0200 Subject: [PATCH 4/6] remove ruby 2.0.0 from travis.yml --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8de221c..1e0d25c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ language: ruby rvm: - - 2.0.0 - 2.2.2 gemfile: - gemfiles/rails_4.gemfile From f29c090264e50652f99e7e342a944f04999520f0 Mon Sep 17 00:00:00 2001 From: Chris Okamoto Date: Tue, 2 Jul 2019 11:17:01 +0200 Subject: [PATCH 5/6] testig --- Appraisals | 5 +++++ gemfiles/rails_5.gemfile | 2 +- re_track.gemspec | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Appraisals b/Appraisals index dba4e49..5bd14fe 100644 --- a/Appraisals +++ b/Appraisals @@ -7,3 +7,8 @@ appraise 'rails-4' do gem 'rails', '~> 4.0' gem 'mongoid', '~> 4' end + +appraise 'rails-5' do + gem 'rails', '~> 5.0' + gem 'mongoid', '~> 6' +end diff --git a/gemfiles/rails_5.gemfile b/gemfiles/rails_5.gemfile index 2819f26..5b4d9af 100644 --- a/gemfiles/rails_5.gemfile +++ b/gemfiles/rails_5.gemfile @@ -6,6 +6,6 @@ gem "jquery-rails" gem "responders" gem "test-unit", "~> 3.0" gem "rails", "~> 5.0" -gem "mongoid", "~> 5" +gem "mongoid", "~> 6" gemspec path: "../" diff --git a/re_track.gemspec b/re_track.gemspec index 188b176..8ff06de 100644 --- a/re_track.gemspec +++ b/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' From 9529ae2b136c8f5a11d45491a216858993971a44 Mon Sep 17 00:00:00 2001 From: Chris Okamoto Date: Tue, 2 Jul 2019 11:26:26 +0200 Subject: [PATCH 6/6] changes on mongoid.yml --- Appraisals | 5 ----- re_track.gemspec | 2 +- spec/dummy/config/mongoid.yml | 23 ++++++++++++++--------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Appraisals b/Appraisals index 5bd14fe..f6336fe 100644 --- a/Appraisals +++ b/Appraisals @@ -1,8 +1,3 @@ -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' diff --git a/re_track.gemspec b/re_track.gemspec index 8ff06de..199d47b 100644 --- a/re_track.gemspec +++ b/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', '>= 6' + s.add_runtime_dependency 'mongoid', '>= 4' s.add_runtime_dependency 'activesupport' s.add_development_dependency 'rspec-rails' diff --git a/spec/dummy/config/mongoid.yml b/spec/dummy/config/mongoid.yml index 4086424..fd355ce 100644 --- a/spec/dummy/config/mongoid.yml +++ b/spec/dummy/config/mongoid.yml @@ -1,16 +1,21 @@ -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