plutus 0.12.2 → 0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ff6db3055f833f230341e09d485329f5e2150d7d
-  data.tar.gz: bfc7ded7630f7a77c4bd79ebb17f723db77c7596
+SHA256:
+  metadata.gz: 8d6d53fa47c9c392c0a240fadd36257b8716367a1694642d3597d338f6173a93
+  data.tar.gz: a918177e468ee3d2f47acd6fa62eeaceb1e2c604f86161e8c717c9b00927ced4
 SHA512:
-  metadata.gz: 05d28ad8fabc751e2fcf36ca759a11d3daf8103b6e62c933a8933cfc6515a9fa9c510f602efbc4faf51bf3769d7e72886a7115d097cb048bb6c6a7517d3ef22e
-  data.tar.gz: fb15f1b5870bff1159c0b3eab675f3298cd973e96ffa82740aed24263bd037750a59f33b5a5d975d9e5c50d9dda05dfe414782b68f6da76ea69a025d93a54c0e
+  metadata.gz: d84a78fe7b972cd457d27c9da70fac2c79dfeaf5bea80e26be2d131174c3750d4a59a3254214a96b51f871f1f7895a905811df8b25b2953587d77bce981108b1
+  data.tar.gz: cf15cc0e6c2492c7b15f1a2aba067737bc3816fabe59ee57f61f44f74ea84af417b7fc169d6028bf95de6bc693062586433d5fcbf55570c6292b722cdab1a40f

data/README.markdown

@@ -1,14 +1,14 @@
 Plutus
 =================
-[![Build Status](https://secure.travis-ci.org/mbulat/plutus.png?branch=master)](http://travis-ci.org/mbulat/plutus)
+[![Build Status](https://travis-ci.org/mbulat/plutus.svg?branch=master)](https://travis-ci.org/mbulat/plutus) [![Coverage Status](https://coveralls.io/repos/github/mbulat/plutus/badge.svg?branch=master)](https://coveralls.io/github/mbulat/plutus?branch=master)
 
 The Plutus plugin is a Ruby on Rails Engine which provides a double entry accounting system for your application.
 
 Compatibility
 =============
 
-* Ruby versions: MRI 1.9.3 - 2.2, Rubinius 2.2, JRuby 1.7+
-* Rails versions: ~> 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)
 
@@ -16,9 +16,7 @@ Installation
 ============
 
 - Add the gem to your Gemfile `gem "plutus"`
-
-- generate migration files `rails g plutus`
-
+- generate migration files `rake plutus:install:migrations`
 - run migrations `rake db:migrate`
 
 Overview
@@ -269,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
 
@@ -291,6 +289,19 @@ Plutus.config do |config|
   config.tenant_class = 'Tenant'
 end
 ```
+*NOTE: When building entries, be sure to specify the account directly, rather than use the `account_name` feature. Otherwise you'll probably end up with the wrong account.*
+
+```ruby
+debit_account = Plutus::Account.where(:name => "Cash", :tenant => my_tenant).last
+credit_account = Plutus::Account.where(:name => "Unearned Revenue", :tenant => my_tenant).last
+entry = Plutus::Entry.new(
+                :description => "Order placed for widgets",
+                :date => Date.yesterday,
+                :debits => [
+                  {:account => debit_account, :amount => 100.00}],
+                :credits => [
+                  {:account => credit_account, :amount => 100.00}])
+```
 
 Reporting Views
 ===============
@@ -315,7 +326,7 @@ Previous Versions
 
 For the rails 3 version, you can go here:
 
-[https://github.com/mbulat/plutus](https://github.com/mbulat/plutus/tree/rails3)
+[https://github.com/mbulat/plutus/tree/rails3](https://github.com/mbulat/plutus/tree/rails3)
 
 For the rails 2 version, you can go here:
 
@@ -324,6 +335,7 @@ For the rails 2 version, you can go here:
 * Gems in RubyGems.org >= 0.5.0 support Rails 3
 * Gems in RubyGems.org >= 0.8.0 support Rails 4
 * Gems in RubyGems.org >= 0.9.0 support Rails ~> 4.1
+* Gems in RubyGems.org >= 0.13.0 support Rails ~> 5.0
 
 Upgrading from older versions
 -----------------------------
@@ -360,8 +372,6 @@ Plutus is free software, but if you'd like to support development, feel free to
 
 `1QFSdJheyFkLcsV8X428J8e3pYqX1nmW39`
 
-![bitcoin](https://dl.dropboxusercontent.com/u/8428240/plutus_tip.png)
-
 Also, if anyone is using Plutus for bitcoin related accounting, I'd love to hear about it! Drop me a line.
 
 ToDo
@@ -379,4 +389,4 @@ For a complete reference on Accounting principles, we recommend the following te
 
 * * *
 
-Copyright (c) 2010-2012 Michael Bulat
+Copyright (c) 2010-2016 Michael Bulat

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/entries_controller.rb

@@ -17,7 +17,12 @@ module Plutus
     #   GET /entries.xml
     #   GET /entries.json
     def index
-      @entries = Entry.limit(100).order('date DESC')
+      if params[:order] == 'ascending'
+        order = 'ASC'
+      else
+        order = 'DESC'
+      end
+      @entries = Entry.page(params[:page]).per(params[:limit]).order("date #{order}")
 
       respond_to do |format|
         format.html # index.html.erb

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

@@ -32,13 +32,25 @@ module Plutus
   class Account < ActiveRecord::Base
     class_attribute :normal_credit_balance
 
+    has_many :amounts
     has_many :credit_amounts, :extend => AmountsExtension, :class_name => 'Plutus::CreditAmount'
     has_many :debit_amounts, :extend => AmountsExtension, :class_name => 'Plutus::DebitAmount'
+    has_many :entries, through: :amounts, source: :entry
     has_many :credit_entries, :through => :credit_amounts, :source => :entry, :class_name => 'Plutus::Entry'
     has_many :debit_entries, :through => :debit_amounts, :source => :entry, :class_name => 'Plutus::Entry'
 
     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
@@ -135,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/amount.rb

@@ -12,22 +12,13 @@ module Plutus
     validates_presence_of :type, :amount, :entry, :account
     # attr_accessible :account, :account_name, :amount, :entry
 
+    delegate :name, to: :account, prefix: true, allow_nil: true
+
     # Assign an account by name
     def account_name=(name)
       self.account = Account.find_by_name!(name)
     end
 
     protected
-
-    # Support constructing amounts with account = "name" syntax
-    def account_with_name_lookup=(v)
-      if v.kind_of?(String)
-        ActiveSupport::Deprecation.warn('Plutus was given an :account String (use account_name instead)', caller)
-        self.account_name = v
-      else
-        self.account_without_name_lookup = v
-      end
-    end
-    alias_method_chain :account=, :name_lookup
   end
 end

data/app/models/plutus/amounts_extension.rb

@@ -30,12 +30,10 @@ 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
-          balance += amount_record.amount
-        else
-          balance = nil
+        if amount_record.amount && !amount_record.marked_for_destruction?
+          balance += amount_record.amount # unless amount_record.marked_for_destruction?
         end
       end
       return balance

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 < 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/entry.rb

@@ -23,7 +23,13 @@ module Plutus
   # @author Michael Bulat
   class Entry < ActiveRecord::Base
     before_save :default_date
-    belongs_to :commercial_document, :polymorphic => true
+
+    if ActiveRecord::VERSION::MAJOR > 4
+      belongs_to :commercial_document, :polymorphic => true, optional: true
+    else
+      belongs_to :commercial_document, :polymorphic => true
+    end
+
     has_many :credit_amounts, :extend => AmountsExtension, :class_name => 'Plutus::CreditAmount', :inverse_of => :entry
     has_many :debit_amounts, :extend => AmountsExtension, :class_name => 'Plutus::DebitAmount', :inverse_of => :entry
     has_many :credit_accounts, :through => :credit_amounts, :source => :account, :class_name => 'Plutus::Account'
@@ -35,7 +41,7 @@ module Plutus
     validate :amounts_cancel?
 
     # Support construction using 'credits' and 'debits' keys
-    accepts_nested_attributes_for :credit_amounts, :debit_amounts
+    accepts_nested_attributes_for :credit_amounts, :debit_amounts, allow_destroy: true
     alias_method :credits=, :credit_amounts_attributes=
     alias_method :debits=, :debit_amounts_attributes=
     # attr_accessible :credits, :debits
@@ -52,7 +58,8 @@ module Plutus
 
     private
       def default_date
-        self.date ||= Date.today
+        todays_date = ActiveRecord::Base.default_timezone == :utc ? Time.now.utc : Time.now
+        self.date ||= todays_date
       end
 
       def has_credit_amounts?

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 < 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 < 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 < 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 < Account
+  class Revenue < ::Plutus::Account
 
     self.normal_credit_balance = true
 

data/app/models/plutus/tenancy.rb

@@ -5,7 +5,11 @@ module Plutus
     included do
       validates :name, presence: true, uniqueness: { scope: :tenant_id }
 
-      belongs_to :tenant, class_name: Plutus.tenant_class
+      if ActiveRecord::VERSION::MAJOR > 4
+        belongs_to :tenant, class_name: Plutus.tenant_class, optional: true
+      else
+        belongs_to :tenant, class_name: Plutus.tenant_class
+      end
     end
   end
 end

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/entries/index.html.erb

@@ -2,6 +2,13 @@
   <center>
     <h1>Journal</h1>
     <br>
+    <%= form_tag({:action => 'index'}, {:method => :get, :class => 'form-inline'}) do%>
+      <div class="form-group">
+      Per page: <%= select_tag :limit, options_for_select([25, 100, 200, 300], selected: params[:limit]), class: 'form-control' %>
+      Order: <%= select_tag :order, options_for_select(['descending', 'ascending'], selected: params[:order]), class: 'form-control' %>
+      </div>
+      <button type="submit" class="btn btn-default">Refresh</button>
+    <% end %>
   </center>
 
 <table class="table table-striped table-hover">
@@ -47,4 +54,6 @@
   </tbody>
 </table>
 
+<%= paginate @entries %>
+
 </div>

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/generators/plutus/templates/migration.rb → db/migrate/20160422010135_create_plutus_tables.rb}

@@ -1,9 +1,9 @@
-class CreatePlutusTables < ActiveRecord::Migration
-  def self.up
+class CreatePlutusTables < ActiveRecord::Migration[4.2]
+  def change
     create_table :plutus_accounts do |t|
       t.string :name
       t.string :type
-      t.boolean :contra
+      t.boolean :contra, default: false
 
       t.timestamps
     end
@@ -30,10 +30,4 @@ class CreatePlutusTables < ActiveRecord::Migration
     add_index :plutus_amounts, [:account_id, :entry_id]
     add_index :plutus_amounts, [:entry_id, :account_id]
   end
-
-  def self.down
-    drop_table :plutus_accounts
-    drop_table :plutus_entries
-    drop_table :plutus_amounts
-  end
 end

data/lib/generators/plutus/templates/tenant_migration.rb

@@ -1,4 +1,4 @@
-class TenantPlutusTables < ActiveRecord::Migration
+class TenantPlutusTables < ActiveRecord::Migration[4.2]
   def change
     # add a tenant column to plutus accounts table.
     add_column :plutus_accounts, :tenant_id, :integer, index: true

data/lib/plutus.rb

@@ -2,11 +2,6 @@
 require "rails"
 
 module Plutus
-  class Engine < Rails::Engine
-    isolate_namespace Plutus
-  end
-
-
   # ------------------------------ tenancy ------------------------------
   # configuration to enable or disable tenancy
   mattr_accessor :enable_tenancy
@@ -21,3 +16,5 @@ module Plutus
     yield(self)
   end
 end
+
+require "plutus/engine"