think_feel_do_engine 3.12.7 → 3.12.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcb3c344a9fe87b672b6df1c46467251978bb9bb
-  data.tar.gz: baba54d9b84a62b997b0ae7f54837b2e8a68a8f3
+  metadata.gz: 5eda6daa84e50aee599b51148c676115de55d51e
+  data.tar.gz: f0ae52521b0989d9cd36a0c63b5b418268743738
 SHA512:
-  metadata.gz: 1eb26653fbd96f3397fe47b88fc03e2d0c4642fdea7de838d1e9b87cc4b3c137a14c8e06d91689225cd46b1d37e4f5152928ac9fb508669a3466ccf1702ba1f2
-  data.tar.gz: 0535ad61ae2e474b045fc7f14edebcb67fc641b2930bc96177d10e85d1bd165b129d3f226ac67c06f3242929bd59e39e27a5f49bd197ad78bb2c7669ad4fea27
+  metadata.gz: 32f96a9a4ea720b696a50782e487d4204a56bf17d4e443fd8ff7eacbc9e145155e90bacd2fd66e3126c98990bd54db015286081b0ea7544416ca2c0f41c7939e
+  data.tar.gz: 435508a4bdd58facc163bae3c9bf1d6fadf14ec593d128610735ee35030322458c1d9a302e37ce8fa16b19a1d2a1c0957049629694e51265969e6d688dfdd0b9

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

@@ -20,6 +20,9 @@ module ThinkFeelDoEngine
 
       def new
         @participants = current_user.participants_for_group(@group)
+        redirect_to(coach_group_site_messages_path(@group),
+                    alert: "A group must have participants in order "\
+                            " to send site message.") if @participants.empty?
       end
 
       def create

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

@@ -14,9 +14,12 @@ module ThinkFeelDoEngine
 
         # condense adjacent interactions
         filtered_interactions = []
+
         interactions.each_with_index do |interaction, i|
-          previous_interaction = i > 0 ? interactions[i - 1] : {}
-          next if previous_interaction[:slide_id] == interaction[:slide_id]
+          previous_interaction = find_previous_interaction(interactions, i)
+          next if previous_interaction.nil? ||
+                  interaction.nil? ||
+                  previous_interaction[:slide_id] == interaction[:slide_id]
 
           next_interaction = interactions[i + 1] || {}
           filtered_interaction = interaction.clone
@@ -39,17 +42,20 @@ module ThinkFeelDoEngine
           slide_view_events(lessons, participant.id).map do |lesson_event|
             e = lesson_event[1]
             lesson_id = lesson_event[0]
-            slides = ContentModules::LessonModule.find(lesson_id).slides
-            slide = find_slide_by_url(slides, e.current_url)
-
-            {
-              participant_id: participant.study_id,
-              lesson_id: lesson_id,
-              slide_id: slide.try(:id),
-              slide_title: slide.try(:title),
-              slide_selected_at: e.emitted_at.try(:iso8601),
-              slide_exited_at: next_event_at(e).try(:iso8601)
-            }
+            begin
+              slides = ContentModules::LessonModule.find(lesson_id).slides
+              slide = find_slide_by_url(slides, e.current_url)
+              {
+                participant_id: participant.study_id,
+                lesson_id: lesson_id,
+                slide_id: slide.try(:id),
+                slide_title: slide.try(:title),
+                slide_selected_at: e.emitted_at.try(:iso8601),
+                slide_exited_at: next_event_at(e).try(:iso8601)
+              }
+            rescue ActiveRecord::RecordNotFound
+              lesson_module_not_found(participant, lesson_id) if defined?(Raven)
+            end
           end
         end.flatten
       end
@@ -87,7 +93,20 @@ module ThinkFeelDoEngine
           slide_position = url[/\d+$/].to_i
         end
 
-        slides.find_by_position(slide_position)
+        slides.find_by_position(slide_position) unless slides.empty?
+      end
+
+      def self.lesson_module_not_found(participant, lesson_id)
+        Raven.capture_message "No slides found for lesson found",
+                              extra: {
+                                participant_id: participant.try(:id),
+                                study_id: participant.try(:study_id),
+                                lesson_id: lesson_id
+                              }
+      end
+
+      def self.find_previous_interaction(interactions, index)
+        index > 0 ? interactions[index - 1] : {}
       end
     end
   end

data/lib/think_feel_do_engine/version.rb

@@ -1,4 +1,4 @@
 # nodoc
 module ThinkFeelDoEngine
-  VERSION = "3.12.7"
+  VERSION = "3.12.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: think_feel_do_engine
 version: !ruby/object:Gem::Version
-  version: 3.12.7
+  version: 3.12.8
 platform: ruby
 authors:
 - Eric Carty-Fickes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-09 00:00:00.000000000 Z
+date: 2016-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails