think_feel_do_engine 3.19.9 → 3.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e695923c18d7bbe38d48ca8692b714f28e630869
-  data.tar.gz: 43a31f61ecdb2b90d2c2b6c3a2c025680fc42c00
+  metadata.gz: c3b3775063e21d489dcf856ddef6e179cd34e8c2
+  data.tar.gz: 2ea4750cceba7cd1786b7c3c795dd2f1aaa3201e
 SHA512:
-  metadata.gz: 5d31f6ab1648f09f448e995bac2ba8b8e3685494c8ffb439be9cd4959f41bdbef581ceef83d80f9a92806ee5f0c4ad0ff32c9a3ec04455fea278484125e09e78
-  data.tar.gz: 5241013386ba0456ba8bbd16359607334e185af804e6b84abe28729e97b454e29a18aef18a0e2fbb8bdef01e2357a3c97c800f6b08917b6a0a2d4078c12f8337
+  metadata.gz: 12a9befe18ff9028e706a304f6723ae0569f76fb6e1ab5987bc5cc9d309e52383888aebff8b0bea25f87698a784aa2c2ac44209084e0ea1b2981197bd4686226
+  data.tar.gz: dc32b56ca3eb64cf1184f73cd9330db7daf4ec4b3eb2e108ffadf3724e6064044403018a75949886a8ae10cc0bb02b0bbe08abff26597c342adcbc1efc963312

data/Rakefile

@@ -15,8 +15,15 @@ load "#{git_tagger.gem_dir}/lib/tasks/deploy.rake"
 require "rspec/core"
 require "rspec/core/rake_task"
  
-desc "Run all specs in spec directory (excluding plugin specs)"
-RSpec::Core::RakeTask.new(:spec)
+# Run all specs using transactional fixtures
+RSpec::Core::RakeTask.new(:fixture_specs) do |t|
+  t.pattern = "spec/{models,controllers,helpers,mailers,presenters,requests,tasks,views}/{,/*/**}/*_spec.rb"
+end
+ 
+# Run all specs using Database Cleaner
+RSpec::Core::RakeTask.new(:cleaner_specs) do |t|
+  t.pattern = "spec/{features}/{,/*/**}/*_spec.rb"
+end
 
 desc "Run all JS specs"
 task :js_spec do
@@ -48,5 +55,6 @@ task :default do
   Rake::Task["jshint"].invoke
   Rake::Task["rubocop"].invoke
   Rake::Task["js_spec"].invoke
-  Rake::Task["spec"].invoke
+  Rake::Task["fixture_specs"].invoke
+  Rake::Task["cleaner_specs"].invoke
 end

data/app/assets/config/manifest.js

@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link think_feel_do_engine/print.css
+//= link application.js

data/app/assets/javascripts/think_feel_do_engine/activities/activity_tracker.js

@@ -122,6 +122,7 @@
     };
 
     this.handleSubmitClick = function(e) {
+      $("#submit_activities").prop('disabled', true);
       var shared_item_name;
 
       if($(".activity_shared_item_true")[0]) {
@@ -139,7 +140,7 @@
               if ($('.has-error').length === 0) {
                 $forms.submit();
               }
-
+              $("#submit_activities").prop('disabled', false);
               return false;
           } else {
               return _.each($forms, function (form, index, list) {
@@ -162,7 +163,7 @@
                           dataType: "script"
                       });
                   }
-
+                  $("#submit_activities").prop('disabled', false);
                   return false;
               });
           }

data/app/controllers/think_feel_do_engine/application_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "cancancan"
 
 module ThinkFeelDoEngine
@@ -62,12 +63,12 @@ module ThinkFeelDoEngine
     # Called by last route matching unmatched routes. Raises an exception that
     # is expected to be rescued.
     def raise_not_found!
-      fail ActionController::RoutingError,
-           "No route matches #{params[:unmatched_route]}"
+      raise ActionController::RoutingError,
+            "No route matches #{params[:unmatched_route]}"
     end
 
     def render_not_found(_)
-      render file: "#{Rails.root}/public/404.html",  status: 404
+      render file: "#{Rails.root}/public/404.html", status: 404
     end
 
     protected

data/app/controllers/think_feel_do_engine/bit_maker/content_modules_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_dependency "think_feel_do_engine/application_controller"
 
 module ThinkFeelDoEngine
@@ -5,7 +6,7 @@ module ThinkFeelDoEngine
     # Enables users to create, update, and delete modules
     # These modules contain providers that display content to the participants
     class ContentModulesController < ApplicationController
-      ARM_NOT_FOUND_MESSAGE = "Unable to find that arm.".freeze
+      ARM_NOT_FOUND_MESSAGE = "Unable to find that arm."
       before_action :authenticate_user!, :set_arm, :set_tools
       before_action :set_content_module, only: [:show, :edit, :update, :destroy]
       load_and_authorize_resource only: [:show, :edit, :update, :destroy]
@@ -71,14 +72,14 @@ module ThinkFeelDoEngine
         BitCore::ContentModule.transaction do
           ids = @content_module.content_provider_ids
           ContentProviderPolicy.where(bit_core_content_provider_id: ids)
-            .destroy_all
+                               .destroy_all
 
           if tasks_destroyed
             @content_module.destroy!
 
             true
           else
-            fail ActiveRecord::Rollback
+            raise ActiveRecord::Rollback
           end
         end
       rescue

data/app/controllers/think_feel_do_engine/bit_maker/content_providers_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_dependency "think_feel_do_engine/application_controller"
 
 module ThinkFeelDoEngine
@@ -81,7 +82,7 @@ module ThinkFeelDoEngine
         else
           redirect_to arm_bit_maker_content_providers_url(@arm),
                       alert: "Unable to delete ContentProvider " +
-                        model_errors
+                             model_errors
         end
       end
 

data/app/controllers/think_feel_do_engine/bit_maker/slides_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_dependency "think_feel_do_engine/application_controller"
 
 module ThinkFeelDoEngine
@@ -42,7 +43,8 @@ module ThinkFeelDoEngine
           position: FIRST_SLIDE_POSITION,
           title: "Table of Contents",
           is_title_visible: true,
-          body: "")
+          body: ""
+        )
         authorize! :create, @slide
 
         if @slide.save
@@ -63,11 +65,11 @@ module ThinkFeelDoEngine
           toc_decrement_slide_pos(@slideshow)
           @slideshow.update(has_table_of_contents: false)
           flash[:success] = "Table of contents deleted."
-          redirect_to arm_bit_maker_slideshow_path(@arm, @slide.slideshow)
         else
           flash[:error] = "There were errors."
-          redirect_to arm_bit_maker_slideshow_path(@arm, @slide.slideshow)
         end
+
+        redirect_to arm_bit_maker_slideshow_path(@arm, @slide.slideshow)
       end
 
       def show
@@ -90,11 +92,11 @@ module ThinkFeelDoEngine
       def destroy
         if @slide.destroy
           flash[:success] = "Slide deleted."
-          redirect_to arm_bit_maker_slideshow_path(@arm, @slide.slideshow)
         else
           flash[:error] = "There were errors."
-          redirect_to arm_bit_maker_slideshow_path(@arm, @slide.slideshow)
         end
+
+        redirect_to arm_bit_maker_slideshow_path(@arm, @slide.slideshow)
       end
 
       def sort

data/app/controllers/think_feel_do_engine/bit_maker/slideshow_anchors_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_dependency "think_feel_do_engine/application_controller"
 
 module ThinkFeelDoEngine
@@ -51,8 +52,8 @@ module ThinkFeelDoEngine
 
       def anchor_params
         params.require(:slideshow_anchor)
-          .permit(:target_name)
-          .merge(bit_core_slideshow_id: @slideshow.id)
+              .permit(:target_name)
+              .merge(bit_core_slideshow_id: @slideshow.id)
       end
 
       def set_arm

data/app/controllers/think_feel_do_engine/bit_maker/slideshows_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_dependency "think_feel_do_engine/application_controller"
 
 module ThinkFeelDoEngine

data/app/controllers/think_feel_do_engine/coach/group_dashboard_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_dependency "think_feel_do_engine/application_controller"
 
 module ThinkFeelDoEngine

data/app/controllers/think_feel_do_engine/coach/memberships_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_dependency "think_feel_do_engine/application_controller"
 
 module ThinkFeelDoEngine
@@ -13,10 +14,12 @@ module ThinkFeelDoEngine
           redirect_to coach_group_patient_dashboards_path(@group),
                       notice: "Participant was successfully stepped."
         else
