lib/groupdate2.rb in groupdate2-4.1.5 vs lib/groupdate2.rb in groupdate2-5.0.0

- old
+ new

@@ -1,26 +1,36 @@ +# dependencies require "active_support/core_ext/module/attribute_accessors" require "active_support/time" -require "groupdate/version" + +# modules +require "groupdate/magic" require "groupdate/relation_builder" require "groupdate/series_builder" -require "groupdate/magic" +require "groupdate/version" module Groupdate class Error < RuntimeError; end - PERIODS = [:second, :minute, :hour, :day, :week, :month, :quarter, :year, :day_of_week, :hour_of_day, :minute_of_hour, :day_of_month, :month_of_year] + PERIODS = [:second, :minute, :hour, :day, :week, :month, :quarter, :year, :day_of_week, :hour_of_day, :minute_of_hour, :day_of_month, :day_of_year, :month_of_year] METHODS = PERIODS.map { |v| :"group_by_#{v}" } + [:group_by_period] mattr_accessor :week_start, :day_start, :time_zone, :dates - self.week_start = :sun + self.week_start = :sunday self.day_start = 0 self.dates = true # api for gems like ActiveMedian def self.process_result(relation, result, **options) if relation.groupdate_values result = Groupdate::Magic::Relation.process_result(relation, result, **options) + end + result + end + + def self.process_series_label(relation, result) + if relation.groupdate_values + result = Groupdate::Magic::Relation.process_series_label(relation, result) end result end end