adds consistency to ruby code style

Keep a blank line before and after private
Keep a blank line before and after protected
Remove extra empty line at class body end
Remove extra blank line
Add final newline
Use 2 (not 3) spaces for indentation
Use 2 (not 4) spaces for indentation
Remove space before comma
Add space after comma
Remove trailing whitespaces
Remove unnecessary spacing
Use snake_case for variable names
Do not use then for multi-line if
Remove unused block argument - i
Use the new Ruby 1.9 hash syntax
Remove unused assignment to variable
Indent when as deep as case
Align attributes
Align end with def

Gemfile

@@ -85,6 +85,7 @@ group :development, :test do
   gem 'capistrano3-delayed-job', '~> 1.0'
   gem "bullet"
   gem "faker"
+  gem 'rubocop', '~> 0.45.0', require: false
 end
 
 group :test do

Gemfile.lock

@@ -59,7 +59,7 @@ GEM
     ancestry (2.2.1)
       activerecord (>= 3.0.0)
     arel (6.0.3)
-    ast (2.2.0)
+    ast (2.3.0)
     babel-source (5.8.35)
     babel-transpiler (0.7.0)
       babel-source (>= 4.0, < 6)
@@ -271,7 +271,7 @@ GEM
     orm_adapter (0.5.0)
     paranoia (2.2.0)
       activerecord (>= 4.0, < 5.1)
-    parser (2.3.0.6)
+    parser (2.3.1.4)
       ast (~> 2.2)
     pg (0.19.0)
     pg_search (1.0.6)
@@ -282,6 +282,7 @@ GEM
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
+    powerpack (0.1.1)
     quiet_assets (1.1.0)
       railties (>= 3.1, < 5.0)
     rack (1.6.4)
