rubyforgood
diff --git a/‎.rubocop.yml
+20-1 b/‎.rubocop.yml
+20-1
diff --git a/‎.rubocop_todo.yml
+2-30 b/‎.rubocop_todo.yml
+2-30
diff --git a/‎Capfile
+9-7 b/‎Capfile
+9-7
diff --git a/‎Gemfile
+12-12 b/‎Gemfile
+12-12
diff --git a/‎Gemfile.lock
+9-10 b/‎Gemfile.lock
+9-10
diff --git a/‎analyze_new_cluster.sh
+22 b/‎analyze_new_cluster.sh
+22
diff --git a/‎app/models/item.rb
+2-2 b/‎app/models/item.rb
+2-2
diff --git a/‎app/models/site_manager.rb
+1-1 b/‎app/models/site_manager.rb
+1-1
diff --git a/‎app/models/user.rb
+3-3 b/‎app/models/user.rb
+3-3
diff --git a/‎bin/yarn
+2-2 b/‎bin/yarn
+2-2
diff --git a/‎config/deploy.rb
+20-16 b/‎config/deploy.rb
+20-16
@@ -16,9 +16,28 @@ AllCops:
   # `-S/--display-style-guide` option.
   DisplayStyleGuide: true
 
+# Numbers shouldn't have to be formatted with underscores
 Style/NumericLiterals:
   Enabled: false
 
-Style/BlockDelimiters:
+# The excluded files below can create some pretty big blocks which are needed
+Metrics/BlockLength:
+  CountComments: false
   Exclude:
     - spec/**/*
+    - config/**/*
+
+Metrics/MethodLength:
+  Max: 12
+
+# This gives us some breathing room
+Metrics/AbcSize:
+  Max: 20
+
+# If code isn't self-documenting then we should add documentation, otherwise
+# forcing documentation isn't needed.
+Style/Documentation:
+  Enabled: false
+
+Style/MixinUsage:
+  Enabled: false
@@ -1,41 +1,13 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2017-10-19 07:48:24 -0700 using RuboCop version 0.50.0.
+# on 2017-10-24 20:49:44 -0500 using RuboCop version 0.50.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 1
-Metrics/AbcSize:
-  Max: 19
-
-# Offense count: 51
-# Configuration parameters: CountComments, ExcludedMethods.
-Metrics/BlockLength:
-  Max: 305
-
-# Offense count: 33
+# Offense count: 34
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:
   Max: 117
-
-# Offense count: 1
-# Configuration parameters: CountComments.
-Metrics/MethodLength:
-  Max: 12
-
-# Offense count: 1
-# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
-# NamePrefix: is_, has_, have_
-# NamePrefixBlacklist: is_, has_, have_
-# NameWhitelist: is_a?
-Naming/PredicateName:
-  Exclude:
-    - 'spec/**/*'
-    - 'lib/amazon_product_api/search_item.rb'
-
-# Offense count: 49
-Style/Documentation:
-  Enabled: false
@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 # Load DSL and set up stages
-require "capistrano/setup"
+require 'capistrano/setup'
 
 # Include default deployment tasks
-require "capistrano/deploy"
+require 'capistrano/deploy'
 
 require 'capistrano/rbenv'
 # require 'capistrano/chruby'
@@ -11,12 +13,12 @@ require 'capistrano/rails/assets'
 require 'capistrano/rails/migrations'
 require 'capistrano/puma'
 require 'capistrano/rails/console'
-require "capistrano/scm/git"
+require 'capistrano/scm/git'
 
 install_plugin Capistrano::SCM::Git
-install_plugin Capistrano::Puma  # Default puma tasks
-install_plugin Capistrano::Puma::Workers  # if you want to control the workers (in cluster mode)
-install_plugin Capistrano::Puma::Nginx  # if you want to upload a nginx site template
+install_plugin Capistrano::Puma # Default puma tasks
+install_plugin Capistrano::Puma::Workers # if you want to control the workers (in cluster mode)
+install_plugin Capistrano::Puma::Nginx # if you want to upload a nginx site template
 
 # Load custom tasks from `lib/capistrano/tasks` if you have any defined
-Dir.glob("lib/capistrano/tasks/*.rake").each { |r| import r }
+Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }
@@ -71,6 +71,15 @@ group :development, :test do
 end
 
 group :development do
+  gem 'better_errors', '~> 2.1'
+  gem 'binding_of_caller', '~> 0.7'
+  # Helps detect N+1 queries and unused eager loading
+  gem 'bullet'
+  gem 'capistrano-bundler', '~> 1.2'
+  gem 'capistrano-rails', '~> 1.2'
+  gem 'capistrano-rails-console', require: false
+  gem 'capistrano-rbenv', '~> 2.1'
+  gem 'capistrano3-puma', '~> 3.1'
   # Access an IRB console on exception pages or by using <%= console %> anywhere
   # in the code.
   gem 'web-console', '>= 3.3.0'
@@ -79,25 +88,16 @@ group :development do
   # The Listen gem listens to file modifications and notifies you about the
   # changes. https://rubygems.org/gems/listen
   gem 'listen', '>= 3.0.5', '< 3.2'
+  # Ruby's style guide enforcer
+  gem 'rubocop', '~> 0.52.1'
   # Spring speeds up development by keeping your application running in the
   # background. Read more: https://github.com/rails/spring
   gem 'spring'
   # This gem makes Spring watch the filesystem for changes using Listen rather
   # than by polling the filesystem.
   gem 'spring-watcher-listen', '~> 2.0.0'
-  # Implements the `rspec` command for Spring, allowing for faster test loading
+  # Implements the `rspec` command for Spring, allowing for faster test loading.
   gem 'spring-commands-rspec', '~> 1.0'
-  # Helps detect N+1 queries and unused eager loading
-  gem 'bullet'
-  # Ruby's style guide enforcer
-  gem 'rubocop'
-  gem 'binding_of_caller', '~> 0.7'
-  gem 'better_errors', '~> 2.1'
-  gem 'capistrano-rails', '~> 1.2'
-  gem 'capistrano-rbenv', '~> 2.1'
-  gem 'capistrano-bundler', '~> 1.2'
-  gem 'capistrano3-puma', '~> 3.1'
-  gem 'capistrano-rails-console', require: false
 end
 
 group :test do
 
@@ -181,9 +181,9 @@ GEM
     omniauth-oauth2 (1.4.0)
       oauth2 (~> 1.0)
       omniauth (~> 1.2)
-    parallel (1.12.0)
-    parser (2.4.0.0)
-      ast (~> 2.2)
+    parallel (1.12.1)
+    parser (2.4.0.2)
+      ast (~> 2.3)
     pg (0.20.0)
     powerpack (0.1.1)
     pry (0.10.4)
@@ -223,8 +223,7 @@ GEM
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rainbow (2.2.2)
-      rake
+    rainbow (3.0.0)
     rake (12.0.0)
     rb-fsevent (0.9.8)
     rb-inotify (0.9.8)
@@ -248,11 +247,11 @@ GEM
       rspec-mocks (~> 3.6.0)
       rspec-support (~> 3.6.0)
     rspec-support (3.6.0)
-    rubocop (0.50.0)
+    rubocop (0.52.1)
       parallel (~> 1.10)
-      parser (>= 2.3.3.1, < 3.0)
+      parser (>= 2.4.0.2, < 3.0)
       powerpack (~> 0.1)
-      rainbow (>= 2.2.2, < 3.0)
+      rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.9.0)
@@ -355,7 +354,7 @@ DEPENDENCIES
   rails-assets-tether (>= 1.3.3)!
   rollbar
   rspec-rails (~> 3.5)
-  rubocop
+  rubocop (~> 0.52.1)
   sass-rails (~> 5.0)
   selenium-webdriver
   social-share-button (~> 1.0.0)
@@ -372,4 +371,4 @@ RUBY VERSION
    ruby 2.4.1p111
 
 BUNDLED WITH
-   1.15.4
+   1.16.1
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+echo 'This script will generate minimal optimizer statistics rapidly'
+echo 'so your system is usable, and then gather statistics twice more'
+echo 'with increasing accuracy.  When it is done, your system will'
+echo 'have the default level of optimizer statistics.'
+echo
+
+echo 'If you have used ALTER TABLE to modify the statistics target for'
+echo 'any tables, you might want to remove them and restore them after'
+echo 'running this script because they will delay fast statistics generation.'
+echo
+
+echo 'If you would like default statistics as quickly as possible, cancel'
+echo 'this script and run:'
+echo '    "/usr/local/Cellar/postgresql/10.1/bin/vacuumdb" --all --analyze-only'
+echo
+
+"/usr/local/Cellar/postgresql/10.1/bin/vacuumdb" --all --analyze-in-stages
+echo
+
+echo 'Done'
@@ -18,13 +18,13 @@
 #
 
 class Item < ApplicationRecord
-  has_many :wishlist_items
+  has_many :wishlist_items, dependent: :nullify
   has_many :wishlists, through: :wishlist_items
 
   validates :name, presence: true
 
   def self.find_or_create_by_asin!(item_params)
     asin = item_params[:asin] || item_params['asin']
-    Item.find_by_asin(asin) || Item.create!(item_params)
+    Item.find_by(asin: asin) || Item.create!(item_params)
   end
 end
@@ -11,7 +11,7 @@
 #  updated_at  :datetime         not null
 #
 
-class SiteManager < ActiveRecord::Base
+class SiteManager < ApplicationRecord
   belongs_to :user
   belongs_to :wishlist
 end
@@ -23,7 +23,7 @@ class User < ApplicationRecord
   validates :amazon_user_id, uniqueness: true,
                              allow_blank: true
 
