groupdate 0.1.3 → 0.1.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 96aed6d659f986f853f50f45bc93663f884235ac
+  data.tar.gz: b33a101116de8a25f3fde64ab7824aeb5e09d72b
+SHA512:
+  metadata.gz: a7756158b511af490af7f6c6c6f516674161c5e2f5957380d4d6c7eb30cf733f25b4d7acdd203d9f835c7a98b9126ec91c3027910f71717eeb455ad993c37200
+  data.tar.gz: 3c1998ad9aec8d3a93001e86ad6d4e54d43547cc32689a32a247566b3bb010b9792799077a5c9485fbfdb906cf2f830d080d3c05856a432988d5d9764c75637b

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 rvm:
+  - 1.8.7
   - 1.9.3
   - 2.0.0
   - jruby

data/Gemfile

@@ -6,6 +6,6 @@ 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"
+  gem "activerecord-jdbcpostgresql-adapter", :github => "jruby/activerecord-jdbc-adapter"
+  gem "activerecord-jdbcmysql-adapter", :github => "jruby/activerecord-jdbc-adapter"
 end

data/README.md

@@ -123,12 +123,12 @@ mysql_tzinfo_to_sql /usr/share/zoneinfo | mysql -u root mysql
 
 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
+```ruby
 # postgresql
-gem "activerecord-jdbcpostgresql-adapter", github: "jruby/activerecord-jdbc-adapter"
+gem "activerecord-jdbcpostgresql-adapter", :github => "jruby/activerecord-jdbc-adapter"
 
 # mysql
-gem "activerecord-jdbcmysql-adapter", github: "jruby/activerecord-jdbc-adapter"
+gem "activerecord-jdbcmysql-adapter", :github => "jruby/activerecord-jdbc-adapter"
 ```
 
 ## Complete list

data/lib/groupdate/version.rb

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

data/lib/groupdate.rb

@@ -30,9 +30,9 @@ module Groupdate
       # http://www.postgresql.org/docs/9.1/static/functions-datetime.html
       fields = %w(second minute hour day week month year day_of_week hour_of_day)
       fields.each do |field|
-        self.scope :"group_by_#{field}", lambda {|unsafe_column, time_zone = Time.zone|
-          column = connection.quote_column_name(unsafe_column)
-          time_zone ||= "Etc/UTC"
+        self.scope :"group_by_#{field}", lambda {|*args|
+          column = connection.quote_table_name(args[0])
+          time_zone = args[1] || 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

data/test/groupdate_test.rb

@@ -16,7 +16,7 @@ end
 
 # migrations
 %w(postgresql mysql2).each do |adapter|
-  ActiveRecord::Base.establish_connection adapter: adapter, database: "groupdate_test", username: adapter == "mysql2" ? "root" : nil
+  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|
@@ -32,22 +32,22 @@ describe Groupdate do
     describe adapter do
 
       before do
-        User.establish_connection adapter: adapter, database: "groupdate_test", username: adapter == "mysql2" ? "root" : nil
+        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")}
+          {: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
@@ -58,6 +58,10 @@ describe Groupdate do
         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
@@ -124,7 +128,7 @@ describe Groupdate do
 
   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)
+    assert_equal(ordered_hash({time_key(key) => 1}), User.send(:"group_by_#{method}", :created_at, time_zone).count)
   end
 
   def assert_group_tz(method, created_at, key)
@@ -133,7 +137,7 @@ describe Groupdate do
 
   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)
+    assert_equal(ordered_hash({number_key(key) => 1}), User.send(:"group_by_#{method}", :created_at, time_zone).count)
   end
 
   def assert_group_number_tz(method, created_at, key)
@@ -144,7 +148,7 @@ describe Groupdate do
     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)
+      User.connection.adapter_name == "PostgreSQL" && ActiveRecord::VERSION::MAJOR == 3 ? Time.parse(key).strftime("%Y-%m-%d %H:%M:%S+00") : Time.parse(key)
     end
   end
 
@@ -156,8 +160,12 @@ describe Groupdate do
     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))
+    User.create!(:name => "Andrew", :score => 1, :created_at => Time.parse(created_at))
   end
 
 end

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: groupdate
 version: !ruby/object:Gem::Version
-  version: 0.1.3
-  prerelease: 
+  version: 0.1.4
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-25 00:00:00.000000000 Z
+date: 2013-05-01 00:00:00.000000000 Z
 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
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,65 +41,57 @@ 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
@@ -127,28 +114,26 @@ 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: 1.8.23
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: The simplest way to group temporal data
 test_files:
 - test/groupdate_test.rb
-has_rdoc: