groupdate 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51407cdc14a5d08e4a7f50111c5d5bd91f7d2a8a
-  data.tar.gz: 00650eedbd754abced4b15701c631eee2baa9e61
+  metadata.gz: db67453333111a42475d9ca697eb81181c6f291d
+  data.tar.gz: bf1a4d74a65edc1aa710ac417800fe5d5d2c43bb
 SHA512:
-  metadata.gz: 9528a76cc3e2a523216c18b0692c5edb4b6739c34e720e2ae35797305266125bc059b60dbe5cca9ea36e981a85b538600f9aa1ebb8613c87538066453b0c0175
-  data.tar.gz: 2be5da38025c0865eaaf8e8086dd146378172187972ec80efa72171331134088388d96dd2296b1567e10ab0f2ff74bd2e3b63168129abf2ddf552986d4910e3b
+  metadata.gz: cc7436598003f15a4219dc3fae9964b99bba54cb610b2a553b84b5365e5434f2ccca3c3c0ed2fb344a00e64c03e61a334700a32d837c687460e24b334dabab1f
+  data.tar.gz: dd4de87e97a685898f3d61f465e768cf6886df28497b5b9b1f7015b9c1ca9ab48870e3acc1dc8bc59279824f14ba252cd4db9f85bcae0cc2b0722a37487cab2b

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in groupdate.gemspec
 gemspec
+
+gem "activerecord", github: "rails/rails"

data/README.md

@@ -18,23 +18,23 @@ PostgreSQL and MySQL only at the moment - support for other datastores coming so
 ```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-18 00:00:00+00" => 34
+#   2013-04-16 00:00:00 UTC => 50,
+#   2013-04-17 00:00:00 UTC => 100,
+#   2013-04-18 00:00:00 UTC => 34
 # }
 
 Task.group_by_month(:updated_at).count
 # {
-#   "2013-02-01 00:00:00+00" => 84,
-#   "2013-03-01 00:00:00+00" => 23,
-#   "2013-04-01 00:00:00+00" => 44
+#   2013-02-01 00:00:00 UTC => 84,
+#   2013-03-01 00:00:00 UTC => 23,
+#   2013-04-01 00:00:00 UTC => 44
 # }
 
 Goal.group_by_year(:accomplished_at).count
 # {
-#   "2011-01-01 00:00:00+00" => 7,
-#   "2012-01-01 00:00:00+00" => 11,
-#   "2013-01-01 00:00:00+00" => 3
+#   2011-01-01 00:00:00 UTC => 7,
+#   2012-01-01 00:00:00 UTC => 11,
+#   2013-01-01 00:00:00 UTC => 3
 # }
 ```
 
@@ -43,9 +43,9 @@ 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-03-03 08:00:00+00" => 80,
-#   "2013-03-10 08:00:00+00" => 70,
-#   "2013-03-17 07:00:00+00" => 54
+#   2013-03-03 08:00:00 UTC => 80,
+#   2013-03-10 08:00:00 UTC => 70,
+#   2013-03-17 07:00:00 UTC => 54
 # }
 
 # equivalently
@@ -61,19 +61,19 @@ You can also group by the day of the week or hour of the day.
 # day of the week
 User.group_by_day_of_week(:created_at).count
 # {
-#   "0" => 54, # Sunday
-#   "1" => 2,  # Monday
+#   0 => 54, # Sunday
+#   1 => 2,  # Monday
 #   ...
-#   "6" => 3   # Saturday
+#   6 => 3   # Saturday
 # }
 
 # hour of the day
 User.group_by_hour_of_day(:created_at, "Pacific Time (US & Canada)").count
 # {
-#   "0" => 34,
-#   "1" => 61,
+#   0 => 34,
+#   1 => 61,
 #   ...
-#   "23" => 12
+#   23 => 12
 # }
 ```
 
@@ -89,7 +89,38 @@ Go nuts!
 Request.where(page: "/home").group_by_minute(:started_at).maximum(:request_time)
 ```
 
-**Note:** On Rails 4 edge, queries return a Time object (much better!) as a result of [this commit](https://github.com/rails/rails/commit/2cc09441c2de57b024b11ba666ba1e72c2b20cfe)
+### Note
+
+activerecord <= 4.0.0.beta1 and the pg gem returns String objects instead of Time objects.
+[This is fixed on activerecord master](https://github.com/rails/rails/commit/2cc09441c2de57b024b11ba666ba1e72c2b20cfe)
+
+```ruby
+User.group_by_day(:created_at).count
+
+# mysql2
+# pg and activerecord master
+{2013-04-22 00:00:00 UTC => 1} # Time object
+
+# pg and activerecord <= 4.0.0.beta1
+{"2013-04-22 00:00:00+00" => 1} # String
+```
+
+Another data type inconsistency
+
+```ruby
+User.group_by_day_of_week(:created_at).count
+
+# mysql2
+{0 => 1, 4 => 1} # Integer
+
+# pg and activerecord <= 4.0.0.beta1
+{"0" => 1, "4" => 1} # String
+
+# pg and activerecord master
+{0.0 => 1, 4.0 => 1} # Float
+```
+
+These are *not* a result of groupdate (and unfortunately cannot be fixed by groupdate)
 
 ## Installation
 
@@ -99,6 +130,14 @@ Add this line to your application's Gemfile:
 gem 'groupdate'
 ```
 
+### MySQL only
+
+[Time zone support](http://dev.mysql.com/doc/refman/5.6/en/time-zone-support.html) must be installed on the server.
+
+```
+mysql_tzinfo_to_sql /usr/share/zoneinfo | mysql -u root mysql
+```
+
 ## Complete list
 
 group_by_?

data/groupdate.gemspec

@@ -24,6 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "pg"
-  spec.add_development_dependency "mysql"
   spec.add_development_dependency "mysql2"
 end

data/lib/groupdate.rb

@@ -39,15 +39,15 @@ module Groupdate
           end
           query =
             case connection.adapter_name
-            when "MySQL", "Mysql2"
+            when "Mysql2"
               case field
               when "day_of_week" # Sunday = 0, Monday = 1, etc
                 # use CONCAT for consistent return type (String)
-                ["CONCAT('', DAYOFWEEK(CONVERT_TZ(#{column}, '+00:00', ?)) - 1)", time_zone]
+                ["DAYOFWEEK(CONVERT_TZ(#{column}, '+00:00', ?)) - 1", time_zone]
               when "hour_of_day"
-                ["CONCAT('', EXTRACT(HOUR from CONVERT_TZ(#{column}, '+00:00', ?)))", time_zone]
+                ["EXTRACT(HOUR from CONVERT_TZ(#{column}, '+00:00', ?))", time_zone]
               when "week"
-                ["CONCAT(CONVERT_TZ(DATE_FORMAT(CONVERT_TZ(DATE_SUB(#{column}, INTERVAL (DAYOFWEEK(CONVERT_TZ(#{column}, '+00:00', ?)) - 1) DAY), '+00:00', ?), '%Y-%m-%d 00:00:00'), ?, '+00:00'), '+00')", time_zone, time_zone, time_zone]
+                ["CONVERT_TZ(DATE_FORMAT(CONVERT_TZ(DATE_SUB(#{column}, INTERVAL (DAYOFWEEK(CONVERT_TZ(#{column}, '+00:00', ?)) - 1) DAY), '+00:00', ?), '%Y-%m-%d 00:00:00'), ?, '+00:00')", time_zone, time_zone, time_zone]
               else
                 format =
                   case field
@@ -65,7 +65,7 @@ module Groupdate
                     "%Y-01-01 00:00:00"
                   end
 
-                ["CONCAT(CONVERT_TZ(DATE_FORMAT(CONVERT_TZ(#{column}, '+00:00', ?), '#{format}'), ?, '+00:00'), '+00')", time_zone, time_zone]
+                ["CONVERT_TZ(DATE_FORMAT(CONVERT_TZ(#{column}, '+00:00', ?), '#{format}'), ?, '+00:00')", time_zone, time_zone]
               end
             when "PostgreSQL"
               case field

data/lib/groupdate/version.rb

@@ -1,3 +1,3 @@
 module Groupdate
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/test/groupdate_test.rb

@@ -1,5 +1,5 @@
-require "minitest/spec"
 require "minitest/autorun"
+require "minitest/pride"
 require "active_record"
 require "groupdate"
 require "logger"
@@ -15,7 +15,7 @@ class User < ActiveRecord::Base
 end
 
 describe Groupdate do
-  %w(postgresql mysql mysql2).each do |adapter|
+  %w(postgresql mysql2).each do |adapter|
     describe adapter do
       before do
         ActiveRecord::Base.establish_connection adapter: adapter, database: "groupdate"
@@ -37,84 +37,88 @@ describe Groupdate do
         ].each{|u| User.create!(u) }
 
         assert_equal(
-          {"2013-04-01 00:00:00+00" => 1, "2013-04-02 00:00:00+00" => 1},
+          {"2013-04-01 00:00:00+00".to_time => 1, "2013-04-02 00:00:00+00".to_time => 1},
           User.where("score > 1").group_by_day(:created_at).count
         )
       end
 
       it "group_by_second" do
         create_user "2013-04-01 00:00:01 UTC"
-        assert_equal({"2013-04-01 00:00:01+00" => 1}, User.group_by_second(:created_at).count)
+        assert_equal({"2013-04-01 00:00:01+00".to_time => 1}, User.group_by_second(:created_at).count)
       end
 
       it "group_by_minute" do
         create_user "2013-04-01 00:01:01 UTC"
-        assert_equal({"2013-04-01 00:01:00+00" => 1}, User.group_by_minute(:created_at).count)
+        assert_equal({"2013-04-01 00:01:00+00".to_time => 1}, User.group_by_minute(:created_at).count)
       end
 
       it "group_by_hour" do
         create_user "2013-04-01 01:01:01 UTC"
-        assert_equal({"2013-04-01 01:00:00+00" => 1}, User.group_by_hour(:created_at).count)
+        assert_equal({"2013-04-01 01:00:00+00".to_time => 1}, User.group_by_hour(:created_at).count)
       end
 
       it "group_by_day" do
         create_user "2013-04-01 01:01:01 UTC"
-        assert_equal({"2013-04-01 00:00:00+00" => 1}, User.group_by_day(:created_at).count)
+        assert_equal({"2013-04-01 00:00:00+00".to_time => 1}, User.group_by_day(:created_at).count)
       end
 
       it "group_by_day with time zone" do
         create_user "2013-04-01 01:01:01 UTC"
-        assert_equal({"2013-03-31 07:00:00+00" => 1}, User.group_by_day(:created_at, "Pacific Time (US & Canada)").count)
+        assert_equal({"2013-03-31 07:00:00+00".to_time => 1}, User.group_by_day(:created_at, "Pacific Time (US & Canada)").count)
       end
 
       it "group_by_week" do
         create_user "2013-03-17 01:01:01 UTC"
-        assert_equal({"2013-03-17 00:00:00+00" => 1}, User.group_by_week(:created_at).count)
+        assert_equal({"2013-03-17 00:00:00+00".to_time => 1}, User.group_by_week(:created_at).count)
       end
 
       it "group_by_week with time zone" do # day of DST
         create_user "2013-03-17 01:01:01 UTC"
-        assert_equal({"2013-03-10 08:00:00+00" => 1}, User.group_by_week(:created_at, "Pacific Time (US & Canada)").count)
+        assert_equal({"2013-03-10 08:00:00+00".to_time => 1}, User.group_by_week(:created_at, "Pacific Time (US & Canada)").count)
       end
 
       it "group_by_month" do
         create_user "2013-04-01 01:01:01 UTC"
-        assert_equal({"2013-04-01 00:00:00+00" => 1}, User.group_by_month(:created_at).count)
+        assert_equal({"2013-04-01 00:00:00+00".to_time(:utc) => 1}, User.group_by_month(:created_at).count)
       end
 
       it "group_by_month with time zone" do
         create_user "2013-04-01 01:01:01 UTC"
-        assert_equal({"2013-03-01 08:00:00+00" => 1}, User.group_by_month(:created_at, "Pacific Time (US & Canada)").count)
+        assert_equal({"2013-03-01 08:00:00+00".to_time(:utc) => 1}, User.group_by_month(:created_at, "Pacific Time (US & Canada)").count)
       end
 
       it "group_by_year" do
         create_user "2013-01-01 01:01:01 UTC"
-        assert_equal({"2013-01-01 00:00:00+00" => 1}, User.group_by_year(:created_at).count)
+        assert_equal({"2013-01-01 00:00:00+00".to_time(:utc) => 1}, User.group_by_year(:created_at).count)
       end
 
       it "group_by_year with time zone" do
         create_user "2013-01-01 01:01:01 UTC"
-        assert_equal({"2012-01-01 08:00:00+00" => 1}, User.group_by_year(:created_at, "Pacific Time (US & Canada)").count)
+        assert_equal({"2012-01-01 08:00:00+00".to_time(:utc) => 1}, User.group_by_year(:created_at, "Pacific Time (US & Canada)").count)
       end
 
       it "group_by_hour_of_day" do
         create_user "2013-01-01 11:00:00 UTC"
-        assert_equal({"11" => 1}, User.group_by_hour_of_day(:created_at).count)
+        expected = adapter == "mysql2" ? {11 => 1} : {11.0 => 1}
+        assert_equal(expected, User.group_by_hour_of_day(:created_at).count)
       end
 
       it "group_by_hour_of_day with time zone" do
         create_user "2013-01-01 11:00:00 UTC"
-        assert_equal({"3" => 1}, User.group_by_hour_of_day(:created_at, "Pacific Time (US & Canada)").count)
+        expected = adapter == "mysql2" ? {3 => 1} : {3.0 => 1}
+        assert_equal(expected, User.group_by_hour_of_day(:created_at, "Pacific Time (US & Canada)").count)
       end
 
       it "group_by_day_of_week" do
         create_user "2013-03-03 00:00:00 UTC"
-        assert_equal({"0" => 1}, User.group_by_day_of_week(:created_at).count)
+        expected = adapter == "mysql2" ? {0 => 1} : {0.0 => 1}
+        assert_equal(expected, User.group_by_day_of_week(:created_at).count)
       end
 
       it "group_by_day_of_week with time zone" do
         create_user "2013-03-03 00:00:00 UTC"
-        assert_equal({"6" => 1}, User.group_by_day_of_week(:created_at, "Pacific Time (US & Canada)").count)
+        expected = adapter == "mysql2" ? {6 => 1} : {6.0 => 1}
+        assert_equal(expected, User.group_by_day_of_week(:created_at, "Pacific Time (US & Canada)").count)
       end
 
       # helper methods

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: groupdate
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Andrew Kane
@@ -80,20 +80,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mysql
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement