double_entry 0.10.1 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a89a7b1a2bfa39a0c51b309f107fc625af9643f0
-  data.tar.gz: 1ac1862d044333c98bb26e78c6ba7d2c508203b4
+  metadata.gz: 6508beca76ce3246851d21126397d9323d5e25e7
+  data.tar.gz: 9b759848f69e62ecd9973c19352e9c22f3c913d8
 SHA512:
-  metadata.gz: 235592b9bce67bfdbb4aa474e722a9dd54573ad495797fc1338521d6807e7d51648c7d3eb6258bbde8bdfa8b4b04a5fb6993dca63f21aadd123b9d76d4364dd3
-  data.tar.gz: 28f0afca58a850bca2efc4a28bfa967639f54e383b5b16cc9e5959cef65b5eb8f3d8a72efb0e519f745e9491252fe2ff5c7ca86fa90168e6e41da9a2e1152765
+  metadata.gz: 2da0f34279cb0b98bc8d28be724d7ecfd02681af4508450c57d1ddaba0cc488716913aa8d9dcec26c51768b4503b794d9897e6cf36313c85ed44e1fd3c6fae96
+  data.tar.gz: 33fa36646e96b139fd532273510bd0462ed8e10f3315c05d62720eff9baa72907f8d97c8f213bf7c8640ef9cd0c6d8c06dece2b3a3dbe68a6aa55a8c362be57f

data/lib/double_entry/reporting/aggregate_array.rb

@@ -47,16 +47,16 @@ module DoubleEntry
       # get any previously calculated aggregates
       def retrieve_aggregates
         fail ArgumentError, "Invalid range type '#{range_type}'" unless %w(year month week day hour).include? range_type
-        @aggregates = LineAggregate.
-                      where(:function => function).
-                      where(:range_type => 'normal').
-                      where(:account => account.to_s).
-                      where(:code => code.to_s).
-                      where(:filter => filter.inspect).
-                      where(LineAggregate.arel_table[range_type].not_eq(nil)).
-                      each_with_object({}) do |hash, result|
-                        hash[result.key] = formatted_amount(result.amount)
-                      end
+        scope = LineAggregate.
+          where(:function => function).
+          where(:range_type => 'normal').
+          where(:account => account.to_s).
+          where(:code => code.to_s).
+          where(:filter => filter.inspect).
+          where(LineAggregate.arel_table[range_type].not_eq(nil))
+        @aggregates = scope.each_with_object({}) do |result, hash|
+          hash[result.key] = formatted_amount(result.amount)
+        end
       end
 
       def all_periods

data/lib/double_entry/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module DoubleEntry
-  VERSION = '0.10.1'
+  VERSION = '0.10.2'
 end

data/spec/double_entry/reporting/aggregate_array_spec.rb

@@ -36,6 +36,27 @@ module DoubleEntry
             let(:range_type) { 'year' }
             let(:start) { '2006-08-03' }
             it { should eq [Money.zero, Money.new(10_00), Money.new(20_00), Money.zero] }
+
+            describe 'reuse of aggregates' do
+              let(:years) { TimeRangeArray.make(range_type, start, finish) }
+
+              context 'and some aggregates were created previously' do
+                before do
+                  Reporting.aggregate(function.to_s, account, transfer_code, :filter => nil, :range => years[0])
+                  Reporting.aggregate(function.to_s, account, transfer_code, :filter => nil, :range => years[1])
+                  allow(Reporting).to receive(:aggregate)
+                end
+
+                it 'only asks Reporting for the non-existent ones' do
+                  expect(Reporting).not_to receive(:aggregate).with(function.to_s, account, transfer_code, :filter => nil, :range => years[0])
+                  expect(Reporting).not_to receive(:aggregate).with(function.to_s, account, transfer_code, :filter => nil, :range => years[1])
+
+                  expect(Reporting).to receive(:aggregate).with(function.to_s, account, transfer_code, :filter => nil, :range => years[2])
+                  expect(Reporting).to receive(:aggregate).with(function.to_s, account, transfer_code, :filter => nil, :range => years[3])
+                  aggregate_array
+                end
+              end
+            end
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: double_entry
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.2
 platform: ruby
 authors:
 - Anthony Sellitti
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-06 00:00:00.000000000 Z
+date: 2015-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money