Merge pull request #336 from jasnow/master

Upgraded 5 gems and fixed rubocop messages.

Gemfile.lock

@@ -41,7 +41,7 @@ GEM
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
     arel (8.0.0)
-    aruba (0.14.3)
+    aruba (0.14.4)
       childprocess (~> 0.8.0)
       contracts (~> 0.9)
       cucumber (>= 1.3.19)
@@ -106,7 +106,7 @@ GEM
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
-    erubi (1.7.0)
+    erubi (1.7.1)
     eventmachine (1.2.5)
     execjs (2.7.0)
     ffi (1.9.23)
@@ -182,7 +182,7 @@ GEM
       nenv (~> 0.1)
       shellany (~> 0.0)
     parallel (1.12.1)
-    parser (2.5.0.2)
+    parser (2.5.0.3)
       ast (~> 2.4.0)
     poltergeist (1.17.0)
       capybara (~> 2.1)
@@ -230,7 +230,7 @@ GEM
     rainbow (3.0.0)
     raindrops (0.19.0)
     rake (12.3.0)
-    rb-fsevent (0.10.2)
+    rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
     ref (2.0.0)
@@ -258,14 +258,14 @@ GEM
       rspec-mocks (~> 3.7.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.1)
-    rubocop (0.52.1)
+    rubocop (0.53.0)
       parallel (~> 1.10)
-      parser (>= 2.4.0.2, < 3.0)
+      parser (>= 2.5)
       powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    rubocop-github (0.9.0)
+    rubocop-github (0.10.0)
       rubocop (~> 0.51)
     ruby-prof (0.17.0)
     ruby-progressbar (1.9.0)
@@ -310,7 +310,7 @@ GEM
     turbolinks-source (5.1.0)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    uglifier (4.1.6)
+    uglifier (4.1.7)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.3.0)
     unicorn (5.4.0)

Guardfile

@@ -10,7 +10,7 @@ guard "brakeman", run_on_start: true do
 end
 
 guard :shell do
-  watch(%r{^Gemfile|Gemfile.lock$}) { system("bundle-audit")}
+  watch(%r{^Gemfile|Gemfile.lock$}) { system("bundle-audit") }
 end
 
 guard "livereload", host: "railsgoat.dev", port: "35727" do
@@ -23,7 +23,7 @@ guard "livereload", host: "railsgoat.dev", port: "35727" do
 end
 
 
-guard :rspec, cmd: 'bundle exec rspec' do
+guard :rspec, cmd: "bundle exec rspec" do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch("spec/spec_helper.rb")  { "spec" }

app/controllers/pay_controller.rb

@@ -15,7 +15,7 @@ class PayController < ApplicationController
 
     msg = true if pay.save!
     respond_to do |format|
-      format.json {render json: {msg: msg } }
+      format.json { render json: {msg: msg } }
     end
   end
 
@@ -38,7 +38,7 @@ class PayController < ApplicationController
   def decrypted_bank_acct_num
     decrypted = Encryption.decrypt_sensitive_value(params[:value_to_decrypt])
     respond_to do |format|
-      format.json {render json: {account_num: decrypted || "No Data" }}
+      format.json { render json: {account_num: decrypted || "No Data" } }
     end
   end
 end

app/controllers/schedule_controller.rb

@@ -15,7 +15,7 @@ class ScheduleController < ApplicationController
       end
 
     respond_to do |format|
-      format.json {render json: {msg: message ? "success" : "failure" }}
+      format.json { render json: {msg: message ? "success" : "failure" } }
     end
   end
 

app/models/analytics.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 class Analytics < ApplicationRecord
-  scope :hits_by_ip, ->(ip, col = "*") { select("#{col}").where(ip_address: ip).order("id DESC")}
+  scope :hits_by_ip, ->(ip, col = "*") { select("#{col}").where(ip_address: ip).order("id DESC") }
 
   def self.count_by_col(col)
     calculate(:count, col)

db/migrate/20140408185601_create_analytics.rb

@@ -2,9 +2,9 @@
 class CreateAnalytics < ActiveRecord::Migration[4.2]
   def change
     create_table :analytics do |t|
-      t.string		:ip_address
-      t.string		:referrer
-      t.string		:user_agent
+      t.string    :ip_address
+      t.string    :referrer
+      t.string    :user_agent
       t.timestamps
     end
   end

db/schema.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.

spec/support/capybara_shared.rb

@@ -89,7 +89,7 @@ class WarningSuppressor
   private
 
   def ignore?(message)
-    IGNORE_PATTERNS.any? {|regexp| message =~ regexp }
+    IGNORE_PATTERNS.any? { |regexp| message =~ regexp }
   end
 end