plutus 0.12.2 → 0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff6db3055f833f230341e09d485329f5e2150d7d
-  data.tar.gz: bfc7ded7630f7a77c4bd79ebb17f723db77c7596
+  metadata.gz: baf78f34f534da86425756a8213a9651d531467e
+  data.tar.gz: a3c1df3ffd80619d1e0522794c03c02324d4cc68
 SHA512:
-  metadata.gz: 05d28ad8fabc751e2fcf36ca759a11d3daf8103b6e62c933a8933cfc6515a9fa9c510f602efbc4faf51bf3769d7e72886a7115d097cb048bb6c6a7517d3ef22e
-  data.tar.gz: fb15f1b5870bff1159c0b3eab675f3298cd973e96ffa82740aed24263bd037750a59f33b5a5d975d9e5c50d9dda05dfe414782b68f6da76ea69a025d93a54c0e
+  metadata.gz: 1502ce1be2995f71f55c4e902ff27894dd88ff91cfc9a5df02a850998e236e377ef1b5c76febf1312a1540e545d9ed9f2e2f22c10ea0979359a2648b676a8232
+  data.tar.gz: 9c127eafa076bad39a64c01c913e8db559bc3e2295d9571f1f9b78e7f14c5b5af8287f8ca5f18b9b3c1d330b246bc161e97249670844a287213f89114987f36a

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 1.9.3 - 2.2, Rubinius 2.2, JRuby 1.7+
-* Rails versions: ~> 4.0
+* Ruby versions: MRI 2.2.2+ (should work with earlier versions if using Rails 4)
+* Rails versions: ~> 5.0, ~> 4.0
 
 For earlier versions, and upgrading, please see the section titled [Previous Versions](https://github.com/mbulat/plutus#previous-versions)
 
@@ -291,6 +291,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::Acount.where(:name => "Cash", :tenant => my_tenant).last
+credit_account = Plutus::Acount.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 +328,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:
 
@@ -379,4 +392,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/datepicker
 //= require_tree .

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

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

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/models/plutus/account.rb

@@ -32,8 +32,10 @@ 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'
 

data/app/models/plutus/amount.rb

@@ -18,16 +18,5 @@ module Plutus
     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

@@ -32,10 +32,8 @@ module Plutus
     def balance_for_new_record
       balance = BigDecimal.new('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/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/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/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/lib/generators/plutus/templates/add_date_migration.rb

@@ -1,4 +1,4 @@
-class AddDateToPlutusEntries < ActiveRecord::Migration
+class AddDateToPlutusEntries < ActiveRecord::Migration[4.2]
   def change
     add_column :plutus_entries, :date, :date
     add_index :plutus_entries, :date

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

@@ -1,4 +1,4 @@
-class CreatePlutusTables < ActiveRecord::Migration
+class CreatePlutusTables < ActiveRecord::Migration[4.2]
   def self.up
     create_table :plutus_accounts do |t|
       t.string :name

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/generators/plutus/templates/update_migration.rb

@@ -1,4 +1,4 @@
-class UpdatePlutusTables < ActiveRecord::Migration
+class UpdatePlutusTables < ActiveRecord::Migration[4.2]
   def change
     # we have to remove these indexes because the temporary
     # table index name is too long

data/lib/plutus/version.rb

@@ -1,3 +1,3 @@
 module Plutus
-  VERSION = "0.12.2"
+  VERSION = "0.13"
 end

data/spec/controllers/accounts_controller_spec.rb

@@ -10,9 +10,9 @@ module Plutus
 
     describe "GET index" do
       it "assigns all accounts as @accounts" do
-        Account.stub(:all).and_return([mock_account])
+        allow(Account).to receive(:all).and_return([mock_account])
         get :index
-        assigns[:accounts].should == [mock_account]
+        expect(assigns[:accounts]).to eq([mock_account])
       end
     end
   end

data/spec/controllers/entries_controller_spec.rb

@@ -10,9 +10,9 @@ module Plutus
 
     describe "GET index" do
       it "assigns all entries as @entries" do
-        Entry.stub_chain(:limit, :order).and_return([mock_entry])
+        allow(Entry).to receive_message_chain(:per, :order).and_return([mock_entry])
         get :index
-        assigns[:entries].should == [mock_entry]
+        expect(assigns[:entries]).to eq([mock_entry])
       end
     end
   end

data/spec/controllers/reports_controller_spec.rb

@@ -10,14 +10,14 @@ module Plutus
 
     describe "GET balance_sheet" do
       it "renders when one entry exists" do
-        Entry.stub_chain(:order).and_return([mock_entry])
+        allow(Entry).to receive_message_chain(:order).and_return([mock_entry])
         get :balance_sheet
-        response.should be_success
+        expect(response).to be_success
       end
       it "renders when no entries exist" do
-        Entry.stub_chain(:order).and_return([])
+        allow(Entry).to receive_message_chain(:order).and_return([])
         get :balance_sheet
-        response.should be_success
+        expect(response).to be_success
       end
     end
   end

data/spec/models/account_spec.rb

@@ -5,16 +5,16 @@ module Plutus
     let(:account) { FactoryGirl.build(:account) }
     subject { account }
 
-    it { should_not be_valid }  # must construct a child type instead
+    it { is_expected.not_to be_valid }  # must construct a child type instead
 
     describe "when using a child type" do
       let(:account) { FactoryGirl.create(:account, type: "Finance::Asset") }
-      it { should be_valid }
+      it { is_expected.to be_valid }
 
       it "should be unique per name" do
         conflict = FactoryGirl.build(:account, name: account.name, type: account.type)
-        conflict.should_not be_valid
-        conflict.errors[:name].should == ["has already been taken"]
+        expect(conflict).not_to be_valid
+        expect(conflict.errors[:name]).to eq(["has already been taken"])
       end
     end
 
@@ -28,10 +28,10 @@ module Plutus
 
     describe ".trial_balance" do
       subject { Account.trial_balance }
-      it { should be_kind_of BigDecimal }
+      it { is_expected.to be_kind_of BigDecimal }
 
       context "when given no entries" do
-        it { should == 0 }
+        it { is_expected.to eq(0) }
       end
 
       context "when given correct entries" do
@@ -69,8 +69,65 @@ module Plutus
           FactoryGirl.create(:entry, :credit_amounts => [ca5], :debit_amounts => [da5])
         }
 
-        it { should == 0 }
+        it { is_expected.to eq(0) }
       end
     end
+
+    describe "#amounts" do
+      it "returns all credit and debit amounts" do
+        equity = FactoryGirl.create(:equity)
+        asset = FactoryGirl.create(:asset)
+        expense = FactoryGirl.create(:expense)
+
+        investment = Entry.new(
+          description: "Initial investment",
+          date: Date.today,
+          debits: [{ account_name: equity.name, amount: 1000 }],
+          credits: [{ account_name: asset.name, amount: 1000 }],
+        )
+        investment.save
+
+        purchase = Entry.new(
+          description: "First computer",
+          date: Date.today,
+          debits: [{ account_name: asset.name, amount: 900 }],
+          credits: [{ account_name: expense.name, amount: 900 }],
+        )
+        purchase.save
+
+        expect(equity.amounts.size).to eq 1
+        expect(asset.amounts.size).to eq 2
+        expect(expense.amounts.size).to eq 1
+      end
+    end
+
+    describe "#entries" do
+      it "returns all credit and debit entries" do
+        equity = FactoryGirl.create(:equity)
+        asset = FactoryGirl.create(:asset)
+        expense = FactoryGirl.create(:expense)
+
+        investment = Entry.new(
+          description: "Initial investment",
+          date: Date.today,
+          debits: [{ account_name: equity.name, amount: 1000 }],
+          credits: [{ account_name: asset.name, amount: 1000 }],
+        )
+        investment.save
+
+        purchase = Entry.new(
+          description: "First computer",
+          date: Date.today,
+          debits: [{ account_name: asset.name, amount: 900 }],
+          credits: [{ account_name: expense.name, amount: 900 }],
+        )
+        purchase.save
+
+        expect(equity.entries.size).to eq 1
+        expect(asset.entries.size).to eq 2
+        expect(expense.entries.size).to eq 1
+      end
+    end
+
   end
 end

data/spec/models/amount_spec.rb

@@ -3,6 +3,6 @@ require 'spec_helper'
 module Plutus
   describe Amount do
     subject { FactoryGirl.build(:amount) }
-    it { should_not be_valid }  # construct a child class instead
+    it { is_expected.not_to be_valid }  # construct a child class instead
   end
 end

data/spec/models/entry_spec.rb

@@ -5,15 +5,15 @@ module Plutus
     let(:entry) { FactoryGirl.build(:entry) }
     subject { entry }
 
-    it { should_not be_valid }
+    it { is_expected.not_to be_valid }
 
     context "with credit and debit" do
       let(:entry) { FactoryGirl.build(:entry_with_credit_and_debit) }
-      it { should be_valid }
+      it { is_expected.to be_valid }
 
       it "should require a description" do
         entry.description = nil
-        entry.should_not be_valid
+        expect(entry).not_to be_valid
       end
     end
 
@@ -21,13 +21,13 @@ module Plutus
       before {
         entry.debit_amounts << FactoryGirl.build(:debit_amount, entry: entry)
       }
-      it { should_not be_valid }
+      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)
         }
