From 7f1c1cbc06affd81c086221b80e18757d8552d09 Mon Sep 17 00:00:00 2001 From: Stepan Melnikov Date: Thu, 22 Mar 2018 20:19:01 +1000 Subject: [PATCH 1/4] [WIP] Increase Rails version to see what happens on Rails 5 --- survey.gemspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/survey.gemspec b/survey.gemspec index 31d8e3e..1b19534 100644 --- a/survey.gemspec +++ b/survey.gemspec @@ -11,8 +11,8 @@ Gem::Specification.new do |s| s.authors = %Q{Runtime Revolution} s.require_paths = %w(lib) - s.add_dependency("rails", [">= 3.2.6", "< 5"]) - s.add_dependency("railties", ">= 3.2.6", "< 5") + s.add_dependency("rails", [">= 3.2.6", "< 6"]) + s.add_dependency("railties", ">= 3.2.6", "< 6") s.add_development_dependency("mocha") s.add_development_dependency("faker") s.add_development_dependency("rake") From 53e1a9dff6ac36fbfd07e5a6d44da498f9372a1d Mon Sep 17 00:00:00 2001 From: unn4m3d Date: Thu, 22 Mar 2018 21:04:32 +1000 Subject: [PATCH 2/4] Small fix --- lib/survey.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/survey.rb b/lib/survey.rb index be0e532..459fe07 100644 --- a/lib/survey.rb +++ b/lib/survey.rb @@ -1,10 +1,14 @@ module ::Kernel + def rails5? + return defined?(Rails) && Rails::VERSION::MAJOR == 5 + end + def rails4? return defined?(Rails) && Rails::VERSION::MAJOR == 4 end def in_rails_3(&block) - yield if block_given? unless rails4? + yield if block_given? unless rails4? || rails5? end end @@ -12,4 +16,4 @@ def in_rails_3(&block) require 'survey/version' require 'survey/active_record' -ActiveRecord::Base.send(:include, Survey::ActiveRecord) \ No newline at end of file +ActiveRecord::Base.send(:include, Survey::ActiveRecord) From 9019dd32d790ed061ee3db28a71ce78d0a338d12 Mon Sep 17 00:00:00 2001 From: unn4m3d Date: Thu, 22 Mar 2018 21:49:57 +1000 Subject: [PATCH 3/4] Fix template --- lib/generators/templates/migration.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/generators/templates/migration.rb b/lib/generators/templates/migration.rb index 24b239b..7c76ecd 100644 --- a/lib/generators/templates/migration.rb +++ b/lib/generators/templates/migration.rb @@ -1,4 +1,4 @@ -class CreateSurvey < ActiveRecord::Migration +class CreateSurvey < ActiveRecord::Migration[4.2] def self.up # survey surveys logic From 5dff3e0a0a935d79005d1a937bdff7e0743dba19 Mon Sep 17 00:00:00 2001 From: unn4m3d Date: Fri, 23 Mar 2018 19:32:08 +1000 Subject: [PATCH 4/4] Fix --- app/models/survey/attempt.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/survey/attempt.rb b/app/models/survey/attempt.rb index 57537b5..f6e4385 100644 --- a/app/models/survey/attempt.rb +++ b/app/models/survey/attempt.rb @@ -25,7 +25,7 @@ class Survey::Attempt < ActiveRecord::Base scope :for_survey, ->(survey) { where(:survey_id => survey.id) } scope :exclude_survey, ->(survey) { where("NOT survey_id = #{survey.id}") } scope :for_participant, ->(participant) { - where(:participant_id => participant.try(:id), :participant_type => participant.class.base_class) + where(:participant_id => participant.try(:id), :participant_type => participant.class.base_class.to_s) } # callbacks