rapidfire 4.0.0 → 8.0.0

data/app/models/rapidfire/survey.rb

@@ -1,9 +1,49 @@
+require 'csv'
 module Rapidfire
-  class Survey < ActiveRecord::Base
+  class Survey < ApplicationRecord
     has_many  :attempts
     has_many  :questions
-    has_many :attempts
 
     validates :name, :presence => true
+
+
+    if Rails::VERSION::MAJOR == 3
+      attr_accessible :name, :introduction, :after_survey_content
+    end
+
+    def self.csv_user_attributes=(attributes)
+      @@csv_user_attributes = Array(attributes)
+    end
+
+    def self.csv_user_attributes
+      @@csv_user_attributes ||= []
+    end
+
+    def results_to_csv(filter)
+      CSV.generate do |csv|
+        header = []
+        header += Rapidfire::Survey.csv_user_attributes
+        questions.each do |question|
+          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|
+          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)
+            this_attempt << answer
+          end
+
+          this_attempt << attempt.updated_at
+          csv << this_attempt
+        end
+      end
+    end
   end
 end

data/app/services/rapidfire/attempt_builder.rb

@@ -28,14 +28,26 @@ module Rapidfire
           else
             text
           end
+
+        case answer.question
+        when Rapidfire::Questions::MultiFile
+          answer.files = answer_attributes[:files]
+        when Rapidfire::Questions::File
+          answer.file = answer_attributes[:file]
+        end
       end
 
-      @attempt.save!(options)
+      if Rails::VERSION::MAJOR >= 5
+        @attempt.save!
+      else
+        @attempt.save!(options)
+      end
     end
 
     def save(options = {})
       save!(options)
     rescue ActiveRecord::ActiveRecordError => e
+      errors.add(:base, e.message)
       # repopulate answers here in case of failure as they are not getting updated
       @answers = @survey.questions.collect do |question|
         @attempt.answers.find { |a| a.question_id == question.id }
@@ -44,6 +56,7 @@ module Rapidfire
     end
 
     private
+
     def build_attempt(attempt_id)
       if attempt_id.present?
         @attempt = Attempt.find(attempt_id)

data/app/services/rapidfire/question_form.rb

@@ -9,6 +9,9 @@ module Rapidfire
        Rapidfire::Questions::Radio,
        Rapidfire::Questions::Select,
        Rapidfire::Questions::Short,
+       Rapidfire::Questions::Information,
+       Rapidfire::Questions::File,
+       Rapidfire::Questions::MultiFile,
       ]
 
     QUESTION_TYPES = AVAILABLE_QUESTIONS.inject({}) do |result, question|
@@ -48,11 +51,12 @@ module Rapidfire
     end
 
     def update_question
-      @question.update_attributes(to_question_params)
+      @question.update(to_question_params)
     end
 
     def to_question_params
       {
+        :type => type,
         :survey => survey,
         :question_text  => question_text,
         :position => position,

data/app/services/rapidfire/survey_results.rb

@@ -8,24 +8,58 @@ module Rapidfire
     # 2. question text
     # 3. if aggregatable, return each option with value
     # 4. else return an array of all the answers given
-    def extract
+    def extract(filter_params = {})
       @survey.questions.collect do |question|
         results =
           case question
           when Rapidfire::Questions::Select, Rapidfire::Questions::Radio,
             Rapidfire::Questions::Checkbox
-            answers = question.answers.map(&:answer_text).map do |text|
+            answers = question.answers.where(*filter(filter_params)).map(&:answer_text).map do |text|
               text.to_s.split(Rapidfire.answers_delimiter)
             end.flatten
 
-            answers.inject(Hash.new(0)) { |total, e| total[e] += 1; total }
+            count_hash = Hash.new(0)
+            question.options.map{|o| count_hash[o] = 0 }
+
+            answers.inject(count_hash) { |total, e| total[e] += 1; total }
           when Rapidfire::Questions::Short, Rapidfire::Questions::Date,
             Rapidfire::Questions::Long, Rapidfire::Questions::Numeric
-            question.answers.pluck(:answer_text)
+            question.answers.where(*filter(filter_params)).pluck(:answer_text)
           end
 
         QuestionResult.new(question: question, results: results)
       end
     end
+
+    def filter(filter_params, column = 'attempt_id')
+      @filter_result ||= begin
+        return ["0=0"] unless Array(filter_params[:question_ids]).compact.count == Array(filter_params[:options]).compact.count
+        return ["0=0"] unless %w(id attempt_id).include?(column)
+        return ["0=0"] if Array(filter_params[:question_ids]).compact.count == 0
+
+        collected_filters = {}
+        Array(filter_params[:question_ids]).each_with_index do |question_id, i|
+          collected_filters[question_id] ||= []
+          collected_filters[question_id] << filter_params[:options][i]
+        end
+
+        attempt_ids = nil
+
+        collected_filters.each do |question_id, options|
+          these_matches = Answer.where("question_id = ? and answer_text in (?)", question_id, options).pluck(:attempt_id)
+          if attempt_ids.nil?
+            attempt_ids = these_matches
+          else
+            attempt_ids = attempt_ids & these_matches
+          end
+        end
+
+        ["#{column} in (?)", attempt_ids]
+      end
+    end
+
+    def self.filter(filter_params, column)
+      self.new.filter(filter_params, column)
+    end
   end
 end

data/app/views/rapidfire/answers/_checkbox.html.erb

@@ -1,7 +1,7 @@
 <%= render partial: "rapidfire/answers/errors", locals: {answer: answer} %>
 
 <div class="form-group">
-<%= f.label :answer_text, answer.question.question_text %>
+<%= f.label :answer_text, answer.question.question_text.html_safe %>
 <%= f.fields_for :answer_text do |af| %>
   <%- answer.question.options.each_with_index do |option, index| %>
     <%= af.label index do %>

data/app/views/rapidfire/answers/_date.html.erb

@@ -1,5 +1,5 @@
 <%= render partial: "rapidfire/answers/errors", locals: {answer: answer} %>
 <div class="form-group">
-<%= f.label :answer_text, answer.question.question_text %>
+<%= f.label :answer_text, answer.question.question_text.html_safe %>
 <%= f.text_field :answer_text %>
 </div>

data/app/views/rapidfire/answers/_file.html.erb

@@ -0,0 +1,5 @@
+<%= render partial: "rapidfire/answers/errors", locals: {answer: answer} %>
+<div class="form-group">
+<%= f.label :answer_text, answer.question.question_text.html_safe %>
+<%= f.file_field :file %>
+</div>

data/app/views/rapidfire/answers/_information.html.erb

@@ -0,0 +1,4 @@
+<%= render partial: "rapidfire/answers/errors", locals: {answer: answer} %>
+<div class="form-group">
+<%= f.label :answer_text, answer.question.question_text.html_safe %>
+</div>

data/app/views/rapidfire/answers/_long.html.erb

@@ -1,5 +1,5 @@
 <%= render partial: "rapidfire/answers/errors", locals: {answer: answer} %>
 <div class="form-group">
-<%= f.label :answer_text, answer.question.question_text %>
+<%= f.label :answer_text, answer.question.question_text.html_safe %>
 <%= f.text_area :answer_text, value: answer.answer_text || answer.question.default_text, :rows => 5, placeholder: answer.question.placeholder %>
 </div>

data/app/views/rapidfire/answers/_multifile.html.erb

@@ -0,0 +1,5 @@
+<%= render partial: "rapidfire/answers/errors", locals: {answer: answer} %>
+<div class="form-group">
+<%= f.label :answer_text, answer.question.question_text.html_safe %>
+<%= f.file_field :files, multiple: true %>
+</div>

data/app/views/rapidfire/answers/_numeric.html.erb

@@ -1,5 +1,5 @@
 <%= render partial: "rapidfire/answers/errors", locals: {answer: answer} %>
 <div class="form-group">
-<%= f.label :answer_text, answer.question.question_text %>
+<%= f.label :answer_text, answer.question.question_text.html_safe %>
 <%= f.text_field :answer_text %>
 </div>

data/app/views/rapidfire/answers/_radio.html.erb

@@ -1,7 +1,7 @@
 <%= render partial: "rapidfire/answers/errors", locals: {answer: answer} %>
 
 <div class="form-group">
-  <%= f.label :answer_text, answer.question.question_text %>
+  <%= f.label :answer_text, answer.question.question_text.html_safe %>
   <%- answer.question.options.each_with_index do |option, index| %>
     <span class="form-group sub">
       <%= f.label "answer_text_#{index}" do %>

data/app/views/rapidfire/answers/_select.html.erb

@@ -1,5 +1,5 @@
 <%= render partial: "rapidfire/answers/errors", locals: {answer: answer} %>
 <div class="form-group">
-<%= f.label :answer_text, answer.question.question_text %>
+<%= f.label :answer_text, answer.question.question_text.html_safe %>
 <%= f.select :answer_text, answer.question.options, include_blank: true %>
 </div>

data/app/views/rapidfire/answers/_short.html.erb

@@ -1,5 +1,5 @@
 <%= render partial: "rapidfire/answers/errors", locals: {answer: answer} %>
 <div class="form-group">
-<%= f.label :answer_text, answer.question.question_text %>
+<%= f.label :answer_text, answer.question.question_text.html_safe %>
 <%= f.text_field :answer_text, value: answer.answer_text || answer.question.default_text, placeholder: answer.question.placeholder %>
 </div>

data/app/views/rapidfire/attempts/_form.html.erb

@@ -3,7 +3,15 @@
 
 <p><%= @survey.introduction %></p>
 
-<%= form_for([@survey, @attempt_builder]) do |f| %>
+<%= form_for([@survey, @attempt_builder], method: method) do |f| %>
+  <%- if @attempt_builder.errors.present? %>
+    <ul>
+      <%- @attempt_builder.errors.full_messages.each do |message| %>
+        <li><%= message %></li>
+      <% end %>
+    </ul>
+  <% end %>
+
   <%- @attempt_builder.answers.each do |answer| %>
     <%= f.fields_for("#{answer.question.id}", answer) do |answer_form| %>
       <%= render_answer_form_helper(answer, answer_form) %>

data/app/views/rapidfire/attempts/edit.html.erb

@@ -1 +1 @@
-<%= render partial: 'form', locals: { submit_text: 'Update' } %>
+<%= render partial: 'form', locals: { submit_text: 'Update', method: :put } %>

data/app/views/rapidfire/attempts/new.html.erb

@@ -1 +1 @@
-<%= render partial: 'form', locals: { submit_text: t('rapidfire.attempts.save') } %>
+<%= render partial: 'form', locals: { submit_text: t('rapidfire.attempts.save'), method: :post } %>

data/app/views/rapidfire/questions/_form.html.erb

@@ -16,7 +16,7 @@
 
   <div class="form-group">
     <%= f.label :question_text %>
-    <%= f.text_field :question_text %>
+    <%= f.text_area :question_text, rows: 5 %>
   </div>
 
   <div class="form-group">

data/app/views/rapidfire/surveys/_survey.html.erb

@@ -12,7 +12,13 @@
       <% if can_administer? %>
         <li><%= link_to "Results", [:results, survey] %></li>
         <li><%= link_to "Edit", edit_survey_path(survey) %></li>
+        <li><%= link_to "Copy", surveys_path(copy_survey_id: survey), method: :post %></li>
         <li><%= link_to "Delete", survey, method: :delete %></li>
+        <% if survey.active? %>
+          <li><%= link_to "De-activate", survey_path(survey, survey: { active: 0 }), method: :patch %></li>
+        <% else %>
+          <li><%= link_to "Activate", survey_path(survey, survey: { active: 1 }), method: :patch %></li>
+        <% end %>
       <% end %>
     </ul>
   </td>

data/app/views/rapidfire/surveys/index.html.erb

@@ -1,9 +1,14 @@
 <h2>
-  Surveys
+  <%= params[:active].to_i == 0 ? "In-A" : "A" %>ctive Surveys
 </h2>
 <h3>
   <% if can_administer? %>
-    <%= link_to "New Survey", new_survey_path %>
+    <%= link_to "New Survey", new_survey_path %> |
+    <% if params[:active].to_i == 0 %>
+      <%= link_to "View Active Surveys", surveys_path(active: 1) %>
+    <% else %>
+      <%= link_to "View Inactive Surveys", surveys_path(active: 0) %>
+    <% end %>
   <% end %>
 </h3>
 <h4>

data/app/views/rapidfire/surveys/results.html.erb

@@ -1,5 +1,5 @@
 <h1>Results</h1>
-
+<%= link_to "Download CSV", results_survey_path(id: params[:id], format: :csv) %>
 <%- @survey_results.each do |result| %>
   <div>
     <h4><%= result.question.question_text %></h4>
@@ -16,6 +16,7 @@
             <tr>
               <th>Option</th>
               <th>Count</th>
+              <th>Filter</th>
             </tr>
           </thead>
           <tbody>
@@ -23,6 +24,7 @@
               <tr>
                 <td><%= option %></td>
                 <td><%= count %></td>
+                <td><%= filter_link(result.question.id, option) %></th>
               </tr>
             <% end %>
           </tbody>

data/db/migrate/20190701274749_add_active_to_surveys.rb

@@ -0,0 +1,12 @@
+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
+  def change
+    add_column :rapidfire_surveys, :active, :boolean
+  end
+end

data/lib/generators/rapidfire/active_survey_migration_generator.rb

@@ -0,0 +1,18 @@
+module Rapidfire
+  module Generators
+    class ActiveSurveyMigrationGenerator < ::Rails::Generators::Base
+      include Rails::Generators::Migration
+
+      source_root File.expand_path('../templates', __FILE__)
+
+      def self.next_migration_number(dir)
+        Time.now.utc.strftime("%Y%m%d%H%M%S")
+      end
+
+      def copy_migrations
+        migration_template "migrations/add_active_to_survey.rb", "db/migrate/add_active_to_survey.rapidfire.rb"
+      end
+
+    end
+  end
+end

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

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

data/lib/rapidfire/version.rb

@@ -1,3 +1,3 @@
 module Rapidfire
-  VERSION = '4.0.0'
+  VERSION = '8.0.0'
 end

data/lib/tasks/change_delimiter_to_srsn.rake

@@ -8,7 +8,7 @@ namespace :rapidfire do
 
           new_answer_options = question.answer_options.split(',')
             .join(Rapidfire.answers_delimiter)
-          question.update_attributes!(answer_options: new_answer_options)
+          question.update!(answer_options: new_answer_options)
         end
       end
     end

data/lib/tasks/rapidfire.rake

@@ -6,10 +6,20 @@ namespace :rapidfire do
         `rails generate rapidfire:upgrade_migration`
       end
 
+      desc "Adding multitenancy support to Rapidfire"
+      task multitenancy: :environment do
+        `rails generate rapidfire:multitenant_migration`
+      end
+
       desc "Adds a field to show the user after they take a survey"
       task after_survey_page: :environment do
         `rails generate rapidfire:after_survey_content_migration`
       end
+
+      desc "Adds a field to make a survey active/inactive"
+      task active_inactive_surveys: :environment do
+        `rails generate rapidfire:active_survey_migration`
+      end
     end
   end
 end

data/spec/controllers/rapidfire/attempts_controller_spec.rb

@@ -10,7 +10,7 @@ describe Rapidfire::AttemptsController do
   # any default value.
   context 'when no parameters are passed' do
     it 'initializes answer builder with empty args' do
-      survey = FactoryGirl.create(:survey)
+      survey = FactoryBot.create(:survey)
 
       if Rails::VERSION::MAJOR >= 5
         expect {

data/spec/dummy/README.rdoc

@@ -206,7 +206,7 @@ app/controllers
 
 app/models
   Holds models that should be named like post.rb. Models descend from
-  ActiveRecord::Base by default.
+  ApplicationRecord by default.
 
 app/views
   Holds the template files for the view that should be named like

data/spec/dummy/app/assets/config/mainfest.js

@@ -0,0 +1,2 @@
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css

data/spec/dummy/app/models/application_record.rb

@@ -0,0 +1,3 @@
+class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+end

data/spec/dummy/app/models/user.rb

@@ -0,0 +1,2 @@
+class User < ApplicationRecord
+end

data/spec/dummy/app/views/layouts/application.html.erb

@@ -2,8 +2,6 @@
 <html>
 <head>
   <title>Dummy</title>
-  <%= stylesheet_link_tag    "application", :media => "all" %>
-  <%= javascript_include_tag "application" %>
   <%= csrf_meta_tags %>
 </head>
 <body>

data/spec/dummy/config/application.rb

@@ -1,6 +1,21 @@
 require File.expand_path('../boot', __FILE__)
 
-require 'rails/all'
+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 "action_controller/railtie"
+require "action_mailer/railtie"
+# require "action_mailbox/engine"
+# require "action_text/engine"
+require "action_view/railtie"
+# require "action_cable/engine"
+# require "sprockets/railtie"
+require "rails/test_unit/railtie"
+
 
 Bundler.require(*Rails.groups)
 
@@ -44,10 +59,14 @@ module Dummy
     # config.active_record.schema_format = :sql
 
     # Enable the asset pipeline
-    config.assets.enabled = true
+    # config.assets.enabled = true
 
     # Version of your assets, change this if you want to expire all your assets
-    config.assets.version = '1.0'
+    # config.assets.version = '1.0'
+
+    if "#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}" >= "5.1"
+      config.load_defaults "#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}"
+    end
   end
 end
 

data/spec/dummy/config/environments/development.rb

@@ -21,5 +21,5 @@ Dummy::Application.configure do
   config.whiny_nils = false
 
   # Expands the lines which load the assets
-  config.assets.debug = true
+  # config.assets.debug = true
 end

data/spec/dummy/config/environments/test.rb

@@ -30,4 +30,9 @@ Dummy::Application.configure do
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
+
+  if "#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}" >= "5.2"
+    # Store uploaded files on the local file system in a temporary directory.
+    config.active_storage.service = :test
+  end
 end

data/spec/dummy/config/storage.yml

@@ -0,0 +1,7 @@
+test:
+  service: Disk
+  root: <%= Rails.root.join("tmp/storage-#{ENV['RAILS_VERSION']}-#{ENV['RUBY_VERSION']}") %>
+
+local:
+  service: Disk
+  root: <%= Rails.root.join("storage") %>

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

@@ -0,0 +1,15 @@
+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
+  def change
+    create_table :users do |t|
+      t.string :name
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/migrate/20230402174122_create_active_storage_tables.active_storage.rb

@@ -0,0 +1,67 @@
+if Rails::VERSION::MAJOR >= 5
+  version = [Rails::VERSION::MAJOR, Rails::VERSION::MINOR].join('.').to_f
+  base = ActiveRecord::Migration[version]
+else
+  base = ActiveRecord::Migration
+end
+
+
+# This migration comes from active_storage (originally 20170806125915)
+class CreateActiveStorageTables < base
+  def change
+    # Use Active Record's configured type for primary and foreign keys
+    primary_key_type, foreign_key_type = primary_and_foreign_key_types
+
+    create_table :active_storage_blobs, id: primary_key_type do |t|
+      t.string   :key,          null: false
+      t.string   :filename,     null: false
+      t.string   :content_type
+      t.text     :metadata
+      if "#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}" >= "6.1"
+        t.string   :service_name, null: false
+      end
+      t.bigint   :byte_size,    null: false
+      t.string   :checksum
+
+      if connection.supports_datetime_with_precision?
+        t.datetime :created_at, precision: 6, null: false
+      else
+        t.datetime :created_at, null: false
+      end
+
+      t.index [ :key ], unique: true
+    end
+
+    create_table :active_storage_attachments, id: primary_key_type do |t|
+      t.string     :name,     null: false
+      t.references :record,   null: false, polymorphic: true, index: false, type: foreign_key_type
+      t.references :blob,     null: false, type: foreign_key_type
+
+      if connection.supports_datetime_with_precision?
+        t.datetime :created_at, precision: 6, null: false
+      else
+        t.datetime :created_at, null: false
+      end
+
+      t.index [ :record_type, :record_id, :name, :blob_id ], name: :index_active_storage_attachments_uniqueness, unique: true
+      t.foreign_key :active_storage_blobs, column: :blob_id
+    end
+
+    create_table :active_storage_variant_records, id: primary_key_type do |t|
+      t.belongs_to :blob, null: false, index: false, type: foreign_key_type
+      t.string :variation_digest, null: false
+
+      t.index [ :blob_id, :variation_digest ], name: :index_active_storage_variant_records_uniqueness, unique: true
+      t.foreign_key :active_storage_blobs, column: :blob_id
+    end
+  end
+
+  private
+    def primary_and_foreign_key_types
+      config = Rails.configuration.generators
+      setting = config.options[config.orm][:primary_key_type]
+      primary_key_type = setting || :primary_key
+      foreign_key_type = setting || :bigint
+      [primary_key_type, foreign_key_type]
+    end
+end