rubocop auto correct

8398a7 · Mar 28, 2017 · 99db2f9 · 99db2f9
1 parent a599e2b
commit 99db2f9
Show file tree

Hide file tree

Showing 133 changed files with 158 additions and 17 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -12,6 +12,9 @@ ClassAndModuleChildren:
 Documentation:
   Enabled: false
 
+Style/MixinGrouping:
+  Enabled: false
+
 # has_ から始まるメソッドは許可する
 Style/PredicateName:
   NamePrefixBlacklist:
@@ -26,6 +29,7 @@ AllCops:
     - '**/Rakefile'
     - '**/config.ru'
   Exclude:
+    - 'Gemfile'
     - 'db/**/*'
     - 'bin/*'
     - 'config/**/*'

diff --git a/Gemfile b/Gemfile
@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 ruby '2.4.0'
 
 # a,b,c,d,e,f,g {{{
 gem 'activerecord-import'
-gem 'aws-sdk'
 gem 'assets_rails'
+gem 'aws-sdk'
 gem 'capistrano-slackify', require: false
 gem 'carrierwave'
 gem 'coffee-rails'

diff --git a/Rakefile b/Rakefile
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 

diff --git a/app/controllers/admin/dashboards_controller.rb b/app/controllers/admin/dashboards_controller.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Admin::DashboardsController < ApplicationController
   before_action :authenticate_user!
   before_action :owner_user!

diff --git a/app/controllers/admin/mails_controller.rb b/app/controllers/admin/mails_controller.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Admin::MailsController < ApplicationController
   before_action :authenticate_user!
   before_action :admin_user!

diff --git a/app/controllers/admin/messages_controller.rb b/app/controllers/admin/messages_controller.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Admin::MessagesController < ApplicationController
   before_action :authenticate_user!
   before_action :admin_user!

diff --git a/app/controllers/admin/sheets_controller.rb b/app/controllers/admin/sheets_controller.rb
@@ -1,8 +1,9 @@
 # frozen_string_literal: true
+
 class Admin::SheetsController < ApplicationController
   before_action :authenticate_user!
   before_action :member_user!
-  before_action :load_sheet, except: [:index, :new, :create]
+  before_action :load_sheet, except: %i(index new create)
 
   def index
     @search = Sheet.search(params[:q])

diff --git a/app/controllers/admin/sidekiq_controller.rb b/app/controllers/admin/sidekiq_controller.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Admin::SidekiqController < ApplicationController
   before_action :authenticate_user!
   before_action :admin_user!

diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
@@ -1,9 +1,10 @@
 # frozen_string_literal: true
+
 class Admin::UsersController < ApplicationController
   before_action :authenticate_user!
   before_action :admin_user!
-  before_action :check_xhr, except: [:index, :login]
-  before_action :load_user, except: [:index, :new, :create]
+  before_action :check_xhr, except: %i(index login)
+  before_action :load_user, except: %i(index new create)
 
   def index
     @search = User.search(params[:q])

diff --git a/app/controllers/api/api_controller.rb b/app/controllers/api/api_controller.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class UnauthorizedError < RuntimeError; end
 class Forbidden < RuntimeError; end
 class BadRequest < RuntimeError; end

diff --git a/app/controllers/api/v1/base_controller.rb b/app/controllers/api/v1/base_controller.rb
@@ -1,3 +1,4 @@
 # frozen_string_literal: true
+
 class Api::V1::BaseController < Api::ApiController
 end
diff --git a/app/controllers/api/v1/logs_controller.rb b/app/controllers/api/v1/logs_controller.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Api::V1::LogsController < Api::V1::BaseController
   before_action :load_user!
 

diff --git a/app/controllers/api/v1/messages_controller.rb b/app/controllers/api/v1/messages_controller.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Api::V1::MessagesController < Api::V1::BaseController
   def index
     authenticate_member!

diff --git a/app/controllers/api/v1/scores_controller.rb b/app/controllers/api/v1/scores_controller.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Api::V1::ScoresController < Api::V1::BaseController
   before_action :load_user, except: :sync_official
   before_action :authenticate!, only: :update

