Skip to content

Commit

Permalink
use Date.current instead of Date.today as it is timezone aware
Browse files Browse the repository at this point in the history
  • Loading branch information
lsylvester authored and qrush committed Feb 26, 2011
1 parent 140f62b commit 1eee54a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions app/models/download.rb
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ def self.most_downloaded_today
end

def self.counts_by_day_for_versions(versions, days)
dates = (days.days.ago.to_date...Date.today).map &:to_s
dates = (days.days.ago.to_date...Date.current).map &:to_s

versions.inject({}) do |downloads, version|
$redis.hmget(self.history_key(version), *dates).each_with_index do |count, idx|
downloads["#{version.id}-#{dates[idx]}"] = count.to_i
end
downloads["#{version.id}-#{Date.today}"] = self.today(version)
downloads["#{version.id}-#{Date.current}"] = self.today(version)
downloads
end
end
Expand Down
2 changes: 1 addition & 1 deletion lib/tasks/downloads.rake
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ namespace "gemcutter:downloads" do

puts "*" * 80

Dl.created_at_inside(Date.today.to_datetime, Date.today.to_datetime + 1.day).group_by(&:version_id).each do |version_id, downloads|
Dl.created_at_inside(Date.current.to_datetime, Date.current.to_datetime + 1.day).group_by(&:version_id).each do |version_id, downloads|
name = vmap[version_id].full_name
count = downloads.size
puts ">>> #{name}: #{count}"
Expand Down
6 changes: 3 additions & 3 deletions test/unit/download_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,9 @@ class DownloadTest < ActiveSupport::TestCase
Download.incr(@rubygem_1, @version_2.full_name)

downloads = {
"#{@version_1.id}-#{2.days.ago.to_date}" => 0, "#{@version_1.id}-#{Date.yesterday}" => 1, "#{@version_1.id}-#{Date.today}" => 1,
"#{@version_2.id}-#{2.days.ago.to_date}" => 0, "#{@version_2.id}-#{Date.yesterday}" => 1, "#{@version_2.id}-#{Date.today}" => 1,
"#{@version_3.id}-#{2.days.ago.to_date}" => 0, "#{@version_3.id}-#{Date.yesterday}" => 1, "#{@version_3.id}-#{Date.today}" => 3 }
"#{@version_1.id}-#{2.days.ago.to_date}" => 0, "#{@version_1.id}-#{Date.yesterday}" => 1, "#{@version_1.id}-#{Date.current}" => 1,
"#{@version_2.id}-#{2.days.ago.to_date}" => 0, "#{@version_2.id}-#{Date.yesterday}" => 1, "#{@version_2.id}-#{Date.current}" => 1,
"#{@version_3.id}-#{2.days.ago.to_date}" => 0, "#{@version_3.id}-#{Date.yesterday}" => 1, "#{@version_3.id}-#{Date.current}" => 3 }

assert_equal downloads, Download.counts_by_day_for_versions([@version_1, @version_2, @version_3], 2)
end
Expand Down

0 comments on commit 1eee54a

Please sign in to comment.