groupdate 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00f2a25fe5b1a02e4b8a6e2b483e407ed4d5d76e
-  data.tar.gz: 5f6c81ee95f601a8ad189d706c53b5e57cf6d483
+  metadata.gz: 89762e723508e5431f4f03eccc43b9a1edb63847
+  data.tar.gz: e78b217c7424bb628b284a143f8004d0ef159d93
 SHA512:
-  metadata.gz: e3f980694ad4a61ae5a3915720f8e90a4d01fd62e865aa5db751f06c3fb4bc87b3b91f0681cf0d49ba39287b08aeb1ba7bbfe78b86d1fe3d8554b3f4754e6113
-  data.tar.gz: 6700771e7de2ad8e0153e58efaa417fcbc73e5fd8f55beaa5af5314fc54d46425ea2d9ecacbed8a28a71f49931fa64f717f657b51da26e9203c2ed2b3f99fae9
+  metadata.gz: 3de4b5d5d7d05a10c77ef8b098bca4abbf7495cadd91381088f92bb299131ffac9b3c1cf86ada1ab0e1f202ae404f56ba1cfaba18f1a91233c9f6c7b93dfbcf2
+  data.tar.gz: 917773b5b9c2a6c42ff061f11dc7fc31ad50313d53e5140b828c91dc8331abd3be2ee49ec3ba627e8f8d3749991d7535f94a953ff4459ad9c9a571667ead05a8

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 2.0.1
+
+- Use time zone instead of UTC for results
+
 # 2.0.0
 
 - Returns entire series by default

data/README.md

@@ -97,6 +97,14 @@ or
 User.group_by_day(:created_at, day_start: 2).count
 ```
 
+### Time Range
+
+To get a specific time range, use:
+
+```ruby
+User.group_by_day(:created_at, range: 2.weeks.ago.midnight..Time.now).count
+```
+
 ## Installation
 
 Add this line to your application’s Gemfile:

data/lib/groupdate/scopes.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"
@@ -21,7 +22,7 @@ module Groupdate
         # for week
         week_start = [:mon, :tue, :wed, :thu, :fri, :sat, :sun].index((options[:week_start] || options[:start] || Groupdate.week_start).to_sym)
         if field == "week" and !week_start
-          raise "Unrecognized :start option"
+          raise "Unrecognized :week_start option"
         end
 
         # for day
@@ -53,7 +54,7 @@ module Groupdate
                   "%Y-%m-01 00:00:00"
                 else # year
                   "%Y-01-01 00:00:00"
-              end
+                end
 
               ["DATE_ADD(CONVERT_TZ(DATE_FORMAT(CONVERT_TZ(DATE_SUB(#{column}, INTERVAL #{day_start} HOUR), '+00:00', ?), '#{format}'), ?, '+00:00'), INTERVAL #{day_start} HOUR)", time_zone, time_zone]
             end
@@ -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

data/lib/groupdate/series.rb

@@ -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

data/lib/groupdate/version.rb

@@ -1,3 +1,3 @@
 module Groupdate
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

data/test/test_helper.rb

@@ -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 = {})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: groupdate
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Andrew Kane