reportable 1.3.0 → 1.3.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: c29f948fbe08b5fcd5fcb8c93b8eb080a5a63e39
4
- data.tar.gz: e74b8522ddd8b95af32653a27b30aa056538ee68
3
+ metadata.gz: 2d0deffb0fa9ea3e4ac5b6f398b365919f7a7a3e
4
+ data.tar.gz: ec672ff78bc8adaa5fbe797501abe2aecc80122c
5
5
  SHA512:
6
- metadata.gz: 991545e56bce51a1c3fdff4bc85487f63368d63b5b12d87598168c4955093d97cce4ef380e96609afe3e1f46f0ce98bccbeaa20991378100ea9484127b395963
7
- data.tar.gz: 7a0e85284ec828a4e2eb77314d02e1304e584821f7aad8b172ffc06c0c590e26d79da66ed8b2922c6635b6936f1762c148d58d1a94001d930178c86460386725
6
+ metadata.gz: af95eceb42afd32bb2ce499a22a338c83c0a2ece2b17cbb534dd016b0e6c3007cfaad5b3318daee84f7e17aaff1bb24225ea4664583f8edcc28cf19e769ce0be
7
+ data.tar.gz: 6d6cfc92c7aaef9a2afaa375779ffdad5c4555a2087a598ae3199fa9db9fcf647c6bf81e2c43ccd6ab6bdab156186937b47db6c0315d9a54826c7ed94f165ddb
@@ -93,10 +93,12 @@ module Saulabs
93
93
  while reporting_period < (options[:end_date] ? ReportingPeriod.new(options[:grouping], options[:end_date]).next : current_reporting_period)
94
94
  if cached = cached_data.find { |cached| reporting_period == cached[0] }
95
95
  result << [cached[0].date_time, cached[1]]
96
- else
96
+ elsif reporting_period.last_date_time.past?
97
97
  new_cached = build_cached_data(report, options[:grouping], options[:conditions], reporting_period, find_value(new_data, reporting_period))
98
98
  new_cached.save!
99
99
  result << [reporting_period.date_time, new_cached.value]
100
+ else
101
+ result << [reporting_period.date_time, find_value(new_data, reporting_period)]
100
102
  end
101
103
  reporting_period = reporting_period.next
102
104
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: reportable
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.0
4
+ version: 1.3.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Marco Otte-Witte