Skip to content

Commit 4aa5c71

Browse files
myabcbeseven
authored andcommitted
Prefer Time.zone.now over Date.current ('strict')
Make adjustments to comply with Rails/Date 'strict' style. See: http://www.rubydoc.info/gems/rubocop/RuboCop/Cop/Rails/Date
1 parent 7ddcd1e commit 4aa5c71

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

app/models/activity.rb

+8-6
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def participated_by(user)
4848
end
4949

5050
def order_by_start_time
51-
t = Date.current.beginning_of_day
51+
t = Time.zone.now.beginning_of_day
5252
custom_order = <<~SQL
5353
*,
5454
(
@@ -75,7 +75,9 @@ def find_recent(limit)
7575
end
7676

7777
def find_today
78-
where('(NOT(start_time <= :t1 AND end_time = :t1 ) AND (start_time <= :t2 AND end_time >= :t1)) OR anytime=true', t1: Date.current.beginning_of_day, t2: Date.current.end_of_day).order_by_start_time
78+
where('(NOT(start_time <= :t1 AND end_time = :t1 ) AND (start_time <= :t2 AND end_time >= :t1)) OR anytime=true',
79+
t1: Time.zone.now.beginning_of_day,
80+
t2: Time.zone.now.end_of_day).order_by_start_time
7981
end
8082

8183
def find_with_name_like(name)
@@ -101,8 +103,8 @@ def anybody_can_join?
101103

102104
def today?
103105
return true if anytime?
104-
t1 = Date.current.beginning_of_day
105-
t2 = Date.current.end_of_day
106+
t1 = Time.zone.now.beginning_of_day
107+
t2 = Time.zone.now.end_of_day
106108
if start_time <= t1 && end_time == t1
107109
false
108110
else
@@ -111,12 +113,12 @@ def today?
111113
end
112114

113115
def upcoming?
114-
start_time > Date.current.end_of_day
116+
start_time > Time.zone.now.end_of_day
115117
end
116118

117119
def in_past?
118120
return false if anytime?
119-
end_time < Date.current.beginning_of_day
121+
end_time < Time.zone.now.beginning_of_day
120122
end
121123

122124
def full?

db/seeds.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
User.transaction do |_tx|
2-
event = Event.new('Test Event', Date.current, 14.days.from_now)
2+
event = Event.new('Test Event', Time.zone.now, 14.days.from_now)
33
ultra_secure_password = 'qweqweqwe'
44

55
creator = User.new(

0 commit comments

Comments
 (0)