Update migrations and model associations for Rails 7 compatibility

app/models/rapidfire/answer.rb

@@ -4,12 +4,10 @@ class Answer < ApplicationRecord
     belongs_to :attempt, inverse_of: :answers
 
     validates :question, :attempt, presence: true
-    validate  :verify_answer_text
+    validate :verify_answer_text
 
-    if "#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}" >= "5.2"
-      has_one_attached :file
-      has_many_attached :files
-    end
+    has_one_attached :file
+    has_many_attached :files
 
     private
 

app/models/rapidfire/attempt.rb

@@ -1,12 +1,7 @@
 module Rapidfire
   class Attempt < ApplicationRecord
     belongs_to :survey
-    has_many   :answers, inverse_of: :attempt, autosave: true
-
-    if Rails::VERSION::MAJOR >= 5
-      belongs_to :user, polymorphic: true, optional: true
-    else
-      belongs_to :user, polymorphic: true
-    end
+    has_many :answers, dependent: :destroy, inverse_of: :attempt
+    belongs_to :user, polymorphic: true, optional: true
   end
 end

app/models/rapidfire/question.rb

@@ -1,10 +1,9 @@
 module Rapidfire
   class Question < ApplicationRecord
     belongs_to :survey, :inverse_of => :questions
-    has_many   :answers
-
-    has_many_attached :files
+    has_many :answers
 
+    has_many_attached :files
 
     default_scope { order(:position) }
 
@@ -36,20 +35,12 @@ def validate_answer(answer)
       if rules[:presence] == "1"
         case self
         when Rapidfire::Questions::File
-          if Rails::VERSION::MAJOR >= 6
-            answer.validates_presence_of :file
-          else
-            if !answer.file.attached?
-              answer.errors.add(:file, :blank)
-            end
+          if !answer.file.attached?
+            answer.errors.add(:file, :blank)
           end
         when Rapidfire::Questions::MultiFile
-          if Rails::VERSION::MAJOR >= 6
-            answer.validates_presence_of :files
-          else
-            if !answer.files.attached?
-              answer.errors.add(:files, :blank)
-            end
+          if !answer.files.attached?
+            answer.errors.add(:files, :blank)
           end
         else
           answer.validates_presence_of :answer_text

app/models/rapidfire/survey.rb

@@ -1,15 +1,12 @@
-require 'csv'
+require "csv"
+
 module Rapidfire
   class Survey < ApplicationRecord
-    has_many  :attempts
-    has_many  :questions
-
-    validates :name, :presence => true
+    has_many :attempts, dependent: :destroy
+    has_many :questions, dependent: :destroy
+    has_many :answers, through: :attempts, dependent: :destroy
 
-
-    if Rails::VERSION::MAJOR == 3
-      attr_accessible :name, :introduction, :after_survey_content
-    end
+    validates :name, presence: true
 
     def self.csv_user_attributes=(attributes)
       @@csv_user_attributes = Array(attributes)
@@ -24,24 +21,21 @@ def results_to_csv(filter)
         header = []
         header += Rapidfire::Survey.csv_user_attributes
         questions.each do |question|
-          header << ActionView::Base.full_sanitizer.sanitize(question.question_text, :tags => [], :attributes => [])
+          header << ActionView::Base.full_sanitizer.sanitize(question.question_text, tags: [], attributes: [])
         end
         header << "results updated at"
         csv << header
-        attempts.where(SurveyResults.filter(filter, 'id')).each do |attempt|
+        attempts.where(SurveyResults.filter(filter, "id")).each do |attempt|
           this_attempt = []
 
           Survey.csv_user_attributes.each do |attribute|
             this_attempt << attempt.user.try(attribute)
           end
 
           questions.each do |question|
-            answer = attempt.answers.detect{|a| a.question_id == question.id }.try(:answer_text)
+            answer = attempt.answers.detect { |a| a.question_id == question.id }.try(:answer_text)
             this_attempt << answer
           end
-
-          this_attempt << attempt.updated_at
-          csv << this_attempt
         end
       end
     end

app/services/rapidfire/attempt_builder.rb

@@ -22,8 +22,7 @@ def save!(options = {})
         # strings. we will store answers as one big string separated
         # by delimiter.
         text = text.values if text.is_a?(ActionController::Parameters)
-        answer.answer_text =
-          if text.is_a?(Array)
+        answer.answer_text = if text.is_a?(Array)
             strip_checkbox_answers(text).join(Rapidfire.answers_delimiter)
           else
             text
@@ -37,11 +36,7 @@ def save!(options = {})
         end
       end
 
-      if Rails::VERSION::MAJOR >= 5
-        @attempt.save!
-      else
-        @attempt.save!(options)
-      end
+      @attempt.save!(validate: options[:validate] != false)
     end
 
     def save(options = {})

db/migrate/20130502170733_create_rapidfire_tables.rb

@@ -1,51 +1,37 @@
-if Rails::VERSION::MAJOR >= 5
-  version = [Rails::VERSION::MAJOR, Rails::VERSION::MINOR].join('.').to_f
-  base = ActiveRecord::Migration[version]
-else
-  base = ActiveRecord::Migration
-end
-
-class CreateRapidfireTables < base
+class CreateRapidfireTables < ActiveRecord::Migration[7.0]
   def change
     create_table :rapidfire_surveys do |t|
-      t.string  :name
+      t.string :name
       t.text :introduction
       t.timestamps
     end
 
     create_table :rapidfire_questions do |t|
-      t.references :survey
-      t.string  :type
-      t.string  :question_text
-      t.string  :default_text
-      t.string  :placeholder
+      t.references :survey, foreign_key: { to_table: :rapidfire_surveys }
+      t.string :type
+      t.string :question_text
+      t.string :default_text
+      t.string :placeholder
       t.integer :position
       t.text :answer_options
       t.text :validation_rules
 
       t.timestamps
     end
-    add_index :rapidfire_questions, :survey_id if Rails::VERSION::MAJOR < 5
 
     create_table :rapidfire_attempts do |t|
-      t.references :survey
-      t.references :user, polymorphic: true
+      t.references :survey, foreign_key: { to_table: :rapidfire_surveys }
+      t.references :user, polymorphic: true, index: true
 
       t.timestamps
     end
-    add_index :rapidfire_attempts, :survey_id if Rails::VERSION::MAJOR < 5
-    add_index :rapidfire_attempts, [:user_id, :user_type]
 
     create_table :rapidfire_answers do |t|
-      t.references :attempt
-      t.references :question
+      t.references :attempt, foreign_key: { to_table: :rapidfire_attempts }
+      t.references :question, foreign_key: { to_table: :rapidfire_questions }
       t.text :answer_text
 
       t.timestamps
     end
-    if Rails::VERSION::MAJOR < 5
-      add_index :rapidfire_answers, :attempt_id
-      add_index :rapidfire_answers, :question_id
-    end
   end
 end

db/migrate/20170701191411_add_after_survey_content_to_survey.rb

@@ -1,11 +1,4 @@
-if Rails::VERSION::MAJOR >= 5
-  version = [Rails::VERSION::MAJOR, Rails::VERSION::MINOR].join('.').to_f
-  base = ActiveRecord::Migration[version]
-else
-  base = ActiveRecord::Migration
-end
-
-class AddAfterSurveyContentToSurvey < base
+class AddAfterSurveyContentToSurvey < ActiveRecord::Migration[7.0]
   def change
     add_column :rapidfire_surveys, :after_survey_content, :text
   end

db/migrate/20190701274749_add_active_to_surveys.rb

@@ -1,11 +1,4 @@
-if Rails::VERSION::MAJOR >= 5
-  version = [Rails::VERSION::MAJOR, Rails::VERSION::MINOR].join('.').to_f
-  base = ActiveRecord::Migration[version]
-else
-  base = ActiveRecord::Migration
-end
-
-class AddActiveToSurveys < base
+class AddActiveToSurveys < ActiveRecord::Migration[7.0]
   def change
     add_column :rapidfire_surveys, :active, :boolean
   end

lib/generators/rapidfire/templates/migrations/add_active_to_survey.rb