-          redirect_to coach_group_patient_dashboards_path(@group),
-                      alert: @membership.errors.full_messages.join(", ") +
-                        "End date cannot be set prior to tomorrow's date. "\
-                        "Please use [Discontinue] or [Terminate Access]."
+          redirect_to(
+            coach_group_patient_dashboards_path(@group),
+            alert: @membership.errors.full_messages.join(", ") +
+                   "End date cannot be set prior to tomorrow's date. "\
+                   "Please use [Discontinue] or [Terminate Access]."
+          )
         end
       end
 

data/app/controllers/think_feel_do_engine/coach/messages_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_dependency "think_feel_do_engine/application_controller"
 
 module ThinkFeelDoEngine
@@ -25,7 +26,7 @@ module ThinkFeelDoEngine
 
         @reply_recipient =
           current_user.participants
-          .find(params[:recipient_id]) if params[:recipient_id]
+                      .find(params[:recipient_id]) if params[:recipient_id]
 
         render(
           locals: {

data/app/controllers/think_feel_do_engine/coach/participant_activities_visualizations_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_dependency "think_feel_do_engine/application_controller"
 
 module ThinkFeelDoEngine

data/app/controllers/think_feel_do_engine/coach/participant_thoughts_visualizations_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_dependency "think_feel_do_engine/application_controller"
 
 module ThinkFeelDoEngine

data/app/controllers/think_feel_do_engine/coach/patient_dashboards_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_dependency "think_feel_do_engine/application_controller"
 
 module ThinkFeelDoEngine

data/app/controllers/think_feel_do_engine/coach/phq_assessments_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_dependency "think_feel_do_engine/application_controller"
 
 module ThinkFeelDoEngine

data/app/controllers/think_feel_do_engine/coach/received_messages_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_dependency "think_feel_do_engine/application_controller"
 
 module ThinkFeelDoEngine
@@ -28,7 +29,7 @@ module ThinkFeelDoEngine
         new_coach_group_message_path(
           @group,
           # This Message.class IS DeliveredMessage
-          body: "#{received_message.body}",
+          body: received_message.body,
           message_id: received_message.id,
           recipient_id: received_message.message.sender_id,
           subject: "Reply: #{received_message.subject}"

data/app/controllers/think_feel_do_engine/coach/sent_messages_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_dependency "think_feel_do_engine/application_controller"
 
 module ThinkFeelDoEngine

data/app/controllers/think_feel_do_engine/coach/site_messages_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_dependency "think_feel_do_engine/application_controller"
 
 module ThinkFeelDoEngine

data/app/controllers/think_feel_do_engine/coach_dashboard_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_dependency "think_feel_do_engine/application_controller"
 
 module ThinkFeelDoEngine

data/app/controllers/think_feel_do_engine/concerns/browser_detective.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ThinkFeelDoEngine
   module Concerns
     # Methods for browser type detection.
@@ -8,18 +9,18 @@ module ThinkFeelDoEngine
 
       # See http://richonrails.com/articles/action-pack-variants-in-rails-4-1
       def detect_browser
-        case request.user_agent
-        when /iPad/i
-          request.variant = :tablet
-        when /iPhone|Windows Phone/i
-          request.variant = :phone
-        when /Android/i && /mobile/i
-          request.variant = :phone
-        when /Android/i
-          request.variant = :tablet
-        else
-          request.variant = :desktop
-        end
+        request.variant = case request.user_agent
+                          when /iPad/i
+                            :tablet
+                          when /iPhone|Windows Phone/i
+                            :phone
+                          when /Android/i && /mobile/i
+                            :phone
+                          when /Android/i
+                            :tablet
+                          else
+                            :desktop
+                          end
       end
     end
   end

data/app/controllers/think_feel_do_engine/concerns/invalid_auth_token.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ThinkFeelDoEngine
   module Concerns
     # Rescues exception when authenticity token has expired

data/app/controllers/think_feel_do_engine/concerns/navigator_enabled.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "bit_player"
 
 module ThinkFeelDoEngine

data/app/controllers/think_feel_do_engine/keep_alive_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_dependency "think_feel_do_engine/application_controller"
 
 module ThinkFeelDoEngine

data/app/controllers/think_feel_do_engine/lesson_slides_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_dependency "think_feel_do_engine/application_controller"
 
 module ThinkFeelDoEngine
@@ -60,11 +61,11 @@ module ThinkFeelDoEngine
       authorize! :update, ContentModules::LessonModule
       if @lesson.sort(params[:slide])
         flash.now[:success] = "Reorder was successful."
-        render nothing: true
       else
         flash.now[:alert] = @lesson.errors.full_messages.join(", ")
-        render nothing: true
       end
+
+      render nothing: true
     end
 
     private

data/app/controllers/think_feel_do_engine/lessons_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_dependency "think_feel_do_engine/application_controller"
 
 module ThinkFeelDoEngine
@@ -11,7 +12,7 @@ module ThinkFeelDoEngine
     def index
       authorize! :index, ContentModules::LessonModule
       @lessons = @lessons.includes(content_providers: :source_content)
-                 .order(:position)
+                         .order(:position)
     end
 
     def all_content
@@ -87,11 +88,11 @@ module ThinkFeelDoEngine
 
       if ContentModules::LessonModule.sort(@arm.id, params[:lesson])
         flash.now[:success] = "Reorder was successful."
-        render nothing: true
       else
         flash.now[:alert] = "Error while sorting."
-        render nothing: true
       end
+
+      render nothing: true
     end
 
     private

data/app/controllers/think_feel_do_engine/manage/groups_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_dependency "think_feel_do_engine/application_controller"
 
 module ThinkFeelDoEngine
@@ -14,8 +15,8 @@ module ThinkFeelDoEngine
 
       def edit_tasks
         @group = @arm.groups
-                 .includes(tasks: { bit_core_content_module: :tool })
-                 .find(params[:id])
+                     .includes(tasks: { bit_core_content_module: :tool })
+                     .find(params[:id])
         authorize! :update, @group
         @task = current_user.tasks.build
         @content_modules = BitCore::ContentModule

data/app/controllers/think_feel_do_engine/manage/tasks_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_dependency "think_feel_do_engine/application_controller"
 
 module ThinkFeelDoEngine

data/app/controllers/think_feel_do_engine/memberships_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_dependency "think_feel_do_engine/application_controller"
 
 module ThinkFeelDoEngine

data/app/controllers/think_feel_do_engine/navigator_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "devise"
 require_dependency "think_feel_do_engine/application_controller"
 
@@ -47,7 +48,8 @@ module ThinkFeelDoEngine
           module_id: @navigator.current_module.try(:id),
           provider_id: @navigator.current_content_provider
                          .try(:id),
-          content_position: @navigator.content_position)
+          content_position: @navigator.content_position
+        )
       else
         next_content_not_found
       end
@@ -122,7 +124,8 @@ module ThinkFeelDoEngine
     def mark_engagement_completed
       if navigator_content_module && last_engagement &&
          !@navigator.current_content_provider.exists?(
-           @navigator.content_position + 1)
+           @navigator.content_position + 1
+         )
         last_engagement.update_attributes(completed_at: DateTime.current)
       end
     end
@@ -151,8 +154,8 @@ module ThinkFeelDoEngine
 
     def home_tool
       current_participant.current_group
-        .arm
-        .bit_core_tools.find_by_type("Tools::Home")
+                         .arm
+                         .bit_core_tools.find_by_type("Tools::Home")
     end
 
     def next_content_not_found

data/app/controllers/think_feel_do_engine/participant_data_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_dependency "think_feel_do_engine/application_controller"
 
 module ThinkFeelDoEngine
@@ -54,7 +55,7 @@ module ThinkFeelDoEngine
 
     def singular_association
       unless provider.data_class_name
-        fail "Sorry, unable to process your request. Please try again."
+        raise "Sorry, unable to process your request. Please try again."
       end
 
       @singular_association ||= provider.data_class_name.underscore
@@ -78,7 +79,7 @@ module ThinkFeelDoEngine
           render template: "think_feel_do_engine/navigator/show_content"
         end
         format.js { render status: 400 }
-        format.json  { render json: { status: "error" } }
+        format.json { render json: { status: "error" } }
       end
     end
   end

data/app/controllers/think_feel_do_engine/participants/activities_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_dependency "think_feel_do_engine/application_controller"
 
 module ThinkFeelDoEngine
@@ -17,14 +18,12 @@ module ThinkFeelDoEngine
       def update
         if @activity.update_as_reviewed(activity_params_for_update)
           flash[:notice] = "Activity updated."
-          respond_to do |format|
-            format.js { render inline: "Turbolinks.visit(window.location);" }
-          end
         else
           flash[:alert] = @activity.errors.full_messages.join(", ")
-          respond_to do |format|
-            format.js { render inline: "Turbolinks.visit(window.location);" }
-          end
+        end
+
+        respond_to do |format|
+          format.js { render inline: "Turbolinks.visit(window.location);" }
         end
       end
 
@@ -37,11 +36,9 @@ module ThinkFeelDoEngine
 
       def activity_params
         params.require(:activities)
-          .permit(activity_id => [
-            :actual_pleasure_intensity,
-            :actual_accomplishment_intensity
-          ])
-          .fetch(activity_id)
+              .permit(activity_id => [:actual_pleasure_intensity,
+                                      :actual_accomplishment_intensity])
+              .fetch(activity_id)
       end
       # ...
 

data/app/controllers/think_feel_do_engine/participants/assessments_controller.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 require_dependency "think_feel_do_engine/application_controller"
 
 module ThinkFeelDoEngine
   module Participants
     # Authorizes and manages Assessment administration.
     class AssessmentsController < ApplicationController
-      ASSESSMENT_TYPES = { phq9: PhqAssessment, wai: WaiAssessment }
+      ASSESSMENT_TYPES = { phq9: PhqAssessment, wai: WaiAssessment }.freeze
 
       before_action :authorize_token
 
@@ -77,8 +78,8 @@ module ThinkFeelDoEngine
       def available_token
         @available_token ||= @token.others_on_this_day.to_a.find do |token|
           !assessment_class(token.token_type)
-           .exists?(participant_id: token.participant_id,
-                    release_date: token.release_date)
+            .exists?(participant_id: token.participant_id,
+                     release_date: token.release_date)
         end
       end
     end

data/app/controllers/think_feel_do_engine/participants/lessons_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_dependency "think_feel_do_engine/application_controller"
 
 module ThinkFeelDoEngine

data/app/controllers/think_feel_do_engine/participants/media_access_events_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_dependency "think_feel_do_engine/application_controller"
 
 module ThinkFeelDoEngine
@@ -35,9 +36,8 @@ module ThinkFeelDoEngine
 
       def media_access_event_params
         params.require(:media_access_event)
-          .permit([
-            :media_type, :bit_core_slide_id, :media_link, :end_time, :id
-          ])
+              .permit([:media_type, :bit_core_slide_id, :media_link, :end_time,
+                       :id])
       end
     end
   end

data/app/controllers/think_feel_do_engine/participants/passwords_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ThinkFeelDoEngine
   module Participants
     # Customize Participant password actions.

data/app/controllers/think_feel_do_engine/participants/public_slides_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_dependency "think_feel_do_engine/application_controller"
 
 module ThinkFeelDoEngine
@@ -8,8 +9,8 @@ module ThinkFeelDoEngine
         @slideshow = BitCore::Slideshow.find(params[:slideshow_id])
         @slide = @slideshow.slides.find(params[:id])
 
-        rescue ActiveRecord::RecordNotFound => e
-          redirect_to new_participant_session_path, alert: e.message
+      rescue ActiveRecord::RecordNotFound => e
+        redirect_to new_participant_session_path, alert: e.message
       end
     end
   end

data/app/controllers/think_feel_do_engine/participants/sessions_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ThinkFeelDoEngine
   module Participants
     # Extends the Devise controller to record logins.

data/app/controllers/think_feel_do_engine/participants/thoughts_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_dependency "think_feel_do_engine/application_controller"
 
 module ThinkFeelDoEngine
@@ -19,11 +20,9 @@ module ThinkFeelDoEngine
 
       def thought_params
         params.require(:thoughts)
-          .permit(thought_id => [
-            :content, :effect, :pattern_id,
-            :challenging_thought, :act_as_if
-          ])
-          .fetch(thought_id)
+              .permit(thought_id => [:content, :effect, :pattern_id,
+                                     :challenging_thought, :act_as_if])
+              .fetch(thought_id)
       end
     end
   end

data/app/controllers/think_feel_do_engine/password_entropy_bits_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_dependency "think_feel_do_engine/application_controller"
 
 module ThinkFeelDoEngine
@@ -7,7 +8,8 @@ module ThinkFeelDoEngine
       validator = PasswordValidator
                   .new(
                     password: params[:password],
-                    password_token: params[:reset_password_token])
+                    password_token: params[:reset_password_token]
+                  )
       render json: { bits: validator.entropy_value }
     end
   end