diff --git a/app/controllers/api/v1/sheets_controller.rb b/app/controllers/api/v1/sheets_controller.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Api::V1::SheetsController < Api::V1::BaseController
   def index
     sheets = {}

diff --git a/app/controllers/api/v1/statics_controller.rb b/app/controllers/api/v1/statics_controller.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Api::V1::StaticsController < Api::V1::BaseController
   def index
     render json: {

diff --git a/app/controllers/api/v1/users_controller.rb b/app/controllers/api/v1/users_controller.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Api::V1::UsersController < Api::V1::BaseController
   before_action :authenticate!, only: %i(change_rival score_viewer)
 

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class ApplicationController < ActionController::Base
   before_action :set_raven_context
   # protect_from_forgery with: :exception

diff --git a/app/controllers/helps_controller.rb b/app/controllers/helps_controller.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class HelpsController < ApplicationController
   def official
     domain = Rails.env.development? ? request.host_with_port : request.host

diff --git a/app/controllers/logs_controller.rb b/app/controllers/logs_controller.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class LogsController < ApplicationController
   before_action :special_user!, only: %w(update_official)
   before_action :load_user, only: %w(sheet list show)

diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class MessagesController < ApplicationController
   def new
     @message = Message.new

diff --git a/app/controllers/recommends_controller.rb b/app/controllers/recommends_controller.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class RecommendsController < ApplicationController
   before_action :load_color
   before_action :load_sheets

diff --git a/app/controllers/rivals_controller.rb b/app/controllers/rivals_controller.rb
@@ -1,7 +1,8 @@
 # frozen_string_literal: true
+
 class RivalsController < ApplicationController
   before_action :authenticate_user!
-  before_action :load_sheet, only: [:clear, :hard]
+  before_action :load_sheet, only: %i(clear hard)
 
   def list
     @users = current_user.following

diff --git a/app/controllers/scores_controller.rb b/app/controllers/scores_controller.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class ScoresController < ApplicationController
   before_action :authenticate_user!
   before_action :check_xhr

diff --git a/app/controllers/sheets_controller.rb b/app/controllers/sheets_controller.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class SheetsController < ApplicationController
   before_action :load_user
   before_action :check_action, except: %i(change_reverse detail)

diff --git a/app/controllers/users/passwords_controller.rb b/app/controllers/users/passwords_controller.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Users::PasswordsController < Devise::PasswordsController
   def create
     self.resource = resource_class.send_reset_password_instructions(resource_params)

diff --git a/app/controllers/users/registrations_controller.rb b/app/controllers/users/registrations_controller.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Users::RegistrationsController < Devise::RegistrationsController
   def create
     pre_user = User.select(:id).count

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class UsersController < ApplicationController
   def index
     @title = '最近更新した200人'

diff --git a/app/controllers/welcomes_controller.rb b/app/controllers/welcomes_controller.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class WelcomesController < ApplicationController
   def index
     @title = 'TOP'

diff --git a/app/decorators/mail_decorator.rb b/app/decorators/mail_decorator.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class MailDecorator < Draper::Decorator
   delegate_all
 end
diff --git a/app/decorators/message_decorator.rb b/app/decorators/message_decorator.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class MessageDecorator < Draper::Decorator
   delegate_all
 

diff --git a/app/decorators/score_decorator.rb b/app/decorators/score_decorator.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class ScoreDecorator < Draper::Decorator
   delegate_all
 

diff --git a/app/decorators/sheet_decorator.rb b/app/decorators/sheet_decorator.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class SheetDecorator < Draper::Decorator
   delegate_all
 

diff --git a/app/decorators/user_decorator.rb b/app/decorators/user_decorator.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class UserDecorator < Draper::Decorator
   delegate_all
 

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module ApplicationHelper
   def return_ability_rival(cnt)
     params[:action] == 'clear' ? @sheets[cnt].n_ability : @sheets[cnt].h_ability

diff --git a/app/mailers/devise/mailer.rb b/app/mailers/devise/mailer.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Devise::Mailer < Devise.parent_mailer.constantize
   include Devise::Mailers::Helpers
 

diff --git a/app/mailers/notice_mail.rb b/app/mailers/notice_mail.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class NoticeMail < ActionMailer::Base
   default from: 'no-reply@iidx12.tk'
 

diff --git a/app/models/ability.rb b/app/models/ability.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # == Schema Information
 #
 # Table name: abilities

diff --git a/app/models/application_record.rb b/app/models/application_record.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class ApplicationRecord < ActiveRecord::Base
   self.abstract_class = true
 end
diff --git a/app/models/concerns/graph.rb b/app/models/concerns/graph.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Graph
   extend ActiveSupport::Concern
 

diff --git a/app/models/concerns/score/api.rb b/app/models/concerns/score/api.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Score::API
   extend ActiveSupport::Concern
 

diff --git a/app/models/concerns/score/iidxme.rb b/app/models/concerns/score/iidxme.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Score::IIDXME
   extend ActiveSupport::Concern
 

diff --git a/app/models/concerns/score/score_viewer.rb b/app/models/concerns/score/score_viewer.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Score::ScoreViewer
   extend ActiveSupport::Concern
 

diff --git a/app/models/concerns/sheet/api.rb b/app/models/concerns/sheet/api.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Sheet::API
   extend ActiveSupport::Concern
 

diff --git a/app/models/concerns/static.rb b/app/models/concerns/static.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Static
   LAMP = %w(FC EXH H C E A F N).freeze
   LAMP_HASH = LAMP.map.with_index(0) { |e, i| [e, i] }.to_h

diff --git a/app/models/concerns/user/api.rb b/app/models/concerns/user/api.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module User::API
   extend ActiveSupport::Concern
 

diff --git a/app/models/concerns/user/devise_methods.rb b/app/models/concerns/user/devise_methods.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module User::DeviseMethods
   extend ActiveSupport::Concern
 

diff --git a/app/models/concerns/user/follow_methods.rb b/app/models/concerns/user/follow_methods.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module User::FollowMethods
   extend ActiveSupport::Concern
   included do

diff --git a/app/models/concerns/user/list.rb b/app/models/concerns/user/list.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module User::List
   extend ActiveSupport::Concern
 
@@ -9,16 +10,16 @@ def users_list(type, options = {})
       end
 
       def recent200
-        query = <<-EOF
-SELECT
-users.id, users.djname, users.iidxid, users.pref, users.grade,
-scores.updated_at, scores.state, sheets.title
-FROM users, scores, sheets
-WHERE users.id = scores.user_id
-AND scores.state != 7
-AND sheets.id = scores.sheet_id
-ORDER BY scores.updated_at DESC
-LIMIT 6400
+        query = <<~EOF
+          SELECT
+          users.id, users.djname, users.iidxid, users.pref, users.grade,
+          scores.updated_at, scores.state, sheets.title
+          FROM users, scores, sheets
+          WHERE users.id = scores.user_id
+          AND scores.state != 7
+          AND sheets.id = scores.sheet_id
+          ORDER BY scores.updated_at DESC
+          LIMIT 6400
         EOF
         query.chomp.tr("\n", ' ')
         users = ActiveRecord::Base.connection.execute(query.chomp.tr("\n", ' ')).to_a

diff --git a/app/models/concerns/user/official.rb b/app/models/concerns/user/official.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module User::Official
   extend ActiveSupport::Concern
 

diff --git a/app/models/concerns/user/role.rb b/app/models/concerns/user/role.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module User::Role
   extend ActiveSupport::Concern
 

diff --git a/app/models/concerns/user/static.rb b/app/models/concerns/user/static.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module User::Static
   PREF = %w(
     海外

diff --git a/app/models/follow.rb b/app/models/follow.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # == Schema Information
 #
 # Table name: follows

diff --git a/app/models/log.rb b/app/models/log.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # == Schema Information
 #
 # Table name: logs

diff --git a/app/models/message.rb b/app/models/message.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # == Schema Information
 #
 # Table name: messages