From b8262ecb0a2d0fbae24a9965f159f8b0d6e82e0d Mon Sep 17 00:00:00 2001 From: Al Snow Date: Thu, 8 Mar 2018 17:02:24 -0500 Subject: [PATCH] Fixed rubocop messages --- Guardfile | 4 ++-- app/controllers/pay_controller.rb | 4 ++-- app/controllers/schedule_controller.rb | 2 +- app/models/analytics.rb | 2 +- db/migrate/20140408185601_create_analytics.rb | 6 +++--- db/schema.rb | 1 + spec/support/capybara_shared.rb | 2 +- 7 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Guardfile b/Guardfile index e7d5a0f..18b70eb 100755 --- a/Guardfile +++ b/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" } diff --git a/app/controllers/pay_controller.rb b/app/controllers/pay_controller.rb index 7db951e..d345f14 100644 --- a/app/controllers/pay_controller.rb +++ b/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 diff --git a/app/controllers/schedule_controller.rb b/app/controllers/schedule_controller.rb index 7e30139..1b52e6b 100644 --- a/app/controllers/schedule_controller.rb +++ b/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 diff --git a/app/models/analytics.rb b/app/models/analytics.rb index ab8fd73..e331808 100644 --- a/app/models/analytics.rb +++ b/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) diff --git a/db/migrate/20140408185601_create_analytics.rb b/db/migrate/20140408185601_create_analytics.rb index 695cb8f..1ede62d 100644 --- a/db/migrate/20140408185601_create_analytics.rb +++ b/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 diff --git a/db/schema.rb b/db/schema.rb index 074df54..e9d5e1e 100755 --- a/db/schema.rb +++ b/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. diff --git a/spec/support/capybara_shared.rb b/spec/support/capybara_shared.rb index 5838f92..7216b16 100644 --- a/spec/support/capybara_shared.rb +++ b/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