Skip to content

Commit

Permalink
Prefer IfUnlessModifier to if block
Browse files Browse the repository at this point in the history
  • Loading branch information
veganstraightedge committed Sep 23, 2018
1 parent e5bb728 commit b12a014
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 29 deletions.
8 changes: 0 additions & 8 deletions ruby-gatekeeper/.rubocop_todo.yml
Expand Up @@ -59,14 +59,6 @@ Style/GlobalVars:
- 'app/helpers/method_helpers.rb'
- 'server.rb'

# Offense count: 8
# Cop supports --auto-correct.
Style/IfUnlessModifier:
Exclude:
- 'Rakefile'
- 'app/helpers/method_helpers.rb'
- 'config/database.rb'

# Offense count: 5
Style/MixinUsage:
Exclude:
Expand Down
16 changes: 4 additions & 12 deletions ruby-gatekeeper/Rakefile
Expand Up @@ -8,17 +8,13 @@ require 'active_support/core_ext'
namespace :generate do
desc 'Create an empty model in app/models, e.g., rake generate:model NAME=User'
task :model do
unless ENV.key?('NAME')
raise 'Must specificy model name, e.g., rake generate:model NAME=User'
end
raise 'Must specificy model name, e.g., rake generate:model NAME=User' unless ENV.key?('NAME')

model_name = ENV['NAME'].camelize
model_filename = ENV['NAME'].underscore + '.rb'
model_path = APP_ROOT.join('app', 'models', model_filename)

if File.exist?(model_path)
raise "ERROR: Model file '#{model_path}' already exists"
end
raise "ERROR: Model file '#{model_path}' already exists" if File.exist?(model_path)

puts "Creating #{model_path}"
File.open(model_path, 'w+') do |f|
Expand All @@ -32,9 +28,7 @@ namespace :generate do

desc 'Create an empty migration in db/migrate, e.g., rake generate:migration NAME=create_tasks'
task :migration do
unless ENV.key?('NAME')
raise 'Must specificy migration name, e.g., rake generate:migration NAME=create_tasks'
end
raise 'Must specificy migration name, e.g., rake generate:migration NAME=create_tasks' unless ENV.key?('NAME')

name = ENV['NAME'].camelize
filename = format('%s_%s.rb', Time.now.strftime('%Y%m%d%H%M%S'), ENV['NAME'].underscore)
Expand All @@ -55,9 +49,7 @@ namespace :generate do

desc 'Create an empty model spec in spec, e.g., rake generate:spec NAME=user'
task :spec do
unless ENV.key?('NAME')
raise 'Must specificy migration name, e.g., rake generate:spec NAME=user'
end
raise 'Must specificy migration name, e.g., rake generate:spec NAME=user' unless ENV.key?('NAME')

name = ENV['NAME'].camelize
filename = format('%s_spec.rb', ENV['NAME'].underscore)
Expand Down
8 changes: 2 additions & 6 deletions ruby-gatekeeper/app/helpers/method_helpers.rb
Expand Up @@ -20,18 +20,14 @@ def validate_write_key(users_write_key)
end

matching_team = $known_teams.select { |team| team.write_key == users_write_key }
if matching_team.empty?
raise AuthFailure.new("error": 'writekey does not match valid credentials')
end
raise AuthFailure.new("error": 'writekey does not match valid credentials') if matching_team.empty?

matching_team[0]
end

def resolve_dataset(given_dataset)
matching_dataset = $known_datasets.select { |dataset| dataset.name == given_dataset }
if matching_dataset.empty?
raise DatasetLookupFailure.new("error": 'failed to resolve dataset')
end
raise DatasetLookupFailure.new("error": 'failed to resolve dataset') if matching_dataset.empty?

matching_dataset[0]
end
Expand Down
4 changes: 1 addition & 3 deletions ruby-gatekeeper/config/database.rb
@@ -1,7 +1,5 @@
# Log queries to STDOUT in development
if Sinatra::Application.development?
ActiveRecord::Base.logger = Logger.new(STDOUT)
end
ActiveRecord::Base.logger = Logger.new(STDOUT) if Sinatra::Application.development?

# Automatically load every file in APP_ROOT/app/models/*.rb, e.g.,
# autoload "Person", 'app/models/person.rb'
Expand Down

0 comments on commit b12a014

Please sign in to comment.