-        it { should_not be_valid }
+        it { is_expected.not_to be_valid }
       end
     end
 
@@ -35,13 +35,13 @@ module Plutus
       before {
         entry.credit_amounts << FactoryGirl.build(:credit_amount, entry: entry)
       }
-      it { should_not be_valid }
+      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)
         }
-        it { should_not be_valid }
+        it { is_expected.not_to be_valid }
       end
     end
 
@@ -50,23 +50,32 @@ module Plutus
 
       context "should assign a default date before being saved" do
         before { entry.save! }
-        its(:date) { should == Date.today }
+        its(:date) { is_expected.to eq(Time.now.to_date) }
       end
     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.should_not be_valid
-      entry.errors['base'].should == ["The credit and debit amounts are not equal"]
+      expect(entry).not_to be_valid
+      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.should_not be_valid
-      entry.errors['base'].should == ["The credit and debit amounts are not equal"]
+      expect(entry).not_to be_valid
+      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)
+      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"])
     end
 
     it "should have a polymorphic commercial document associations" do
@@ -74,7 +83,7 @@ module Plutus
       entry = FactoryGirl.build(:entry_with_credit_and_debit, commercial_document: mock_document)
       entry.save!
       saved_entry = Entry.find(entry.id)
-      saved_entry.commercial_document.should == mock_document
+      expect(saved_entry.commercial_document).to eq(mock_document)
     end
 
     context "given a set of accounts" do
