think_feel_do_engine 3.14.7 → 3.14.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f6254fd47d318dc7d56d53e80c99d4f388d207c
-  data.tar.gz: b7848c0a7ce18bfe532fa395966886d25f06764e
+  metadata.gz: ac82bd61ac77001bfdef60c6c4c401ce5f7180be
+  data.tar.gz: 5bfb5ab62b671bb1d9713600f001530f2eb2e478
 SHA512:
-  metadata.gz: e95d8aa852da0d28e3cbfd95c0abfa016304c0ff172d5c4ecf3cfe91e3974f38fdb06596d73fef89995d6e2971c81a51a4b65c6fc4c2bcf7d252e5a3bc33e478
-  data.tar.gz: 0c4d6e1b4233923db7db2d4cd6c8039ae7ae3d1bb67e927fab0300a2c1e8bfb7a34b3e801214b2bcb40dd9c941430d2c8a9909fc2baff326a47ae30f83a2f30a
+  metadata.gz: 8d2ee7577bdafbc3f69122e6076ca5dbc24342d19576673364a2d3fa479293b42bdb85fbe233f63f3e89a287e7b9543d09dc066d7f0aeddcb6c41be2c17cd43c
+  data.tar.gz: 30c619cdd4a3b376c37ccd5249ccc275c2d9f47671811200de576125aaded08c7a7aa4d671211c534f0f62d37562b54cd6e82481b0c33a398b16f44de2e75280

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

@@ -3,20 +3,20 @@ module ThinkFeelDoEngine
     # Shared Lesson Module behavior.
     module LessonModule
       URL_ROOT_RE = /^[^\/]*\/\/[^\/]+/
-
+      # Disabling method length due to nested methods.
+      # rubocop:disable Metrics/MethodLength
       def self.included(klass)
         class << klass
           # Returns a hash mapping lesson entry (first slide) path to Lesson
           # Module id.
           def lesson_entries_map
-            lessons = ContentModules::LessonModule.all.map do |m|
+            lessons = ContentModules::LessonModule
+                      .includes(:content_providers).map do |m|
               first_provider_id = m.provider(1).try(:id)
               next unless first_provider_id
-
               path = navigator_location_path(module_id: m.id,
                                              provider_id: first_provider_id,
                                              content_position: 1)
-
               ["#{ path }", m.id]
             end.compact
 
@@ -42,6 +42,7 @@ module ThinkFeelDoEngine
           end
         end
       end
+      # rubocop:enable Metrics/LineLength
     end
   end
 end

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

@@ -17,6 +17,7 @@ module ThinkFeelDoEngine
 
       def self.all(*ids)
         lessons = lesson_entries_map
+        lessons_default = lessons_with_default_urls
 
         Participant.select(:id, :study_id)
           .where(id: participant_ids(ids)).map do |participant|
@@ -26,14 +27,14 @@ module ThinkFeelDoEngine
             .select(:participant_id, :emitted_at, :payload)
             .to_a.select do |e|
               lessons.keys.include?(e.current_url.gsub(URL_ROOT_RE, "")) ||
-              lessons_with_default_urls
+              lessons_default
               .keys.include?(e.current_url.gsub(URL_ROOT_RE, ""))
             end
 
           lesson_select_events.map do |e|
             lesson_id = lessons[e.current_url.gsub(URL_ROOT_RE, "")] ||
-                        lessons_with_default_urls[e.current_url
-                                                  .gsub(URL_ROOT_RE, "")]
+                        lessons_default[e.current_url
+                                        .gsub(URL_ROOT_RE, "")]
             last_page_opened = last_page_opened(e, lesson_id)
             event_hash(participant, lesson_id, e, last_page_opened)
           end

data/db/migrate/20160408185958_add_event_composite_index_participant_kind.rb

@@ -0,0 +1,5 @@
+class AddEventCompositeIndexParticipantKind < ActiveRecord::Migration
+  def change
+    add_index :event_capture_events, [:participant_id, :kind]
+  end
+end

data/lib/think_feel_do_engine/version.rb

@@ -1,4 +1,4 @@
 # nodoc
 module ThinkFeelDoEngine
-  VERSION = "3.14.7"
+  VERSION = "3.14.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: think_feel_do_engine
 version: !ruby/object:Gem::Version
-  version: 3.14.7
+  version: 3.14.8
 platform: ruby
 authors:
 - Eric Carty-Fickes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-08 00:00:00.000000000 Z
+date: 2016-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -950,6 +950,7 @@ files:
 - db/migrate/20160205212840_create_experiences.rb
 - db/migrate/20160209225643_add_emotions_thoughts_body_feelings_to_experience.rb
 - db/migrate/20160404195642_change_show_next_nav_column_default.bit_core.rb
+- db/migrate/20160408185958_add_event_composite_index_participant_kind.rb
 - lib/tasks/lesson_notifications.rake
 - lib/tasks/seed.rake
 - lib/tasks/think_feel_do_engine_tasks.rake