double_entry 0.10.2 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6508beca76ce3246851d21126397d9323d5e25e7
-  data.tar.gz: 9b759848f69e62ecd9973c19352e9c22f3c913d8
+  metadata.gz: 54feac773a636f4df4556412c09a80698172e6ca
+  data.tar.gz: 7373d84edcb61edab5d4bedc3da3792a6d3ef01e
 SHA512:
-  metadata.gz: 2da0f34279cb0b98bc8d28be724d7ecfd02681af4508450c57d1ddaba0cc488716913aa8d9dcec26c51768b4503b794d9897e6cf36313c85ed44e1fd3c6fae96
-  data.tar.gz: 33fa36646e96b139fd532273510bd0462ed8e10f3315c05d62720eff9baa72907f8d97c8f213bf7c8640ef9cd0c6d8c06dece2b3a3dbe68a6aa55a8c362be57f
+  metadata.gz: 2d62479172ef59645acda32f45231bc074bc2b46b9688932d3fc7aba336ea7aeb26fe71dfcd3f3e74a0015c30a3f6881f998374ab474214b7e284e87cef0b5a4
+  data.tar.gz: 8cb7508387deacfcfb836a54fd16986ff6b47efee669082a8be40031e5c12eb3552c7795c11faea3d324debbcaae6ba3b0195992b3ddd5ce6f472d6e552eaf4e

data/.rubocop.yml

@@ -39,6 +39,9 @@ Style/DoubleNegation:
 Style/ModuleFunction:
   Enabled: false
 
+Style/ParallelAssignment:
+  Enabled: false
+
 Metrics/AbcSize:
   Max: 47 #15
 
@@ -51,5 +54,8 @@ Metrics/LineLength:
 Metrics/MethodLength:
   Max: 30 # 10
 
+Metrics/ModuleLength:
+  Max: 221 #100
+
 Metrics/PerceivedComplexity:
   Max: 13 #7

data/.travis.yml

@@ -6,6 +6,7 @@ before_script:
 script:
   - rake spec
   - ruby script/jack_hammer -t 2000
+  - rake rubocop
 matrix:
   include:
     - rvm: 1.9.3
@@ -14,18 +15,18 @@ matrix:
     - rvm: 2.0.0
       gemfile: spec/support/gemfiles/Gemfile.rails-4.2.x
       env: DB=mysql
-    - rvm: 2.2.0
+    - rvm: 2.2.2
       gemfile: spec/support/gemfiles/Gemfile.rails-4.1.x
       env: DB=mysql
-    - rvm: 2.2.0
+    - rvm: 2.2.2
       gemfile: spec/support/gemfiles/Gemfile.rails-4.2.x
       env: DB=mysql
-    - rvm: 2.2.0
+    - rvm: 2.2.2
       gemfile: spec/support/gemfiles/Gemfile.rails-4.2.x
       env: DB=sqlite
-    - rvm: 2.2.0
+    - rvm: 2.2.2
       gemfile: spec/support/gemfiles/Gemfile.rails-4.2.x
       env: DB=postgres
-    - rvm: 2.1.5
+    - rvm: 2.1.6
       gemfile: spec/support/gemfiles/Gemfile.rails-3.2.x
       env: DB=mysql

data/Rakefile

@@ -7,7 +7,9 @@ RSpec::Core::RakeTask.new(:spec) do |t|
   t.ruby_opts = '-w'
 end
 
-RuboCop::RakeTask.new(:rubocop)
+RuboCop::RakeTask.new(:rubocop) do |t|
+  t.fail_on_error = true
+end
 
 task :default do
   %w(mysql postgres sqlite).each do |db|

data/double_entry.gemspec

@@ -34,5 +34,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'generator_spec'
   gem.add_development_dependency 'machinist'
   gem.add_development_dependency 'timecop'
-  gem.add_development_dependency 'rubocop'
+  gem.add_development_dependency 'rubocop', '~> 0.32.0'
 end

data/lib/double_entry/reporting/aggregate.rb

@@ -25,7 +25,7 @@ module DoubleEntry
         end
       end
 
-      def formatted_amount(value = amount())
+      def formatted_amount(value = amount)
         value ||= 0
         if function == 'count'
           value

data/lib/double_entry/reporting/aggregate_array.rb

@@ -48,12 +48,12 @@ module DoubleEntry
       def retrieve_aggregates
         fail ArgumentError, "Invalid range type '#{range_type}'" unless %w(year month week day hour).include? range_type
         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))
+                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

data/lib/double_entry/version.rb

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

data/spec/double_entry/reporting/aggregate_spec.rb

@@ -33,84 +33,84 @@ module DoubleEntry
       end
 
       it 'should store the aggregate for quick retrieval' do
-        Reporting.aggregate(:sum, :savings, :bonus, :range => TimeRange.make(:year => 2009, :month => 10))
+        Aggregate.new(:sum, :savings, :bonus, :range => TimeRange.make(:year => 2009, :month => 10)).amount
         expect(LineAggregate.count).to eq 1
       end
 
       it 'should only store the aggregate once if it is requested more than once' do
-        Reporting.aggregate(:sum, :savings, :bonus, :range => TimeRange.make(:year => 2009, :month => 9))
-        Reporting.aggregate(:sum, :savings, :bonus, :range => TimeRange.make(:year => 2009, :month => 9))
-        Reporting.aggregate(:sum, :savings, :bonus, :range => TimeRange.make(:year => 2009, :month => 10))
+        Aggregate.new(:sum, :savings, :bonus, :range => TimeRange.make(:year => 2009, :month => 9)).amount
+        Aggregate.new(:sum, :savings, :bonus, :range => TimeRange.make(:year => 2009, :month => 9)).amount
+        Aggregate.new(:sum, :savings, :bonus, :range => TimeRange.make(:year => 2009, :month => 10)).amount
         expect(LineAggregate.count).to eq 2
       end
 
       it 'should calculate the complete year correctly' do
         expect(
-          Reporting.aggregate(
+          Aggregate.new(
             :sum, :savings, :bonus,
             :range => TimeRange.make(:year => 2009)
-          ),
+          ).formatted_amount,
         ).to eq Money.new(200_00)
       end
 
       it 'should calculate seperate months correctly' do
         expect(
-          Reporting.aggregate(
+          Aggregate.new(
             :sum, :savings, :bonus,
             :range => TimeRange.make(:year => 2009, :month => 10)
-          ),
+          ).formatted_amount,
         ).to eq Money.new(110_00)
         expect(
-          Reporting.aggregate(
+          Aggregate.new(
             :sum, :savings, :bonus,
             :range => TimeRange.make(:year => 2009, :month => 11)
-          ),
+          ).formatted_amount,
         ).to eq Money.new(90_00)
       end
 
       it 'should calculate seperate weeks correctly' do
         # Week 40 - Mon Sep 28, 2009 to Sun Oct 4 2009
         expect(
-          Reporting.aggregate(
+          Aggregate.new(
             :sum, :savings, :bonus,
             :range => TimeRange.make(:year => 2009, :week => 40)
-          ),
+          ).formatted_amount,
         ).to eq Money.new(60_00)
       end
 
       it 'should calculate seperate days correctly' do
         # 1 Nov 2009
         expect(
-          Reporting.aggregate(
+          Aggregate.new(
             :sum, :savings, :bonus,
             :range => TimeRange.make(:year => 2009, :week => 44, :day => 7)
-          ),
+          ).formatted_amount,
         ).to eq Money.new(90_00)
       end
 
       it 'should calculate seperate hours correctly' do
         # 1 Nov 2009
         expect(
-          Reporting.aggregate(
+          Aggregate.new(
             :sum, :savings, :bonus,
             :range => TimeRange.make(:year => 2009, :week => 44, :day => 7, :hour => 0)
-          ),
+          ).formatted_amount,
         ).to eq Money.new(40_00)
         expect(
-          Reporting.aggregate(
+          Aggregate.new(
             :sum, :savings, :bonus,
             :range => TimeRange.make(:year => 2009, :week => 44, :day => 7, :hour => 1)
-          ),
+          ).formatted_amount,
         ).to eq Money.new(50_00)
       end
 
       it 'should calculate, but not store aggregates when the time range is still current' do
         Timecop.freeze Time.local(2009, 11, 21) do
           expect(
-            Reporting.aggregate(
+            Aggregate.new(
               :sum, :savings, :bonus,
               :range => TimeRange.make(:year => 2009, :month => 11)
-            ),
+            ).formatted_amount,
           ).to eq Money.new(90_00)
           expect(LineAggregate.count).to eq 0
         end
@@ -119,10 +119,10 @@ module DoubleEntry
       it 'should calculate, but not store aggregates when the time range is in the future' do
         Timecop.freeze Time.local(2009, 11, 21) do
           expect(
-            Reporting.aggregate(
+            Aggregate.new(
               :sum, :savings, :bonus,
               :range => TimeRange.make(:year => 2009, :month => 12)
-            ),
+            ).formatted_amount,
           ).to eq Money.new(0)
           expect(LineAggregate.count).to eq 0
         end
@@ -130,64 +130,64 @@ module DoubleEntry
 
       it 'should calculate monthly all_time ranges correctly' do
         expect(
-          Reporting.aggregate(
+          Aggregate.new(
             :sum, :savings, :bonus,
             :range => TimeRange.make(:year => 2009, :month => 12, :range_type => :all_time)
-          ),
+          ).formatted_amount,
         ).to eq Money.new(200_00)
       end
 
       it 'calculates the average monthly all_time ranges correctly' do
         expect(
-          Reporting.aggregate(
+          Aggregate.new(
             :average, :savings, :bonus,
             :range => TimeRange.make(:year => 2009, :month => 12, :range_type => :all_time)
-          ),
+          ).formatted_amount,
         ).to eq expected_monthly_average
       end
 
       it 'returns the correct count for weekly all_time ranges correctly' do
         expect(
-          Reporting.aggregate(
+          Aggregate.new(
             :count, :savings, :bonus,
             :range => TimeRange.make(:year => 2009, :month => 12, :range_type => :all_time)
-          ),
+          ).formatted_amount,
         ).to eq 5
       end
 
       it 'should calculate weekly all_time ranges correctly' do
         expect(
-          Reporting.aggregate(
+          Aggregate.new(
             :sum, :savings, :bonus,
             :range => TimeRange.make(:year => 2009, :week => 43, :range_type => :all_time)
-          ),
+          ).formatted_amount,
         ).to eq Money.new(110_00)
       end
 
       it 'calculates the average weekly all_time ranges correctly' do
         expect(
-          Reporting.aggregate(
+          Aggregate.new(
             :average, :savings, :bonus,
             :range => TimeRange.make(:year => 2009, :week => 43, :range_type => :all_time)
-          ),
+          ).formatted_amount,
         ).to eq expected_weekly_average
       end
 
       it 'returns the correct count for weekly all_time ranges correctly' do
         expect(
-          Reporting.aggregate(
+          Aggregate.new(
             :count, :savings, :bonus,
             :range => TimeRange.make(:year => 2009, :week => 43, :range_type => :all_time)
-          ),
+          ).formatted_amount,
         ).to eq 3
       end
 
       it 'raises an AggregateFunctionNotSupported exception' do
         expect do
-          Reporting.aggregate(
+          Aggregate.new(
             :not_supported_calculation, :savings, :bonus,
             :range => TimeRange.make(:year => 2009, :week => 43, :range_type => :all_time)
-          )
+          ).amount
         end.to raise_error(AggregateFunctionNotSupported)
       end
 
@@ -210,35 +210,35 @@ module DoubleEntry
 
         it 'saves filtered aggregations' do
           expect do
-            Reporting.aggregate(:sum, :savings, :bonus, :range => range, :filter => [:test_filter])
+            Aggregate.new(:sum, :savings, :bonus, :range => range, :filter => [:test_filter]).amount
           end.to change { LineAggregate.count }.by 1
         end
 
         it 'saves filtered aggregation only once for a range' do
           expect do
-            Reporting.aggregate(:sum, :savings, :bonus, :range => range, :filter => [:test_filter])
-            Reporting.aggregate(:sum, :savings, :bonus, :range => range, :filter => [:test_filter])
+            Aggregate.new(:sum, :savings, :bonus, :range => range, :filter => [:test_filter]).amount
+            Aggregate.new(:sum, :savings, :bonus, :range => range, :filter => [:test_filter]).amount
           end.to change { LineAggregate.count }.by 1
         end
 
         it 'saves filtered aggregations and non filtered aggregations separately' do
           expect do
-            Reporting.aggregate(:sum, :savings, :bonus, :range => range, :filter => [:test_filter])
-            Reporting.aggregate(:sum, :savings, :bonus, :range => range)
+            Aggregate.new(:sum, :savings, :bonus, :range => range, :filter => [:test_filter]).amount
+            Aggregate.new(:sum, :savings, :bonus, :range => range).amount
           end.to change { LineAggregate.count }.by 2
         end
 
         it 'loads the correct saved aggregation' do
           # cache the results for filtered and unfiltered aggregations
-          Reporting.aggregate(:sum, :savings, :bonus, :range => range, :filter => [:test_filter])
-          Reporting.aggregate(:sum, :savings, :bonus, :range => range)
+          Aggregate.new(:sum, :savings, :bonus, :range => range, :filter => [:test_filter]).amount
+          Aggregate.new(:sum, :savings, :bonus, :range => range).amount
 
           # ensure a second call loads the correct cached value
           expect(
-            Reporting.aggregate(:sum, :savings, :bonus, :range  => range, :filter => [:test_filter]),
+            Aggregate.new(:sum, :savings, :bonus, :range  => range, :filter => [:test_filter]).formatted_amount,
           ).to eq Money.new(10_00)
           expect(
-            Reporting.aggregate(:sum, :savings, :bonus, :range  => range),
+            Aggregate.new(:sum, :savings, :bonus, :range  => range).formatted_amount,
           ).to eq Money.new(19_00)
         end
       end
@@ -252,7 +252,9 @@ module DoubleEntry
 
       it 'should calculate the sum in the correct currency' do
         expect(
-          Reporting.aggregate(:sum, :btc_savings, :btc_test_transfer, :range => TimeRange.make(:year => Time.now.year)),
+          Aggregate.new(
+            :sum, :btc_savings, :btc_test_transfer, :range => TimeRange.make(:year => Time.now.year)
+          ).formatted_amount,
         ).to eq(Money.new(300_000_000, :btc))
       end
     end

data/spec/spec_helper.rb

@@ -54,6 +54,7 @@ RSpec.configure do |config|
     # ...rather than:
     #   # => "be bigger than 2"
     expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+    expectations.warn_about_potential_false_positives = false
   end
 
   # rspec-mocks config goes here. You can use an alternate test double

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: double_entry
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.3
 platform: ruby
 authors:
 - Anthony Sellitti
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-10 00:00:00.000000000 Z
+date: 2015-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
@@ -231,16 +231,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.32.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.32.0
 description: 
 email:
 - anthony.sellitti@envato.com
@@ -344,7 +344,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Tools to build your double entry financial ledger