groupdate 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db67453333111a42475d9ca697eb81181c6f291d
-  data.tar.gz: bf1a4d74a65edc1aa710ac417800fe5d5d2c43bb
+  metadata.gz: ecaeb21da82e1d6200205f6c8f0de7675bd9a047
+  data.tar.gz: 0f5c4ca2715331c187ba9fd343f68b9a5a5143b4
 SHA512:
-  metadata.gz: cc7436598003f15a4219dc3fae9964b99bba54cb610b2a553b84b5365e5434f2ccca3c3c0ed2fb344a00e64c03e61a334700a32d837c687460e24b334dabab1f
-  data.tar.gz: dd4de87e97a685898f3d61f465e768cf6886df28497b5b9b1f7015b9c1ca9ab48870e3acc1dc8bc59279824f14ba252cd4db9f85bcae0cc2b0722a37487cab2b
+  metadata.gz: 5a21d57c6b249f6de6e27bf27ce6acd5886c3395d5e98edfadb3c5dcebe77a52ec0fb4640a4ca731b59a15a54b398fcca8ecc72e09bbb07386f0c579d0cc3101
+  data.tar.gz: dc3063e2885001609d9ee8cbccd38558b6e33cc2e7ae4af49b0b8b922fa68180c38b92e62b9416536fb399c7f20ad4d10686781f7f9452d6f86f548641b90b7d

data/Gemfile

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

data/README.md

@@ -7,11 +7,13 @@ The simplest way to group by:
 - month
 - day of the week
 - hour of the day
-- *and more* (complete list at bottom)
+- and more (complete list at bottom)
 
-:tada: Time zones supported!!
+:tada: Time zones supported!! **The best part**
 
-PostgreSQL and MySQL only at the moment - support for other datastores coming soon
+Works with Rails 3.0+
+
+Supports PostgreSQL and MySQL
 
 ## Usage
 
@@ -77,6 +79,12 @@ User.group_by_hour_of_day(:created_at, "Pacific Time (US & Canada)").count
 # }
 ```
 
+You can order results with `group_field`.
+
+```ruby
+User.group_by_day(:created_at).order("group_field desc").limit(20).count
+```
+
 Use it with anything you can use `group` with:
 
 ```ruby
@@ -89,7 +97,37 @@ Go nuts!
 Request.where(page: "/home").group_by_minute(:started_at).maximum(:request_time)
 ```
 
-### Note
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'groupdate'
+```
+
+#### For MySQL
+
+[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_?
+
+- second
+- minute
+- hour
+- day
+- week
+- month
+- year
+- hour_of_day
+- day_of_week
+
+## 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)
@@ -122,36 +160,6 @@ User.group_by_day_of_week(:created_at).count
 
 These are *not* a result of groupdate (and unfortunately cannot be fixed by groupdate)
 
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-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_?
-
-- second
-- minute
-- hour
-- day
-- week
-- month
-- year
-- hour_of_day
-- day_of_week
-
 ## Contributing
 
 1. Fork it

data/lib/groupdate.rb

@@ -1,4 +1,5 @@
 require "groupdate/version"
+require "active_record"
 
 module Groupdate
   extend ActiveSupport::Concern
@@ -81,12 +82,31 @@ module Groupdate
             else
               raise "Connection adapter not supported"
             end
-          group(sanitize_sql_array(query))
+
+          group(Groupdate::OrderHack.new(sanitize_sql_array(query)))
         }
       end
     end
   end
 
+  class OrderHack < String; end
 end
 
 ActiveRecord::Base.send :include, Groupdate
+
+# hack for **unfixed** rails issue
+# https://github.com/rails/rails/issues/7121
+module ActiveRecord
+  module Calculations
+
+    def column_alias_for_with_hack(*keys)
+      if keys.first.is_a?(Groupdate::OrderHack)
+        "group_field"
+      else
+        column_alias_for_without_hack(*keys)
+      end
+    end
+    alias_method_chain :column_alias_for, :hack
+
+  end
+end

data/lib/groupdate/version.rb

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

data/test/groupdate_test.rb