-  has_many :pledges
+  has_many :pledges, dependent: :nullify
   has_many :wishlist_items, through: :pledges
   has_many :site_managers, dependent: :destroy
   has_many :wishlists, through: :site_managers
@@ -73,8 +73,8 @@ def self.generate_csv(csv_generator: ActiveRecordCSVGenerator.new(self))
   def self.find_or_create_from_amazon_hash!(hash)
     oauth_info = AmazonOAuthInfo.new(hash)
 
-    find_by_amazon_user_id(oauth_info.amazon_user_id) ||
-      find_by_email(oauth_info.email) ||
+    find_by(amazon_user_id: oauth_info.amazon_user_id) ||
+      find_by(email: oauth_info.email) ||
       create!(
         name:           oauth_info.name,
         email:          oauth_info.email,
 
@@ -6,8 +6,8 @@ Dir.chdir(VENDOR_PATH) do
   begin
     exec "yarnpkg #{ARGV.join(' ')}"
   rescue Errno::ENOENT
-    $stderr.puts 'Yarn executable was not detected in the system.'
-    $stderr.puts 'Download Yarn at https://yarnpkg.com/en/docs/install'
+    warn 'Yarn executable was not detected in the system.'
+    warn 'Download Yarn at https://yarnpkg.com/en/docs/install'
     exit 1
   end
 end
@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 # config valid only for current version of Capistrano
 lock '3.9.1'
 
-set :repo_url,        "git@github.com:rubyforgood/playtime.git"
-set :application,     "playtime"
-set :user,            "deploy"
+set :repo_url,        'git@github.com:rubyforgood/playtime.git'
+set :application,     'playtime'
+set :user,            'deploy'
 set :puma_threads,    [4, 16]
 set :puma_workers,    1
-set :ssh_options, keys: ["config/deploy_id_rsa"] if File.exist?("config/deploy_id_rsa")
+set :ssh_options, keys: ['config/deploy_id_rsa'] if File.exist?('config/deploy_id_rsa')
 
 # Don't change these unless you know what you're doing
 set :pty,             true
@@ -19,10 +21,13 @@
 set :puma_pid,        "#{shared_path}/tmp/pids/puma.pid"
 set :puma_access_log, "#{release_path}/log/puma.error.log"
 set :puma_error_log,  "#{release_path}/log/puma.access.log"
-set :ssh_options,     { forward_agent: true, user: fetch(:user), keys: %w(~/.ssh/id_rsa.pub) }
+# rubocop:disable Style/BracesAroundHashParameters
+# The below makes things more readable which is better than being stylistically correct here.
+set :ssh_options,     { forward_agent: true, user: fetch(:user), keys: %w[~/.ssh/id_rsa.pub] }
+# rubocop:enable Style/BracesAroundHashParameters
 set :puma_preload_app, true
 set :puma_worker_timeout, nil
-set :puma_init_active_record, true  # Change to false when not using ActiveRecord
+set :puma_init_active_record, true # Change to false when not using ActiveRecord
 
 ## Defaults:
 # set :scm,           :git
@@ -32,8 +37,8 @@
 # set :keep_releases, 5
 
 ## Linked Files & Directories (Default None):
-set :linked_files, %w{config/database.yml}
-set :linked_dirs,  %w{log tmp/pids tmp/cache tmp/sockets vendor/bundle public/system}
+set :linked_files, %w[config/database.yml]
+set :linked_dirs,  %w[log tmp/pids tmp/cache tmp/sockets vendor/bundle public/system]
 
 namespace :puma do
   desc 'Create Directories for Puma Pids and Socket'
@@ -48,27 +53,26 @@
 end
 
 namespace :deploy do
-  desc "Make sure local git is in sync with remote."
+  desc 'Make sure local git is in sync with remote.'
   task :check_revision do
     on roles(:app) do
       unless `git rev-parse HEAD` == `git rev-parse origin/master`
-        puts "WARNING: HEAD is not the same as origin/master"
-        puts "Run `git push` to sync changes."
-        exit
+        raise 'WARNING: HEAD is not the same as origin/master\n'\
+              'Run `git push` to sync changes.'
       end
     end
   end
 
   desc 'Restart application'
-    task :restart do
-      on roles(:app), in: :sequence, wait: 5 do
+  task :restart do
+    on roles(:app), in: :sequence, wait: 5 do
       invoke 'puma:restart'
     end
   end
 
   desc 'Puma is sometimes not restarting. This ensures it restarts... Nothing happens if restart works'
-    task :ensure_start do
-      on roles(:app), in: :sequence, wait: 10 do
+  task :ensure_start do
+    on roles(:app), in: :sequence, wait: 10 do
       invoke 'puma:stop'
     end
   end
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`# updated_at :datetime not null`
`12`	`12`	`#`
`13`	`13`
`14`		`-class SiteManager < ActiveRecord::Base`
	`14`	`+class SiteManager < ApplicationRecord`
`15`	`15`	`belongs_to :user`
`16`	`16`	`belongs_to :wishlist`
`17`	`17`	`end`