think_feel_do_dashboard 1.1.19 → 1.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6920f2ca865ff9bf8ed7262534ff7655c2317aa
-  data.tar.gz: 04c3d6af43b677e230357db4471173db354ec868
+  metadata.gz: 60c04e6bf832febb87121a5d4b9dfd4a5d36f331
+  data.tar.gz: c490cf52e688ff1ba77995d668508f6009308fbd
 SHA512:
-  metadata.gz: 257b05c606e24f987e4c4f98a18138f2aa61d2f563c2e6b2c351ea112221173fcaba3c3e75f5651c2382e996cce3784bf4ccb72174a8708383d7780b6c6bf18b
-  data.tar.gz: f77d2bf05cb88a7dea0fc5337d64c2827aa5bc42d432dec72977e32bb1440a8ae15ebddd7da0b74705dd2915032ad89e8966f070f45d8d7691c7d9ec010d6490
+  metadata.gz: 5ca8a9ed20bb1f0522da2ee5f5fec4e2cbd78b7b9695e1559f7a14c45fbc6a74e1156319bd77869e991184c528ec3b86118bab80823b5190c216d5c9d87a69e2
+  data.tar.gz: a6fd2463370bb7d652d8bc4f5561fc58097b9d227d80dbb62f21b659e456ed4e0472d4f080a6eae18aa22aab8b3dbb1e491a7b8c3cd49e2dcf9097f80b19e6de

data/app/controllers/think_feel_do_dashboard/coach_assignments_controller.rb

@@ -81,7 +81,8 @@ module ThinkFeelDoDashboard
     def set_new_woz_coach
       @coach_assignment = CoachAssignment.new(
         participant: @participant,
-        coach_id: @participant.active_group.moderator_id)
+        coach_id: @participant.active_group.moderator_id
+      )
       if @coach_assignment.save
         notification = "Coach/Moderator was successfully assigned"
       else

data/app/helpers/think_feel_do_dashboard/application_helper.rb

@@ -13,11 +13,11 @@ module ThinkFeelDoDashboard
           concat(content_tag(:li, link_to("Home", root_path)))
 
           if can_view_resource_index?
-            concat(content_tag(:li,
-                               link_to(controller_name.capitalize,
-                                       url_for(controller: controller_name))
-                              )
-                  )
+            concat(
+              content_tag(
+                :li, controller_link
+              )
+            )
           end
         end
       )
@@ -44,5 +44,9 @@ module ThinkFeelDoDashboard
 
       !klass.is_a?(Class) || can?(:index, klass)
     end
+
+    def controller_link
+      link_to(controller_name.capitalize, url_for(controller: controller_name))
+    end
   end
 end

data/app/helpers/think_feel_do_dashboard/participants_helper.rb

@@ -2,12 +2,21 @@ module ThinkFeelDoDashboard
   # Display the membership status for a participant and membership
   module ParticipantsHelper
     def membership_status(participant, membership)
-      if participant.memberships.active.where(
-        "memberships.is_complete = false").include?(membership)
+      if participant_active?(participant, membership)
         "<span class=\"label label-success\">Active</span> ".html_safe
       else
         "<span class=\"label label-danger\">Inactive</span> ".html_safe
       end
     end
+
+    private
+
+    def participant_active?(participant, membership)
+      participant
+        .memberships
+        .active
+        .where("memberships.is_complete = false")
+        .include?(membership)
+    end
   end
 end

data/app/models/think_feel_do_dashboard/concerns/group.rb

@@ -46,7 +46,8 @@ module ThinkFeelDoDashboard
           memberships.build(
             participant_id: participant.id,
             start_date: Time.zone.today,
-            end_date: Time.zone.today.advance(days: days))
+            end_date: Time.zone.today.advance(days: days)
+          )
         end
       end
 
@@ -62,14 +63,16 @@ module ThinkFeelDoDashboard
           is_admin: true,
           password: password,
           password_confirmation: password,
-          study_id: study_id)
+          study_id: study_id
+        )
       end
 
       def create_profile(participant_id)
         ::SocialNetworking::Profile.create!(
           participant_id: participant_id,
           icon_name: "admin",
-          active: true)
+          active: true
+        )
       end
     end
   end

data/lib/think_feel_do_dashboard.rb

@@ -1,4 +1,5 @@
 require "think_feel_do_dashboard/engine"
+require "jquery-rails"
 
 # Rails engine that is replacing rails_admin
 # Provides admin functionailty such as assigning participants

data/lib/think_feel_do_dashboard/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 # Version number of engine
 module ThinkFeelDoDashboard
-  VERSION = "1.1.19".freeze
+  VERSION = "1.1.20".freeze
 end

data/spec/controllers/think_feel_do_dashboard/groups_controllers_spec.rb

