Skip to content

Commit 04ffa53

Browse files
committed
enforce double quote style and run rubocop on the project with --safe-auto-correct
1 parent 9724f9a commit 04ffa53

94 files changed

Lines changed: 394 additions & 389 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.rubocop.yaml renamed to .rubocop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Style/StringLiterals:
22
Description: Checks if uses of quotes match the configured preference.
33
StyleGuide: https://github.com/bbatsov/ruby-style-guide#consistent-string-literals
4-
Enabled: false
4+
Enabled: true
55
EnforcedStyle: double_quotes
66
SupportedStyles:
77
- single_quotes

Gemfile

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,54 +3,54 @@ source "https://rubygems.org"
33
ruby "2.4.2"
44

55
gem "airbrake"
6+
gem "apartment"
7+
gem "audited"
8+
gem "aws-sdk"
9+
gem "bitters"
610
gem "bourbon"
11+
gem "brakeman"
712
gem "coffee-rails"
813
gem "delayed_job_active_record"
14+
gem "devise", "~> 4.7.1"
15+
gem "devise_invitable"
916
gem "email_validator"
1017
gem "flutie"
18+
gem "gravatar_image_tag"
19+
gem "haml-rails"
20+
gem "hashtel", "~> 0.0.2"
1121
gem "high_voltage"
22+
gem "holidays"
23+
gem "http_accept_language"
24+
gem "jquery-atwho-rails", "~> 1.3.2" # autocomplete
1225
gem "jquery-rails", "~> 4.0"
26+
gem "kaminari"
27+
gem "momentjs-rails"
1328
gem "neat"
14-
gem "bitters"
29+
gem "normalize-rails"
30+
gem "paperclip", "~> 6.1.0"
1531
gem "pg"
32+
gem "pikaday-gem", "~> 1.2.0.0"
1633
gem "rack-timeout"
1734
gem "rails", "~> 5.0.0"
1835
gem "recipient_interceptor"
36+
gem "redcarpet"
1937
gem "sass-rails", "~> 5.0.1"
38+
gem "select2-rails"
2039
gem "simple_form"
40+
gem "sprockets-rails", "~>3.0"
2141
gem "title"
42+
gem "twitter-text" # hashtag parsing
2243
gem "uglifier"
2344
gem "unicorn"
24-
gem "devise", "~> 4.7.1"
25-
gem "devise_invitable"
26-
gem "apartment"
27-
gem "pikaday-gem", "~> 1.2.0.0"
28-
gem "momentjs-rails"
29-
gem "gravatar_image_tag"
30-
gem "hashtel", "~> 0.0.2"
31-
gem "kaminari"
32-
gem "select2-rails"
33-
gem "http_accept_language"
34-
gem "normalize-rails"
35-
gem "twitter-text" # hashtag parsing
36-
gem "jquery-atwho-rails", "~> 1.3.2" # autocomplete
37-
gem "haml-rails"
38-
gem "audited"
39-
gem "paperclip", "~> 6.1.0"
40-
gem "aws-sdk"
41-
gem "redcarpet"
42-
gem "holidays"
43-
gem "sprockets-rails", "~>3.0"
44-
gem "brakeman"
4545

4646
source "https://rails-assets.org" do
4747
gem "rails-assets-chartjs"
4848
end
4949

5050
# caching
5151

52-
gem "kgio" # faster I/O
5352
gem "dalli" # memcached
53+
gem "kgio" # faster I/O
5454
gem "memcachier"
5555

5656
group :development do
@@ -63,17 +63,17 @@ group :development do
6363
end
6464

6565
group :development, :test do
66+
gem "annotate"
6667
gem "dotenv-rails"
68+
gem "email_spec"
6769
gem "factory_girl_rails"
70+
gem "letter_opener"
6871
gem "pry-rails"
6972
gem "rspec-rails", "~> 3.8"
70-
gem "annotate"
71-
gem "letter_opener"
72-
gem "email_spec"
7373
end
7474

7575
group :test do
76-
gem 'capybara'
76+
gem "capybara"
7777
gem "database_cleaner"
7878
gem "launchy"
7979
gem "shoulda-matchers", "~> 2.7.0"

Rakefile

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,34 +3,34 @@
33
# Add your own tasks in files placed in lib/tasks ending in .rake,
44
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
55

6-
require File.expand_path('../config/application', __FILE__)
6+
require File.expand_path("config/application", __dir__)
77

88
Hours::Application.load_tasks
99
if defined?(RSpec)
1010
task(:spec).clear
1111

12-
desc 'Run all specs'
12+
desc "Run all specs"
1313
RSpec::Core::RakeTask.new(:spec) do |t|
14-
t.rspec_opts = '--tag ~factory'
14+
t.rspec_opts = "--tag ~factory"
1515
end
1616

17-
desc 'Run factory specs.'
17+
desc "Run factory specs."
1818
RSpec::Core::RakeTask.new(:factory_specs) do |t|
19-
t.pattern = './spec/models/factories_spec.rb'
19+
t.pattern = "./spec/models/factories_spec.rb"
2020
end
2121

2222
task spec: :factory_specs
2323
end
2424

2525
namespace :brakeman do
26-
desc 'Run Brakeman'
26+
desc "Run Brakeman"
2727
task :check, :output_files do |_t, args|
28-
require 'brakeman'
28+
require "brakeman"
2929

30-
files = args[:output_files].split(' ') if args[:output_files]
31-
Brakeman.run app_path: '.', output_files: files, print_report: true
30+
files = args[:output_files].split(" ") if args[:output_files]
31+
Brakeman.run app_path: ".", output_files: files, print_report: true
3232
end
3333
end
3434

3535
task(:default).clear
36-
task default: [:spec, 'brakeman:check']
36+
task default: [:spec, "brakeman:check"]

app/controllers/accounts_controller.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
class AccountsController < ApplicationController
2-
skip_before_action :authenticate_user!, only: [:new, :create]
3-
before_action :authorize!, only: [:edit, :destroy]
2+
skip_before_action :authenticate_user!, only: %i[new create]
3+
before_action :authorize!, only: %i[edit destroy]
44

55
def new
66
@signup = Signup.new
@@ -32,7 +32,7 @@ def destroy
3232
def signup_params
3333
params.require(:signup)
3434
.permit(:subdomain, :first_name, :last_name, :email,
35-
:password, :password_confirmation)
35+
:password, :password_confirmation)
3636
end
3737

3838
def authorize!

app/controllers/application_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def current_account
4444
end
4545

4646
def load_schema
47-
Apartment::Tenant.switch!('public')
47+
Apartment::Tenant.switch!("public")
4848
return unless request.subdomain.present?
4949

5050
if current_account

app/controllers/audits_controller.rb

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,12 @@ def index
88
private
99

1010
def audit_log
11-
case
12-
when params.key?(:hour_id)
13-
return hour_log
14-
when params.key?(:mileage_id)
15-
return mileage_log
16-
when params.key?(:project_id)
17-
return project_log
11+
if params.key?(:hour_id)
12+
hour_log
13+
elsif params.key?(:mileage_id)
14+
mileage_log
15+
elsif params.key?(:project_id)
16+
project_log
1817
end
1918
end
2019

app/controllers/categories_controller.rb

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
class CategoriesController < ApplicationController
2-
before_action :find_category, only: [:edit, :update]
2+
before_action :find_category, only: %i[edit update]
33

44
def index
55
@category = Category.new
@@ -16,8 +16,7 @@ def create
1616
end
1717
end
1818

19-
def edit
20-
end
19+
def edit; end
2120

2221
def update
2322
if @category.update(category_params)

app/controllers/entries_controller.rb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,17 @@ def index
77
@user = User.find_by_slug(params[:user_id])
88
@hours_entries = @user.hours.by_date.page(params[:hours_pages]).per(20)
99
@mileages_entries = @user.mileages.by_date.page(
10-
params[:mileages_pages]).per(20)
10+
params[:mileages_pages]
11+
).per(20)
1112

1213
respond_to do |format|
1314
format.html { @mileages_entries + @hours_entries }
1415
format.csv do
1516
send_csv(
1617
name: @user.name,
1718
hours_entries: @user.hours.by_date,
18-
mileages_entries: @user.mileages.by_date)
19+
mileages_entries: @user.mileages.by_date
20+
)
1921
end
2022
end
2123
end

app/controllers/hours_controller.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ def resource
3030
end
3131

3232
def entry_params
33-
params.require(:hour).
34-
permit(:project_id, :category_id, :value, :description, :date).
35-
merge(date: parsed_date(:hour))
33+
params.require(:hour)
34+
.permit(:project_id, :category_id, :value, :description, :date)
35+
.merge(date: parsed_date(:hour))
3636
end
3737
end

app/controllers/mileages_controller.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ def resource
3333
end
3434

3535
def entry_params
36-
params.require(:mileage).
37-
permit(:project_id, :value, :date).
38-
merge(date: parsed_date(:mileage))
36+
params.require(:mileage)
37+
.permit(:project_id, :value, :date)
38+
.merge(date: parsed_date(:mileage))
3939
end
4040
end

0 commit comments

Comments
 (0)