groupdate 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f28f0b992e2888b1f1adcf75bf3170f6e3d8fb6
-  data.tar.gz: c0184bc2c7cb5362559856fc897f5f215a2bab35
+  metadata.gz: 9f1468425ce9451398c5c487174224dc971a30d2
+  data.tar.gz: 5fff75e9b44d6651ca75d634f3bff1ceb68901de
 SHA512:
-  metadata.gz: 657151e8e0ebdc8d823af7c0d0116691d846f4347d52b22bf7951b1cdd89e65f50435ff70a19fc30b093c6c28e7c11fa49880c208b9afa0f3fac340aa4cc2a35
-  data.tar.gz: 7bb1f7899d84420aea67ebf935a5d6029985a9953fed4b7343cbe410fdc43aef0961118cd103c8966796c0b19008a0e87d5d59b61d52df18bb93b4fb94bb0f7f
+  metadata.gz: c14ee2daf271500e82db8e221fb8e1dcee97694355e244664c575b9e035c03fd62ba5e4a09189b4555b76f4b685ea9261e58a7101d707b892e2e8e52a051abb1
+  data.tar.gz: 33c9afbdc4ec5bf3e99329c99c6b41702507762f122acbae0addbac7faeda9c6e87aa147b4f3c53cefceb9b58bb7643d21674958815cdb3974dfaa4df920c36b

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.1
+
+- Fixed series for Rails < 3.2 and MySQL 2
+
 ## 1.0.0
 
 - First major release

data/Gemfile

@@ -4,6 +4,8 @@ source 'https://rubygems.org'
 gemspec
 
 # gem "activerecord", github: "rails/rails"
+# gem "activerecord", "3.0.20"
+# gem "mysql2", "< 0.3.0"
 
 platform :jruby do
   gem "activerecord-jdbcpostgresql-adapter", :github => "jruby/activerecord-jdbc-adapter"

data/Rakefile

@@ -1,9 +1,19 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
 
+task :default => :test
 Rake::TestTask.new do |t|
-  t.libs = ["lib"]
-  t.warning = false
-  t.verbose = false
-  t.test_files = FileList["test/*_test.rb"]
+  t.libs << "test"
+  t.pattern = "test/**/*_test.rb"
+end
+
+namespace :test do
+  Rake::TestTask.new(:postgresql) do |t|
+    t.libs << "test"
+    t.pattern = "test/postgresql_test.rb"
+  end
+  Rake::TestTask.new(:mysql) do |t|
+    t.libs << "test"
+    t.pattern = "test/mysql_test.rb"
+  end
 end

data/lib/groupdate/scopes.rb

@@ -75,9 +75,9 @@ module Groupdate
               when "PostgreSQL"
                 case field
                 when "day_of_week"
-                  ["EXTRACT(DOW from #{column}::timestamptz AT TIME ZONE ?)", time_zone]
+                  ["EXTRACT(DOW from #{column}::timestamptz AT TIME ZONE ?)::integer", time_zone]
                 when "hour_of_day"
-                  ["EXTRACT(HOUR from #{column}::timestamptz AT TIME ZONE ?)", time_zone]
+                  ["EXTRACT(HOUR from #{column}::timestamptz AT TIME ZONE ?)::integer", time_zone]
                 when "week" # start on Sunday, not PostgreSQL default Monday
                   ["(DATE_TRUNC('#{field}', (#{column}::timestamptz + INTERVAL '1 day') AT TIME ZONE ?) - INTERVAL '1 day') AT TIME ZONE ?", time_zone, time_zone]
                 else

data/lib/groupdate/series.rb

@@ -12,12 +12,14 @@ module Groupdate
     end
 
     def build_series(count)
+      utc = ActiveSupport::TimeZone["UTC"]
+
       cast_method =
         case @field
         when "day_of_week", "hour_of_day"
           lambda{|k| k.to_i }
         else
-          lambda{|k| k.is_a?(Time) ? k : Time.parse(k) }
+          lambda{|k| (k.is_a?(Time) ? k : utc.parse(k)).utc }
         end
 
       count = Hash[count.map do |k, v|
@@ -53,7 +55,8 @@ module Groupdate
             when "day"
               time.beginning_of_day
             when "week"
-              time.beginning_of_week(:sunday)
+              # beginning_of_week does not support :sunday argument in activesupport < 3.2
+              (time - time.wday.days).midnight
             when "month"
               time.beginning_of_month
             else # year
@@ -68,7 +71,7 @@ module Groupdate
             series << series.last + step
           end
 
-          series.map{|s| s.to_time }
+          series.map{|s| s.to_time.utc }
         end
 
       Hash[series.map do |k|

data/lib/groupdate/version.rb

@@ -1,3 +1,3 @@
 module Groupdate
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/test/mysql_test.rb

@@ -0,0 +1,22 @@
+require "test_helper"
+
+class TestMysql < Minitest::Test
+  include TestGroupdate
+
+  def setup
+    User.establish_connection :adapter => "mysql2", :database => "groupdate_test", :username => "root"
+  end
+
+  def time_key(key)
+    if RUBY_PLATFORM == "java"
+      key.utc.strftime("%Y-%m-%d %H:%M:%S").gsub(/ 00\:00\:00\z/, "")
+    else
+      key
+    end
+  end
+
+  def number_key(key)
+    key
+  end
+
+end

data/test/postgresql_test.rb

@@ -0,0 +1,30 @@
+require "test_helper"
+
+class TestPostgresql < Minitest::Test
+  include TestGroupdate
+
+  def setup
+    User.establish_connection :adapter => "postgresql", :database => "groupdate_test"
+  end
+
+  def time_key(key)
+    if RUBY_PLATFORM == "java"
+      key.utc.strftime("%Y-%m-%d %H:%M:%S%z")[0..-3]
+    else
+      if ActiveRecord::VERSION::MAJOR == 3
+        key.utc.strftime("%Y-%m-%d %H:%M:%S+00")
+      else
+        key
+      end
+    end
+  end
+
+  def number_key(key)
+    if RUBY_PLATFORM != "java" and ActiveRecord::VERSION::MAJOR == 3
+      key.to_s
+    else
+      key
+    end
+  end
+
+end

data/test/test_helper.rb

@@ -0,0 +1,306 @@
+require "bundler/setup"
+Bundler.require(:default)
+require "minitest/autorun"
+require "minitest/pride"
+require "logger"
+
+# for debugging
+# ActiveRecord::Base.logger = Logger.new(STDOUT)
+
+# rails does this in activerecord/lib/active_record/railtie.rb
+ActiveRecord::Base.default_timezone = :utc
+ActiveRecord::Base.time_zone_aware_attributes = true
+
+class User < ActiveRecord::Base
+end
+
+# migrations
+%w(postgresql mysql2).each do |adapter|
+  ActiveRecord::Base.establish_connection :adapter => adapter, :database => "groupdate_test", :username => adapter == "mysql2" ? "root" : nil
+
+  unless ActiveRecord::Base.connection.table_exists? "users"
+    ActiveRecord::Migration.create_table :users do |t|
+      t.string :name
+      t.integer :score
+      t.timestamps
+    end
+  end
+end
+
+module TestGroupdate
+
+  # second
+
+  def test_second_end_of_second
+    assert_result_time :second, "2013-05-03 00:00:00 UTC", "2013-05-03 00:00:00.999"
+  end
+
+  def test_second_start_of_second
+    assert_result_time :second, "2013-05-03 00:00:01 UTC", "2013-05-03 00:00:01.000"
+  end
+
+  # minute
+
+  def test_minute_end_of_minute
+    assert_result_time :minute, "2013-05-03 00:00:00 UTC", "2013-05-03 00:00:59"
+  end
+
+  def test_minute_start_of_minute
+    assert_result_time :minute, "2013-05-03 00:01:00 UTC", "2013-05-03 00:01:00"
+  end
+
+  # hour
+
+  def test_hour_end_of_hour
+    assert_result_time :hour, "2013-05-03 00:00:00 UTC", "2013-05-03 00:59:59"
+  end
+
+  def test_hour_start_of_hour
+    assert_result_time :hour, "2013-05-03 01:00:00 UTC", "2013-05-03 01:00:00"
+  end
+
+  # day
+
+  def test_day_end_of_day
+    assert_result_time :day, "2013-05-03 00:00:00 UTC", "2013-05-03 23:59:59"
+  end
+
+  def test_day_start_of_day
+    assert_result_time :day, "2013-05-04 00:00:00 UTC", "2013-05-04 00:00:00"
+  end
+
+  def test_day_end_of_day_with_time_zone
+    assert_result_time :day, "2013-05-02 00:00:00 PDT", "2013-05-03 06:59:59", true
+  end
+
+  def test_day_start_of_day_with_time_zone
+    assert_result_time :day, "2013-05-03 00:00:00 PDT", "2013-05-03 07:00:00", true
+  end
+
+  # week
+
+  def test_week_end_of_week
+    assert_result_time :week, "2013-03-17 00:00:00 UTC", "2013-03-23 23:59:59"
+  end
+
+  def test_week_start_of_week
+    assert_result_time :week, "2013-03-24 00:00:00 UTC", "2013-03-24 00:00:00"
+  end
+
+  def test_week_end_of_week_with_time_zone
+    assert_result_time :week, "2013-03-10 00:00:00 PST", "2013-03-17 06:59:59", true
+  end
+
+  def test_week_start_of_week_with_time_zone
+    assert_result_time :week, "2013-03-17 00:00:00 PDT", "2013-03-17 07:00:00", true
+  end
+
+  # month
+
+  def test_month_end_of_month
+    assert_result_time :month, "2013-05-01 00:00:00 UTC", "2013-05-31 23:59:59"
+  end
+
+  def test_month_start_of_month
+    assert_result_time :month, "2013-06-01 00:00:00 UTC", "2013-06-01 00:00:00"
+  end
+
+  def test_month_end_of_month_with_time_zone
+    assert_result_time :month, "2013-05-01 00:00:00 PDT", "2013-06-01 06:59:59", true
+  end
+
+  def test_month_start_of_month_with_time_zone
+    assert_result_time :month, "2013-06-01 00:00:00 PDT", "2013-06-01 07:00:00", true
+  end
+
+  # year
+
+  def test_year_end_of_year
+    assert_result_time :year, "2013-01-01 00:00:00 UTC", "2013-12-31 23:59:59"
+  end
+
+  def test_year_start_of_year
+    assert_result_time :year, "2014-01-01 00:00:00 UTC", "2014-01-01 00:00:00"
+  end
+
+  def test_year_end_of_year_with_time_zone
+    assert_result_time :year, "2013-01-01 00:00:00 PST", "2014-01-01 07:59:59", true
+  end
+
+  def test_year_start_of_year_with_time_zone
+    assert_result_time :year, "2014-01-01 00:00:00 PST", "2014-01-01 08:00:00", true
+  end
+
+  # hour of day
+
+  def test_hour_of_day_end_of_hour
+    assert_result :hour_of_day, 0, "2013-01-01 00:59:59"
+  end
+
+  def test_hour_of_day_start_of_hour
+    assert_result :hour_of_day, 1, "2013-01-01 01:00:00"
+  end
+
+  def test_hour_of_day_end_of_hour_with_time_zone
+    assert_result :hour_of_day, 0, "2013-01-01 08:59:59", true
+  end
+
+  def test_hour_of_day_start_of_hour_with_time_zone
+    assert_result :hour_of_day, 1, "2013-01-01 09:00:00", true
+  end
+
+  # day of week
+
+  def test_day_of_week_end_of_day
+    assert_result :day_of_week, 2, "2013-01-01 23:59:59"
+  end
+
+  def test_day_of_week_start_of_day
+    assert_result :day_of_week, 3, "2013-01-02 00:00:00"
+  end
+
+  def test_day_of_week_end_of_week_with_time_zone
+    assert_result :day_of_week, 2, "2013-01-02 07:59:59", true
+  end
+
+  def test_day_of_week_start_of_week_with_time_zone
+    assert_result :day_of_week, 3, "2013-01-02 08:00:00", true
+  end
+
+  # zeros
+
+  def test_zeros_second
+    assert_zeros :second, "2013-05-01 00:00:01 UTC", ["2013-05-01 00:00:00 UTC", "2013-05-01 00:00:01 UTC", "2013-05-01 00:00:02 UTC"], "2013-05-01 00:00:00.999 UTC", "2013-05-01 00:00:02 UTC"
+  end
+
+  def test_zeros_minute
+    assert_zeros :minute, "2013-05-01 00:01:00 UTC", ["2013-05-01 00:00:00 UTC", "2013-05-01 00:01:00 UTC", "2013-05-01 00:02:00 UTC"], "2013-05-01 00:00:59 UTC", "2013-05-01 00:02:00 UTC"
+  end
+
+  def test_zeros_hour
+    assert_zeros :hour, "2013-05-01 04:01:01 UTC", ["2013-05-01 03:00:00 UTC", "2013-05-01 04:00:00 UTC", "2013-05-01 05:00:00 UTC"], "2013-05-01 03:59:59 UTC", "2013-05-01 05:00:00 UTC"
+  end
+
+  def test_zeros_day
+    assert_zeros :day, "2013-05-01 20:00:00 UTC", ["2013-04-30 00:00:00 UTC", "2013-05-01 00:00:00 UTC", "2013-05-02 00:00:00 UTC"], "2013-04-30 00:00:00 UTC", "2013-05-02 23:59:59 UTC"
+  end
+
+  def test_zeros_day_time_zone
+    assert_zeros :day, "2013-05-01 20:00:00 PDT", ["2013-04-30 00:00:00 PDT", "2013-05-01 00:00:00 PDT", "2013-05-02 00:00:00 PDT"], "2013-04-30 00:00:00 PDT", "2013-05-02 23:59:59 PDT", true
+  end
+
+  def test_zeros_week
+    assert_zeros :week, "2013-05-01 20:00:00 UTC", ["2013-04-21 00:00:00 UTC", "2013-04-28 00:00:00 UTC", "2013-05-05 00:00:00 UTC"], "2013-04-27 23:59:59 UTC", "2013-05-11 23:59:59 UTC"
+  end
+
+  def test_zeros_week_time_zone
+    assert_zeros :week, "2013-05-01 20:00:00 PDT", ["2013-04-21 00:00:00 PDT", "2013-04-28 00:00:00 PDT", "2013-05-05 00:00:00 PDT"], "2013-04-27 23:59:59 PDT", "2013-05-11 23:59:59 PDT", true
+  end
+
+  def test_zeros_month
+    assert_zeros :month, "2013-04-16 20:00:00 UTC", ["2013-03-01 00:00:00 UTC", "2013-04-01 00:00:00 UTC", "2013-05-01 00:00:00 UTC"], "2013-03-01 00:00:00 UTC", "2013-05-31 23:59:59 UTC"
+  end
+
+  def test_zeros_month_time_zone
+    assert_zeros :month, "2013-04-16 20:00:00 PDT", ["2013-03-01 00:00:00 PST", "2013-04-01 00:00:00 PDT", "2013-05-01 00:00:00 PDT"], "2013-03-01 00:00:00 PST", "2013-05-31 23:59:59 PDT", true
+  end
+
+  def test_zeros_year
+    assert_zeros :year, "2013-04-16 20:00:00 UTC", ["2012-01-01 00:00:00 UTC", "2013-01-01 00:00:00 UTC", "2014-01-01 00:00:00 UTC"], "2012-01-01 00:00:00 UTC", "2014-12-31 23:59:59 UTC"
+  end
+
+  def test_zeros_year_time_zone
+    assert_zeros :year, "2013-04-16 20:00:00 PDT", ["2012-01-01 00:00:00 PST", "2013-01-01 00:00:00 PST", "2014-01-01 00:00:00 PST"], "2012-01-01 00:00:00 PST", "2014-12-31 23:59:59 PST", true
+  end
+
+  def test_zeros_day_of_week
+    create_user "2013-05-01 00:00:00 UTC"
+    expected = {}
+    7.times do |n|
+      expected[n] = n == 3 ? 1 : 0
+    end
+    assert_equal(expected, User.group_by_day_of_week(:created_at, Time.zone, true).count(:created_at))
+  end
+
+  def test_zeros_hour_of_day
+    create_user "2013-05-01 20:00:00 UTC"
+    expected = {}
+    24.times do |n|
+      expected[n] = n == 20 ? 1 : 0
+    end
+    assert_equal(expected, User.group_by_hour_of_day(:created_at, Time.zone, true).count(:created_at))
+  end
+
+  def test_zeros_excludes_end
+    create_user "2013-05-02 00:00:00 UTC"
+    expected = {
+      Time.parse("2013-05-01 00:00:00 UTC") => 0
+    }
+    assert_equal(expected, User.group_by_day(:created_at, Time.zone, Time.parse("2013-05-01 00:00:00 UTC")...Time.parse("2013-05-02 00:00:00 UTC")).count)
+  end
+
+  def test_zeros_previous_scope
+    create_user "2013-05-01 00:00:00 UTC"
+    expected = {
+      Time.parse("2013-05-01 00:00:00 UTC") => 0
+    }
+    assert_equal(expected, User.where("id = 0").group_by_day(:created_at, Time.zone, Time.parse("2013-05-01 00:00:00 UTC")..Time.parse("2013-05-01 23:59:59 UTC")).count)
+  end
+
+  # misc
+
+  def test_order_day
+    assert_equal({}, User.group_by_day(:created_at).order("day desc").limit(20).count)
+  end
+
+  def test_order_week
+    assert_equal({}, User.group_by_week(:created_at).order("week asc").count)
+  end
+
+  def test_order_hour_of_day
+    assert_equal({}, User.group_by_hour_of_day(:created_at).order("hour_of_day desc").count)
+  end
+
+  def test_table_name
+    assert_equal({}, User.group_by_day("users.created_at").count)
+  end
+
+  def test_previous_scopes
+    create_user "2013-05-01 00:00:00 UTC"
+    assert_equal({}, User.where("id = 0").group_by_day(:created_at).count)
+  end
+
+  # helpers
+
+  def assert_result_time(method, expected, time_str, time_zone = false)
+    assert_result method, Time.parse(expected), time_str, time_zone
+  end
+
+  def assert_result(method, expected, time_str, time_zone = false)
+    create_user time_str
+    expected = expected.is_a?(Time) ? time_key(expected) : number_key(expected)
+    assert_equal(ordered_hash({expected => 1}), User.send(:"group_by_#{method}", :created_at, time_zone ? "Pacific Time (US & Canada)" : nil).order(method.to_s).count)
+  end
+
+  def assert_zeros(method, created_at, keys, range_start, range_end, time_zone = nil)
+    create_user created_at
+    expected = {}
+    keys.each_with_index do |key, i|
+      expected[Time.parse(key)] = i == 1 ? 1 : 0
+    end
+    assert_equal(expected, User.send(:"group_by_#{method}", :created_at, time_zone ? "Pacific Time (US & Canada)" : nil, Time.parse(range_start)..Time.parse(range_end)).count)
+  end
+
+  def ordered_hash(hash)
+    RUBY_VERSION =~ /1\.8/ ? hash.inject(ActiveSupport::OrderedHash.new){|h, (k, v)| h[k] = v; h } : hash
+  end
+
+  def create_user(created_at)
+    User.create!(:name => "Andrew", :score => 1, :created_at => ActiveSupport::TimeZone["UTC"].parse(created_at))
+  end
+
+  def teardown
+    User.delete_all
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groupdate
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-16 00:00:00.000000000 Z
+date: 2013-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -114,7 +114,9 @@ files:
 - lib/groupdate/scopes.rb
 - lib/groupdate/series.rb
 - lib/groupdate/version.rb
-- test/groupdate_test.rb
+- test/mysql_test.rb
+- test/postgresql_test.rb
+- test/test_helper.rb
 homepage: ''
 licenses:
 - MIT
@@ -140,4 +142,6 @@ signing_key:
 specification_version: 4
 summary: The simplest way to group temporal data
 test_files:
-- test/groupdate_test.rb
+- test/mysql_test.rb
+- test/postgresql_test.rb
+- test/test_helper.rb

data/test/groupdate_test.rb

@@ -1,288 +0,0 @@
-require "bundler/setup"
-Bundler.require(:default)
-require "minitest/autorun"
-require "minitest/pride"
-require "logger"
-
-# for debugging
-# ActiveRecord::Base.logger = Logger.new(STDOUT)
-
-# rails does this in activerecord/lib/active_record/railtie.rb
-ActiveRecord::Base.default_timezone = :utc
-ActiveRecord::Base.time_zone_aware_attributes = true
-
-class User < ActiveRecord::Base
-end
-
-# migrations
-%w(postgresql mysql2).each do |adapter|
-  ActiveRecord::Base.establish_connection :adapter => adapter, :database => "groupdate_test", :username => adapter == "mysql2" ? "root" : nil
-
-  unless ActiveRecord::Base.connection.table_exists? "users"
-    ActiveRecord::Migration.create_table :users do |t|
-      t.string :name
-      t.integer :score
-      t.timestamps
-    end
-  end
-end
-
-describe Groupdate do
-  %w(postgresql mysql2).each do |adapter|
-    describe adapter do
-
-      before do
-        User.establish_connection :adapter => adapter, :database => "groupdate_test", :username => adapter == "mysql2" ? "root" : nil
-        User.delete_all
-      end
-
-      it "works!" do
-        [
-          {: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(
-          ordered_hash({
-            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
-        assert_equal({}, User.group_by_day(:created_at).order("day desc").limit(20).count)
-        assert_equal({}, User.group_by_week(:created_at).order("week asc").count)
-        assert_equal({}, User.group_by_hour_of_day(:created_at).order("hour_of_day desc").count)
-      end
-
-      it "allows for table name" do
-        assert_equal({}, User.group_by_day("users.created_at").count)
-      end
-
-      it "group_by_second" do
-        assert_group :second, "2013-04-01 00:00:01 UTC", "2013-04-01 00:00:01 UTC"
-      end
-
-      it "group_by_minute" do
-        assert_group :minute, "2013-04-01 00:01:01 UTC", "2013-04-01 00:01:00 UTC"
-      end
-
-      it "group_by_hour" do
-        assert_group :hour, "2013-04-01 01:01:01 UTC", "2013-04-01 01:00:00 UTC"
-      end
-
-      it "group_by_day" do
-        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
-        assert_group_tz :day, "2013-04-01 01:01:01 UTC", "2013-03-31 07:00:00 UTC"
-      end
-
-      it "group_by_week" do
-        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
-        assert_group_tz :week, "2013-03-17 01:01:01 UTC", "2013-03-10 08:00:00 UTC"
-      end
-
-      it "group_by_month" do
-        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
-        assert_group_tz :month, "2013-04-01 01:01:01 UTC", "2013-03-01 08:00:00 UTC"
-      end
-
-      it "group_by_year" do
-        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
-        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
-        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
-        assert_group_number_tz :hour_of_day, "2013-01-01 11:00:00 UTC", 3
-      end
-
-      it "group_by_day_of_week" do
-        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
-        assert_group_number_tz :day_of_week, "2013-03-03 00:00:00 UTC", 6
-      end
-
-      it "works with previous scopes" do
-        create_user "2013-05-01 00:00:00 UTC"
-        assert_equal({}, User.where("id = 0").group_by_day(:created_at).count)
-      end
-
-      describe "returns zeros" do
-
-        it "group_by_second" do
-          assert_zeros :second, "2013-05-01 00:00:01 UTC", ["2013-05-01 00:00:00 UTC", "2013-05-01 00:00:01 UTC", "2013-05-01 00:00:02 UTC"], "2013-05-01 00:00:00.999 UTC", "2013-05-01 00:00:02 UTC"
-        end
-
-        it "group_by_minute" do
-          assert_zeros :minute, "2013-05-01 00:01:00 UTC", ["2013-05-01 00:00:00 UTC", "2013-05-01 00:01:00 UTC", "2013-05-01 00:02:00 UTC"], "2013-05-01 00:00:59 UTC", "2013-05-01 00:02:00 UTC"
-        end
-
-        it "group_by_hour" do
-          assert_zeros :hour, "2013-05-01 04:01:01 UTC", ["2013-05-01 03:00:00 UTC", "2013-05-01 04:00:00 UTC", "2013-05-01 05:00:00 UTC"], "2013-05-01 03:59:59 UTC", "2013-05-01 05:00:00 UTC"
-        end
-
-        it "group_by_day" do
-          assert_zeros :day, "2013-05-01 20:00:00 UTC", ["2013-04-30 00:00:00 UTC", "2013-05-01 00:00:00 UTC", "2013-05-02 00:00:00 UTC"], "2013-04-30 00:00:00 UTC", "2013-05-02 23:59:59 UTC"
-        end
-
-        it "group_by_day with time zone" do
-          assert_zeros_tz :day, "2013-05-01 20:00:00 PDT", ["2013-04-30 00:00:00 PDT", "2013-05-01 00:00:00 PDT", "2013-05-02 00:00:00 PDT"], "2013-04-30 00:00:00 PDT", "2013-05-02 23:59:59 PDT"
-        end
-
-        it "group_by_week" do
-          assert_zeros :week, "2013-05-01 20:00:00 UTC", ["2013-04-21 00:00:00 UTC", "2013-04-28 00:00:00 UTC", "2013-05-05 00:00:00 UTC"], "2013-04-27 23:59:59 UTC", "2013-05-11 23:59:59 UTC"
-        end
-
-        it "group_by_week with time zone" do
-          assert_zeros_tz :week, "2013-05-01 20:00:00 PDT", ["2013-04-21 00:00:00 PDT", "2013-04-28 00:00:00 PDT", "2013-05-05 00:00:00 PDT"], "2013-04-27 23:59:59 PDT", "2013-05-11 23:59:59 PDT"
-        end
-
-        it "group_by_month" do
-          assert_zeros :month, "2013-04-16 20:00:00 UTC", ["2013-03-01 00:00:00 UTC", "2013-04-01 00:00:00 UTC", "2013-05-01 00:00:00 UTC"], "2013-03-01 00:00:00 UTC", "2013-05-31 23:59:59 UTC"
-        end
-
-        it "group_by_month with time zone" do
-          assert_zeros_tz :month, "2013-04-16 20:00:00 PDT", ["2013-03-01 00:00:00 PST", "2013-04-01 00:00:00 PDT", "2013-05-01 00:00:00 PDT"], "2013-03-01 00:00:00 PST", "2013-05-31 23:59:59 PDT"
-        end
-
-        it "group_by_year" do
-          assert_zeros :year, "2013-04-16 20:00:00 UTC", ["2012-01-01 00:00:00 UTC", "2013-01-01 00:00:00 UTC", "2014-01-01 00:00:00 UTC"], "2012-01-01 00:00:00 UTC", "2014-12-31 23:59:59 UTC"
-        end
-
-        it "group_by_year with time zone" do
-          assert_zeros_tz :year, "2013-04-16 20:00:00 PDT", ["2012-01-01 00:00:00 PST", "2013-01-01 00:00:00 PST", "2014-01-01 00:00:00 PST"], "2012-01-01 00:00:00 PST", "2014-12-31 23:59:59 PST"
-        end
-
-        it "group_by_day_of_week" do
-          create_user "2013-05-01 00:00:00 UTC"
-          expected = {}
-          7.times do |n|
-            expected[n] = n == 3 ? 1 : 0
-          end
-          assert_equal(expected, User.group_by_day_of_week(:created_at, Time.zone, true).count(:created_at))
-        end
-
-        it "group_by_hour_of_day" do
-          create_user "2013-05-01 20:00:00 UTC"
-          expected = {}
-          24.times do |n|
-            expected[n] = n == 20 ? 1 : 0
-          end
-          assert_equal(expected, User.group_by_hour_of_day(:created_at, Time.zone, true).count(:created_at))
-        end
-
-        it "excludes end" do
-          create_user "2013-05-02 00:00:00 UTC"
-          expected = {
-            Time.parse("2013-05-01 00:00:00 UTC") => 0
-          }
-          assert_equal(expected, User.group_by_day(:created_at, Time.zone, Time.parse("2013-05-01 00:00:00 UTC")...Time.parse("2013-05-02 00:00:00 UTC")).count)
-        end
-
-        it "works with previous scopes" do
-          create_user "2013-05-01 00:00:00 UTC"
-          expected = {
-            Time.parse("2013-05-01 00:00:00 UTC") => 0
-          }
-          assert_equal(expected, User.where("id = 0").group_by_day(:created_at, Time.zone, Time.parse("2013-05-01 00:00:00 UTC")..Time.parse("2013-05-01 23:59:59 UTC")).count)
-        end
-
-      end
-
-    end
-  end
-
-  # helper methods
-
-  def assert_group(method, created_at, key, time_zone = nil)
-    create_user created_at
-    assert_equal(ordered_hash({time_key(key) => 1}), User.send(:"group_by_#{method}", :created_at, time_zone).order(method.to_s).count)
-  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(ordered_hash({number_key(key) => 1}), User.send(:"group_by_#{method}", :created_at, time_zone).order(method.to_s).count)
-  end
-
-  def assert_group_number_tz(method, created_at, key)
-    assert_group_number method, created_at, key, "Pacific Time (US & Canada)"
-  end
-
-  def assert_zeros(method, created_at, keys, range_start, range_end, time_zone = nil, java_hack = false)
-    create_user created_at
-    expected = {}
-    keys.each_with_index do |key, i|
-      expected[Time.parse(key)] = i == 1 ? 1 : 0
-    end
-    assert_equal(expected, User.send(:"group_by_#{method}", :created_at, time_zone, Time.parse(range_start)..Time.parse(range_end)).count)
-  end
-
-  def assert_zeros_tz(method, created_at, keys, range_start, range_end)
-    assert_zeros method, created_at, keys, range_start, range_end, "Pacific Time (US & Canada)", true
-  end
-
-  def time_key(key)
-    if RUBY_PLATFORM == "java"
-      if User.connection.adapter_name == "PostgreSQL"
-        Time.parse(key).utc.strftime("%Y-%m-%d %H:%M:%S%z")[0..-3]
-      else
-        Time.parse(key).strftime("%Y-%m-%d %H:%M:%S").gsub(/ 00\:00\:00\z/, "")
-      end
-    else
-      if User.connection.adapter_name == "PostgreSQL" and ActiveRecord::VERSION::MAJOR == 3
-        Time.parse(key).utc.strftime("%Y-%m-%d %H:%M:%S+00")
-      else
-        Time.parse(key)
-      end
-    end
-  end
-
-  def number_key(key)
-    if RUBY_PLATFORM == "java"
-      if User.connection.adapter_name == "PostgreSQL"
-        key.to_f
-      else
-        key
-      end
-    else
-      if User.connection.adapter_name == "PostgreSQL"
-        ActiveRecord::VERSION::MAJOR == 3 ? key.to_s : key.to_f
-      else
-        key
-      end
-    end
-  end
-
-  def ordered_hash(hash)
-    RUBY_VERSION =~ /1\.8/ ? hash.inject(ActiveSupport::OrderedHash.new){|h, (k, v)| h[k] = v; h } : hash
-  end
-
-  def create_user(created_at)
-    User.create!(:name => "Andrew", :score => 1, :created_at => Time.parse(created_at))
-  end
-
-end