think_feel_do_engine 3.19.9 → 3.20.1

data/app/support/mood_and_emotion_visualization_service.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Grouping logic for the visualization of participant mood and emotion data.
 class MoodAndEmotionVisualizationService
   def initialize(participant)
@@ -9,20 +10,18 @@ class MoodAndEmotionVisualizationService
     daily_ratings = @participant
                     .moods
                     .group_by { |x| x.created_at.strftime("%Y-%m-%d") }
-    # rubocop:disable all
     daily_ratings.each do |day, moods_array|
-      # rubocop:enable all
       ratings = moods_array.collect do |mood|
         [mood.rating, mood.created_at].compact
       end
-      if ratings.size > 0
-        averaged_ratings << { day: day,
-                              intensity: average_rating(ratings),
-                              is_positive: true,
-                              drill_down: ratings,
-                              data_type: "Mood"
-        }
-      end
+
+      next if ratings.empty?
+
+      averaged_ratings << { day: day,
+                            intensity: average_rating(ratings),
+                            is_positive: true,
+                            drill_down: ratings,
+                            data_type: "Mood" }
     end
     averaged_ratings
   end
@@ -30,30 +29,28 @@ class MoodAndEmotionVisualizationService
   def emotional_rating_daily_averages
     averaged_ratings = []
 
-    daily_ratings = @participant.emotional_ratings
+    daily_ratings = @participant
+                    .emotional_ratings
                     .group_by { |x| x.created_at.strftime("%Y-%m-%d") }
-    # rubocop:disable all
     daily_ratings.each do |day, emotion_array|
-      # rubocop:enable all
       positive_ratings = @participant.positive_emotions(emotion_array)
-      if positive_ratings.size > 0
+      unless positive_ratings.empty?
         daily_positive = { day: day,
                            intensity: average_rating(positive_ratings),
                            is_positive: true,
                            drill_down: positive_ratings,
-                           data_type: "Emotion"
-        }
+                           data_type: "Emotion" }
         averaged_ratings << daily_positive
       end
       negative_ratings = @participant.negative_emotions(emotion_array)
-      if negative_ratings.size > 0
-        daily_negative = {  day: day,
-                            intensity: average_rating(negative_ratings),
-                            is_positive: false,
-                            drill_down: negative_ratings, data_type: "Emotion"
-        }
-        averaged_ratings << daily_negative
-      end
+
+      next if negative_ratings.empty?
+
+      daily_negative = {  day: day,
+                          intensity: average_rating(negative_ratings),
+                          is_positive: false,
+                          drill_down: negative_ratings, data_type: "Emotion" }
+      averaged_ratings << daily_negative
     end
     averaged_ratings
   end
@@ -63,4 +60,4 @@ class MoodAndEmotionVisualizationService
   def average_rating(array)
     array.reduce(0) { |a, e| a.to_f + e[0] } / array.size
   end
-end
+end

data/lib/think_feel_do_engine/engine.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ThinkFeelDoEngine
   # The mountable application engine.
   class Engine < ::Rails::Engine

data/lib/think_feel_do_engine/version.rb

@@ -1,4 +1,5 @@
+# frozen_string_literal: true
 # nodoc
 module ThinkFeelDoEngine
-  VERSION = "3.19.9"
+  VERSION = "3.20.1"
 end

data/lib/think_feel_do_engine.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Devise must be required first to override views.
 require "devise"
 require "think_feel_do_engine/engine"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: think_feel_do_engine
 version: !ruby/object:Gem::Version
-  version: 3.19.9
+  version: 3.20.1
 platform: ruby
 authors:
 - Eric Carty-Fickes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-09 00:00:00.000000000 Z
+date: 2016-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 6.0.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 6.0.0.beta1
 - !ruby/object:Gem::Dependency
   name: underscore-rails
   requirement: !ruby/object:Gem::Requirement
@@ -212,6 +212,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: sprockets-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: jshintrb
   requirement: !ruby/object:Gem::Requirement
@@ -334,6 +348,7 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- app/assets/config/manifest.js
 - app/assets/images/changing_actions.gif
 - app/assets/images/evaluating_thoughts.gif
 - app/assets/images/favicon.ico
@@ -988,9 +1003,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Summary of ThinkFeelDoEngine.
 test_files: []
-has_rdoc: