Merge branch 'trestrantham-value-carry-forward' into trestrantham-master

Andrew Kane
2 parents aa3f4798 6045e984
Showing 1 changed file with 5 additions and 1 deletions Show diff stats
lib/groupdate/magic.rb
@@ -230,8 +230,12 @@ module Groupdate
           lambda{|k| k }
         end
+      value = nil
+
       Hash[series.map do |k|
-        [multiple_groups ? k[0...@group_index] + [key_format.call(k[@group_index])] + k[(@group_index + 1)..-1] : key_format.call(k), count[k] || default_value]
+        value = count[k] || (@options[:carry_forward] ? value : false) || default_value
+
+        [multiple_groups ? k[0...@group_index] + [key_format.call(k[@group_index])] + k[(@group_index + 1)..-1] : key_format.call(k), value]
       end]
     end