@@ -1,4 +1,4 @@
-class AddActiveToSurvey < ActiveRecord::Migration[6.0]
+class AddActiveToSurvey < ActiveRecord::Migration[7.0]
   def change
     add_column :rapidfire_surveys, :active, :boolean, default: 1
   end

lib/generators/rapidfire/templates/migrations/add_after_survey_content_to_survey.rb

@@ -1,11 +1,4 @@
-if Rails::VERSION::MAJOR >= 5
-  version = [Rails::VERSION::MAJOR, Rails::VERSION::MINOR].join('.').to_f
-  base = ActiveRecord::Migration[version]
-else
-  base = ActiveRecord::Migration
-end
-
-class AddAfterSurveyContentToSurvey < base
+class AddAfterSurveyContentToSurvey < ActiveRecord::Migration[7.0]
   def change
     add_column :rapidfire_surveys, :after_survey_content, :text
   end

lib/generators/rapidfire/templates/migrations/rename_answer_groups_and_question_groups.rb

@@ -1,11 +1,4 @@
-if Rails::VERSION::MAJOR >= 5
-  version = [Rails::VERSION::MAJOR, Rails::VERSION::MINOR].join('.').to_f
-  base = ActiveRecord::Migration[version]
-else
-  base = ActiveRecord::Migration
-end
-
-class RenameAnswerGroupsAndQuestionGroups < base
+class RenameAnswerGroupsAndQuestionGroups < ActiveRecord::Migration[7.0]
   def change
     rename_table :rapidfire_answer_groups, :rapidfire_attempts
     rename_table :rapidfire_question_groups, :rapidfire_surveys

spec/controllers/rapidfire/attempts_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Rapidfire::AttemptsController do
   before do
@@ -8,19 +8,13 @@
   # this scenario is possible when there is only 1 radio button question, and
   # user has not selected any option. in this case, browser doesn't send
   # any default value.
-  context 'when no parameters are passed' do
-    it 'initializes answer builder with empty args' do
+  context "when no parameters are passed" do
+    it "initializes answer builder with empty args" do
       survey = FactoryBot.create(:survey)
 
-      if Rails::VERSION::MAJOR >= 5
-        expect {
-          post :create, params: { survey_id: survey.id }
-        }.not_to raise_error
-      else
-        expect {
-          post :create, survey_id: survey.id
-        }.not_to raise_error
-      end
+      expect {
+        post :create, params: { survey_id: survey.id }
+      }.not_to raise_error
     end
   end
 end

spec/dummy/config/application.rb

@@ -1,12 +1,10 @@
-require File.expand_path('../boot', __FILE__)
+require File.expand_path("../boot", __FILE__)
 
 require "rails"
 require "active_model/railtie"
 # require "active_job/railtie"
 require "active_record/railtie"
-if "#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}" >= "5.2"
-  require "active_storage/engine"
-end
+require "active_storage/engine"
 require "action_controller/railtie"
 require "action_mailer/railtie"
 # require "action_mailbox/engine"
@@ -16,10 +14,8 @@
 # require "sprockets/railtie"
 require "rails/test_unit/railtie"
 
-
 Bundler.require(*Rails.groups)
 
-
 module Dummy
   class Application < Rails::Application
     # Settings in config/environments/* take precedence over those specified here.
@@ -64,9 +60,6 @@ class Application < Rails::Application
     # Version of your assets, change this if you want to expire all your assets
     # config.assets.version = '1.0'
 
-    if "#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}" >= "5.1"
-      config.load_defaults "#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}"
-    end
+    config.load_defaults "#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}"
   end
 end
-

spec/dummy/db/migrate/20170701191422_create_users.rb

@@ -1,11 +1,4 @@
-if Rails::VERSION::MAJOR >= 5
-  version = [Rails::VERSION::MAJOR, Rails::VERSION::MINOR].join('.').to_f
-  base = ActiveRecord::Migration[version]
-else
-  base = ActiveRecord::Migration
-end
-
-class CreateUsers < base
+class CreateUsers < ActiveRecord::Migration[7.0]
   def change
     create_table :users do |t|
       t.string :name