Skip to content
This repository was archived by the owner on Oct 2, 2024. It is now read-only.

Commit c559048

Browse files
committed
Add rubocop fixes
1 parent 9694e99 commit c559048

17 files changed

+124
-102
lines changed

Gemfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
source "http://rubygems.org"
1+
# frozen_string_literal: true
2+
3+
source 'http://rubygems.org'
24

35
# Declare your gem's dependencies in samfundet_auth.gemspec.
46
# Bundler will treat runtime dependencies like base dependencies, and

Rakefile

100644100755
Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
#!/usr/bin/env rake
2+
# frozen_string_literal: true
3+
24
begin
35
require 'bundler/setup'
46
rescue LoadError
@@ -20,11 +22,9 @@ RDoc::Task.new(:rdoc) do |rdoc|
2022
rdoc.rdoc_files.include('lib/**/*.rb')
2123
end
2224

23-
APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
25+
APP_RAKEFILE = File.expand_path('test/dummy/Rakefile', __dir__)
2426
load 'rails/tasks/engine.rake'
2527

26-
27-
2828
Bundler::GemHelper.install_tasks
2929

3030
require 'rake/testtask'
@@ -36,5 +36,4 @@ Rake::TestTask.new(:test) do |t|
3636
t.verbose = false
3737
end
3838

39-
40-
task :default => :test
39+
task default: :test

app/models/member.rb

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1+
# frozen_string_literal: true
2+
13
class Member < ActiveRecord::Base
24
self.primary_key = :medlem_id
35

4-
has_many :members_roles, :dependent => :destroy
5-
has_many :roles, :through => :members_roles
6+
has_many :members_roles, dependent: :destroy
7+
has_many :roles, through: :members_roles
68

7-
attr_accessor :passord if %w(production staging).include? Rails.env
9+
attr_accessor :passord if %w[production staging].include? Rails.env
810

911
validates_presence_of :fornavn, :etternavn, :mail, :telefon
1012

11-
if Rails.env.development?
12-
validates_presence_of :passord
13-
end
13+
validates_presence_of :passord if Rails.env.development?
1414

1515
def firstname
1616
fornavn
@@ -25,7 +25,7 @@ def full_name
2525
end
2626

2727
def self.authenticate(member_id_or_email, password)
28-
if %w(production staging).include? Rails.env
28+
if %w[production staging].include? Rails.env
2929
authenticate_production member_id_or_email, password
3030
else
3131
authenticate_development member_id_or_email, password
@@ -37,22 +37,20 @@ def self.authenticate(member_id_or_email, password)
3737
def self.authenticate_production(member_id_or_email, password)
3838
Rails.logger.silence do # Prevents passwords from showing up in the logs.
3939
member_id = connection.select_value sanitize_sql([
40-
"SELECT * FROM sett_lim_utvidet_medlemsinfo(?, ?)",
41-
member_id_or_email.to_s,
42-
password
40+
'SELECT * FROM sett_lim_utvidet_medlemsinfo(?, ?)',
41+
member_id_or_email.to_s,
42+
password
4343
])
44-
unless member_id.nil?
45-
Member.find member_id
46-
end
44+
Member.find member_id unless member_id.nil?
4745
end
4846
end
4947

5048
def self.authenticate_development(member_id_or_email, password)
5149
# There are no SQL standard for lower case search,
5250
# and that's why there's no help from ruby or rails.
5351
member = Member.find_by_medlem_id(member_id_or_email) ||
54-
Member.where("lower(mail) = ?", member_id_or_email.downcase).first
52+
Member.where('lower(mail) = ?', member_id_or_email.downcase).first
5553

56-
member if member and member.passord == password
54+
member if member && (member.passord == password)
5755
end
5856
end

app/models/members_role.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
class MembersRole < ActiveRecord::Base
24
validates_presence_of :member_id
35
validates_presence_of :role_id

app/models/role.rb

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1+
# frozen_string_literal: true
2+
13
class Role < ActiveRecord::Base
2-
validates_format_of :title, :with => /\A[a-z0-9\_\-]+\z/
4+
validates_format_of :title, with: /\A[a-z0-9\_\-]+\z/
35
validates_presence_of :name, :description
46

57
attr_readonly :title
68

79
default_scope { order(:title) }
810

9-
has_many :members_roles, :dependent => :destroy
10-
has_many :members, :through => :members_roles
11+
has_many :members_roles, dependent: :destroy
12+
has_many :members, through: :members_roles
1113
has_many :roles
1214
belongs_to :group
1315
belongs_to :role

config/routes.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1+
# frozen_string_literal: true
2+
13
SamfundetAuth::Engine.routes.draw do
24
end

db/migrate/20121031220629_create_members.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
# frozen_string_literal: true
2+
13
class CreateMembers < ActiveRecord::Migration
24
def up
3-
create_table :members, :primary_key => :medlem_id do |t|
5+
create_table :members, primary_key: :medlem_id do |t|
46
t.string :fornavn
57
t.string :etternavn
68
t.string :mail

db/migrate/20121031220750_create_roles.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1+
# frozen_string_literal: true
2+
13
class CreateRoles < ActiveRecord::Migration
24
def up
35
create_table :roles do |t|
46
t.string :name # The name is a generic name of that type of role. E.g. «Gjengsjef» is a name.
57
t.string :title # The title of a role is unique and the properties gained from a role depends on its title. E.g. «mg_gjengsjef» is a title.
68
t.text :description
7-
t.boolean :show_in_hierarchy, :default => false
9+
t.boolean :show_in_hierarchy, default: false
810
t.references :role
911
t.references :group
1012

db/migrate/20121031220820_create_members_roles.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
class CreateMembersRoles < ActiveRecord::Migration
24
def up
35
create_table :members_roles do |t|

db/migrate/20140322161444_add_foreign_keys_for_roles_and_member_roles.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
class AddForeignKeysForRolesAndMemberRoles < ActiveRecord::Migration
24
def up
35
add_foreign_key :roles, :roles

0 commit comments

Comments
 (0)