groupdate 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd126e51d0c9b683eae721f9c2bf6a133409039b
-  data.tar.gz: 0f5f4487b87fbe82f22eea5edebe9558cc883593
+  metadata.gz: 8a15c2188ffbf51536333cfad342a88325d5866c
+  data.tar.gz: 962f3ddeffa87168994308c6740ad126393db9e3
 SHA512:
-  metadata.gz: 7b9c7878256b705354bb3ccef1c87946fa94815f34144cf1332775ec448f2db35bcd485399dc91bddef7089d56d92e94ed9be18acf4332fe415074b927a1d32e
-  data.tar.gz: 8653c47e5f08f1001974aad183fbd7c182673a0da9436d8e1d79b288cac728621a472d3c9abc92ee5b5303ffc0d4a5d2090e96a69df3b33786096e92d845d35f
+  metadata.gz: caf2a8b62b7d05e4934f3035b1d7e16c739bef41d316ced765ceb48b0b5c36cb29bad12579ca90b3cfdacdb870d4ab721bc0d925aa5d1c791b15a393a067d4ba
+  data.tar.gz: dabd8ea049f07f730c219348dc247996838831221252eecb3a58a40fd650aa6a16b552a707db4aba1e6b522e984300888e4a7615fb8737bb0360ae2f2ff8e73b

data/.travis.yml

@@ -10,7 +10,7 @@ gemfile:
   - test/gemfiles/activerecord41.gemfile
   - test/gemfiles/activerecord42.gemfile
 sudo: false
-script: bundle exec rake test
+script: RUBYOPT=W0 bundle exec rake test
 before_install:
   - gem install bundler
   - mysql -e 'create database groupdate_test;'

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 3.0.2
+
+- Fixed `group_by_period` with associations
+- Fixed `week_start` option for enumerables
+
 ## 3.0.1
 
 - Added support for Redshift

data/README.md

@@ -11,8 +11,6 @@ The simplest way to group by:
 
 :cake: Get the entire series - **the other best part**
 
-Works with Rails 3.1+
-
 Supports PostgreSQL, MySQL, and Redshift, plus arrays and hashes
 
 [![Build Status](https://travis-ci.org/ankane/groupdate.svg?branch=master)](https://travis-ci.org/ankane/groupdate)

data/lib/groupdate.rb

@@ -7,7 +7,7 @@ module Groupdate
   PERIODS = [:second, :minute, :hour, :day, :week, :month, :quarter, :year, :day_of_week, :hour_of_day, :day_of_month, :month_of_year]
   # backwards compatibility for anyone who happened to use it
   FIELDS = PERIODS
-  METHODS = PERIODS.map { |v| :"group_by_#{v}" }
+  METHODS = PERIODS.map { |v| :"group_by_#{v}" } + [:group_by_period]
 
   mattr_accessor :week_start, :day_start, :time_zone, :dates
   self.week_start = :sun

data/lib/groupdate/enumerable.rb

@@ -11,13 +11,20 @@ module Enumerable
     end
   end
 
-  def group_by_period(period, options = {}, &block)
-    # to_sym is unsafe on user input, so convert to strings
-    permitted_periods = ((options[:permit] || Groupdate::PERIODS).map(&:to_sym) & Groupdate::PERIODS).map(&:to_s)
-    if permitted_periods.include?(period.to_s)
-      send("group_by_#{period}", options, &block)
+  def group_by_period(*args, &block)
+    if block || !respond_to?(:scoping)
+      period = args[0]
+      options = args[1] || {}
+
+      # to_sym is unsafe on user input, so convert to strings
+      permitted_periods = ((options[:permit] || Groupdate::PERIODS).map(&:to_sym) & Groupdate::PERIODS).map(&:to_s)
+      if permitted_periods.include?(period.to_s)
+        send("group_by_#{period}", options, &block)
+      else
+        raise ArgumentError, "Unpermitted period"
+      end
     else
-      raise ArgumentError, "Unpermitted period"
+      scoping { @klass.send(:group_by_period, *args, &block) }
     end
   end
 end

data/lib/groupdate/magic.rb

@@ -320,7 +320,7 @@ module Groupdate
         when :hour_of_day
           time.hour
         when :day_of_week
-          (7 - week_start + ((time.wday - 1) % 7) % 7)
+          time.wday
         when :day_of_month
           time.day
         when :month_of_year

data/lib/groupdate/version.rb

@@ -1,3 +1,3 @@
 module Groupdate
-  VERSION = "3.0.1"
+  VERSION = "3.0.2"
 end

data/test/test_helper.rb

@@ -293,6 +293,15 @@ module TestDatabase
     assert_equal expected, user.posts.group_by_day(:created_at).count
   end
 
+  def test_associations_period
+    user = create_user("2014-03-01")
+    user.posts.create!(created_at: "2014-04-01 00:00:00 UTC")
+    expected = {
+      Date.parse("2014-04-01") => 1
+    }
+    assert_equal expected, user.posts.group_by_period(:day, :created_at).count
+  end
+
   # activerecord default_timezone option
 
   def test_default_timezone_local
@@ -378,7 +387,7 @@ module TestGroupdate
   # second
 
   def test_second_end_of_second
-    if enumerable_test? || (ActiveRecord::Base.connection.adapter_name == "Mysql2" && ActiveRecord::VERSION::STRING.starts_with?("4.2."))
+    if enumerable_test? || ActiveRecord::Base.connection.adapter_name == "Mysql2"
       skip # no millisecond precision
     else
       assert_result_time :second, "2013-05-03 00:00:00 UTC", "2013-05-03 00:00:00.999"
@@ -962,17 +971,22 @@ module TestGroupdate
 
   def test_format_hour_of_day_day_start
     create_user "2014-03-01"
-    assert_format :hour_of_day, "2 am", "%-l %P", day_start: 2
+    assert_format :hour_of_day, "12 am", "%-l %P", day_start: 2
   end
 
   def test_format_day_of_week
     create_user "2014-03-01"
-    assert_format :day_of_week, "Sun", "%a"
+    assert_format :day_of_week, "Sat", "%a"
+  end
+
+  def test_format_day_of_week_day_start
+    create_user "2014-03-01"
+    assert_format :day_of_week, "Fri", "%a", day_start: 2
   end
 
   def test_format_day_of_week_week_start
     create_user "2014-03-01"
-    assert_format :day_of_week, "Sun", "%a", week_start: :sat
+    assert_format :day_of_week, "Sat", "%a", week_start: :mon
   end
 
   def test_format_day_of_month
@@ -1016,7 +1030,7 @@ module TestGroupdate
   # helpers
 
   def assert_format(method, expected, format, options = {})
-    assert_equal expected, call_method(method, :created_at, options.merge(format: format, series: true)).keys.first
+    assert_equal({expected => 1}, call_method(method, :created_at, options.merge(format: format, series: false)))
   end
 
   def assert_result_time(method, expected, time_str, time_zone = false, options = {})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groupdate
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-13 00:00:00.000000000 Z
+date: 2016-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport