borutus 0.2.1 → 0.2.2

data/spec/models/amount_spec.rb

@@ -7,7 +7,7 @@ module Borutus
       it { is_expected.to delegate_method(:name).to(:account).with_prefix }
     end
 
-    subject { FactoryGirl.build(:amount) }
+    subject { FactoryBot.build(:amount) }
     it { is_expected.not_to be_valid }  # construct a child class instead
   end
 end

data/spec/models/entry_spec.rb

@@ -1,14 +1,14 @@
-require 'spec_helper'
+require "spec_helper"
 
 module Borutus
   describe Entry do
-    let(:entry) { FactoryGirl.build(:entry) }
+    let(:entry) { FactoryBot.build(:entry) }
     subject { entry }
 
     it { is_expected.not_to be_valid }
 
     context "with credit and debit" do
-      let(:entry) { FactoryGirl.build(:entry_with_credit_and_debit) }
+      let(:entry) { FactoryBot.build(:entry_with_credit_and_debit) }
       it { is_expected.to be_valid }
 
       it "should require a description" do
@@ -18,35 +18,35 @@ module Borutus
     end
 
     context "with a debit" do
-      before {
-        entry.debit_amounts << FactoryGirl.build(:debit_amount, entry: entry)
-      }
+      before do
+        entry.debit_amounts << FactoryBot.build(:debit_amount, entry: entry)
+      end
       it { is_expected.not_to be_valid }
 
       context "with an invalid credit" do
         before {
-          entry.credit_amounts << FactoryGirl.build(:credit_amount, entry: entry, amount: nil)
+          entry.credit_amounts << FactoryBot.build(:credit_amount, entry: entry, amount: nil)
         }
         it { is_expected.not_to be_valid }
       end
     end
 
     context "with a credit" do
-      before {
-        entry.credit_amounts << FactoryGirl.build(:credit_amount, entry: entry)
-      }
+      before do
+        entry.credit_amounts << FactoryBot.build(:credit_amount, entry: entry)
+      end
       it { is_expected.not_to be_valid }
 
       context "with an invalid debit" do
-        before {
-          entry.debit_amounts << FactoryGirl.build(:debit_amount, entry: entry, amount: nil)
-        }
+        before do
+          entry.debit_amounts << FactoryBot.build(:debit_amount, entry: entry, amount: nil)
+        end
         it { is_expected.not_to be_valid }
       end
     end
 
     context "without a date" do
-      let(:entry) { FactoryGirl.build(:entry_with_credit_and_debit, date: nil) }
+      let(:entry) { FactoryBot.build(:entry_with_credit_and_debit, date: nil) }
 
       context "should assign a default date before being saved" do
         before { entry.save! }
@@ -55,44 +55,50 @@ module Borutus
     end
 
     it "should require the debit and credit amounts to cancel" do
-      entry.credit_amounts << FactoryGirl.build(:credit_amount, :amount => 100, :entry => entry)
-      entry.debit_amounts << FactoryGirl.build(:debit_amount, :amount => 200, :entry => entry)
+      entry.credit_amounts << FactoryBot.build(:credit_amount, amount: 100, entry: entry)
+      entry.debit_amounts << FactoryBot.build(:debit_amount, amount: 200, entry: entry)
       expect(entry).not_to be_valid
-      expect(entry.errors['base']).to eq(["The credit and debit amounts are not equal"])
+      expect(entry.errors["base"]).to eq(["The credit and debit amounts are not equal"])
     end
 
     it "should require the debit and credit amounts to cancel even with fractions" do
-      entry = FactoryGirl.build(:entry)
-      entry.credit_amounts << FactoryGirl.build(:credit_amount, :amount => 100.1, :entry => entry)
-      entry.debit_amounts << FactoryGirl.build(:debit_amount, :amount => 100.2, :entry => entry)
+      entry = FactoryBot.build(:entry)
+      entry.credit_amounts << FactoryBot.build(:credit_amount, amount: 100.1, entry: entry)
+      entry.debit_amounts << FactoryBot.build(:debit_amount, amount: 100.2, entry: entry)
       expect(entry).not_to be_valid