@@ -1,7 +1,7 @@
+require "bundler/setup"
+Bundler.require(:default)
 require "minitest/autorun"
 require "minitest/pride"
-require "active_record"
-require "groupdate"
 require "logger"
 
 # for debugging
@@ -31,102 +31,116 @@ describe Groupdate do
 
       it "works!" do
         [
-          {name: "Andrew", score: 1, created_at: Time.parse("2013-04-01 00:00:10.200 UTC")},
-          {name: "Jordan", score: 2, created_at: Time.parse("2013-04-01 00:00:10.200 UTC")},
-          {name: "Nick",   score: 3, created_at: Time.parse("2013-04-02 00:00:20.800 UTC")}
+          {name: "Andrew", score: 1, created_at: Time.parse("2013-04-01 00:00:00 UTC")},
+          {name: "Jordan", score: 2, created_at: Time.parse("2013-04-01 00:00:00 UTC")},
+          {name: "Nick",   score: 3, created_at: Time.parse("2013-04-02 00:00:00 UTC")}
         ].each{|u| User.create!(u) }
 
         assert_equal(
-          {"2013-04-01 00:00:00+00".to_time => 1, "2013-04-02 00:00:00+00".to_time => 1},
+          {
+            time_key("2013-04-01 00:00:00 UTC") => 1,
+            time_key("2013-04-02 00:00:00 UTC") => 1
+          },
           User.where("score > 1").group_by_day(:created_at).count
         )
       end
 
+      it "doesn't throw exception with order" do
+        User.group_by_day(:created_at).order("group_field desc").limit(20).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".to_time => 1}, User.group_by_second(:created_at).count)
+        assert_group :second, "2013-04-01 00:00:01 UTC", "2013-04-01 00:00:01 UTC"
       end
 
       it "group_by_minute" do
-        create_user "2013-04-01 00:01:01 UTC"
-        assert_equal({"2013-04-01 00:01:00+00".to_time => 1}, User.group_by_minute(:created_at).count)
+        assert_group :minute, "2013-04-01 00:01:01 UTC", "2013-04-01 00:01:00 UTC"
       end
 
       it "group_by_hour" do
-        create_user "2013-04-01 01:01:01 UTC"
-        assert_equal({"2013-04-01 01:00:00+00".to_time => 1}, User.group_by_hour(:created_at).count)
+        assert_group :hour, "2013-04-01 01:01:01 UTC", "2013-04-01 01:00:00 UTC"
       end
 
       it "group_by_day" do
-        create_user "2013-04-01 01:01:01 UTC"
-        assert_equal({"2013-04-01 00:00:00+00".to_time => 1}, User.group_by_day(:created_at).count)
+        assert_group :day, "2013-04-01 01:01:01 UTC", "2013-04-01 00:00:00 UTC"
       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".to_time => 1}, User.group_by_day(:created_at, "Pacific Time (US & Canada)").count)
+        assert_group_tz :day, "2013-04-01 01:01:01 UTC", "2013-03-31 07:00:00 UTC"
       end
 
       it "group_by_week" do
-        create_user "2013-03-17 01:01:01 UTC"
-        assert_equal({"2013-03-17 00:00:00+00".to_time => 1}, User.group_by_week(:created_at).count)
+        assert_group :week, "2013-03-17 01:01:01 UTC", "2013-03-17 00:00:00 UTC"
       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".to_time => 1}, User.group_by_week(:created_at, "Pacific Time (US & Canada)").count)
+        assert_group_tz :week, "2013-03-17 01:01:01 UTC", "2013-03-10 08:00:00 UTC"
       end
 
       it "group_by_month" do
-        create_user "2013-04-01 01:01:01 UTC"
-        assert_equal({"2013-04-01 00:00:00+00".to_time(:utc) => 1}, User.group_by_month(:created_at).count)
+        assert_group :month, "2013-04-01 01:01:01 UTC", "2013-04-01 00:00:00 UTC"
       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".to_time(:utc) => 1}, User.group_by_month(:created_at, "Pacific Time (US & Canada)").count)
