think_feel_do_engine 3.21.1 → 3.21.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20f20efba264a83a66b5d1824cae5ec07e8ef288
-  data.tar.gz: c30f8503fa62eb29007585f29f0c8cc6dfe66c39
+  metadata.gz: 3ff553dad57d0ae0a68326a83dd251c9f44037c2
+  data.tar.gz: ef4e2750dd4cfe73e15445ac1c3303a7fedbf3d8
 SHA512:
-  metadata.gz: d77b928f8354233495ac71d69f461b41664089c3561c08e2dc70814d2e37c633f43123c09c5addbea86f8f544ef578528f209aaa3d92fdeea41ee7a4f96b656d
-  data.tar.gz: bb916dabaf273b4e6c552d58760d28476b69b2e51a9769fdf7dc9e92640e710bc2739fb5fdfb4411a39fb3dcf8f4ebd54dd7f93f0e12b7f83f8011c897166b43
+  metadata.gz: ece5a0cd2dac5b4f0f8ad8f58cdef342323fab606075c5ecfe077d12f9bc7c5e0141f5f763d9704ff15c81f7f36c2792930f81129ee4d0bbda587d3fe227f93b
+  data.tar.gz: 73a185e725ad537b6543f8aae77ccc55b03a78778c725089f0b326cd6d344f72b86339053d31d34a02e15cc0003f10de494012994abc566160b428361c9887cd

data/app/controllers/think_feel_do_engine/navigator_controller.rb

@@ -42,7 +42,6 @@ module ThinkFeelDoEngine
     def show_next_content
       mark_engagement_completed
       @navigator.fetch_next_content
-
       if @navigator.current_module
         redirect_to navigator_location_path(
           module_id: @navigator.current_module.try(:id),
@@ -122,10 +121,10 @@ module ThinkFeelDoEngine
     end
 
     def mark_engagement_completed
-      if navigator_content_module && last_engagement &&
-         !@navigator.current_content_provider.exists?(
-           @navigator.content_position + 1
-         )
+      if navigator_content_module &&
+         last_engagement &&
+         last_slideshow_of_engagement? &&
+         provider_last_page?
         last_engagement.update_attributes(completed_at: DateTime.current)
       end
     end
@@ -134,6 +133,25 @@ module ThinkFeelDoEngine
       !provider_id.blank? && !content_id.blank?
     end
 
+    def provider_last_page?
+      !@navigator
+        .current_content_provider
+        .exists?(@navigator.content_position + 1)
+    end
+
+    def last_slideshow
+      navigator_content_module
+        .content_providers
+        .where(type: BitCore::ContentProviders::SlideshowProvider)
+        .order(position: :asc)
+        .last
+    end
+
+    def last_slideshow_of_engagement?
+      @navigator
+        .current_content_provider == last_slideshow
+    end
+
     def module_exist?
       @navigator
         .current_module

data/lib/think_feel_do_engine/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 # nodoc
 module ThinkFeelDoEngine
-  VERSION = "3.21.1"
+  VERSION = "3.21.2"
 end

metadata

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