Show until now by default

Andrew Kane
1 parent 7dd42370
Showing 1 changed file with 10 additions and 7 deletions Show diff stats
lib/groupdate/magic.rb
@@ -185,6 +185,12 @@ module Groupdate
         when :month_of_year
           1..12
         else
+          if field == :quarter
+            step = 3.months
+          else
+            step = 1.send(field)
+          end
+
           time_range = self.time_range
           time_range =
             if time_range.is_a?(Range)
@@ -197,18 +203,15 @@ module Groupdate
                 else
                   count.keys.sort
                 end
-              sorted_keys.first..sorted_keys.last
+
+              now = Time.now
+              now -= step if options[:current] == false
+              sorted_keys.first..[sorted_keys.last, now].max
             end
  
           if time_range.first
             series = [round_time(time_range.first)]
  
-            if field == :quarter
-              step = 3.months
-            else
-              step = 1.send(field)
-            end
-
             while (next_step = round_time(series.last + step)) && time_range.cover?(next_step)
               series << next_step
             end
...	...	@@ -185,6 +185,12 @@ module Groupdate
185	185	when :month_of_year
186	186	1..12
187	187	else
	188	+ if field == :quarter
	189	+ step = 3.months
	190	+ else
	191	+ step = 1.send(field)
	192	+ end
	193	+
188	194	time_range = self.time_range
189	195	time_range =
190	196	if time_range.is_a?(Range)
...	...	@@ -197,18 +203,15 @@ module Groupdate
197	203	else
198	204	count.keys.sort
199	205	end
200		- sorted_keys.first..sorted_keys.last
	206	+
	207	+ now = Time.now
	208	+ now -= step if options[:current] == false
	209	+ sorted_keys.first..[sorted_keys.last, now].max
201	210	end
202	211
203	212	if time_range.first
204	213	series = [round_time(time_range.first)]
205	214
206		- if field == :quarter
207		- step = 3.months
208		- else
209		- step = 1.send(field)
210		- end
211		-
212	215	while (next_step = round_time(series.last + step)) && time_range.cover?(next_step)
213	216	series << next_step
214	217	end
...	...