groupdate 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89762e723508e5431f4f03eccc43b9a1edb63847
-  data.tar.gz: e78b217c7424bb628b284a143f8004d0ef159d93
+  metadata.gz: af27fcb8fcdb2e8bb300ca3ad248690b47b750df
+  data.tar.gz: c7db61278cb56b67bafdb01beceadaa2236e955b
 SHA512:
-  metadata.gz: 3de4b5d5d7d05a10c77ef8b098bca4abbf7495cadd91381088f92bb299131ffac9b3c1cf86ada1ab0e1f202ae404f56ba1cfaba18f1a91233c9f6c7b93dfbcf2
-  data.tar.gz: 917773b5b9c2a6c42ff061f11dc7fc31ad50313d53e5140b828c91dc8331abd3be2ee49ec3ba627e8f8d3749991d7535f94a953ff4459ad9c9a571667ead05a8
+  metadata.gz: 1f1be192a48bc96363a39627f69aaa0d1f598c39f91f3dd0728d47c1c49d2e4bafc15b54e7e3d7437247e5bda8e8b68a452db55e3fff156ab6ab1dce8fa77778
+  data.tar.gz: 681d43a72eb1c7b97c91d923b5de0de2517a114bb202e97a7f902ca9ff24cd71678a4a453736adf71331837058b43fde744aba26e08c419b20ae7a99ffd273ef

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 2.0.2
+
+- where, joins, and includes no longer need to be before the group_by method
+
 # 2.0.1
 
 - Use time zone instead of UTC for results

data/README.md

@@ -61,9 +61,9 @@ or
 ```ruby
 User.group_by_week(:created_at, time_zone: "Pacific Time (US & Canada)").count
 # {
-#   2013-03-03 08:00:00 UTC => 80,
-#   2013-03-10 08:00:00 UTC => 70,
-#   2013-03-17 07:00:00 UTC => 54
+#   2013-03-10 00:00:00 PST => 70,
+#   2013-03-17 00:00:00 PDT => 54,
+#   2013-03-24 00:00:00 PDT => 80
 # }
 ```
 
@@ -135,29 +135,10 @@ gem "activerecord-jdbcmysql-adapter", :github => "jruby/activerecord-jdbc-adapte
 
 ## Upgrading to 2.0
 
-Groupdate 2.0 brings a number a great improvements.
+Groupdate 2.0 brings a number a great improvements.  Here are two things to be aware of:
 
 - the entire series is returned by default
-- the `day_start` option
-- an improved interface
-
-However, there are a few things to be aware of when upgrading.
-
-1. Groupdate methods must come after any `where`, `joins`, or `includes`.
-
-  Throws error
-
-  ```ruby
-  User.group_by_day(:created_at).where(company_id: 1).count
-  ```
-
-  :moneybag:
-
-  ```ruby
-  User.where(company_id: 1).group_by_day(:created_at).count
-  ```
-
-2. `Time` keys are now returned for every database adapter. Some older adapters previously returned `String` keys.
+- `ActiveSupport::TimeWithZone` keys are now returned for every database adapter - adapters previously returned `Time` or `String` keys
 
 ## History
 

data/lib/groupdate/series.rb

@@ -91,10 +91,11 @@ module Groupdate
       # https://github.com/rails/rails/blob/master/activerecord/lib/active_record/relation/calculations.rb
       if ActiveRecord::Calculations.method_defined?(method)
         build_series(@relation.send(method, *args, &block))
-      elsif [:joins, :includes, :where].include?(method)
-        raise NoMethodError, "#{method} must come before the group_by_#{@field} method"
+      elsif @relation.respond_to?(method)
+        @relation = @relation.send(method, *args, &block)
+        self
       else
-        raise NoMethodError, "valid methods are: #{ActiveRecord::Calculations.instance_methods.join(", ")}"
+        super
       end
     end
 

data/lib/groupdate/version.rb

@@ -1,3 +1,3 @@
 module Groupdate
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

data/test/test_helper.rb

@@ -480,6 +480,17 @@ module TestGroupdate
     assert_equal time_zone, User.group_by_day(:created_at, time_zone: time_zone).count.keys.first.time_zone.name
   end
 
+  def test_where_after
+    create_user "2013-05-01 00:00:00 UTC"
+    create_user "2013-05-02 00:00:00 UTC"
+    expected = {utc.parse("2013-05-02 00:00:00 UTC") => 1}
+    assert_equal expected, User.group_by_day(:created_at).where("created_at > ?", "2013-05-01 00:00:00 UTC").count
+  end
+
+  def test_bad_method
+    assert_raises(NoMethodError) { User.group_by_day(:created_at).no_such_method }
+  end
+
   # helpers
 
   def assert_result_time(method, expected, time_str, time_zone = false, options = {})
@@ -507,7 +518,11 @@ module TestGroupdate
   end
 
   def create_user(created_at)
-    User.create! :name => "Andrew", :score => 1, :created_at => ActiveSupport::TimeZone["UTC"].parse(created_at)
+    User.create! :name => "Andrew", :score => 1, :created_at => utc.parse(created_at)
+  end
+
+  def utc
+    ActiveSupport::TimeZone["UTC"]
   end
 
   def teardown

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groupdate
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-07 00:00:00.000000000 Z
+date: 2014-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord