groupdate 0.1.2 → 0.1.3

data/.travis.yml

@@ -0,0 +1,10 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - jruby
+script: bundle exec rake test
+before_script:
+  - mysql -e 'create database groupdate_test;'
+  - mysql_tzinfo_to_sql /usr/share/zoneinfo | mysql -u root mysql
+  - psql -c 'create database groupdate_test;' -U postgres

data/Gemfile

@@ -4,3 +4,8 @@ source 'https://rubygems.org'
 gemspec
 
 # gem "activerecord", github: "rails/rails"
+
+platform :jruby do
+  gem "activerecord-jdbcpostgresql-adapter", github: "jruby/activerecord-jdbc-adapter"
+  gem "activerecord-jdbcmysql-adapter", github: "jruby/activerecord-jdbc-adapter"
+end

data/README.md

@@ -15,6 +15,8 @@ Works with Rails 3.0+
 
 Supports PostgreSQL and MySQL
 
+[![Build Status](https://travis-ci.org/ankane/groupdate.png)](https://travis-ci.org/ankane/groupdate)
+
 ## Usage
 
 ```ruby
@@ -79,13 +81,17 @@ User.group_by_hour_of_day(:created_at, "Pacific Time (US & Canada)").count
 # }
 ```
 
-You can order results with `group_field`.
+You can order results with:
 
 ```ruby
-User.group_by_day(:created_at).order("group_field desc").limit(20).count
+User.group_by_day(:created_at).order("day asc").count
+
+User.group_by_week(:created_at).order("week desc").count
+
+User.group_by_hour_of_day(:created_at).order("hour_of_day asc").count
 ```
 
-Use it with anything you can use `group` with:
+Use it with anywhere you can use `group`.
 
 ```ruby
 Task.completed.group_by_hour(:completed_at).average(:priority)
@@ -109,10 +115,22 @@ gem 'groupdate'
 
 [Time zone support](http://dev.mysql.com/doc/refman/5.6/en/time-zone-support.html) must be installed on the server.
 
-```
+```sh
 mysql_tzinfo_to_sql /usr/share/zoneinfo | mysql -u root mysql
 ```
 
+#### For JRuby
+
+Use the master version of your JDBC adapter.  You will get incorrect results for versions before [this commit](https://github.com/jruby/activerecord-jdbc-adapter/commit/c1cdb7cec8d3f06fc54995e8d872d830bd0a4d91).
+
+```sh
+# postgresql
+gem "activerecord-jdbcpostgresql-adapter", github: "jruby/activerecord-jdbc-adapter"
+
+# mysql
+gem "activerecord-jdbcmysql-adapter", github: "jruby/activerecord-jdbc-adapter"
+```
+
 ## Complete list
 
 group_by_?

data/Rakefile

@@ -1 +1,9 @@
 require "bundler/gem_tasks"
+require "rake/testtask"
+
+Rake::TestTask.new do |t|
+  t.libs = ["lib"]
+  t.warning = false
+  t.verbose = false
+  t.test_files = FileList["test/*_test.rb"]
+end

data/groupdate.gemspec

@@ -23,6 +23,12 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest"
-  spec.add_development_dependency "pg"
-  spec.add_development_dependency "mysql2"
+
+  if RUBY_PLATFORM == "java"
+    spec.add_development_dependency "activerecord-jdbcpostgresql-adapter"
+    spec.add_development_dependency "activerecord-jdbcmysql-adapter"
+  else
+    spec.add_development_dependency "pg"
+    spec.add_development_dependency "mysql2"
+  end
 end

data/lib/groupdate.rb

@@ -40,7 +40,7 @@ module Groupdate
           end
           query =
             case connection.adapter_name
-            when "Mysql2"
+            when "MySQL", "Mysql2"
               case field
               when "day_of_week" # Sunday = 0, Monday = 1, etc
                 # use CONCAT for consistent return type (String)
@@ -80,16 +80,23 @@ module Groupdate
                 ["DATE_TRUNC('#{field}', #{column}::timestamptz AT TIME ZONE ?) AT TIME ZONE ?", time_zone, time_zone]
               end
             else
-              raise "Connection adapter not supported"
+              raise "Connection adapter not supported: #{connection.adapter_name}"
             end
 
-          group(Groupdate::OrderHack.new(sanitize_sql_array(query)))
+          group(Groupdate::OrderHack.new(sanitize_sql_array(query), field))
         }
       end
     end
   end
 
-  class OrderHack < String; end
+  class OrderHack < String
+    attr_reader :field
+
+    def initialize(str, field)
+      super(str)
+      @field = field
+    end
+  end
 end
 
 ActiveRecord::Base.send :include, Groupdate
@@ -101,7 +108,7 @@ module ActiveRecord
 
     def column_alias_for_with_hack(*keys)
       if keys.first.is_a?(Groupdate::OrderHack)
-        "group_field"
+        keys.first.field
       else
         column_alias_for_without_hack(*keys)
       end

data/lib/groupdate/version.rb

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

data/test/groupdate_test.rb

@@ -14,18 +14,25 @@ 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
-        ActiveRecord::Base.establish_connection adapter: adapter, database: "groupdate"
-
-        # ActiveRecord::Migration.create_table :users do |t|
-        #   t.string :name
-        #   t.integer :score
-        #   t.timestamps
-        # end
 
+      before do
+        User.establish_connection adapter: adapter, database: "groupdate_test", username: adapter == "mysql2" ? "root" : nil
         User.delete_all
       end
 
@@ -46,7 +53,9 @@ describe Groupdate do
       end
 
       it "doesn't throw exception with order" do
-        User.group_by_day(:created_at).order("group_field desc").limit(20).count == {}
+        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 "group_by_second" do
@@ -132,11 +141,19 @@ describe Groupdate do
   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)
+    if RUBY_PLATFORM == "java"
+      User.connection.adapter_name == "PostgreSQL" ? Time.parse(key).strftime("%Y-%m-%d %H:%M:%S%z")[0..-3] : Time.parse(key).strftime("%Y-%m-%d %H:%M:%S").gsub(/ 00\:00\:00\z/, "")
+    else
+      User.connection.adapter_name == "PostgreSQL" && ActiveRecord::VERSION::MAJOR == 3 ? Time.parse(key).strftime("%Y-%m-%d %H:%M:%S%z")[0..-3] : Time.parse(key)
+    end
   end
 
   def number_key(key)
-    User.connection.adapter_name == "PostgreSQL" ? (ActiveRecord::VERSION::MAJOR == 3 ? key.to_s : key.to_f) : key
+    if RUBY_PLATFORM == "java"
+      User.connection.adapter_name == "PostgreSQL" ? key.to_f : key
+    else
+      User.connection.adapter_name == "PostgreSQL" ? (ActiveRecord::VERSION::MAJOR == 3 ? key.to_s : key.to_f) : key
+    end
   end
 
   def create_user(created_at)

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: groupdate
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
+  prerelease: 
 platform: ruby
 authors:
 - Andrew Kane
@@ -13,20 +14,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,57 +46,65 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: The simplest way to group temporal data
@@ -102,6 +115,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -113,26 +127,27 @@ files:
 homepage: ''
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: The simplest way to group temporal data
 test_files:
 - test/groupdate_test.rb

checksums.yaml

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