Skip to content

Commit 151e0ba

Browse files
committed
Clean up code to satisfy RuboCop
1 parent 5272c00 commit 151e0ba

File tree

2 files changed

+16
-17
lines changed

2 files changed

+16
-17
lines changed

bench/serializing.rb

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ def initialize
1010
end
1111
end
1212

13-
class ClassRoom
13+
class ClassRoom
1414
attr_reader :students
1515
attr_accessor :teacher
1616
def initialize(opts = {})
@@ -51,7 +51,7 @@ class School < Grape::Entity
5151
class ClassRoom < Grape::Entity
5252
expose :teacher, using: 'Entities::Teacher'
5353
expose :students, using: 'Entities::Student'
54-
expose :size do |model, opts|
54+
expose :size do |model, _opts|
5555
model.students.count
5656
end
5757
end
@@ -62,7 +62,7 @@ class Person < Grape::Entity
6262

6363
class Student < Entities::Person
6464
expose :grade
65-
expose :failing do |model, opts|
65+
expose :failing do |model, _opts|
6666
model.grade == 'F'
6767
end
6868
end
@@ -72,28 +72,27 @@ class Teacher < Entities::Person
7272
end
7373
end
7474

75+
teacher1 = Models::Teacher.new(name: 'John Smith', tenure: 2)
76+
classroom1 = Models::ClassRoom.new(teacher: teacher1)
77+
classroom1.students << Models::Student.new(name: 'Bobby', grade: 'A')
78+
classroom1.students << Models::Student.new(name: 'Billy', grade: 'B')
7579

76-
teacher1 = Models::Teacher.new(:name => "John Smith", :tenure => 2)
77-
classroom1 = Models::ClassRoom.new(:teacher => teacher1)
78-
classroom1.students << Models::Student.new(:name => "Bobby", :grade => 'A' )
79-
classroom1.students << Models::Student.new(:name => "Billy", :grade => 'B' )
80-
81-
teacher2 = Models::Teacher.new(:name => "Lisa Barns")
82-
classroom2 = Models::ClassRoom.new(:teacher => teacher2, :tenure => 15)
83-
classroom2.students << Models::Student.new(:name => "Eric", :grade => 'A' )
84-
classroom2.students << Models::Student.new(:name => "Eddie", :grade => 'C' )
85-
classroom2.students << Models::Student.new(:name => "Arnie", :grade => 'C' )
86-
classroom2.students << Models::Student.new(:name => "Alvin", :grade => 'F' )
80+
teacher2 = Models::Teacher.new(name: 'Lisa Barns')
81+
classroom2 = Models::ClassRoom.new(teacher: teacher2, tenure: 15)
82+
classroom2.students << Models::Student.new(name: 'Eric', grade: 'A')
83+
classroom2.students << Models::Student.new(name: 'Eddie', grade: 'C')
84+
classroom2.students << Models::Student.new(name: 'Arnie', grade: 'C')
85+
classroom2.students << Models::Student.new(name: 'Alvin', grade: 'F')
8786
school = Models::School.new
8887
school.classrooms << classroom1
8988
school.classrooms << classroom2
9089

9190
iters = 5000
9291

9392
Benchmark.bm do |bm|
94-
bm.report("serializing") do
93+
bm.report('serializing') do
9594
iters.times do
96-
Entities::School.represent(school, :serializable => true)
95+
Entities::School.represent(school, serializable: true)
9796
end
9897
end
9998
end

lib/grape_entity/entity.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@ def valid_exposure?(attribute, exposure_options)
501501
def conditions_met?(exposure_options, options)
502502
if_conditions = []
503503
unless exposure_options[:if_extras].nil?
504-
if_conditions.concat(exposure_options[:if_extras])
504+
if_conditions.concat(exposure_options[:if_extras])
505505
end
506506
if_conditions << exposure_options[:if] unless exposure_options[:if].nil?
507507

0 commit comments

Comments
 (0)