kubaninc / groupdate

Download as
Browse Code ยป

Commit fac36403e0927c18190ef3f3e15e7bfba509e1eb

Authored by Andrew Kane
2 parents 5dc8b0d9 55285b56
Exists in master and in 10 other branches auto_calculations, debug_time_zone_support, infinite_loop_fix, jruby, mysql_adapter, parallel_tests, sqlite, to_now, travis_sqlite, v2

Merge branch 'hyfen-group_by_quarter'

Showing 4 changed files with 60 additions and 2 deletions   Show diff stats
@@ -41,6 +41,7 @@ You can also group by: @@ -41,6 +41,7 @@ You can also group by:
41 - hour 41 - hour
42 - week 42 - week
43 - month 43 - month
  44 +- quarter
44 - year 45 - year
45 46
46 and 47 and
lib/groupdate.rb
  Diff comments   View file @fac3640
@@ -4,7 +4,7 @@ require "groupdate/version" @@ -4,7 +4,7 @@ require "groupdate/version"
4 require "groupdate/magic" 4 require "groupdate/magic"
5 5
6 module Groupdate 6 module Groupdate
7 - PERIODS = [:second, :minute, :hour, :day, :week, :month, :year, :day_of_week, :hour_of_day, :day_of_month, :month_of_year] 7 + PERIODS = [:second, :minute, :hour, :day, :week, :month, :quarter, :year, :day_of_week, :hour_of_day, :day_of_month, :month_of_year]
8 # backwards compatibility for anyone who happened to use it 8 # backwards compatibility for anyone who happened to use it
9 FIELDS = PERIODS 9 FIELDS = PERIODS
10 METHODS = PERIODS.map { |v| :"group_by_#{v}" } 10 METHODS = PERIODS.map { |v| :"group_by_#{v}" }
lib/groupdate/magic.rb
  Diff comments   View file @fac3640
@@ -45,6 +45,8 @@ module Groupdate @@ -45,6 +45,8 @@ module Groupdate
45 ["MONTH(CONVERT_TZ(DATE_SUB(#{column}, INTERVAL #{day_start} HOUR), '+00:00', ?))", time_zone] 45 ["MONTH(CONVERT_TZ(DATE_SUB(#{column}, INTERVAL #{day_start} HOUR), '+00:00', ?))", time_zone]
46 when :week 46 when :week
47 ["CONVERT_TZ(DATE_FORMAT(CONVERT_TZ(DATE_SUB(#{column}, INTERVAL ((#{7 - week_start} + WEEKDAY(CONVERT_TZ(#{column}, '+00:00', ?) - INTERVAL #{day_start} HOUR)) % 7) DAY) - INTERVAL #{day_start} HOUR, '+00:00', ?), '%Y-%m-%d 00:00:00') + INTERVAL #{day_start} HOUR, ?, '+00:00')", time_zone, time_zone, time_zone] 47 ["CONVERT_TZ(DATE_FORMAT(CONVERT_TZ(DATE_SUB(#{column}, INTERVAL ((#{7 - week_start} + WEEKDAY(CONVERT_TZ(#{column}, '+00:00', ?) - INTERVAL #{day_start} HOUR)) % 7) DAY) - INTERVAL #{day_start} HOUR, '+00:00', ?), '%Y-%m-%d 00:00:00') + INTERVAL #{day_start} HOUR, ?, '+00:00')", time_zone, time_zone, time_zone]
  48 + when :quarter
  49 + ["DATE_ADD(CONVERT_TZ(DATE_FORMAT(DATE(CONCAT(EXTRACT(YEAR FROM CONVERT_TZ(DATE_SUB(#{column}, INTERVAL #{day_start} HOUR), '+00:00', ?)), '-', LPAD(1 + 3 * (QUARTER(CONVERT_TZ(DATE_SUB(#{column}, INTERVAL #{day_start} HOUR), '+00:00', ?)) - 1), 2, '00'), '-01')), '%Y-%m-%d %H:%i:%S'), ?, '+00:00'), INTERVAL #{day_start} HOUR)", time_zone, time_zone, time_zone]
48 else 50 else
49 format = 51 format =
50 case field 52 case field
@@ -201,7 +203,11 @@ module Groupdate @@ -201,7 +203,11 @@ module Groupdate
201 if time_range.first 203 if time_range.first
202 series = [round_time(time_range.first)] 204 series = [round_time(time_range.first)]
203 205
204 - step = 1.send(field) 206 + if field == :quarter
  207 + step = 3.months
  208 + else
  209 + step = 1.send(field)
  210 + end
205 211
206 while (next_step = round_time(series.last + step)) && time_range.cover?(next_step) 212 while (next_step = round_time(series.last + step)) && time_range.cover?(next_step)
207 series << next_step 213 series << next_step
@@ -278,6 +284,8 @@ module Groupdate @@ -278,6 +284,8 @@ module Groupdate
278 (time - ((7 - week_start + weekday) % 7).days).midnight 284 (time - ((7 - week_start + weekday) % 7).days).midnight
279 when :month 285 when :month
280 time.beginning_of_month 286 time.beginning_of_month
  287 + when :quarter
  288 + time.beginning_of_quarter
281 when :year 289 when :year
282 time.beginning_of_year 290 time.beginning_of_year
283 when :hour_of_day 291 when :hour_of_day
test/test_helper.rb
  Diff comments   View file @fac3640
@@ -230,6 +230,42 @@ module TestGroupdate @@ -230,6 +230,42 @@ module TestGroupdate
230 assert_result_time :month, "2013-03-01 02:00:00 PST", "2013-03-01 10:00:00", true, day_start: 2 230 assert_result_time :month, "2013-03-01 02:00:00 PST", "2013-03-01 10:00:00", true, day_start: 2
231 end 231 end
232 232
  233 + # quarter
  234 +
  235 + def test_quarter_end_of_quarter
  236 + assert_result_time :quarter, "2013-04-01 00:00:00 UTC", "2013-06-30 23:59:59"
  237 + end
  238 +
  239 + def test_quarter_start_of_quarter
  240 + assert_result_time :quarter, "2013-04-01 00:00:00 UTC", "2013-04-01 00:00:00"
  241 + end
  242 +
  243 + def test_quarter_end_of_quarter_with_time_zone
  244 + assert_result_time :quarter, "2013-04-01 00:00:00 PDT", "2013-07-01 06:59:59", true
  245 + end
  246 +
  247 + def test_quarter_start_of_quarter_with_time_zone
  248 + assert_result_time :quarter, "2013-04-01 00:00:00 PDT", "2013-04-01 07:00:00", true
  249 + end
  250 +
  251 + # quarter starts at 2am
  252 +
  253 + def test_quarter_end_of_quarter_day_start_2am
  254 + assert_result_time :quarter, "2013-04-01 02:00:00 UTC", "2013-07-01 01:59:59", false, day_start: 2
  255 + end
  256 +
  257 + def test_quarter_start_of_quarter_day_start_2am
  258 + assert_result_time :quarter, "2013-04-01 02:00:00 UTC", "2013-04-01 02:00:00", false, day_start: 2
  259 + end
  260 +
  261 + def test_quarter_end_of_quarter_with_time_zone_day_start_2am
  262 + assert_result_time :quarter, "2013-01-01 02:00:00 PST", "2013-04-01 08:59:59", true, day_start: 2
  263 + end
  264 +
  265 + def test_quarter_start_of_quarter_with_time_zone_day_start_2am
  266 + assert_result_time :quarter, "2013-01-01 02:00:00 PST", "2013-01-01 10:00:00", true, day_start: 2
  267 + end
  268 +
233 # year 269 # year
234 270
235 def test_year_end_of_year 271 def test_year_end_of_year
@@ -468,6 +504,14 @@ module TestGroupdate @@ -468,6 +504,14 @@ module TestGroupdate
468 assert_zeros :month, "2013-04-16 20:00:00 PDT", ["2013-03-01 00:00:00 PST", "2013-04-01 00:00:00 PDT", "2013-05-01 00:00:00 PDT"], "2013-03-01 00:00:00 PST", "2013-05-31 23:59:59 PDT", true 504 assert_zeros :month, "2013-04-16 20:00:00 PDT", ["2013-03-01 00:00:00 PST", "2013-04-01 00:00:00 PDT", "2013-05-01 00:00:00 PDT"], "2013-03-01 00:00:00 PST", "2013-05-31 23:59:59 PDT", true
469 end 505 end
470 506
  507 + def test_zeros_quarter
  508 + assert_zeros :quarter, "2013-04-16 20:00:00 UTC", ["2013-01-01 00:00:00 UTC", "2013-04-01 00:00:00 UTC", "2013-07-01 00:00:00 UTC"], "2013-01-01 00:00:00 UTC", "2013-09-30 23:59:59 UTC"
  509 + end
  510 +
  511 + def test_zeros_quarter_time_zone
  512 + assert_zeros :quarter, "2013-04-16 20:00:00 PDT", ["2013-01-01 00:00:00 PST", "2013-04-01 00:00:00 PDT", "2013-07-01 00:00:00 PDT"], "2013-01-01 00:00:00 PST", "2013-09-30 23:59:59 PDT", true
  513 + end
  514 +
471 def test_zeros_year 515 def test_zeros_year
472 assert_zeros :year, "2013-04-16 20:00:00 UTC", ["2012-01-01 00:00:00 UTC", "2013-01-01 00:00:00 UTC", "2014-01-01 00:00:00 UTC"], "2012-01-01 00:00:00 UTC", "2014-12-31 23:59:59 UTC" 516 assert_zeros :year, "2013-04-16 20:00:00 UTC", ["2012-01-01 00:00:00 UTC", "2013-01-01 00:00:00 UTC", "2014-01-01 00:00:00 UTC"], "2012-01-01 00:00:00 UTC", "2014-12-31 23:59:59 UTC"
473 end 517 end
@@ -721,6 +765,11 @@ module TestGroupdate @@ -721,6 +765,11 @@ module TestGroupdate
721 assert_format :month, "March 2014", "%B %Y" 765 assert_format :month, "March 2014", "%B %Y"
722 end 766 end
723 767
  768 + def test_format_quarter
  769 + create_user "2014-03-05 00:00:00 UTC"
  770 + assert_format :quarter, "January 1, 2014", "%B %-e, %Y"
  771 + end
  772 +
724 def test_format_year 773 def test_format_year
725 create_user "2014-03-01 00:00:00 UTC" 774 create_user "2014-03-01 00:00:00 UTC"
726 assert_format :year, "2014", "%Y" 775 assert_format :year, "2014", "%Y"