Time keys should use time zone instead of UTC - closes #29

Andrew Kane
1 parent 50ba7750
Showing 3 changed files with 10 additions and 3 deletions Show diff stats
lib/groupdate/scopes.rb
lib/groupdate/series.rb
test/test_helper.rb
@@ -13,6 +13,7 @@ module Groupdate
         column = connection.quote_table_name(args[0])
         time_zone = args[1] || options[:time_zone] || Groupdate.time_zone || Time.zone || "Etc/UTC"
         if time_zone.is_a?(ActiveSupport::TimeZone) or time_zone = ActiveSupport::TimeZone[time_zone]
+          time_zone_object = time_zone
           time_zone = time_zone.tzinfo.name
         else
           raise "Unrecognized time zone"
@@ -75,7 +76,7 @@ module Groupdate
         group = group(Groupdate::OrderHack.new(sanitize_sql_array(query), field, time_zone))
         range = args[2] || options[:range] || true
         unless options[:series] == false
-          Series.new(group, field, column, time_zone, range, week_start, day_start)
+          Series.new(group, field, column, time_zone_object, range, week_start, day_start)
         else
           group
         end
@@ -23,7 +23,7 @@ module Groupdate
         when "day_of_week", "hour_of_day"
           lambda{|k| k.to_i }
         else
-          lambda{|k| (k.is_a?(String) ? utc.parse(k) : k.to_time).utc }
+          lambda{|k| (k.is_a?(String) ? utc.parse(k) : k.to_time).in_time_zone(@time_zone) }
         end
       count = Hash[ count.map{|k, v| [cast_method.call(k), v] } ]
@@ -76,7 +76,7 @@ module Groupdate
               series << series.last + step
             end
-            series.map{|s| s.to_time.utc }
+            series
           else
             []
           end
@@ -474,6 +474,12 @@ module TestGroupdate
     assert_empty User.where("id = 0").group_by_day(:created_at).count
   end
+  def test_time_zone
+    create_user "2013-05-01 00:00:00 UTC"
+    time_zone = "Pacific Time (US & Canada)"
+    assert_equal time_zone, User.group_by_day(:created_at, time_zone: time_zone).count.keys.first.time_zone.name
+  end
+
   # helpers
   def assert_result_time(method, expected, time_str, time_zone = false, options = {})
	@@ -23,7 +23,7 @@ module Groupdate		@@ -23,7 +23,7 @@ module Groupdate
23	when "day_of_week", "hour_of_day"	23	when "day_of_week", "hour_of_day"
24	lambda{\|k\| k.to_i }	24	lambda{\|k\| k.to_i }
25	else	25	else
26	- lambda{\|k\| (k.is_a?(String) ? utc.parse(k) : k.to_time).utc }	26	+ lambda{\|k\| (k.is_a?(String) ? utc.parse(k) : k.to_time).in_time_zone(@time_zone) }
27	end	27	end
28		28
29	count = Hash[ count.map{\|k, v\| [cast_method.call(k), v] } ]	29	count = Hash[ count.map{\|k, v\| [cast_method.call(k), v] } ]
	@@ -76,7 +76,7 @@ module Groupdate		@@ -76,7 +76,7 @@ module Groupdate
76	series << series.last + step	76	series << series.last + step
77	end	77	end
78		78
79	- series.map{\|s\| s.to_time.utc }	79	+ series
80	else	80	else
81	[]	81	[]
82	end	82	end
	@@ -474,6 +474,12 @@ module TestGroupdate		@@ -474,6 +474,12 @@ module TestGroupdate
474	assert_empty User.where("id = 0").group_by_day(:created_at).count	474	assert_empty User.where("id = 0").group_by_day(:created_at).count
475	end	475	end
476		476
		477	+ def test_time_zone
		478	+ create_user "2013-05-01 00:00:00 UTC"
		479	+ time_zone = "Pacific Time (US & Canada)"
		480	+ assert_equal time_zone, User.group_by_day(:created_at, time_zone: time_zone).count.keys.first.time_zone.name
		481	+ end
		482	+
477	# helpers	483	# helpers
478		484
479	def assert_result_time(method, expected, time_str, time_zone = false, options = {})	485	def assert_result_time(method, expected, time_str, time_zone = false, options = {})