groupdate 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08308d10dc780963998b4ebcb906f802dd15f6a7
-  data.tar.gz: 4e2a7f3a352b94f22287e2e84e4e8830625914ca
+  metadata.gz: 358ad13de46aa60a282d59df8b6de77acfced7b7
+  data.tar.gz: c90febd166be21d77ce02aac0335b0691ffb8950
 SHA512:
-  metadata.gz: d302a57517c823e80b7192a42153bc4a594af23bd1647f6cd7f3eab77a57252882204e22d40e4a6a3a80253be4adce6577cb9fa723d52342f7f8d8cf4a725d77
-  data.tar.gz: 0fdeb289ba29919be219e0dc1cdaf040552ffdc2ffa1ed5c180178ba8c8f4bb8aa00d8ffb0862eb5030af8996144098b2d03380c96d0a5f97ce248362b148578
+  metadata.gz: 69a1f081be83ddd6bf8d36ce2839bc47957b64ca35f2b71f61a545cf0f4c77fcc80e1a2fbc216aaa5f5a7429c45b1fb07139b99ca640f0efa068454e0965cece
+  data.tar.gz: 29865ae92770fed0d36ed7e4d9d21042057a152e12ed74d49ee0214328a960d3b6008ce63c6fca497982920dbdd5f322ffc0986976ef419c477b7995f37cda8c

data/CHANGELOG.md

@@ -1,37 +1,42 @@
-# 2.1.0
+## 2.1.1
 
-- added last option
-- added format option
+- Fixed format option with multiple groups
+- Better error message if time zone support is missing for MySQL
 
-# 2.0.4
+## 2.1.0
 
-- added multiple groups
-- added order
-- subsequent methods no longer modify relation
+- Added last option
+- Added format option
 
-# 2.0.3
+## 2.0.4
 
-- implemented respond_to?
+- Added multiple groups
+- Added order
+- Subsequent methods no longer modify relation
 
-# 2.0.2
+## 2.0.3
+
+- Implemented respond_to?
+
+## 2.0.2
 
 - where, joins, and includes no longer need to be before the group_by method
 
-# 2.0.1
+## 2.0.1
 
 - Use time zone instead of UTC for results
 
-# 2.0.0
+## 2.0.0
 
 - Returns entire series by default
 - Added day_start option
 - Better interface
 
-# 1.0.5
+## 1.0.5
 
 - Added global time_zone option
 
-# 1.0.4
+## 1.0.4
 
 - Added global week_start option
 - Fixed bug with NULL values and series

data/lib/groupdate/series.rb

@@ -56,7 +56,12 @@ module Groupdate
           lambda{|k| (k.is_a?(String) ? utc.parse(k) : k.to_time).in_time_zone(@time_zone) }
         end
 
-      count = Hash[ relation.send(method, *args, &block).map{|k, v| [multiple_groups ? k[0...@group_index] + [cast_method.call(k[@group_index])] + k[(@group_index + 1)..-1] : cast_method.call(k), v] } ]
+      count =
+        begin
+          Hash[ relation.send(method, *args, &block).map{|k, v| [multiple_groups ? k[0...@group_index] + [cast_method.call(k[@group_index])] + k[(@group_index + 1)..-1] : cast_method.call(k), v] } ]
+        rescue NoMethodError
+          raise "Be sure to install time zone support - https://github.com/ankane/groupdate#for-mysql"
+        end
 
       series =
         case @field
@@ -128,7 +133,7 @@ module Groupdate
         end
 
       Hash[series.map do |k|
-        [key_format.call(k), count[k] || 0]
+        [multiple_groups ? k[0...@group_index] + [key_format.call(k[@group_index])] + k[(@group_index + 1)..-1] : key_format.call(k), count[k] || 0]
       end]
     end
 

data/lib/groupdate/version.rb

@@ -1,3 +1,3 @@
 module Groupdate
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 end

data/test/test_helper.rb

@@ -595,6 +595,12 @@ module TestGroupdate
     assert_format :day_of_week, "Sun", "%a", week_start: :sat
   end
 
+  def test_format_multiple_groups
+    create_user "2014-03-01 00:00:00 UTC"
+    assert_equal ({["Sun", 1] => 1}), User.group_by_week(:created_at, format: "%a").group(:score).count
+    assert_equal ({[1, "Sun"] => 1}), User.group(:score).group_by_week(:created_at, format: "%a").count
+  end
+
   # helpers
 
   def assert_format(method, expected, format, options = {})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groupdate
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-17 00:00:00.000000000 Z
+date: 2014-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: The simplest way to group temporal data