update rubocop

.rubocop.yml

@@ -1,3 +1,5 @@
+inherit_from: .rubocop_todo.yml
+
 AllCops:
 
   # Rails特有のチェックを実行

.rubocop_todo.yml

@@ -0,0 +1,25 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2015-11-27 00:49:42 +0900 using RuboCop version 0.35.1.
+# 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: EnforcedStyle, SupportedStyles.
+Rails/Date:
+  Exclude:
+    - 'app/models/post.rb'
+    - 'spec/models/post_spec.rb'
+
+# Offense count: 14
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Rails/TimeZone:
+  Exclude:
+    - 'app/models/notification.rb'
+    - 'app/models/post.rb'
+    - 'app/models/user.rb'
+    - 'spec/factories/users.rb'
+    - 'spec/features/posts_spec.rb'
+    - 'spec/models/post_spec.rb'

Capfile

@@ -23,4 +23,3 @@ require 'capistrano/rails/migrations'
 
 # Loads custom tasks from `lib/capistrano/tasks' if you have any defined.
 Dir.glob('lib/capistrano/tasks/*.cap').each { |r| import r }
-

app/decorators/tag_decorator.rb

@@ -40,7 +40,7 @@ def tree_view_node
     html = ''
 
     html += %(
-      <a href="#{ show_path }" data-name="#{model.name}">
+      <a href="#{show_path}" data-name="#{model.name}">
         #{model.name} <span class="badge">#{model.posts.size}</span>
       </a>
         )

app/models/footprint.rb

@@ -16,5 +16,5 @@ class Footprint < ActiveRecord::Base
   ######################################################################
   # Named scope
   ######################################################################
-  scope :today, -> { where(arel_table[:created_at].gt 1.days.ago) }
+  scope :today, -> { where(arel_table[:created_at].gt 1.day.ago) }
 end

app/models/notification.rb

@@ -24,7 +24,7 @@ class Notification < ActiveRecord::Base
   end)
 
   scope :recent, (lambda do
-    where(arel_table[:created_at].gt 7.day.ago)
+    where(arel_table[:created_at].gt 7.days.ago)
   end)
 
   ######################################################################

app/models/post.rb

@@ -86,7 +86,7 @@ class Post < ActiveRecord::Base
 
   scope :today, -> { where(arel_table[:updated_at].gt 1.day.ago) }
   scope :this_month, -> { where(arel_table[:updated_at].gt 1.month.ago) }
-  scope :last_month, -> { where(arel_table[:updated_at].gt 2.month.ago).where(arel_table[:updated_at].lt 1.month.ago) }
+  scope :last_month, -> { where(arel_table[:updated_at].gt 2.months.ago).where(arel_table[:updated_at].lt 1.month.ago) }
 
   ######################################################################
   # Class method

app/models/s3_uploader.rb

@@ -5,9 +5,9 @@ class S3Uploader
   # @param [String] region: uploading S3 bucket region.
   # @param [String] bucket: uploading backet name.
   def initialize(access_key_id: Settings.s3.access_key_id,
-    secret_access_key: Settings.s3.secret_access_key,
-    region: 'ap-northeast-1',
-    bucket:)
+                 secret_access_key: Settings.s3.secret_access_key,
+                 region: 'ap-northeast-1',
+                 bucket:)
     @s3 = AWS::S3.new(access_key_id: access_key_id,
                       secret_access_key: secret_access_key,
                       region: region)

app/models/user.rb

@@ -74,7 +74,7 @@ def self.find_for_google_oauth2(access_token, _signed_in_resource = nil)
       u.name = access_token.info['name']
       u.image_url = access_token.info['image']
       u.password = Devise.friendly_token[0, 20]
-      u.nickname = (('a'..'z').to_a + ('A'..'Z').to_a + (0..9).to_a).shuffle[0..4].join
+      u.nickname = (('a'..'z').to_a + ('A'..'Z').to_a + (0..9).to_a).sample(5).join
     end
 
     user.google_auth_token = access_token.credentials['token'] if access_token.credentials['token']

config.ru

@@ -1,4 +1,4 @@
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path('../config/environment',  __FILE__)
+require ::File.expand_path('../config/environment', __FILE__)
 run Rails.application

lib/tasks/batch.rake

@@ -1,11 +1,9 @@
 
 namespace :batch do
-
   desc 'Tagに関連するPostのcounter_cacheの再生成'
   task reset_counters: :environment do
     puts "\t[START] batch:reset_counters"
     Tag.all.each { |t| Tag.reset_counters(t.id, :posts) }
     puts "\t[FINISH] batch:reset_counters"
   end
-
 end

lib/tasks/migrations.rake

@@ -1,14 +1,12 @@
 
 namespace :migrations do
-
   desc '001 nicknameを自動付与'
   task task_001_user_nickname: :environment do
     User.all.each do |user|
       next if user.nickname.present?
 
-      new_nickname = (('a'..'z').to_a + ('A'..'Z').to_a + (0..9).to_a).shuffle[0..4].join
+      new_nickname = (('a'..'z').to_a + ('A'..'Z').to_a + (0..9).to_a).sample(5).join
       user.update_attributes!(nickname: new_nickname)
     end
   end
-
 end

spec/controllers/apis_controller_spec.rb

@@ -1,7 +1,6 @@
 require 'rails_helper'
 
 describe ApisController, type: :controller do
-
   describe "GET 'markdown_preview'" do
     it 'returns http redirect' do
       get 'markdown_preview'
@@ -17,5 +16,4 @@
       expect(response).to be_success
     end
   end
-
 end

spec/controllers/application_controller_spec.rb

@@ -1,11 +1,9 @@
 require 'rails_helper'
 
 describe ApplicationController do
-
   pending '#redirect_unless_signed_in'
 
   pending '#after_sign_in_path_for'
 
   pending '#rescue_from'
-
 end

spec/controllers/concerns/rv/mailer_spec.rb

@@ -3,7 +3,6 @@
 class DummyClass; end
 
 describe RV::Mailer do
-
   let(:klass) { DummyClass.new.extend(RV::Mailer) }
   let(:alice) { FactoryGirl.create(:alice) }
   let(:post) { Post.create title: 'ruby rspec', body: 'This is first espec test: ruby', author: create(:author) }
@@ -27,5 +26,4 @@ class DummyClass; end
   it 'invalid to' do
     expect { klass.compose_mail(post, user: alice, to: 'invalid.email') }.to raise_error
   end
-
 end

spec/controllers/flow_controller_spec.rb

@@ -1,7 +1,6 @@
 require 'rails_helper'
 
 describe FlowController, type: :controller do
-
   describe "GET 'show' without login" do
     it 'returns http redirect' do
       get 'show'
@@ -17,5 +16,4 @@
       expect(response).to be_success
     end
   end
-
 end

spec/controllers/posts_controller_spec.rb

@@ -1,7 +1,6 @@
 require 'rails_helper'
 
 describe PostsController, type: :controller do
-
   let(:post) { FactoryGirl.create(:post) }
 
   describe "GET 'show' without login" do
@@ -12,7 +11,6 @@
   end
 
   describe "GET 'show' with login" do
-
     let(:alice) { FactoryGirl.create(:alice) }
 
     it 'returns http success' do
@@ -29,5 +27,4 @@
       expect(Footprint.where(user_id: alice.id, post_id: post.id)).to exist
     end
   end
-
 end

spec/controllers/search_controller_spec.rb

@@ -1,7 +1,6 @@
 require 'rails_helper'
 
 describe SearchController, type: :controller do
-
   describe "GET 'show' without login" do
     it 'returns http redirect' do
       get 'show'
@@ -17,5 +16,4 @@
       expect(response).to be_success
     end
   end
-
 end

spec/controllers/stock_controller_spec.rb

@@ -1,7 +1,6 @@
 require 'rails_helper'
 
 describe StockController, type: :controller do
-
   describe "GET 'show' without login" do
     it 'returns http redirect' do
       get 'show'
@@ -17,5 +16,4 @@
       expect(response).to be_success
     end
   end
-
 end

spec/controllers/tags_controller_spec.rb

@@ -1,7 +1,6 @@
 require 'rails_helper'
 
 describe TagsController, type: :controller do
-
   let(:tag) { FactoryGirl.create(:tag_ruby) }
 
   describe "GET 'show' without login" do
@@ -19,5 +18,4 @@
       expect(response).to be_success
     end
   end
-
 end

spec/controllers/templates_controller_spec.rb

@@ -1,7 +1,6 @@
 require 'rails_helper'
 
 RSpec.describe TemplatesController, type: :controller do
-
   describe "GET 'show' without template" do
     it 'returns http success' do
       sign_in FactoryGirl.create(:alice)
@@ -19,5 +18,4 @@
       expect(response).to be_success
     end
   end
-
 end

spec/controllers/users_controller_spec.rb

@@ -1,7 +1,6 @@
 require 'rails_helper'
 
 describe UsersController, type: :controller do
-
   describe "GET 'edit'" do
     it 'returns http success' do
       sign_in FactoryGirl.create(:alice)
@@ -19,5 +18,4 @@
       expect(response).to redirect_to('/user/edit')
     end
   end
-
 end

spec/controllers/watchings_controller_spec.rb

@@ -1,7 +1,6 @@
 require 'rails_helper'
 
 RSpec.describe WatchingsController, type: :controller do
-
   describe "GET 'show' without login" do
     it 'returns http redirect' do
       get 'show'
@@ -17,5 +16,4 @@
       expect(response).to be_success
     end
   end
-
 end

spec/controllers/welcome_controller_spec.rb

@@ -1,7 +1,6 @@
 require 'rails_helper'
 
 describe WelcomeController, type: :controller do
-
   describe "GET 'top'" do
     it 'should be successful' do
       get :top
@@ -11,11 +10,9 @@
   end
 
   describe 'Login' do
-
     let(:user) { FactoryGirl.create(:alice) }
 
     describe "GET 'top'" do
-
       it 'should be successful' do
         sign_in FactoryGirl.create(:alice)
 
@@ -30,8 +27,6 @@
         get :top
         expect(assigns(:current_user)).to eq(user)
       end
-
     end
   end
-
 end

spec/factories/posts.rb

@@ -15,7 +15,6 @@
 # Read about factories at https://github.com/thoughtbot/factory_girl
 
 FactoryGirl.define do
-
   factory :post do
     association :author, factory: :author
     title 'sample title'

spec/factories/users.rb

@@ -45,7 +45,7 @@
     email 'author@mail.com'
     nickname 'author'
     password Devise.friendly_token[0, 20]
-    google_token_expires_at Time.now - 30.hour
+    google_token_expires_at Time.now - 30.hours
   end
 
   factory :login_user_1, class: User do

spec/features/posts_spec.rb

@@ -4,7 +4,6 @@
 Warden.test_mode!
 
 describe 'Request via js', js: true do
-
   let(:user) { FactoryGirl.create(:login_user_1) }
 
   before do
@@ -27,5 +26,4 @@
     page.driver.reset!
     Warden.test_reset!
   end
-
 end

spec/models/notification_spec.rb

@@ -16,7 +16,6 @@
 
 describe Notification do
   describe 'Instance method' do
-
     before :each do
       @alice = create(:alice)
       @bob = create(:bob)

spec/models/post_spec.rb

@@ -16,7 +16,6 @@
 require 'date'
 
 describe Post do
-
   describe 'Instance method' do
     before :each do
       @post = create(:post)
@@ -26,7 +25,6 @@
     end
 
     describe 'Fork' do
-
       it 'duplicated' do
         expect(@new_post.id).not_to eq(@post.id)
       end
@@ -50,7 +48,6 @@
       it 'valid specified_date' do
         expect(@new_post.specified_date).to eq(Date.today)
       end
-
     end
   end