@@ -24,7 +24,8 @@ module ThinkFeelDoDashboard
           let(:group) do
             instance_double(
               Group,
-              arm: instance_double(Arm))
+              arm: instance_double(Arm)
+            )
           end
 
           before do

data/spec/controllers/think_feel_do_dashboard/membership_controller_spec.rb

@@ -13,7 +13,8 @@ module ThinkFeelDoDashboard
           Group,
           id: 1,
           arm: instance_double(Arm, is_social?: true),
-          title: "best group eva!!111")
+          title: "best group eva!!111"
+        )
       end
       let(:membership) do
         instance_double Membership
@@ -22,7 +23,8 @@ module ThinkFeelDoDashboard
         instance_double(
           Participant,
           id: 1,
-          memberships: double("memberships"))
+          memberships: double("memberships")
+        )
       end
 
       context "view membership" do
@@ -57,7 +59,8 @@ module ThinkFeelDoDashboard
         instance_double(
           Group,
           arm: instance_double(Arm, is_social?: true),
-          title: "best group eva!!111")
+          title: "best group eva!!111"
+        )
       end
       let(:participant) do
         instance_double(
@@ -69,7 +72,10 @@ module ThinkFeelDoDashboard
               group: group,
               display_name: nil,
               errors:
-                double("errors", full_messages: []))))
+                double("errors", full_messages: [])
+            )
+          )
+        )
       end
 
       context "create new membership in social arm" do

data/spec/controllers/think_feel_do_dashboard/moderators_controller_spec.rb

@@ -18,7 +18,8 @@ module ThinkFeelDoDashboard
               .to receive(:find) do
                 instance_double(
                   Group,
-                  moderating_participant: user)
+                  moderating_participant: user
+                )
               end
             expect(controller).to receive(:sign_in).with(user)
             allow(controller)

data/spec/dummy/config/application.rb

@@ -3,7 +3,7 @@ require File.expand_path('../boot', __FILE__)
 # Pick the frameworks you want:
 require "active_record/railtie"
 require "action_controller/railtie"
-require "action_mailer/railtie"
+#require "action_mailer/railtie"
 require "action_view/railtie"
 require "sprockets/railtie"
 # require "rails/test_unit/railtie"

data/spec/dummy/config/environments/development.rb

@@ -14,7 +14,7 @@ Rails.application.configure do
   config.action_controller.perform_caching = false
 
   # Don't care if the mailer can't send.
-  config.action_mailer.raise_delivery_errors = false
+  #config.action_mailer.raise_delivery_errors = false
 
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
@@ -36,5 +36,5 @@ Rails.application.configure do
   # config.action_view.raise_on_missing_translations = true
 
   # Devise - visit https://github.com/plataformatec/devise
-  config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
+  #config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
 end

data/spec/dummy/config/environments/test.rb

@@ -29,7 +29,7 @@ Rails.application.configure do
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
-  config.action_mailer.delivery_method = :test
+  #config.action_mailer.delivery_method = :test
 
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr

data/spec/dummy/config/initializers/devise.rb

@@ -1,10 +1,12 @@
+require "devise"
+
 # Use this hook to configure devise mailer, warden hooks and so forth.
 # Many of these configuration options can be set straight in your model.
 Devise.setup do |config|
   # The secret key used by Devise. Devise uses this key to generate
   # random tokens. Changing this key will render invalid all existing
   # confirmation, reset password and unlock tokens in the database.
-  # config.secret_key = '178a41b361b8d846f1c32a0ed56cbc1b10e629e08248c41f3a7b97e3e02702f51a9d86a8570d762fc7d23c4c81423259acafffb5b379f3f62b3f9c47007c295c'
+  config.secret_key = '178a41b361b8d846f1c32a0ed56cbc1b10e629e08248c41f3a7b97e3e02702f51a9d86a8570d762fc7d23c4c81423259acafffb5b379f3f62b3f9c47007c295c'
 
   # ==> Mailer Configuration
   # Configure the e-mail address which will be shown in Devise::Mailer,

data/spec/dummy/db/schema.rb

@@ -68,13 +68,12 @@ ActiveRecord::Schema.define(version: 20150410175659) do
     t.inet     "current_sign_in_ip"
     t.inet     "last_sign_in_ip"
     t.boolean  "is_admin"
+    t.index ["email"], name: "index_participants_on_email", unique: true, using: :btree
+    t.index ["phone_number"], name: "index_participants_on_phone_number", unique: true, using: :btree
+    t.index ["reset_password_token"], name: "index_participants_on_reset_password_token", unique: true, using: :btree
+    t.index ["study_id"], name: "index_participants_on_study_id", unique: true, using: :btree
   end
 
-  add_index "participants", ["email"], name: "index_participants_on_email", unique: true, using: :btree
-  add_index "participants", ["phone_number"], name: "index_participants_on_phone_number", unique: true, using: :btree
-  add_index "participants", ["reset_password_token"], name: "index_participants_on_reset_password_token", unique: true, using: :btree
-  add_index "participants", ["study_id"], name: "index_participants_on_study_id", unique: true, using: :btree
-
   create_table "slideshow_anchors", force: :cascade do |t|
     t.integer  "bit_core_slideshow_id"
     t.string   "target_name"
@@ -125,9 +124,8 @@ ActiveRecord::Schema.define(version: 20150410175659) do
     t.datetime "last_sign_in_at"
     t.inet     "current_sign_in_ip"
     t.inet     "last_sign_in_ip"
+    t.index ["email"], name: "index_users_on_email", unique: true, using: :btree
+    t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree
   end
 
-  add_index "users", ["email"], name: "index_users_on_email", unique: true, using: :btree
-  add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree
-
 end

data/spec/dummy/log/development.log

@@ -372305,3 +372305,5 @@ WHERE c.contype = 'f'
   AND t3.nspname = ANY (current_schemas(false))
 ORDER BY c.conname
 
+  Participant Load (31.0ms)  SELECT  "participants".* FROM "participants"  ORDER BY "participants"."id" ASC LIMIT 1
+  Participant Load (0.7ms)  SELECT  "participants".* FROM "participants"  ORDER BY "participants"."id" ASC LIMIT 1

data/spec/models/concerns/group_spec.rb

@@ -9,7 +9,8 @@ describe "Group concern" do
         Participant.create!(
           contact_preference: "email",
           study_id: "bar",
-          email: "foo@ex.com")
+          email: "foo@ex.com"
+        )
       end
 
       it "augments default password to ensure validity" do
@@ -24,13 +25,15 @@ describe "Group concern" do
             display_name: anything,
             email: anything,
             is_admin: true,
-            study_id: anything)
+            study_id: anything
+          )
           .and_return(participant)
 
         Group.create!(
           title: "Valid",
           arm: arms(:arm1),
-          moderator: users(:clinician1))
+          moderator: users(:clinician1)
+        )
       end
     end
   end

data/spec/models/group_spec.rb

@@ -77,7 +77,8 @@ describe Group do
           Group.new(
             arm_id: social_arm.id,
             moderator_id: clinician2.id,
-            title: "Test")
+            title: "Test"
+          )
         end
 
         describe "when invalid" do
@@ -104,7 +105,8 @@ describe Group do
           Group.create!(
             arm_id: social_arm.id,
             moderator_id: clinician2.id,
-            title: "Test")
+            title: "Test"
+          )
         end
 
         before do

data/spec/rails_helper.rb

@@ -8,6 +8,8 @@ require File.expand_path("../dummy/config/environment.rb", __FILE__)
 require "rspec/rails"
 require "capybara/poltergeist"
 
+require "timecop"
+
 Capybara.javascript_driver = :poltergeist
 options = {
   js_errors: false,

data/spec/support/controller_spec_helpers.rb

@@ -1,3 +1,7 @@
+if Rails::VERSION::MAJOR == 5
+  require "rails-controller-testing"
+end
+
 module ControllerSpecHelpers
   def sign_in_participant(participant = double("participant"))
     sign_in_resource(participant, "participant")
@@ -24,6 +28,10 @@ module ControllerSpecHelpers
 end
 
 RSpec.configure do |config|
+  if Rails::VERSION::MAJOR == 5
+    config.include ::Rails::Controller::Testing::TemplateAssertions,
+                   type: :controller
+  end
   config.include Devise::TestHelpers, type: :controller
   config.include ControllerSpecHelpers, type: :controller
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: think_feel_do_dashboard
 version: !ruby/object:Gem::Version
-  version: 1.1.19
+  version: 1.1.20
 platform: ruby
 authors:
 - Eric Carty-Fickes
@@ -10,22 +10,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-27 00:00:00.000000000 Z
+date: 2016-05-20 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 4.2.5.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 4.2.5.2
 - !ruby/object:Gem::Dependency
   name: turbolinks
   requirement: !ruby/object:Gem::Requirement
@@ -41,47 +27,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: devise
+  name: cancancan
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '1.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '1.9'
 - !ruby/object:Gem::Dependency
-  name: cancancan
+  name: phonelib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
-  name: phonelib
+  name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 3.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 3.1.3
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -102,14 +88,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.5.0.beta3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.5.0.beta3
 - !ruby/object:Gem::Dependency
   name: poltergeist
   requirement: !ruby/object:Gem::Requirement
@@ -166,6 +152,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.1
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.26'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.26'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 description: Enables users to manage arms/trials, groups, users, participants, and
   memberships.
 email:
@@ -2392,7 +2406,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Provides administrational tasks.