plutus 0.14 → 0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0aaa19cffdd4a91c7dbfefce4263711e8b8731a53510ee4a96963b07f113b0ae
-  data.tar.gz: 9778f6eda822dda5db140b40b50c206dc96e1e9a921a0e64ffd1d660e29d5db3
+  metadata.gz: 8d6d53fa47c9c392c0a240fadd36257b8716367a1694642d3597d338f6173a93
+  data.tar.gz: a918177e468ee3d2f47acd6fa62eeaceb1e2c604f86161e8c717c9b00927ced4
 SHA512:
-  metadata.gz: 5171b284aa177e22422da572f29c01c624463c5e609ca010e700a3cf134de999fc29cd7ceafb36df43a5b530a3c3a8821ed0f7dccac75aa1b94461f123d4e668
-  data.tar.gz: ba4f84dc1529509892c61ae4d83dd226b8168fde4e4b73bddfe40e416e35fb56ac302a96b47b373c8fde3b8e2daa557864a27fdc970c5f7b1ee41df8b1809e27
+  metadata.gz: d84a78fe7b972cd457d27c9da70fac2c79dfeaf5bea80e26be2d131174c3750d4a59a3254214a96b51f871f1f7895a905811df8b25b2953587d77bce981108b1
+  data.tar.gz: cf15cc0e6c2492c7b15f1a2aba067737bc3816fabe59ee57f61f44f74ea84af417b7fc169d6028bf95de6bc693062586433d5fcbf55570c6292b722cdab1a40f

data/README.markdown

@@ -7,8 +7,8 @@ The Plutus plugin is a Ruby on Rails Engine which provides a double entry accoun
 Compatibility
 =============
 
-* Ruby versions: MRI 2.2.2+ (should work with earlier versions if using Rails 4)
-* Rails versions: ~> 5.0, ~> 4.0
+* Ruby versions: MRI 2.5+
+* Rails versions: ~> 6.0
 
 For earlier versions, and upgrading, please see the section titled [Previous Versions](https://github.com/mbulat/plutus#previous-versions)
 
@@ -267,7 +267,7 @@ entry = Plutus::Entry.build(
 Multitenancy Support
 =====================
 
-Plutus supports multitenant applications. Multitenancy is acheived by associating all Accounts under `Plutus::Account` with a "Tenant" object (typically some model in your Rails application). To add multi-tenancy support to Plutus, you must do the following:
+Plutus supports multitenant applications. Multitenancy is achieved by associating all Accounts under `Plutus::Account` with a "Tenant" object (typically some model in your Rails application). To add multi-tenancy support to Plutus, you must do the following:
 
 - Generate the migration which will add `tenant_id` to the plutus accounts table
 

data/app/assets/javascripts/plutus/application.js

@@ -12,5 +12,5 @@
 //
 //= require jquery
 //= require jquery_ujs
-//= require jquery-ui/datepicker
+//= require jquery-ui/widgets/datepicker
 //= require_tree .

data/app/assets/stylesheets/plutus/application.css

@@ -13,7 +13,6 @@
  *= require_tree .
  *= require bootstrap.min
  *= require bootstrap-theme.min
- *= require jquery-ui/datepicker
  *= require_self
  */
 body { padding-top: 60px; }

data/app/controllers/plutus/accounts_controller.rb

@@ -10,7 +10,7 @@ module Plutus
   # controller will inherit.
   #
   # @author Michael Bulat
-  class AccountsController < Plutus::ApplicationController
+  class AccountsController < ::Plutus::ApplicationController
     unloadable
 
     # @example

data/app/controllers/plutus/reports_controller.rb

@@ -5,7 +5,7 @@ module Plutus
   # controller will inherit.
   #
   # @author Michael Bulat
-  class ReportsController <  Plutus::ApplicationController
+  class ReportsController < ::Plutus::ApplicationController
     unloadable
 
     # @example

data/app/models/plutus/account.rb

@@ -41,6 +41,16 @@ module Plutus
 
     validates_presence_of :type
 
+    def self.types
+      [
+        ::Plutus::Asset,
+        ::Plutus::Equity,
+        ::Plutus::Expense,
+        ::Plutus::Liability,
+        ::Plutus::Revenue,
+      ]
+    end
+
     if Plutus.enable_tenancy
       include Plutus::Tenancy
     else
@@ -137,7 +147,7 @@ module Plutus
       if self.new.class == Plutus::Account
         raise(NoMethodError, "undefined method 'balance'")
       else
-        accounts_balance = BigDecimal.new('0')
+        accounts_balance = BigDecimal('0')
         accounts = self.all
         accounts.each do |account|
           if account.contra

data/app/models/plutus/amounts_extension.rb

@@ -30,7 +30,7 @@ module Plutus
     #
     # Since this does not use the database for sumation, it may be used on non-persisted records.
     def balance_for_new_record
-      balance = BigDecimal.new('0')
+      balance = BigDecimal('0')
       each do |amount_record|
         if amount_record.amount && !amount_record.marked_for_destruction?
           balance += amount_record.amount # unless amount_record.marked_for_destruction?

data/app/models/plutus/asset.rb

@@ -7,7 +7,7 @@ module Plutus
   # @see http://en.wikipedia.org/wiki/Asset Assets
   #
   # @author Michael Bulat
-  class Asset < Plutus::Account
+  class Asset < ::Plutus::Account
 
     self.normal_credit_balance = false
 

data/app/models/plutus/credit_amount.rb

@@ -5,6 +5,6 @@ module Plutus
   #     credit_amount = Plutus::CreditAmount.new(:account => revenue, :amount => 1000)
   #
   # @author Michael Bulat
-  class CreditAmount < Amount
+  class CreditAmount < ::Plutus::Amount
   end
 end

data/app/models/plutus/debit_amount.rb

@@ -5,6 +5,6 @@ module Plutus
   #     debit_amount = Plutus::DebitAmount.new(:account => cash, :amount => 1000)
   #
   # @author Michael Bulat
-  class DebitAmount < Amount
+  class DebitAmount < ::Plutus::Amount
   end
 end

data/app/models/plutus/equity.rb

@@ -7,7 +7,7 @@ module Plutus
   # @see http://en.wikipedia.org/wiki/Equity_(finance) Equity
   #
   # @author Michael Bulat
-  class Equity < Plutus::Account
+  class Equity < ::Plutus::Account
 
     self.normal_credit_balance = true
 

data/app/models/plutus/expense.rb

@@ -7,7 +7,7 @@ module Plutus
   # @see http://en.wikipedia.org/wiki/Expense Expenses
   #
   # @author Michael Bulat
-  class Expense < Plutus::Account
+  class Expense < ::Plutus::Account
 
     self.normal_credit_balance = false
 

data/app/models/plutus/liability.rb

@@ -7,7 +7,7 @@ module Plutus
   # @see http://en.wikipedia.org/wiki/Liability_(financial_accounting) Liability
   #
   # @author Michael Bulat
-  class Liability < Plutus::Account
+  class Liability < ::Plutus::Account
 
     self.normal_credit_balance = true
 

data/app/models/plutus/revenue.rb

@@ -7,7 +7,7 @@ module Plutus
   # @see http://en.wikipedia.org/wiki/Revenue Revenue
   #
   # @author Michael Bulat
-  class Revenue < Plutus::Account
+  class Revenue < ::Plutus::Account
 
     self.normal_credit_balance = true
 

data/app/views/layouts/plutus/application.html.erb

@@ -4,7 +4,6 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>Plutus</title>
   <%= stylesheet_link_tag    "plutus/application", media: "all" %>
-  <%= javascript_include_tag "plutus/application" %>
   <%= csrf_meta_tags %>
 </head>
 <body>

data/app/views/plutus/reports/balance_sheet.html.erb

@@ -5,7 +5,7 @@
     <%= form_tag({:action => 'balance_sheet'}, {:method => :get, :class => 'form-inline'}) do%>
       <div class="form-group">
       <%= label_tag :date, nil, class: 'sr-only'%>
-      <%= text_field_tag :date, @to_date, :class => 'datepicker form-control' %>
+      <%= date_field_tag :date, @to_date, :class => 'form-control' %>
       </div>
       <button type="submit" class="btn btn-default">Get Report</button>
     <% end %>

data/app/views/plutus/reports/income_statement.html.erb

@@ -5,11 +5,11 @@
     <%= form_tag({:action => 'income_statement'}, {:method => :get, :class => 'form-inline'}) do%>
       <div class="form-group">
       <%= label_tag :from_date, nil, class: 'sr-only'%>
-      <%= text_field_tag :from_date, @from_date, :class => 'datepicker form-control', :placeholder => "Date" %>
+      <%= date_field_tag :from_date, @from_date, :class => 'form-control', :placeholder => "Date" %>
       </div>
       <div class="form-group">
       <%= label_tag :to_date, nil, class: 'sr-only'%>
-      <%= text_field_tag :to_date, @to_date, :class => 'datepicker form-control', :placeholder => "Date" %>
+      <%= date_field_tag :to_date, @to_date, :class => 'form-control', :placeholder => "Date" %>
       </div>
       <button type="submit" class="btn btn-default">Get Report</button>
     <% end %>

data/lib/plutus/version.rb

@@ -1,3 +1,3 @@
 module Plutus
-  VERSION = "0.14"
+  VERSION = "0.17"
 end

data/spec/controllers/reports_controller_spec.rb

@@ -12,12 +12,12 @@ module Plutus
       it "renders when one entry exists" do
         allow(Entry).to receive_message_chain(:order).and_return([mock_entry])
         get :balance_sheet
-        expect(response).to be_success
+        assert_template 'reports/balance_sheet'
       end
       it "renders when no entries exist" do
         allow(Entry).to receive_message_chain(:order).and_return([])
         get :balance_sheet
-        expect(response).to be_success
+        assert_template 'reports/balance_sheet'
       end
     end
   end

data/spec/factories/account_factory.rb

@@ -1,32 +1,32 @@
 FactoryGirl.define do
   factory :account, :class => Plutus::Account do |account|
     account.name
-    account.contra false
+    account.contra { false }
   end
 
   factory :asset, :class => Plutus::Asset do |account|
     account.name
-    account.contra false
+    account.contra { false }
   end
 
   factory :equity, :class => Plutus::Equity do |account|
     account.name
-    account.contra false
+    account.contra { false }
   end
 
   factory :expense, :class => Plutus::Expense do |account|
     account.name
-    account.contra false
+    account.contra { false }
   end
 
   factory :liability, :class => Plutus::Liability do |account|
     account.name
-    account.contra false
+    account.contra { false }
   end
 
   factory :revenue, :class => Plutus::Revenue do |account|
     account.name
-    account.contra false
+    account.contra { false }
   end
 
   sequence :name do |n|

data/spec/factories/amount_factory.rb

@@ -1,18 +1,18 @@
 FactoryGirl.define do
   factory :amount, :class => Plutus::Amount do |amount|
-    amount.amount BigDecimal.new('473')
+    amount.amount { BigDecimal('473') }
     amount.association :entry, :factory => :entry_with_credit_and_debit
     amount.association :account, :factory => :asset
   end
 
   factory :credit_amount, :class => Plutus::CreditAmount do |credit_amount|
-    credit_amount.amount BigDecimal.new('473')
+    credit_amount.amount { BigDecimal('473') }
     credit_amount.association :entry, :factory => :entry_with_credit_and_debit
     credit_amount.association :account, :factory => :revenue
   end
 
   factory :debit_amount, :class => Plutus::DebitAmount do |debit_amount|
-    debit_amount.amount BigDecimal.new('473')
+    debit_amount.amount { BigDecimal('473') }
     debit_amount.association :entry, :factory => :entry_with_credit_and_debit
     debit_amount.association :account, :factory => :asset
   end

data/spec/factories/entry_factory.rb

@@ -1,6 +1,6 @@
 FactoryGirl.define do
   factory :entry, :class => Plutus::Entry do |entry|
-    entry.description 'factory description'
+    entry.description { 'factory description' }
     factory :entry_with_credit_and_debit, :class => Plutus::Entry do |entry_cd|
       entry_cd.after_build do |t|
         t.credit_amounts << FactoryGirl.build(:credit_amount, :entry => t)

data/spec/models/account_spec.rb

@@ -7,6 +7,13 @@ module Plutus
 
     it { is_expected.not_to be_valid }  # must construct a child type instead
 
+    describe ".types" do
+      it "lists the available types" do
+        expect(described_class.types).
+          to match_array([Asset, Equity, Expense, Liability, Revenue])
+      end
+    end
+
     describe "when using a child type" do
       let(:account) { FactoryGirl.create(:account, type: "Finance::Asset") }
       it { is_expected.to be_valid }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plutus
 version: !ruby/object:Gem::Version
-  version: '0.14'
+  version: '0.17'
 platform: ruby
 authors:
 - Michael Bulat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-31 00:00:00.000000000 Z
+date: 2020-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,56 +16,28 @@ dependencies:
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.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
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: jquery-ui-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.2
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -110,7 +82,6 @@ files:
 - README.markdown
 - Rakefile
 - app/assets/javascripts/plutus/application.js
-- app/assets/javascripts/plutus/reports.js
 - app/assets/stylesheets/bootstrap-theme.min.css
 - app/assets/stylesheets/bootstrap.min.css
 - app/assets/stylesheets/plutus/application.css
@@ -206,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 3
 summary: A Plugin providing a Double Entry Accounting Engine for Rails

data/app/assets/javascripts/plutus/reports.js

@@ -1,5 +0,0 @@
-jQuery(function() {
-  return $('.datepicker').datepicker({
-    dateFormat: "yy-mm-dd"
-  });
-});