@@ -84,13 +93,13 @@ module Plutus
       let!(:sales_tax_payable) { FactoryGirl.create(:liability, name: "Sales Tax Payable") }
 
       shared_examples_for 'a built-from-hash Plutus::Entry' do
-        its(:credit_amounts) { should_not be_empty }
-        its(:debit_amounts) { should_not be_empty }
-        it { should be_valid }
+        its(:credit_amounts) { is_expected.not_to be_empty }
+        its(:debit_amounts) { is_expected.not_to be_empty }
+        it { is_expected.to be_valid }
 
         context "when saved" do
           before { entry.save! }
-          its(:id) { should_not be_nil }
+          its(:id) { is_expected.not_to be_nil }
 
           context "when reloaded" do
             let(:saved_transaction) { Entry.find(entry.id) }
@@ -135,31 +144,6 @@ module Plutus
           }
           include_examples 'a built-from-hash Plutus::Entry'
         end
-
-        context "when given a credit/debits hash with :account => String" do
-          let(:hash) {
-            {
-                description: "Sold some widgets",
-                commercial_document: mock_document,
-                debits: [{account: accounts_receivable.name, amount: 50}],
-                credits: [
-                    {account: sales_revenue.name, amount: 45},
-                    {account: sales_tax_payable.name, amount: 5}
-                ]
-            }
-          }
-
-          before { ::ActiveSupport::Deprecation.silenced = true }
-          after { ::ActiveSupport::Deprecation.silenced = false }
-
-          it("should be deprecated") {
-            # one deprecation per account looked up
-            ::ActiveSupport::Deprecation.should_receive(:warn).exactly(3).times
-            entry
-          }
-
-          include_examples 'a built-from-hash Plutus::Entry'
-        end
       end
 
       describe ".build" do
@@ -174,32 +158,11 @@ module Plutus
 
           it("should be deprecated") {
             # .build is the only thing deprecated
-            ::ActiveSupport::Deprecation.should_receive(:warn).once
+            expect(::ActiveSupport::Deprecation).to receive(:warn).once
             entry
           }
         end
 
-        context "when given a credit/debits hash with :account => String" do
-          let(:hash) {
-            {
-                description: "Sold some widgets",
-                commercial_document: mock_document,
-                debits: [{account: accounts_receivable.name, amount: 50}],
-                credits: [
-                    {account: sales_revenue.name, amount: 45},
-                    {account: sales_tax_payable.name, amount: 5}
-                ]
-            }
-          }
-
-          it("should be deprecated") {
-            # one deprecation for build, plus three for accounts as strings
-            ::ActiveSupport::Deprecation.should_receive(:warn).exactly(4).times
-            entry
-          }
-
-          include_examples 'a built-from-hash Plutus::Entry'
-        end
       end
     end
 

data/spec/models/tenancy_spec.rb

@@ -30,15 +30,15 @@ module Plutus
         account = FactoryGirl.create(:asset, tenant_id: 10)
 
         record = FactoryGirl.build(:asset, name: account.name, tenant_id: 10)
-        record.should_not be_valid
-        record.errors[:name].should == ['has already been taken']
+        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)
 
         record = FactoryGirl.build(:asset, name: account.name, tenant_id: 11)
-        record.should be_valid
+        expect(record).to be_valid
       end
     end
   end

data/spec/routing/accounts_routing_spec.rb

@@ -6,7 +6,7 @@ module Plutus
 
     describe "routing" do
       it "recognizes and generates #index" do
