groupdate 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6718db413e208c0735f68167fd6347a0e0770c28
-  data.tar.gz: 15f3b021beac304cca17c302fecafe71ddc9249f
+  metadata.gz: 389dc65b32212f41266af6d39d4f422c5ed00143
+  data.tar.gz: b0345ab008fc00b1ae2ac0dffecb1b6677e29daf
 SHA512:
-  metadata.gz: 12ec543e69db27f0f499e170b8d10e3475024d08c776673fbd30423d9979e4407c7c6bbbd6a2ecee18d3687715e09dc77eec2b78f02981be330eddbaddb3d154
-  data.tar.gz: 7ae5b1a1d879fd25b4f20ff07c78c5840ec8b7b7241e876c3bc359c69c487adcdd1be9f5cf40f2fc6befae697bdf0da48606751a0957eff7ca74c40d9c419644
+  metadata.gz: fe786c3908de9a1288f147b4bddac9f62d4e7f67c33734da2b94a98d1b2601ae8c35731a7cacdc0d439ba4a68d0a00dffe9554cee67ed95c907e111c44262e41
+  data.tar.gz: 6534a271d8e8a7730b58cdd0aa73f818a92194b3ee58d2259097634544b2667ef10be5ac75cd5368841e65e7601597f44227bbec4f9414c0e1264a70c1218c0a

data/README.md

@@ -16,21 +16,40 @@ PostgreSQL only at the moment - support for other datastores coming soon
 
 ```ruby
 User.group_by_day(:created_at).count
-# => {"2013-04-16 00:00:00+00" => 50, "2013-04-17 00:00:00+00" => 100}
+# {
+#   "2013-04-16 00:00:00+00" => 50,
+#   "2013-04-17 00:00:00+00" => 100,
+#   "2013-04-18 00:00:00+00" => 34
+# }
 
 Task.group_by_month(:updated_at).count
-# => {"2013-03-01 00:00:00+00" => 23, "2013-04-01 00:00:00+00" => 44}
+# {
+#   "2013-02-01 00:00:00+00" => 84,
+#   "2013-03-01 00:00:00+00" => 23,
+#   "2013-04-01 00:00:00+00" => 44
+# }
 
 Goal.group_by_year(:accomplished_at).count
-# => {"2012-01-01 00:00:00+00" => 11, "2013-01-01 00:00:00+00" => 3}
+# {
+#   "2011-01-01 00:00:00+00" => 7,
+#   "2012-01-01 00:00:00+00" => 11,
+#   "2013-01-01 00:00:00+00" => 3
+# }
 ```
 
 The default time zone is `Time.zone`.  Pass a time zone as the second argument.
 
 ```ruby
+User.group_by_week(:created_at, "Pacific Time (US & Canada)").count
+# {
+#   "2013-02-25 08:00:00+00" => 80,
+#   "2013-03-04 08:00:00+00" => 70,
+#   "2013-03-11 07:00:00+00" => 54
+# }
+
+# equivalently
 time_zone = ActiveSupport::TimeZone["Pacific Time (US & Canada)"]
 User.group_by_week(:created_at, time_zone).count
-# => {"2013-04-16 07:00:00+00" => 80, "2013-04-17 07:00:00+00" => 70}
 ```
 
 Use it with anything you can use `group` with:

data/lib/groupdate.rb

@@ -29,10 +29,12 @@ module Groupdate
       # http://www.postgresql.org/docs/9.1/static/functions-datetime.html
       %w(microseconds milliseconds second minute hour day week month quarter year decade century millennium).each do |field|
         self.scope :"group_by_#{field}", lambda {|column, time_zone = Time.zone|
-          if defined?(ActiveSupport::TimeZone) and time_zone.is_a?(ActiveSupport::TimeZone)
+          time_zone ||= "Etc/UTC"
+          if time_zone.is_a?(ActiveSupport::TimeZone) or time_zone = ActiveSupport::TimeZone[time_zone]
             time_zone = time_zone.tzinfo.name
+          else
+            raise "Unrecognized time zone"
           end
-          time_zone ||= "Etc/UTC"
           sql = "DATE_TRUNC('#{field}', #{column}::timestamptz AT TIME ZONE ?) AT TIME ZONE ?"
           group(sanitize_sql_array([sql, time_zone, time_zone]))
         }

data/lib/groupdate/version.rb

@@ -1,3 +1,3 @@
 module Groupdate
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/groupdate_test.rb

@@ -45,7 +45,7 @@ class TestGroupdate < MiniTest::Unit::TestCase
       "2013-03-31 07:00:00+00" => 2,
       "2013-04-01 07:00:00+00" => 1
     }
-    assert_equal expected, User.group_by_day(:created_at, "America/Los_Angeles").count
+    assert_equal expected, User.group_by_day(:created_at, "Pacific Time (US & Canada)").count
   end
 
   def test_where

metadata

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