-      expect(entry.errors['base']).to eq(["The credit and debit amounts are not equal"])
+      expect(entry.errors["base"]).to eq(["The credit and debit amounts are not equal"])
     end
 
     it "should ignore debit and credit amounts marked for destruction to cancel" do
-      entry.credit_amounts << FactoryGirl.build(:credit_amount, :amount => 100, :entry => entry)
-      debit_amount = FactoryGirl.build(:debit_amount, :amount => 100, :entry => entry)
+      entry.credit_amounts << FactoryBot.build(:credit_amount, amount: 100, entry: entry)
+      debit_amount = FactoryBot.build(:debit_amount, amount: 100, entry: entry)
       debit_amount.mark_for_destruction
       entry.debit_amounts << debit_amount
       expect(entry).not_to be_valid
-      expect(entry.errors['base']).to eq(["The credit and debit amounts are not equal"])
+      expect(entry.errors["base"]).to eq(["The credit and debit amounts are not equal"])
     end
 
     it "should have a polymorphic commercial document associations" do
-      mock_document = FactoryGirl.create(:asset) # one would never do this, but it allows us to not require a migration for the test
-      entry = FactoryGirl.build(:entry_with_credit_and_debit, commercial_document: mock_document)
+      mock_document = FactoryBot.create(:asset) # one would never do this, but it allows us to not require a migration for the test
+      entry = FactoryBot.build(:entry_with_credit_and_debit, commercial_document: mock_document)
       entry.save!
       saved_entry = Entry.find(entry.id)
       expect(saved_entry.commercial_document).to eq(mock_document)
     end
 
     context "given a set of accounts" do
-      let(:mock_document) { FactoryGirl.create(:asset) }
-      let!(:accounts_receivable) { FactoryGirl.create(:asset, name: "Accounts Receivable") }
-      let!(:sales_revenue) { FactoryGirl.create(:revenue, name: "Sales Revenue") }
-      let!(:sales_tax_payable) { FactoryGirl.create(:liability, name: "Sales Tax Payable") }
+      let(:mock_document) { FactoryBot.create(:asset) }
+      let!(:accounts_receivable) do
+        FactoryBot.create(:asset, name: "Accounts Receivable")
+      end
+      let!(:sales_revenue) do
+        FactoryBot.create(:revenue, name: "Sales Revenue") 
+      end
+      let!(:sales_tax_payable) do 
+        FactoryBot.create(:liability, name: "Sales Tax Payable")
+      end
 
-      shared_examples_for 'a built-from-hash Borutus::Entry' do
+      shared_examples_for "a built-from-hash Borutus::Entry" do
         its(:credit_amounts) { is_expected.not_to be_empty }
         its(:debit_amounts) { is_expected.not_to be_empty }
         it { is_expected.to be_valid }
@@ -118,31 +124,31 @@ module Borutus
         context "when given a credit/debits hash with :account => Account" do
           let(:hash) {
             {
-                description: "Sold some widgets",
-                commercial_document: mock_document,
-                debits: [{account: accounts_receivable, amount: 50}],
-                credits: [
-                    {account: sales_revenue, amount: 45},
-                    {account: sales_tax_payable, amount: 5}
-                ]
+              description: "Sold some widgets",
+              commercial_document: mock_document,
+              debits: [{ account: accounts_receivable, amount: 50 }],
+              credits: [
+                { account: sales_revenue, amount: 45 },
+                { account: sales_tax_payable, amount: 5 },
+              ],
             }
           }
-          include_examples 'a built-from-hash Borutus::Entry'
+          include_examples "a built-from-hash Borutus::Entry"
         end
 
         context "when given a credit/debits hash with :account_name => String" do
           let(:hash) {
             {
-                description: "Sold some widgets",
-                commercial_document: mock_document,
-                debits: [{account_name: accounts_receivable.name, amount: 50}],
-                credits: [
-                    {account_name: sales_revenue.name, amount: 45},
-                    {account_name: sales_tax_payable.name, amount: 5}
-                ]
+              description: "Sold some widgets",
+              commercial_document: mock_document,
+              debits: [{ account_name: accounts_receivable.name, amount: 50 }],
+              credits: [
+                { account_name: sales_revenue.name, amount: 45 },
+                { account_name: sales_tax_payable.name, amount: 5 },
+              ],
             }
           }
-          include_examples 'a built-from-hash Borutus::Entry'
+          include_examples "a built-from-hash Borutus::Entry"
         end
       end
 
@@ -154,7 +160,7 @@ module Borutus
         after { ::ActiveSupport::Deprecation.silenced = false }
 
         context "when used at all" do
-          let(:hash) { Hash.new }
+          let(:hash) { {} }
 
           it("should be deprecated") {
             # .build is the only thing deprecated
@@ -162,9 +168,7 @@ module Borutus
             entry
           }
         end
-
       end
     end
-
   end
 end

data/spec/models/tenancy_spec.rb

@@ -10,7 +10,7 @@ module Borutus
         Borutus.enable_tenancy = true
         Borutus.tenant_class = 'Borutus::Entry'
 
-        FactoryGirlHelpers.reload()
+        FactoryBotHelpers.reload()
         Borutus::Asset.new
       end
 
@@ -23,21 +23,21 @@ module Borutus
         Borutus.enable_tenancy = false
         Borutus.tenant_class = nil
 
-        FactoryGirlHelpers.reload()
+        FactoryBotHelpers.reload()
       end
 
       it 'validate uniqueness of name scoped to tenant' do
-        account = FactoryGirl.create(:asset, tenant_id: 10)
+        account = FactoryBot.create(:asset, tenant_id: 10)
 
-        record = FactoryGirl.build(:asset, name: account.name, tenant_id: 10)
+        record = FactoryBot.build(:asset, name: account.name, tenant_id: 10)
         expect(record).not_to be_valid
         expect(record.errors[:name]).to eq(['has already been taken'])
       end
 
       it 'allows same name scoped under a different tenant' do
-        account = FactoryGirl.create(:asset, tenant_id: 10)
+        account = FactoryBot.create(:asset, tenant_id: 10)
 
-        record = FactoryGirl.build(:asset, name: account.name, tenant_id: 11)
+        record = FactoryBot.build(:asset, name: account.name, tenant_id: 11)
         expect(record).to be_valid
       end
     end

data/spec/routing/entries_routing_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 module Borutus
   describe EntriesController do

data/spec/spec_helper.rb

@@ -1,38 +1,40 @@
-require 'coveralls'
+require "coveralls"
 Coveralls.wear!
 
-require 'pry'
+require "pry"
 
-ENV["RAILS_ENV"] ||= 'test'
+ENV["RAILS_ENV"] ||= "test"
 
-require File.expand_path(File.dirname(__FILE__) + "/../fixture_rails_root/config/environment")
-require Rails.root.join('db/schema').to_s
+require File.expand_path(
+  File.dirname(__FILE__) + "/../fixture_rails_root/config/environment",
+)
+require Rails.root.join("db/schema").to_s
 
-require 'rspec/rails'
+require "rspec/rails"
 
-$: << File.expand_path(File.dirname(__FILE__) + '/../lib/')
+$LOAD_PATH << File.expand_path(File.dirname(__FILE__) + "/../lib/")
 
-require 'borutus'
-require 'kaminari'
+require "borutus"
+require "kaminari"
 
 Dir[
   File.expand_path(
-    File.join(File.dirname(__FILE__), 'support', '**', '*.rb')
+    File.join(File.dirname(__FILE__), "support", "**", "*.rb"),
   )
 ].each do |f|
   require f
 end
 
-require 'factory_girl'
+require "factory_bot"
 
 borutus_definitions = File.expand_path(
-  File.join(File.dirname(__FILE__), 'factories')
+  File.join(File.dirname(__FILE__), "factories"),
 )
-FactoryGirl.definition_file_paths << borutus_definitions
+FactoryBot.definition_file_paths << borutus_definitions
 
 RSpec.configure do |config|
   config.use_transactional_fixtures = true
   config.infer_spec_type_from_file_location!
 end
 
-FactoryGirlHelpers.reload()
+FactoryBotHelpers.reload

data/spec/support/account_shared_examples.rb

@@ -1,6 +1,6 @@
 shared_examples_for 'a Borutus::Account subtype' do |elements|
   let(:contra) { false }
-  let(:account) { FactoryGirl.create(elements[:kind], contra: contra)}
+  let(:account) { FactoryBot.create(elements[:kind], contra: contra)}
   subject { account }
 
   describe "class methods" do
@@ -39,7 +39,7 @@ shared_examples_for 'a Borutus::Account subtype' do |elements|
   end
 
   describe "when given a debit" do
-    before { FactoryGirl.create(:debit_amount, account: account) }
+    before { FactoryBot.create(:debit_amount, account: account) }
     its(:balance) { is_expected.to be.send(debit_condition, 0) }
 
     describe "on a contra account" do
@@ -49,7 +49,7 @@ shared_examples_for 'a Borutus::Account subtype' do |elements|
   end
 
   describe "when given a credit" do
-    before { FactoryGirl.create(:credit_amount, account: account) }
+    before { FactoryBot.create(:credit_amount, account: account) }
     its(:balance) { is_expected.to be.send(credit_condition, 0) }
 
     describe "on a contra account" do

data/spec/support/amount_shared_examples.rb

@@ -1,5 +1,5 @@
 shared_examples_for 'a Borutus::Amount subtype' do |elements|
-  let(:amount) { FactoryGirl.build(elements[:kind]) }
+  let(:amount) { FactoryBot.build(elements[:kind]) }
   subject { amount }
 
   it { is_expected.to  be_valid }

data/spec/support/factory_bot_helpers.rb

@@ -0,0 +1,8 @@
+module FactoryBotHelpers
+  def self.reload
+    FactoryBot.factories.clear
+    FactoryBot.sequences.clear
+    FactoryBot.traits.clear
+    FactoryBot.find_definitions
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: borutus
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Ramon Tayag
@@ -9,22 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-04 00:00:00.000000000 Z
+date: 2019-10-25 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -68,7 +54,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: light-service
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -82,7 +96,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: shoulda-matchers
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,11 +109,14 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: The borutus plugin provides a complete double entry accounting system
-  for use in any Ruby on Rails application. The plugin follows general Double Entry
-  Bookkeeping practices. All calculations are done using BigDecimal in order to prevent
-  floating point rounding errors. The plugin requires a decimal type on your database
-  as well.
+description: |2-
+
+      The borutus plugin provides a complete double entry accounting system for
+      use in any Ruby on Rails application. The plugin follows general Double
+      Entry Bookkeeping practices. All calculations are done using BigDecimal
+      in order to prevent floating point rounding errors. The plugin requires
+      a decimal type on your database as well.
+    %
 email:
 - ramon.tayag@gmail.com
 - ace.subido@gmail.com
@@ -134,6 +151,7 @@ files:
 - app/models/borutus/no_tenancy.rb
 - app/models/borutus/revenue.rb
 - app/models/borutus/tenancy.rb
+- app/services/borutus/accounts/build_running_balance_query.rb
 - app/views/borutus/accounts/index.html.erb
 - app/views/borutus/entries/index.html.erb
 - app/views/borutus/reports/_account.html.erb
@@ -151,6 +169,7 @@ files:
 - config/secret_token.rb
 - config/session_store.rb
 - db/migrate/20160422010135_create_borutus_tables.rb
+- db/migrate/20191025095830_add_borutus_amount_counter_cache.rb
 - lib/borutus.rb
 - lib/borutus/engine.rb
 - lib/borutus/version.rb
@@ -186,7 +205,7 @@ files:
 - spec/support/account_shared_examples.rb
 - spec/support/active_support_helpers.rb
 - spec/support/amount_shared_examples.rb
-- spec/support/factory_girl_helpers.rb
+- spec/support/factory_bot_helpers.rb
 - spec/support/shoulda_matchers.rb
 homepage: http://github.com/bloom-solutions/borutus
 licenses: []
@@ -237,5 +256,5 @@ test_files:
 - spec/support/account_shared_examples.rb
 - spec/support/active_support_helpers.rb
 - spec/support/amount_shared_examples.rb
-- spec/support/factory_girl_helpers.rb
+- spec/support/factory_bot_helpers.rb
 - spec/support/shoulda_matchers.rb