+        assert_group_tz :month, "2013-04-01 01:01:01 UTC", "2013-03-01 08:00:00 UTC"
       end
 
       it "group_by_year" do
-        create_user "2013-01-01 01:01:01 UTC"
-        assert_equal({"2013-01-01 00:00:00+00".to_time(:utc) => 1}, User.group_by_year(:created_at).count)
+        assert_group :year, "2013-01-01 01:01:01 UTC", "2013-01-01 00:00:00 UTC"
       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".to_time(:utc) => 1}, User.group_by_year(:created_at, "Pacific Time (US & Canada)").count)
+        assert_group_tz :year, "2013-01-01 01:01:01 UTC", "2012-01-01 08:00:00 UTC"
       end
 
       it "group_by_hour_of_day" do
-        create_user "2013-01-01 11:00:00 UTC"
-        expected = adapter == "mysql2" ? {11 => 1} : {11.0 => 1}
-        assert_equal(expected, User.group_by_hour_of_day(:created_at).count)
+        assert_group_number :hour_of_day, "2013-01-01 11:00:00 UTC", 11
       end
 
       it "group_by_hour_of_day with time zone" do
-        create_user "2013-01-01 11:00:00 UTC"
-        expected = adapter == "mysql2" ? {3 => 1} : {3.0 => 1}
-        assert_equal(expected, User.group_by_hour_of_day(:created_at, "Pacific Time (US & Canada)").count)
+        assert_group_number_tz :hour_of_day, "2013-01-01 11:00:00 UTC", 3
       end
 
       it "group_by_day_of_week" do
-        create_user "2013-03-03 00:00:00 UTC"
-        expected = adapter == "mysql2" ? {0 => 1} : {0.0 => 1}
-        assert_equal(expected, User.group_by_day_of_week(:created_at).count)
+        assert_group_number :day_of_week, "2013-03-03 00:00:00 UTC", 0
       end
 
       it "group_by_day_of_week with time zone" do
-        create_user "2013-03-03 00:00:00 UTC"
-        expected = adapter == "mysql2" ? {6 => 1} : {6.0 => 1}
-        assert_equal(expected, User.group_by_day_of_week(:created_at, "Pacific Time (US & Canada)").count)
+        assert_group_number_tz :day_of_week, "2013-03-03 00:00:00 UTC", 6
       end
+    end
+  end
 
-      # helper methods
+  # helper methods
 
-      def create_user(created_at)
-        User.create!(name: "Andrew", score: 1, created_at: Time.parse(created_at))
-      end
+  def assert_group(method, created_at, key, time_zone = nil)
+    create_user created_at
+    assert_equal({time_key(key) => 1}, User.send(:"group_by_#{method}", :created_at, time_zone).count)
+  end
 
-    end
+  def assert_group_tz(method, created_at, key)
+    assert_group method, created_at, key, "Pacific Time (US & Canada)"
+  end
+
+  def assert_group_number(method, created_at, key, time_zone = nil)
+    create_user created_at
+    assert_equal({number_key(key) => 1}, User.send(:"group_by_#{method}", :created_at, time_zone).count)
   end
+
+  def assert_group_number_tz(method, created_at, key)
+    assert_group_number method, created_at, key, "Pacific Time (US & Canada)"
+  end
+
+  def time_key(key)
+    User.connection.adapter_name == "PostgreSQL" && ActiveRecord::VERSION::MAJOR == 3 ? Time.parse(key).strftime("%Y-%m-%d %H:%M:%S+00") : Time.parse(key)
+  end
+
+  def number_key(key)
+    User.connection.adapter_name == "PostgreSQL" ? (ActiveRecord::VERSION::MAJOR == 3 ? key.to_s : key.to_f) : key
+  end
+
+  def create_user(created_at)
+    User.create!(name: "Andrew", score: 1, created_at: Time.parse(created_at))
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groupdate
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-22 00:00:00.000000000 Z
+date: 2013-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -136,3 +136,4 @@ specification_version: 4
 summary: The simplest way to group temporal data
 test_files:
 - test/groupdate_test.rb
+has_rdoc: