think_feel_do_engine 3.19.7 → 3.19.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae2ac67360cf4936becc3201ca3116aa5a2746a6
-  data.tar.gz: 6014a2de830f98bd3a06736f46b528184bd8e185
+  metadata.gz: 44490ab377c55a5697d0f9cd55455ef8dbd7e365
+  data.tar.gz: 97c16cd8be6225e6527fa30bc7cf50663e5f7213
 SHA512:
-  metadata.gz: ab49783f7ad4d0feaa1693cd618dcd4157eca182b13f51e2569a37f881f3e3f28fe8ea6917b61d1d5abab8928de922f2c35cbe9554625dd3aa1bec29adc45da1
-  data.tar.gz: 64611db3bd1672d9607c30d6fd26ecbe41647af500c1837ea23fa8ccae031b43e2aff6bc7523200b89cd0ef6ca299c1c1f60fd86961e80fd85b3cd44cb7c6610
+  metadata.gz: 0109f1af1b2d18f7082394276e1bd5b078e41202b3c21dc02509d23dba4e56480dbe0b566a39caec9575e3ce6e716a9c8925d123002640aa96a9e508eb223e7f
+  data.tar.gz: 31afec2473200a51f94d1096f0f16ce83d8e2e7a8d7bcb4c6b5957d61120675c72e4e590bb29cd03459a2a1f7fc3f2282aacb7ac5ccfc07bafb7549f3756b55e

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

@@ -5,6 +5,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
       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]
@@ -116,8 +117,21 @@ module ThinkFeelDoEngine
       end
 
       def record_not_found
-        redirect_to arm_bit_maker_content_modules_path(@arm),
-                    alert: "Unable to find content module."
+        if @arm.is_a?(Arm)
+          redirect_to arm_bit_maker_content_modules_path(@arm),
+                      alert: "Unable to find content module."
+        else
+          arm_not_found_path
+        end
+      end
+
+      def arm_not_found_path
+        if defined?(think_feel_do_dashboard)
+          redirect_to think_feel_do_dashboard.arms_path,
+                      alert: ARM_NOT_FOUND_MESSAGE
+        else
+          redirect_to privacy_policy_path, alert: ARM_NOT_FOUND_MESSAGE
+        end
       end
     end
   end

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

@@ -42,7 +42,7 @@ module ThinkFeelDoEngine
           redirect_to coach_group_messages_url(@group), notice: "Message saved"
         else
           errors = @message.errors.full_messages.join(", ")
-          redirect_to :back, alert: "Unable to save message: #{ errors }"
+          redirect_to :back, alert: "Unable to save message: #{errors}"
         end
       end
 

data/app/controllers/think_feel_do_engine/lessons_controller.rb

@@ -79,7 +79,7 @@ module ThinkFeelDoEngine
 
     rescue
       redirect_to arm_lessons_url(@arm),
-                  alert: "Unable to delete lesson: #{ model_errors(@lesson) }"
+                  alert: "Unable to delete lesson: #{model_errors(@lesson)}"
     end
 
     def sort

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

@@ -21,7 +21,7 @@ module ThinkFeelDoEngine
                       notice: "Task assigned."
         else
           errors = @task.errors.full_messages.join(", ")
-          flash[:alert] = "Unable to assign task: #{ errors }"
+          flash[:alert] = "Unable to assign task: #{errors}"
           redirect_to arm_manage_tasks_group_path(@group.arm, @group)
         end
       end
@@ -36,7 +36,7 @@ module ThinkFeelDoEngine
           flash[:success] = "Task unassigned from group."
         else
           errors = @task.errors.full_messages.join(", ")
-          flash[:alert] = "Unable to delete task from group: #{ errors }"
+          flash[:alert] = "Unable to delete task from group: #{errors}"
         end
         redirect_to arm_manage_tasks_group_path(group.arm, group)
       end

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

@@ -12,7 +12,7 @@ module ThinkFeelDoEngine
         @assessment = build_assessment(release_date: @token.release_date)
 
         render "think_feel_do_engine/participants/assessments/" \
-               "new_#{ assessment_name }"
+               "new_#{assessment_name}"
       end
 
       def create
@@ -26,15 +26,15 @@ module ThinkFeelDoEngine
             @assessment = build_assessment(release_date: @token.release_date)
 
             render "think_feel_do_engine/participants/assessments/" \
-                   "new_#{ assessment_name }"
+                   "new_#{assessment_name}"
           else
             render :success
           end
         else
           errors = @assessment.errors.full_messages.join(", ")
-          flash.now[:alert] = "Unable to save assessment: #{ errors }"
+          flash.now[:alert] = "Unable to save assessment: #{errors}"
           render "think_feel_do_engine/participants/assessments/" \
-                 "new_#{ assessment_name }"
+                 "new_#{assessment_name}"
         end
       end
 

data/app/helpers/think_feel_do_engine/coach/group_dashboard_helper.rb

@@ -1,6 +1,7 @@
 module ThinkFeelDoEngine
   module Coach
     # Displays navigational information in the form of breadcrumbs
+    # rubocop:disable Metrics/ModuleLength
     module GroupDashboardHelper
       def social_likes_and_comments_column_headers
         if social_features?
@@ -152,5 +153,6 @@ module ThinkFeelDoEngine
         end
       end
     end
+    # rubocop:enable Metrics/ModuleLength
   end
 end

data/app/helpers/think_feel_do_engine/phq_assessment_helper.rb

@@ -4,7 +4,7 @@ module ThinkFeelDoEngine
   module PhqAssessmentHelper
     def phq_warning(score)
       if score == 3
-        "<div class='label label-danger'>PHQ-9 WARNING: #{ score }</div>"
+        "<div class='label label-danger'>PHQ-9 WARNING: #{score}</div>"
           .html_safe
       else
         score

data/app/helpers/think_feel_do_engine/tasks_helper.rb

@@ -76,7 +76,7 @@ module ThinkFeelDoEngine
     end
 
     def css_id
-      "task-status-#{ available_module.task_status_id }"
+      "task-status-#{available_module.task_status_id}"
     end
 
     def data_attributes

data/app/models/activity.rb

@@ -343,8 +343,12 @@ class Activity < ActiveRecord::Base
   end
 
   def create_activity_type
-    new_title = activity_type_new_title.present? ? activity_type_new_title :
-      activity_type_title
+    new_title = if activity_type_new_title.present?
+                  activity_type_new_title
+                else
+                  activity_type_title
+                end
+
     if new_title
       activity_types = participant.activity_types
 

data/app/models/content_providers/past_activity_form.rb

@@ -43,7 +43,8 @@ module ContentProviders
 
     def timestamps(participant)
       period = most_recent_awake_period(participant)
-      start_time, end_time = period.start_time, period.end_time
+      start_time = period.start_time
+      end_time = period.end_time
       times = []
       (start_time.to_i..(end_time.to_i - 1.hour)).step(1.hour) do |timestamp|
         times << timestamp

data/app/models/content_providers/unhelpful_thoughts_list_provider.rb

@@ -34,30 +34,35 @@ module ContentProviders
       end
     end
 
+    def report_missing_module
+      return unless defined? Raven
+
+      event = Raven::Event.new(message: "one of the thought modules " \
+                                        "couldn't be found via title")
+      Raven.send(event)
+    end
+
     def provider_postscript
       if @thoughts.count > 0
         "We're going to ask you to challenge each thought:"
       else
-        title_1, title_2 = "#1 Identifying", "Add a New Harmful Thought"
+        title_1 = "#1 Identifying"
+        title_2 = "Add a New Harmful Thought"
         module_1 = BitCore::ContentModule.find_by_title(title_1)
         module_2 = BitCore::ContentModule.find_by_title(title_2)
 
         if module_1 && module_2
           "You can log more thoughts in " \
-          "#{ @view.link_to(
+          "#{@view.link_to(
             title_1,
             @view.navigator_location_path(module_id: module_1.id),
-            style: 'font-size: larger;') } or use " \
-          "#{ @view.link_to(
+            style: 'font-size: larger;')} or use " \
+          "#{@view.link_to(
             title_2,
             @view.navigator_location_path(module_id: module_2.id),
-            style: 'font-size: larger;') } to do multiple steps at once."
+            style: 'font-size: larger;')} to do multiple steps at once."
         else
-          if defined? Raven
-            event = Raven::Event.new(message: "one of the thought modules " \
-                                              "couldn't be found via title")
-            Raven.send(event)
-          end
+          report_missing_module
 
           nil
         end

data/app/models/message_sms_notification.rb

@@ -35,7 +35,7 @@ class MessageSmsNotification
 
   def message
     params = {
-      to: "+1#{ phone_number }",
+      to: "+1#{phone_number}",
       from: from_telephone_number,
       body: body
     }

data/app/models/phq_assessment.rb

@@ -48,8 +48,8 @@ class PhqAssessment < ActiveRecord::Base
 
     if answered_questions.min < MIN_QUESTION_SCORE ||
        answered_questions.max > MAX_QUESTION_SCORE
-      errors.add(:base, "scores must be between #{ MIN_QUESTION_SCORE } " \
-                        "and #{ MAX_QUESTION_SCORE } inclusive")
+      errors.add(:base, "scores must be between #{MIN_QUESTION_SCORE} " \
+                        "and #{MAX_QUESTION_SCORE} inclusive")
     end
   end
 end

data/app/models/think_feel_do_engine/reports/lesson_module.rb

@@ -4,7 +4,7 @@ module ThinkFeelDoEngine
     module LessonModule
       URL_ROOT_RE = /^[^\/]*\/\/[^\/]+/
       # Disabling method length due to nested methods.
-      # rubocop:disable Metrics/MethodLength
+      # rubocop:disable Metrics/MethodLength,Lint/NestedMethodDefinition
       def self.included(klass)
         class << klass
           # Returns a hash mapping lesson entry (first slide) path to Lesson
@@ -17,7 +17,7 @@ module ThinkFeelDoEngine
               path = navigator_location_path(module_id: m.id,
                                              provider_id: first_provider_id,
                                              content_position: 1)
-              ["#{ path }", m.id]
+              ["#{path}", m.id]
             end.compact
 
             Hash[lessons]
@@ -28,7 +28,7 @@ module ThinkFeelDoEngine
             lessons = ContentModules::LessonModule.all.map do |m|
               path = navigator_location_path(module_id: m.id)
 
-              ["#{ path }", m.id]
+              ["#{path}", m.id]
             end
 
             Hash[lessons]
@@ -42,7 +42,7 @@ module ThinkFeelDoEngine
           end
         end
       end
-      # rubocop:enable Metrics/LineLength
+      # rubocop:enable Metrics/LineLength,Lint/NestedMethodDefinition
     end
   end
 end

data/app/models/think_feel_do_engine/reports/module_page_view.rb

@@ -49,7 +49,7 @@ module ThinkFeelDoEngine
           .order(:emitted_at)
           .where("emitted_at > ? AND payload NOT LIKE ?",
                  page_render_event.emitted_at,
-                 "%currentUrl: #{ page_render_event.current_url }\n%")
+                 "%currentUrl: #{page_render_event.current_url}\n%")
           .select(:emitted_at).limit(1).first.try(:emitted_at)
       end
     end

data/app/models/think_feel_do_engine/reports/module_session.rb

@@ -118,8 +118,8 @@ module ThinkFeelDoEngine
         if last_provider.nil?
           false
         else
-          provider_re = "modules\/#{ module_id }\/" \
-                        "providers\/#{ last_provider.id }(\/.*)?$"
+          provider_re = "modules\/#{module_id}\/" \
+                        "providers\/#{last_provider.id}(\/.*)?$"
 
           !url.match(/#{ provider_re }/).nil?
         end

data/app/models/think_feel_do_engine/reports/tool_module.rb

@@ -1,6 +1,7 @@
 module ThinkFeelDoEngine
   module Reports
     # Helper methods for reporting on modules.
+    # rubocop:disable Lint/NestedMethodDefinition
     module ToolModule
       URL_ROOT_RE = /^[^\/]*\/\/[^\/]+/
 
@@ -25,5 +26,6 @@ module ThinkFeelDoEngine
         end
       end
     end
+    # rubocop:enable Lint/NestedMethodDefinition
   end
 end

data/app/models/thought.rb

@@ -61,20 +61,20 @@ class Thought < ActiveRecord::Base
   end
 
   def shared_description
-    "Thought: #{ content }"
+    "Thought: #{content}"
   end
 
   private
 
   def clean_attributes
-    def clean_attribute(attr)
+    clean_attribute = lambda do |attr|
       if self[attr].respond_to?(:strip)
         cleaned = self[attr].strip
-        send("#{ attr }=", cleaned == "" ? nil : cleaned)
+        send("#{attr}=", cleaned == "" ? nil : cleaned)
       end
     end
 
-    clean_attribute(:challenging_thought)
-    clean_attribute(:act_as_if)
+    clean_attribute.call(:challenging_thought)
+    clean_attribute.call(:act_as_if)
   end
 end

data/app/models/wai_assessment.rb

@@ -19,8 +19,8 @@ class WaiAssessment < ActiveRecord::Base
 
     if remove_nils.min < MIN_QUESTION_SCORE ||
        remove_nils.max > MAX_QUESTION_SCORE
-      errors.add(:base, "scores must be between #{ MIN_QUESTION_SCORE } " \
-                        "and #{ MAX_QUESTION_SCORE } inclusive")
+      errors.add(:base, "scores must be between #{MIN_QUESTION_SCORE} " \
+                        "and #{MAX_QUESTION_SCORE} inclusive")
     end
   end
 

data/lib/think_feel_do_engine/version.rb

@@ -1,4 +1,4 @@
 # nodoc
 module ThinkFeelDoEngine
-  VERSION = "3.19.7"
+  VERSION = "3.19.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: think_feel_do_engine
 version: !ruby/object:Gem::Version
-  version: 3.19.7
+  version: 3.19.8
 platform: ruby
 authors:
 - Eric Carty-Fickes
@@ -988,7 +988,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Summary of ThinkFeelDoEngine.