Merge pull request #73 from yochiyochirb/as-you-wish-rubocop

Rubocopの警告を潰した

Author: yucao24hours

.rubocop_todo.yml

@@ -1,108 +1,28 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2016-08-29 13:11:03 +0900 using RuboCop version 0.42.0.
+# on 2016-08-30 16:55:44 +0900 using RuboCop version 0.42.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: 2
-# Configuration parameters: AllowSafeAssignment.
-Lint/AssignmentInCondition:
-  Exclude:
-    - 'app/channels/application_cable/connection.rb'
-    - 'app/helpers/emoji_helper.rb'
-
-# Offense count: 3
-Lint/UselessAssignment:
-  Exclude:
-    - 'app/helpers/auto_link_helper.rb'
-
-# Offense count: 1
-Metrics/AbcSize:
-  Max: 17
-
-# Offense count: 2
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 278
-
 # Offense count: 1
 # Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts.
 Style/FileName:
   Exclude:
     - 'config/initializers/slack-ruby-client.rb'
 
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
-# SupportedStyles: ruby19, ruby19_no_mixed_keys, hash_rockets
-Style/HashSyntax:
-  Exclude:
-    - 'db/migrate/20160414062322_sorcery_core.rb'
-    - 'db/migrate/20160414062855_sorcery_external.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: SupportedStyles, IndentationWidth.
-# SupportedStyles: special_inside_parentheses, consistent, align_brackets
-Style/IndentArray:
-  EnforcedStyle: consistent
-
-# Offense count: 5
-# Cop supports --auto-correct.
-# Configuration parameters: Width.
-Style/IndentationWidth:
-  Exclude:
-    - 'app/channels/application_cable/connection.rb'
-    - 'app/controllers/application_controller.rb'
-    - 'app/controllers/posts_controller.rb'
-    - 'app/jobs/post_preview_job.rb'
-    - 'db/migrate/20160827120217_create_versions.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-Style/RedundantSelf:
-  Exclude:
-    - 'app/models/post.rb'
-
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: AllowForAlignment.
-Style/SpaceAroundOperators:
-  Exclude:
-    - 'app/helpers/auto_link_helper.rb'
-
 # Offense count: 4
 # Cop supports --auto-correct.
 Style/SpaceInsideBrackets:
   Exclude:
     - 'config/environments/production.rb'
 
-# Offense count: 6
-# Cop supports --auto-correct.
-Style/SpaceInsidePercentLiteralDelimiters:
-  Exclude:
-    - 'app/controllers/posts_controller.rb'
-    - 'config/initializers/assets.rb'
-    - 'config/routes.rb'
-
-# Offense count: 10
+# Offense count: 7
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, ConsistentQuotesInMultiline.
 # SupportedStyles: single_quotes, double_quotes
 Style/StringLiterals:
   Exclude:
     - 'config/environments/production.rb'
     - 'config/puma.rb'
-    - 'db/migrate/20160827120217_create_versions.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: final_newline, final_blank_line
-Style/TrailingBlankLines:
-  Exclude:
-    - 'app/helpers/markdown_helper.rb'
-    - 'db/migrate/20160414062322_sorcery_core.rb'

app/channels/application_cable/connection.rb

@@ -8,12 +8,12 @@ def connect
 
     protected
 
-    def find_verified_user
-      if current_user = User.find_by(id: cookies.signed[:user_id])
-        current_user
-      else
-        reject_unauthorized_connection
+      def find_verified_user
+        if (current_user = User.find_by(id: cookies.signed[:user_id]))
+          current_user
+        else
+          reject_unauthorized_connection
+        end
       end
-    end
   end
 end

app/channels/post_channel.rb

@@ -1,4 +1,3 @@
-# Be sure to restart your server when you modify this file. Action Cable runs in a loop that does not support auto reloading.
 class PostChannel < ApplicationCable::Channel
   def subscribed
     @post_channel_id = SecureRandom.hex

app/controllers/application_controller.rb

@@ -8,15 +8,15 @@ class ApplicationController < ActionController::Base
 
   private
 
-  def current_user
-    @current_user ||= User.find(session["user_id"]) if session[:user_id]
-  end
+    def current_user
+      @current_user ||= User.find(session["user_id"]) if session[:user_id]
+    end
 
-  def logged_in?
-    current_user ? true : false
-  end
+    def logged_in?
+      current_user ? true : false
+    end
 
-  def require_login
-    redirect_to login_path, alert: "Please login" unless logged_in?
-  end
+    def require_login
+      redirect_to login_path, alert: "Please login" unless logged_in?
+    end
 end

app/controllers/posts_controller.rb

@@ -1,5 +1,5 @@
 class PostsController < ApplicationController
-  before_action :set_post, only: %i( show edit update destroy )
+  before_action :set_post, only: %i(show edit update destroy)
 
   def index
     @posts = Post.all.order(updated_at: :desc)
@@ -40,11 +40,11 @@ def destroy
 
   private
 
-  def set_post
-    @post = Post.find(params[:id])
-  end
+    def set_post
+      @post = Post.find(params[:id])
+    end
 
-  def post_params
-    params.require(:post).permit(:title, :body)
-  end
+    def post_params
+      params.require(:post).permit(:title, :body)
+    end
 end

app/controllers/sessions_controller.rb

@@ -17,7 +17,7 @@ def create
 
     # Use cookies for ActionCable authorization
     cookies.signed[:user_id] = session[:user_id] = user.id
-    redirect_to root_url, notice: "Logged in with #{auth['provider'].titleize}"
+    redirect_to root_url, notice: "Logged in with Slack"
   end
 
   def destroy

app/helpers/auto_link_helper.rb

@@ -1,5 +1,5 @@
 module AutoLinkHelper
   def auto_link(source)
-    Rinku.auto_link(source, mode=:urls, link_attr=nil, skip_tags=nil)
+    Rinku.auto_link(source, :urls, nil, nil)
   end
 end

app/helpers/emoji_helper.rb

@@ -2,7 +2,7 @@ module EmojiHelper
   def emojify(content)
     return "" if content.blank?
     content.gsub(/:([\w+-]+):/) do |match|
-      if emoji = Emoji.find_by_alias(Regexp.last_match[1])
+      if (emoji = Emoji.find_by_alias(Regexp.last_match[1]))
         %(<img alt="#{Regexp.last_match[1]}" ) \
           + %(src="#{image_path("emoji/#{emoji.image_filename}")}" ) \
           + %(style="vertical-align:middle" width="20" height="20" />)

app/helpers/markdown_helper.rb

@@ -4,4 +4,3 @@ def markdown_to_html(source)
     Kramdown::Document.new(source, input: "GFM", syntax_highlighter: "rouge").to_html
   end
 end
-

app/jobs/post_preview_job.rb

@@ -8,11 +8,11 @@ def perform(channel_id:, source:)
 
   private
 
-  def render_preview(source)
-    ApplicationController.renderer.render partial: "posts/preview",
-                                          locals: {
-                                            title: source["title"],
-                                            body: source["body"]
-                                          }
-  end
+    def render_preview(source)
+      ApplicationController.renderer.render partial: "posts/preview",
+                                            locals: {
+                                              title: source["title"],
+                                              body: source["body"]
+                                            }
+    end
 end