@@ -315,6 +316,7 @@ GEM
       activesupport (= 4.2.7.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
+    rainbow (2.1.0)
     raindrops (0.16.0)
     rake (11.3.0)
     redcarpet (3.3.4)
@@ -346,6 +348,12 @@ GEM
       rspec-mocks (~> 3.5.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
+    rubocop (0.45.0)
+      parser (>= 2.3.1.1, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.8.1)
     safe_yaml (1.0.4)
     safely_block (0.1.1)
@@ -412,6 +420,7 @@ GEM
       thread_safe (~> 0.1)
     uglifier (3.0.3)
       execjs (>= 0.3.0, < 3)
+    unicode-display_width (1.1.1)
     unicorn (5.1.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
@@ -494,6 +503,7 @@ DEPENDENCIES
   rinku (~> 2.0.2)
   rollbar (~> 2.13.3)
   rspec-rails (~> 3.5)
+  rubocop (~> 0.45.0)
   sass-rails (~> 5.0, >= 5.0.4)
   savon
   social-share-button

app/controllers/admin/banners_controller.rb

@@ -38,6 +38,7 @@ class Admin::BannersController < Admin::BaseController
   end
 
   private
+
     def banner_params
       params.require(:banner).permit(:title, :description, :target_url, :style, :image, :post_started_at, :post_ended_at)
     end
@@ -53,4 +54,5 @@ class Admin::BannersController < Admin::BaseController
     def banner_imgs
       @banner_imgs = Setting.all.banner_img.map { |banner_img| [banner_img.value, banner_img.key.split('.')[1]] }
     end
+
 end

app/controllers/admin/comments_controller.rb

@@ -20,6 +20,7 @@ class Admin::CommentsController < Admin::BaseController
   end
 
   private
+
     def load_comment
       @comment = Comment.with_hidden.find(params[:id])
     end

app/controllers/admin/officials_controller.rb

@@ -25,6 +25,7 @@ class Admin::OfficialsController < Admin::BaseController
   end
 
   private
+
     def user_params
       params.require(:user).permit(:official_position, :official_level)
     end

app/controllers/admin/settings_controller.rb

@@ -15,7 +15,9 @@ class Admin::SettingsController < Admin::BaseController
   end
 
   private
+
     def settings_params
       params.require(:setting).permit(:value)
     end
+
 end

app/controllers/admin/stats_controller.rb

@@ -32,4 +32,5 @@ class Admin::StatsController < Admin::BaseController
     @direct_messages = DirectMessage.count
     @users_who_have_sent_message = DirectMessage.select(:sender_id).distinct.count
   end
+
 end

app/controllers/admin/valuators_controller.rb

@@ -30,8 +30,10 @@ class Admin::ValuatorsController < Admin::BaseController
   end
 
   private
+
     def create_params
       params[:valuator][:description] = nil if params[:valuator][:description].blank?
       params.require(:valuator).permit(:user_id, :description)
     end
+
 end

app/controllers/concerns/polymorphic.rb

@@ -1,6 +1,7 @@
 module Polymorphic
 
   private
+
     def resource
       @resource ||= instance_variable_get("@#{resource_name}")
     end

app/controllers/management/account_controller.rb

@@ -6,6 +6,7 @@ class Management::AccountController < Management::BaseController
   end
 
   private
+
     def only_verified_users
       check_verified_user t("management.account.alert.unverified_user")
     end

app/controllers/organizations/registrations_controller.rb

@@ -24,6 +24,7 @@ class Organizations::RegistrationsController < Devise::RegistrationsController
   end
 
   protected
+
     def after_inactive_sign_up_path_for(resource)
       organizations_sign_up_success_path
     end

app/controllers/verification/letter_controller.rb

@@ -56,5 +56,4 @@ class Verification::LetterController < ApplicationController
       end
     end
 
-
 end

app/controllers/verification/verified_user_controller.rb

@@ -9,6 +9,7 @@ class Verification::VerifiedUserController < ApplicationController
   end
 
   private
+
     def user_data_present?
       return false if @verified_users.blank?
 

app/controllers/welcome_controller.rb

@@ -16,5 +16,4 @@ class WelcomeController < ApplicationController
     redirect_to verification_path if signed_in?
   end
 
-
 end

app/helpers/banners_helper.rb

@@ -1,5 +1,7 @@
 module BannersHelper
+
   def has_banners
     @banners.count > 0
   end
+
 end

app/helpers/comments_helper.rb

@@ -39,4 +39,5 @@ module CommentsHelper
       "" # Default not author class
     end
   end
+
 end

app/helpers/debates_helper.rb

@@ -3,4 +3,5 @@ module DebatesHelper
   def has_featured?
     Debate.all.featured.count > 0
   end
+
 end

app/helpers/embed_videos_helper.rb

@@ -9,15 +9,15 @@ module EmbedVideosHelper
     end
 
     if server == "Vimeo"
-      regExp = /vimeo.*(staffpicks\/|channels\/|videos\/|video\/|\/)([^#\&\?]*).*/
+      reg_exp = /vimeo.*(staffpicks\/|channels\/|videos\/|video\/|\/)([^#\&\?]*).*/
       src =  "https://player.vimeo.com/video/"
     elsif server == "YouTube"
-      regExp = /youtu.*(be\/|v\/|u\/\w\/|embed\/|watch\?v=|\&v=)([^#\&\?]*).*/
+      reg_exp = /youtu.*(be\/|v\/|u\/\w\/|embed\/|watch\?v=|\&v=)([^#\&\?]*).*/
       src = "https://www.youtube.com/embed/"
     end
 
-    if regExp
+    if reg_exp
-      match  = link.match(regExp)
+      match = link.match(reg_exp)
     end
 
     if match and match[2]

app/helpers/notifications_helper.rb

@@ -1,4 +1,2 @@
 module NotificationsHelper
-
-
 end

app/helpers/stats_helper.rb

@@ -20,4 +20,5 @@ module StatsHelper
     opt[:data][:graph] = admin_api_stats_path(spending_proposals: true)
     content_tag :div, "", opt
   end
+
 end

app/helpers/tracks_helper.rb

@@ -1,4 +1,5 @@
 module TracksHelper
+
   def track_event(data={})
     track_data = ""
     prefix = " data-track-event-"
@@ -9,4 +10,5 @@ module TracksHelper
       track_data
     end
   end
+
 end

app/models/notification.rb

@@ -49,4 +49,5 @@ class Notification < ActiveRecord::Base
   def linkable_resource
     notifiable.is_a?(ProposalNotification) ? notifiable.proposal : notifiable
   end
+
 end

app/models/user.rb

@@ -246,6 +246,7 @@ class User < ActiveRecord::Base
   delegate :can?, :cannot?, to: :ability
 
   private
+
     def clean_document_number
       self.document_number = self.document_number.gsub(/[^a-z0-9]+/i, "").upcase unless self.document_number.blank?
     end

db/dev_seeds.rb

@@ -81,10 +81,10 @@ end
 (1..40).each do |i|
   user = create_user("user#{i}@consul.dev")
   level = [1, 2, 3].sample
-  if level >= 2 then
+  if level >= 2
     user.update(residence_verified_at: Time.now, confirmed_phone: Faker::PhoneNumber.phone_number, document_number: Faker::Number.number(10), document_type: "1" )
   end
-  if level == 3 then
+  if level == 3
     user.update(verified_at: Time.now, document_number: Faker::Number.number(10) )
   end
 end
@@ -113,7 +113,7 @@ ActsAsTaggableOn::Tag.create!(name:  "Medio Ambiente", featured: true, kind: "ca
 puts "Creating Debates"
 
 tags = Faker::Lorem.words(25)
-(1..30).each do |i|
+(1..30).each do
   author = User.reorder("RANDOM()").first
   description = "<p>#{Faker::Lorem.paragraphs.join('</p><p>')}</p>"
   debate = Debate.create!(author: author,
@@ -128,7 +128,7 @@ end
 
 
 tags = ActsAsTaggableOn::Tag.where(kind: 'category')
-(1..30).each do |i|
+(1..30).each do
   author = User.reorder("RANDOM()").first
   description = "<p>#{Faker::Lorem.paragraphs.join('</p><p>')}</p>"
   debate = Debate.create!(author: author,
@@ -165,7 +165,7 @@ end
 puts "Creating Archived Proposals"
 
 tags = Faker::Lorem.words(25)
-(1..5).each do |i|
+(1..5).each do
   author = User.reorder("RANDOM()").first
   description = "<p>#{Faker::Lorem.paragraphs.join('</p><p>')}</p>"
   proposal = Proposal.create!(author: author,
@@ -185,7 +185,7 @@ end
 
 
 tags = ActsAsTaggableOn::Tag.where(kind: 'category')
-(1..30).each do |i|
+(1..30).each do
   author = User.reorder("RANDOM()").first
   description = "<p>#{Faker::Lorem.paragraphs.join('</p><p>')}</p>"
   proposal = Proposal.create!(author: author,
@@ -205,7 +205,7 @@ end
 
 puts "Commenting Debates"
 
-(1..100).each do |i|
+(1..100).each do
   author = User.reorder("RANDOM()").first
   debate = Debate.reorder("RANDOM()").first
   Comment.create!(user: author,
@@ -229,7 +229,7 @@ end
 
 puts "Commenting Comments"
 
-(1..200).each do |i|
+(1..200).each do
   author = User.reorder("RANDOM()").first
   parent = Comment.reorder("RANDOM()").first
   Comment.create!(user: author,
@@ -243,7 +243,7 @@ end
 
 puts "Voting Debates, Proposals & Comments"
 
-(1..100).each do |i|
+(1..100).each do
   voter  = not_org_users.reorder("RANDOM()").first
   vote   = [true, false].sample
   debate = Debate.reorder("RANDOM()").first
@@ -257,7 +257,7 @@ end
   comment.vote_by(voter: voter, vote: vote)
 end
 
-(1..100).each do |i|
+(1..100).each do
   voter  = User.level_two_or_three_verified.reorder("RANDOM()").first
   proposal = Proposal.reorder("RANDOM()").first
   proposal.vote_by(voter: voter, vote: true)
@@ -266,19 +266,19 @@ end
 
 puts "Flagging Debates & Comments"
 
-(1..40).each do |i|
+(1..40).each do
   debate = Debate.reorder("RANDOM()").first
   flagger = User.where(["users.id <> ?", debate.author_id]).reorder("RANDOM()").first
   Flag.flag(flagger, debate)
 end
 
-(1..40).each do |i|
+(1..40).each do
   comment = Comment.reorder("RANDOM()").first
   flagger = User.where(["users.id <> ?", comment.user_id]).reorder("RANDOM()").first
   Flag.flag(flagger, comment)
 end
 
-(1..40).each do |i|
+(1..40).each do
   proposal = Proposal.reorder("RANDOM()").first
   flagger = User.where(["users.id <> ?", proposal.author_id]).reorder("RANDOM()").first
   Flag.flag(flagger, proposal)
@@ -288,7 +288,7 @@ puts "Creating Spending Proposals"
 
 tags = Faker::Lorem.words(10)
 
-(1..60).each do |i|
+(1..60).each do
   geozone = Geozone.reorder("RANDOM()").first
   author = User.reorder("RANDOM()").first
   description = "<p>#{Faker::Lorem.paragraphs.join('</p><p>')}</p>"

db/migrate/20150716174358_devise_create_users.rb

@@ -30,7 +30,6 @@ class DeviseCreateUsers < ActiveRecord::Migration
       # t.string   :unlock_token # Only if unlock strategy is :email or :both
       # t.datetime :locked_at
 
-
       t.timestamps null: false
     end
 

db/migrate/20150808141306_create_simple_captcha_data.rb

@@ -1,12 +1,12 @@
 class CreateSimpleCaptchaData < ActiveRecord::Migration
   def self.up
     create_table :simple_captcha_data do |t|
-      t.string :key, :limit => 40
+      t.string :key, limit: 40
-      t.string :value, :limit => 6
+      t.string :value, limit: 6
       t.timestamps
     end
 
-    add_index :simple_captcha_data, :key, :name => "idx_key"
+    add_index :simple_captcha_data, :key, name: "idx_key"
   end
 
   def self.down

db/migrate/20160114110933_create_tolk_tables.rb

@@ -6,7 +6,7 @@ class CreateTolkTables < ActiveRecord::Migration
       t.datetime :updated_at
     end
 
-    add_index :tolk_locales, :name, :unique => true
+    add_index :tolk_locales, :name, unique: true
 
     create_table :tolk_phrases do |t|
       t.text     :key
@@ -19,17 +19,17 @@ class CreateTolkTables < ActiveRecord::Migration
       t.integer  :locale_id
       t.text     :text
       t.text     :previous_text
-      t.boolean  :primary_updated, :default => false
+      t.boolean  :primary_updated, default: false
       t.datetime :created_at
       t.datetime :updated_at
     end
 
-    add_index :tolk_translations, [:phrase_id, :locale_id], :unique => true
+    add_index :tolk_translations, [:phrase_id, :locale_id], unique: true
   end
 
   def self.down
-    remove_index :tolk_translations, :column => [:phrase_id, :locale_id]
+    remove_index :tolk_translations, column: [:phrase_id, :locale_id]
-    remove_index :tolk_locales, :column => :name
+    remove_index :tolk_locales, column: :name
 
     drop_table :tolk_translations
     drop_table :tolk_phrases

lib/tasks/proposals.rake

@@ -1,4 +1,5 @@
 namespace :proposals do
+
   desc "Updates all proposals by recalculating their hot_score"
   task touch: :environment do
     Proposal.find_in_batches do |proposals|

lib/tasks/spending_proposals.rake

@@ -1,4 +1,5 @@
 namespace :spending_proposals do
+
   desc "Sends an email to the authors of unfeasible spending proposals"
   task send_unfeasible_emails: :environment do
     SpendingProposal.find_each do |spending_proposal|

spec/features/admin/banners_spec.rb

@@ -1,6 +1,7 @@
 require 'rails_helper'
 
 feature 'Admin banners magement' do
+
   background do
     login_as(create(:administrator).user)
   end
@@ -124,8 +125,8 @@ feature 'Admin banners magement' do
     fill_in 'banner_description', with: 'Edited text'
 
     within('div#js-banner-style') do
-      expect(page).to have_selector('h2', :text => 'Modified title')
+      expect(page).to have_selector('h2', text: 'Modified title')
-      expect(page).to have_selector('h3', :text => 'Edited text')
+      expect(page).to have_selector('h3', text: 'Edited text')
     end
 
     click_button 'Save changes'
@@ -139,13 +140,14 @@ feature 'Admin banners magement' do
   end
 
   scenario 'Delete a banner' do
-    banner1 = create(:banner, title: 'Ugly banner',
+    create(:banner, title: 'Ugly banner',
                     description: 'Bad text',
                     target_url:  'http://www.url.com',
                     style: 'banner-style.banner-one',
                     image: 'banner-img.banner-one',
                     post_started_at: (Time.now + 4.days),
                     post_ended_at:   (Time.now + 10.days))
+
     visit admin_root_path
 
     within("#side_menu") do

spec/features/admin/feature_flags_spec.rb

@@ -60,4 +60,5 @@ feature 'Admin feature flags' do
       expect(page).to have_link "Spending proposals"
     end
   end
+
 end

spec/features/admin/managers_spec.rb

@@ -33,5 +33,5 @@ feature 'Admin managers' do
       expect(page).to_not have_content @manager.name
     end
   end
-end
 
+end

spec/features/admin/settings_spec.rb

@@ -27,4 +27,5 @@ feature 'Admin settings' do
 
     expect(page).to have_content 'Value updated'
   end
+
 end

spec/features/debates_spec.rb

@@ -956,7 +956,6 @@ feature 'Debates' do
     end
   end
 
-
   context 'Suggesting debates' do
     scenario 'Shows up to 5 suggestions', :js do
       author = create(:user)
@@ -1029,7 +1028,6 @@ feature 'Debates' do
     end
   end
 
-
   scenario 'Index include featured debates' do
     admin = create(:administrator)
     login_as(admin.user)

spec/features/users_auth_spec.rb

@@ -52,7 +52,6 @@ feature 'Users' do
                                                uid: '12345',
                                                info: {name: 'manuela', email: 'manuelacarmena@example.com', verified: '1'}} }
 
-
       scenario 'Sign up when Oauth provider has a verified email' do
         OmniAuth.config.add_mock(:twitter, twitter_hash_with_verified_email)
 

spec/features/verification/verification_path_spec.rb

@@ -98,4 +98,5 @@ feature 'Verification path' do
       expect(page).to have_content 'Your account is already verified'
     end
   end
+
 end

spec/lib/email_digests_spec.rb

@@ -85,7 +85,7 @@ describe EmailDigest do
       user = create(:user)
 
       proposal_notification = create(:proposal_notification)
-      notification = create(:notification, notifiable: proposal_notification, user: user, emailed_at: Time.now)
+      create(:notification, notifiable: proposal_notification, user: user, emailed_at: Time.now)
 
       reset_mailer
       email_digest = EmailDigest.new(user)

spec/models/proposal_spec.rb

@@ -651,28 +651,28 @@ describe Proposal do
     context "no results" do
 
       it "no words match" do
-        proposal = create(:proposal, title: 'save world')
+        create(:proposal, title: 'save world')
 
         results = Proposal.search('destroy planet')
         expect(results).to eq([])
       end
 
       it "too many typos" do
-        proposal = create(:proposal, title: 'fantastic')
+        create(:proposal, title: 'fantastic')
 
         results = Proposal.search('frantac')
         expect(results).to eq([])
       end
 
       it "too much stemming" do
-        proposal = create(:proposal, title: 'reloj')
+        create(:proposal, title: 'reloj')
 
         results = Proposal.search('superrelojimetro')
         expect(results).to eq([])
       end
 
       it "empty" do
-        proposal = create(:proposal, title: 'great')
+        create(:proposal, title: 'great')
 
         results = Proposal.search('')
         expect(results).to eq([])

spec/spec_helper.rb

@@ -9,7 +9,7 @@ RSpec.configure do |config|
 
   config.filter_run :focus
   config.run_all_when_everything_filtered = true
-  config.include Devise::TestHelpers, :type => :controller
+  config.include Devise::TestHelpers, type: :controller
   config.include FactoryGirl::Syntax::Methods
   config.include(EmailSpec::Helpers)
   config.include(EmailSpec::Matchers)

spec/support/verifiable.rb

@@ -159,4 +159,5 @@ shared_examples_for "verifiable" do
       expect(user.verification_letter_sent?).to eq(false)
     end
   end
+
 end