-        { :get => "/accounts" }.should route_to(:controller => "plutus/accounts", :action => "index")
+        expect(:get => "/accounts").to route_to(:controller => "plutus/accounts", :action => "index")
       end
     end
   end

data/spec/routing/entries_routing_spec.rb

@@ -6,7 +6,7 @@ module Plutus
 
     describe "routing" do
       it "recognizes and generates #index" do
-        { :get => "/entries" }.should route_to(:controller => "plutus/entries", :action => "index")
+        expect(:get => "/entries").to route_to(:controller => "plutus/entries", :action => "index")
       end
     end
   end

data/spec/spec_helper.rb

@@ -9,6 +9,7 @@ require 'rspec/rails'
 
 $: << File.expand_path(File.dirname(__FILE__) + '/../lib/')
 require 'plutus'
+require 'kaminari'
 
 Dir[File.expand_path(File.join(File.dirname(__FILE__),'support','**','*.rb'))].each {|f| require f}
 

data/spec/support/account_shared_examples.rb

@@ -5,28 +5,28 @@ shared_examples_for 'a Plutus::Account subtype' do |elements|
 
   describe "class methods" do
     subject { account.class }
-    its(:balance) { should be_kind_of(BigDecimal) }
+    its(:balance) { is_expected.to be_kind_of(BigDecimal) }
     describe "trial_balance" do
       it "should raise NoMethodError" do
-        lambda { subject.trial_balance }.should raise_error NoMethodError
+        expect { subject.trial_balance }.to raise_error NoMethodError
       end
     end
   end
 
   describe "instance methods" do
-    its(:balance) { should be_kind_of(BigDecimal) }
+    its(:balance) { is_expected.to be_kind_of(BigDecimal) }
 
     it "reports a balance with date range" do
-      account.balance(:from_date => "2014-01-01", :to_date => Date.today).should be_kind_of(BigDecimal)
+      expect(account.balance(:from_date => "2014-01-01", :to_date => Date.today)).to be_kind_of(BigDecimal)
     end
 
-    it { should respond_to(:credit_entries) }
-    it { should respond_to(:debit_entries) }
+    it { is_expected.to respond_to(:credit_entries) }
+    it { is_expected.to respond_to(:debit_entries) }
   end
 
   it "requires a name" do
     account.name = nil
-    account.should_not be_valid
+    expect(account).not_to be_valid
   end
 
   # Figure out which way credits and debits should apply
@@ -40,21 +40,21 @@ shared_examples_for 'a Plutus::Account subtype' do |elements|
 
   describe "when given a debit" do
     before { FactoryGirl.create(:debit_amount, account: account) }
-    its(:balance) { should be.send(debit_condition, 0) }
+    its(:balance) { is_expected.to be.send(debit_condition, 0) }
 
     describe "on a contra account" do
       let(:contra) { true }
-      its(:balance) { should be.send(credit_condition, 0) }
+      its(:balance) { is_expected.to be.send(credit_condition, 0) }
     end
   end
 
   describe "when given a credit" do
     before { FactoryGirl.create(:credit_amount, account: account) }
-    its(:balance) { should be.send(credit_condition, 0) }
+    its(:balance) { is_expected.to be.send(credit_condition, 0) }
 
     describe "on a contra account" do
       let(:contra) { true }
-      its(:balance) { should be.send(debit_condition, 0) }
+      its(:balance) { is_expected.to be.send(debit_condition, 0) }
     end
   end
 end

data/spec/support/amount_shared_examples.rb

@@ -2,20 +2,20 @@ shared_examples_for 'a Plutus::Amount subtype' do |elements|
   let(:amount) { FactoryGirl.build(elements[:kind]) }
   subject { amount }
 
-  it { should be_valid }
+  it { is_expected.to  be_valid }
 
   it "should require an amount" do
     amount.amount = nil
-    amount.should_not be_valid
+    expect(amount).not_to be_valid
   end
 
   it "should require a entry" do
     amount.entry = nil
-    amount.should_not be_valid
+    expect(amount).not_to be_valid
   end
 
   it "should require an account" do
     amount.account = nil
-    amount.should_not be_valid
+    expect(amount).not_to be_valid
   end
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: plutus
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: '0.13'
 platform: ruby
 authors:
 - Michael Bulat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-21 00:00:00.000000000 Z
+date: 2017-07-10 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
@@ -44,14 +44,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.2.2
+- !ruby/object:Gem::Dependency
+  name: kaminari
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -177,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 3
 summary: A Plugin providing a Double Entry Accounting Engine for Rails
@@ -209,4 +223,3 @@ test_files:
 - spec/models/amount_spec.rb
 - spec/models/equity_spec.rb
 - spec/models/entry_spec.rb
-has_rdoc: