double_entry 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 872b6fa2ec70dd3783192e17d4f79139a288d859
-  data.tar.gz: 9b116b6617a97740ba998b8efc26fdc2a51d38e8
+  metadata.gz: 05aef36c2326f83e2a5e81ef732b88eb375d40db
+  data.tar.gz: 14e53582a9aaa42cfb5acbff3273d036d29f7c5b
 SHA512:
-  metadata.gz: dc9648ffc3737e9b8aa9b3ceb7b8fb831dd034c04eb3e9ac756c08ecf4932fe9cca416a792339d9d2dd8036aef70439ed6200b147ee513cdcd30bdfa44ea7e37
-  data.tar.gz: 3aa8185c00db1211e6c537a063a5b345372e98cc05987f86e54bea75f423fbd5d917685064651951bd7f6b4aa42fbdaf6088a238b83f275fcce1de551325f373
+  metadata.gz: 6affae6cedb93232bd40af21f8e2d9386e90014aaed30bfa41d4bf0ff3117d16879e21afc07eaea78e5308e7ccb5ae4b12d6d7e27a7854613a3df21df39bf267
+  data.tar.gz: 8176ff4543e6ffaad668ef63fe2862e472ebb7a160971f6d6749446ed350e334ebe309536e20e2c315b57a2849a17a21fb6a0c931ae93a0f068b40416fb63a17

data/.gitignore

@@ -1,22 +1,29 @@
 *.gem
 *.rbc
-.bundle
-.config
-.yardoc
-.ruby-version
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-spec/support/database.yml
-test/tmp
-test/version_tmp
-tmp
-db/*.sqlite3
-bin/
-log/
+/.config
+/coverage/
+/InstalledFiles
+/pkg/
+/spec/reports/
+/test/tmp/
+/test/version_tmp/
+/tmp/
+
+## Documentation cache and generated files:
+/.yardoc/
+/_yardoc/
+/doc/
+/rdoc/
+
+## Environment normalisation:
+/.bundle/
+/lib/bundler/man/
 /Gemfile.lock
+/.ruby-version
+/.ruby-gemset
+
+# DoubleEntry specific
+/bin/
+/log/
+/spec/reports/
+/spec/support/database.yml

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.1.2
+  - 2.1.4
   - 2.0.0
   - 1.9.3
 env:
@@ -15,6 +15,6 @@ script:
   - rake spec
   - ruby script/jack_hammer -t 2000
 gemfile:
-  - gemfiles/Gemfile.rails-3.2.0
-  - gemfiles/Gemfile.rails-4.0.0
-  - gemfiles/Gemfile.rails-4.1.0
+  - spec/support/gemfiles/Gemfile.rails-3.2.x
+  - spec/support/gemfiles/Gemfile.rails-4.0.x
+  - spec/support/gemfiles/Gemfile.rails-4.1.x

data/Gemfile

@@ -1,3 +1,2 @@
 source 'https://rubygems.org'
-
 gemspec

data/README.md

@@ -26,6 +26,7 @@ Rails Versions: Rails 3.2.x, 4.0.x, 4.1.x
 **Databases Supported:**
  * MySQL
  * PostgreSQL
+ * SQLite
 
 ## Installation
 
@@ -124,7 +125,7 @@ manually lock the accounts you're using:
 ```ruby
 DoubleEntry.lock_accounts(account_a, account_b) do
   # Perhaps transfer some money
-  DoubleEntry.transfer(20.dollars, :from => account_a, :to => account_b, :code => :purchase)
+  DoubleEntry.transfer(Money.new(20_00), :from => account_a, :to => account_b, :code => :purchase)
   # Perform other tasks that should be commited atomically with the transfer of funds...
 end
 ```
@@ -181,6 +182,19 @@ DoubleEntry.configure do |config|
 end
 ```
 
+By default an account's currency is the same as Money.default_currency from the money gem.
+
+You can also specify a currency on a per account basis.
+Transfers between accounts of different currencies are not allowed.
+
+```ruby
+DoubleEntry.configure do |config|
+  config.define_accounts do |accounts|
+    accounts.define(:identifier => :savings,  :scope_identifier => user_scope, :currency => :aud)
+  end
+end
+```
+
 ## Jackhammer
 
 Run a concurrency test on the code.
@@ -240,7 +254,7 @@ See the Github project [issues](https://github.com/envato/double_entry/issues).
     ./script/setup.sh
     ```
 
-3. Install MySQL and PostgreSQL. We run tests against both databases.
+3. Install MySQL, PostgreSQL and SQLite. We run tests against all three databases.
 4. Create a database in MySQL.
 
     ```sh
@@ -265,4 +279,3 @@ See the Github project [issues](https://github.com/envato/double_entry/issues).
     ```sh
     bundle exec rake
     ```
-

data/double_entry.gemspec

@@ -19,11 +19,10 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'money',                 '>= 5.1.0'
-  gem.add_dependency 'encapsulate_as_money'
-  gem.add_dependency 'activerecord',          '>= 3.2.9'
-  gem.add_dependency 'activesupport',         '>= 3.0.0'
-  gem.add_dependency 'railties',              '>= 3.0.0'
+  gem.add_dependency 'money',                 '>= 6.0.0'
+  gem.add_dependency 'activerecord',          '>= 3.2.0'
+  gem.add_dependency 'activesupport',         '>= 3.2.0'
+  gem.add_dependency 'railties',              '>= 3.2.0'
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'mysql2'

data/lib/active_record/locking_extensions.rb

@@ -48,7 +48,7 @@ module ActiveRecord
       begin
         yield
       rescue ActiveRecord::StatementInvalid, ActiveRecord::RecordNotUnique => exception
-        if  exception.message =~ /duplicate/i || exception.message =~ /(is|are) not unique/i
+        if  exception.message =~ /duplicate/i || exception.message =~ /ConstraintException/
           # Just ignore it...someone else has already created the record.
         else
           raise

data/lib/double_entry.rb

@@ -3,7 +3,6 @@ require 'active_record'
 require 'active_record/locking_extensions'
 require 'active_support/all'
 require 'money'
-require 'encapsulate_as_money'
 
 require 'double_entry/version'
 require 'double_entry/errors'
@@ -129,6 +128,14 @@ module DoubleEntry
       BalanceCalculator.calculate(account, options)
     end
 
+    # Get the currency of an account.
+    #
+    # @param [DoubleEntry::Account:Instance, Symbol] account Find the currency for this account
+    # @return [Currency] the currency
+    def currency(account)
+      Account.currency(configuration.accounts, account)
+    end
+
     # Lock accounts in preparation for transfers.
     #
     # This creates a transaction, and uses database-level locking to ensure

data/lib/double_entry/account.rb

@@ -8,6 +8,17 @@ module DoubleEntry
       DoubleEntry::Account::Instance.new(:account => account, :scope => options[:scope])
     end
 
+    # @api private
+    def self.currency(defined_accounts, account)
+      code = account.is_a?(Symbol) ? account : account.identifier
+
+      found_account = defined_accounts.detect do |account|
+        account.identifier == code
+      end
+
+      found_account.currency
+    end
+
     # @api private
     class Set < Array
       def define(attributes)
@@ -47,7 +58,7 @@ module DoubleEntry
 
     class Instance
       attr_accessor :account, :scope
-      delegate :identifier, :scope_identifier, :scoped?, :positive_only, :to => :account
+      delegate :identifier, :scope_identifier, :scoped?, :positive_only, :currency, :to => :account
 
       def initialize(attributes)
         attributes.each { |name, value| send("#{name}=", value) }
@@ -93,7 +104,7 @@ module DoubleEntry
       end
 
       def to_s
-        "\#{Account account: #{identifier} scope: #{scope}}"
+        "\#{Account account: #{identifier} scope: #{scope} currency: #{currency}}"
       end
 
       def inspect
@@ -101,10 +112,11 @@ module DoubleEntry
       end
     end
 
-    attr_accessor :identifier, :scope_identifier, :positive_only
+    attr_accessor :identifier, :scope_identifier, :positive_only, :currency
 
     def initialize(attributes)
       attributes.each { |name, value| send("#{name}=", value) }
+      self.currency ||= Money.default_currency
     end
 
     def scoped?

data/lib/double_entry/account_balance.rb

@@ -9,9 +9,16 @@ module DoubleEntry
   #
   # Account balances are created on demand when transfers occur.
   class AccountBalance < ActiveRecord::Base
-    extend EncapsulateAsMoney
 
-    encapsulate_as_money :balance
+    delegate :currency, :to => :account
+
+    def balance
+      self[:balance] && Money.new(self[:balance], currency)
+    end
+
+    def balance=(money)
+      self[:balance] = (money && money.fractional)
+    end
 
     def account=(account)
       self[:account] = account.identifier.to_s
@@ -19,6 +26,10 @@ module DoubleEntry
       account
     end
 
+    def account
+      DoubleEntry.account(self[:account].to_sym, :scope => self[:scope])
+    end
+
     def self.find_by_account(account, options = {})
       scope = where(:scope => account.scope_identity, :account => account.identifier.to_s)
       scope = scope.lock(true) if options[:lock]
@@ -28,4 +39,3 @@ module DoubleEntry
   end
 
 end
-

data/lib/double_entry/balance_calculator.rb

@@ -18,10 +18,11 @@ module DoubleEntry
       options = Options.new(account, args)
       relations = RelationBuilder.new(options)
       lines = relations.build
+      currency = DoubleEntry.currency(account)
 
       if options.between? || options.code?
         # from and to or code lookups have to be done via sum
-        Money.new(lines.sum(:amount))
+        Money.new(lines.sum(:amount), currency)
       else
         # all other lookups can be performed with running balances
         result = lines.
@@ -29,7 +30,7 @@ module DoubleEntry
           order('id DESC').
           limit(1).
           pluck(:balance)
-        result.empty? ? Money.empty : Money.new(result.first)
+        result.empty? ? Money.zero(currency) : Money.new(result.first, currency)
       end
     end
 

data/lib/double_entry/errors.rb

@@ -7,5 +7,6 @@ module DoubleEntry
   class DuplicateAccount < RuntimeError; end
   class DuplicateTransfer < RuntimeError; end
   class AccountWouldBeSentNegative < RuntimeError; end
-
+  class MismatchedCurrencies < RuntimeError; end
+  class MissingAccountError < RuntimeError; end;
 end

data/lib/double_entry/line.rb

@@ -56,11 +56,24 @@ module DoubleEntry
   # by account, or account and code, over a particular period.
   #
   class Line < ActiveRecord::Base
-    extend EncapsulateAsMoney
 
     belongs_to :detail, :polymorphic => true
 
-    encapsulate_as_money :amount, :balance
+    def amount
+      self[:amount] && Money.new(self[:amount], currency)
+    end
+
+    def amount=(money)
+      self[:amount] = (money && money.fractional)
+    end
+
+    def balance
+      self[:balance] && Money.new(self[:balance], currency)
+    end
+
+    def balance=(money)
+      self[:balance] = (money && money.fractional)
+    end
 
     def save(*)
       check_balance_will_not_be_sent_negative
@@ -81,20 +94,26 @@ module DoubleEntry
       self[:code].try(:to_sym)
     end
 
-    def account=(account)
-      self[:account] = account.identifier.to_s
-      self.scope = account.scope_identity
-      account
+    def account=(_account)
+      self[:account] = _account.identifier.to_s
+      self.scope = _account.scope_identity
+      raise "Missing Account" unless account
+      _account
     end
 
     def account
       DoubleEntry.account(self[:account].to_sym, :scope => scope)
     end
 
-    def partner_account=(partner_account)
-      self[:partner_account] = partner_account.identifier.to_s
-      self.partner_scope = partner_account.scope_identity
-      partner_account
+    def currency
+      account.currency if self[:account]
+    end
+
+    def partner_account=(_partner_account)
+      self[:partner_account] = _partner_account.identifier.to_s
+      self.partner_scope = _partner_account.scope_identity
+      raise "Missing Partner Account" unless partner_account
+      _partner_account
     end
 
     def partner_account
@@ -114,11 +133,11 @@ module DoubleEntry
     end
 
     def decrease?
-      amount < Money.empty
+      amount < Money.zero
     end
 
     def increase?
-      amount > Money.empty
+      amount > Money.zero
     end
 
     # Query out just the id and created_at fields for lines, without

data/lib/double_entry/locking.rb

@@ -162,7 +162,6 @@ module DoubleEntry
         @accounts_without_balances.each do |account|
           # Get the initial balance from the lines table.
           balance = account.balance
-
           # Try to create the balance record, but ignore it if someone else has done it in the meantime.
           AccountBalance.create_ignoring_duplicates!(:account => account, :balance => balance)
         end

data/lib/double_entry/reporting/aggregate.rb

@@ -8,7 +8,7 @@ module DoubleEntry
       @function = function.to_s
       raise AggregateFunctionNotSupported unless %w[sum count average].include?(@function)
 
-      @account = account.to_s
+      @account = account
       @code = code ? code.to_s : nil
       @options = options
       @range = options[:range]
@@ -25,17 +25,17 @@ module DoubleEntry
     end
 
     def formatted_amount
-      Aggregate.formatted_amount(function, amount)
+      Aggregate.formatted_amount(function, amount, currency)
     end
 
-    def self.formatted_amount(function, amount)
+    def self.formatted_amount(function, amount, currency)
       safe_amount = amount || 0
 
       case function.to_s
       when 'count'
         safe_amount
       else
-        Money.new(safe_amount)
+        Money.new(safe_amount, currency)
       end
     end
 
@@ -46,6 +46,10 @@ module DoubleEntry
       aggregate.amount if aggregate
     end
 
+    def currency
+      DoubleEntry.currency(account)
+    end
+
     def clear_old_aggregates
       LineAggregate.delete_all(field_hash)
     end
@@ -75,7 +79,7 @@ module DoubleEntry
       when 'average'
         calculate_yearly_average
       else
-        zero = Aggregate.formatted_amount(function, 0)
+        zero = Aggregate.formatted_amount(function, 0, currency)
 
         result = (1..12).inject(zero) do |total, month|
           total += Reporting.aggregate(function, account, code,

data/lib/double_entry/reporting/aggregate_array.rb

@@ -54,7 +54,7 @@ module DoubleEntry
         where(:filter => filter.inspect).
         where(LineAggregate.arel_table[range_type].not_eq(nil)).
         inject({}) do |hash, result|
-          hash[result.key] = Aggregate.formatted_amount(function, result.amount)
+          hash[result.key] = Aggregate.formatted_amount(function, result.amount, currency)
           hash
         end
     end
@@ -62,6 +62,10 @@ module DoubleEntry
     def all_periods
       TimeRangeArray.make(range_type, start, finish)
     end
+
+    def currency
+      DoubleEntry.currency(account)
+    end
   end
  end
 end

data/lib/double_entry/reporting/line_aggregate.rb

@@ -2,7 +2,6 @@
 module DoubleEntry
  module Reporting
   class LineAggregate < ActiveRecord::Base
-    extend EncapsulateAsMoney
 
     def self.aggregate(function, account, code, range, named_scopes)
       collection = aggregate_collection(named_scopes)

data/lib/double_entry/transfer.rb

@@ -4,7 +4,7 @@ module DoubleEntry
 
     # @api private
     def self.transfer(defined_transfers, amount, options = {})
-      raise TransferIsNegative if amount < Money.empty
+      raise TransferIsNegative if amount < Money.zero
       from, to, code, detail = options[:from], options[:to], options[:code],  options[:detail]
       defined_transfers.
         find!(from, to, code).
@@ -52,9 +52,11 @@ module DoubleEntry
 
     def process(amount, from, to, code, detail)
       if from.scope_identity == to.scope_identity and from.identifier == to.identifier
-        raise TransferNotAllowed.new
+        raise TransferNotAllowed.new("from and to are identical")
+      end
+      if to.currency != from.currency
+        raise MismatchedCurrencies.new("Missmatched currency (#{to.currency} <> #{from.currency})")
       end
-
       Locking.lock_accounts(from, to) do
         credit, debit = Line.new, Line.new
 

data/lib/double_entry/validation/line_check.rb

@@ -4,7 +4,6 @@ require 'set'
 module DoubleEntry
  module Validation
   class LineCheck < ActiveRecord::Base
-    extend EncapsulateAsMoney
 
     default_scope -> { order('created_at') }
 
@@ -65,7 +64,8 @@ module DoubleEntry
       # yes, it needs to be find_by_sql, because any other find will be affected
       # by the find_each call in perform!
       previous_line = Line.find_by_sql(["SELECT * FROM #{Line.quoted_table_name} #{force_index} WHERE account = ? AND scope = ? AND id < ? ORDER BY id DESC LIMIT 1", line.account.identifier.to_s, line.scope, line.id])
-      previous_balance = previous_line.length == 1 ? previous_line[0].balance : Money.empty
+
+      previous_balance = previous_line.length == 1 ? previous_line[0].balance : Money.zero(line.account.currency)
 
       if line.balance != (line.amount + previous_balance)
         log << line_error_message(line, previous_line, previous_balance)
@@ -93,7 +93,7 @@ module DoubleEntry
 
     def recalculate_account(account)
       DoubleEntry.lock_accounts(account) do
-        recalculated_balance = Money.empty
+        recalculated_balance = Money.zero(account.currency)
 
         lines_for_account(account).each do |line|
           recalculated_balance += line.amount

data/lib/double_entry/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module DoubleEntry
-  VERSION = "0.6.1"
+  VERSION = "0.7.0"
 end

data/lib/generators/double_entry/install/templates/migration.rb

@@ -41,9 +41,9 @@ class CreateDoubleEntryTables < ActiveRecord::Migration
       t.integer  "day"
       t.integer  "hour"
       t.integer  "amount"
-      t.timestamps
       t.string   "filter"
       t.string   "range_type"
+      t.timestamps
     end
 
     add_index "double_entry_line_aggregates", ["function", "account", "code", "year", "month", "week", "day"], :name => "line_aggregate_idx"

data/spec/double_entry/account_spec.rb

@@ -20,6 +20,18 @@ module DoubleEntry
       expect(a1.hash).to eq a2.hash
       expect(a1.hash).to_not eq b.hash
     end
+
+    describe "currency" do
+      it "defaults to USD currency" do
+        account = DoubleEntry::Account.new(:identifier => "savings", :scope_identifier => identity_scope)
+        expect(DoubleEntry::Account::Instance.new(:account => account).currency).to eq("USD")
+      end
+
+      it "allows the currency to be set" do
+        account = DoubleEntry::Account.new(:identifier => "savings", :scope_identifier => identity_scope, :currency => "AUD")
+        expect(DoubleEntry::Account::Instance.new(:account => account).currency).to eq("AUD")
+      end
+    end
   end
 
   describe Account::Set do

data/spec/double_entry/balance_calculator_spec.rb

@@ -4,8 +4,8 @@ require 'spec_helper'
 describe DoubleEntry::BalanceCalculator do
 
   describe '#calculate' do
-    let(:account) { double.as_null_object }
-    let(:scope) { nil }
+    let(:account) { DoubleEntry::account(:test, :scope => scope) }
+    let(:scope) { double(:id => 1) }
     let(:from) { nil }
     let(:to) { nil }
     let(:at) { nil }
@@ -28,10 +28,10 @@ describe DoubleEntry::BalanceCalculator do
 
     describe 'what happens with different accounts' do
       context 'when the given account is a symbol' do
-        let(:account) { :account }
+        let(:account) { :test }
 
         it 'scopes the lines summed by the account symbol' do
-          expect(DoubleEntry::Line).to have_received(:where).with(:account => 'account')
+          expect(DoubleEntry::Line).to have_received(:where).with(:account => 'test')
         end
 
         context 'with a scopeable entity provided' do
@@ -48,23 +48,6 @@ describe DoubleEntry::BalanceCalculator do
           end
         end
       end
-
-      context 'when the given account is DoubleEntry::Account-like' do
-        let(:account) do
-          DoubleEntry::Account::Instance.new(
-            :account => DoubleEntry::Account.new(
-                          :identifier => 'account_identity',
-                          :scope_identifier => lambda { |scope_id| scope_id },
-                        ),
-            :scope   => 'account_scope_identity'
-          )
-        end
-
-        it 'scopes the lines summed by the accounts identifier and its scope identity' do
-          expect(DoubleEntry::Line).to have_received(:where).with(:account => 'account_identity')
-          expect(relation).to have_received(:where).with(:scope => 'account_scope_identity')
-        end
-      end
     end
 
     describe 'what happens with different times' do

data/spec/double_entry/line_spec.rb

@@ -1,12 +1,15 @@
 # encoding: utf-8
 require "spec_helper"
 describe DoubleEntry::Line do
+  it "has a table name prefixed with double_entry_" do
+    expect(DoubleEntry::Line.table_name).to eq "double_entry_lines"
+  end
 
-  describe "persistent attributes" do
+  describe "persistance" do
     let(:persisted_line) {
       DoubleEntry::Line.new(
         :amount => Money.new(10_00),
-        :balance => Money.empty,
+        :balance => Money.zero,
         :account => account,
         :partner_account => partner_account,
         :code => code,
@@ -15,53 +18,61 @@ describe DoubleEntry::Line do
     let(:account) { DoubleEntry.account(:test, :scope => "17") }
     let(:partner_account) { DoubleEntry.account(:test, :scope => "72") }
     let(:code) { :test_code }
-    before { persisted_line.save! }
     subject { DoubleEntry::Line.last }
 
-    context "given code = :the_code" do
-      let(:code) { :the_code }
-      its(:code) { should eq :the_code }
-    end
+    describe "attributes" do
+      before { persisted_line.save! }
 
-    context "given code = nil" do
-      let(:code) { nil }
-      its(:code) { should eq nil }
-    end
+      context "given code = :the_code" do
+        let(:code) { :the_code }
+        its(:code) { should eq :the_code }
+      end
 
-    context "given account = :test, 54 " do
-      let(:account) { DoubleEntry.account(:test, :scope => "54") }
-      its("account.account.identifier") { should eq :test }
-      its("account.scope") { should eq "54" }
-    end
+      context "given code = nil" do
+        let(:code) { nil }
+        its(:code) { should eq nil }
+      end
+
+      context "given account = :test, 54 " do
+        let(:account) { DoubleEntry.account(:test, :scope => "54") }
+        its("account.account.identifier") { should eq :test }
+        its("account.scope") { should eq "54" }
+      end
 
-    context "given partner_account = :test, 91 " do
-      let(:partner_account) { DoubleEntry.account(:test, :scope => "91") }
-      its("partner_account.account.identifier") { should eq :test }
-      its("partner_account.scope") { should eq "91" }
+      context "given partner_account = :test, 91 " do
+        let(:partner_account) { DoubleEntry.account(:test, :scope => "91") }
+        its("partner_account.account.identifier") { should eq :test }
+        its("partner_account.scope") { should eq "91" }
+      end
+
+      context "currency" do
+        let(:account) { DoubleEntry.account(:btc_test, :scope => "17") }
+        let(:partner_account) { DoubleEntry.account(:btc_test, :scope => "72") }
+        its(:currency) { should eq "BTC" }
+      end
     end
-  end
 
-  describe '#save' do
-    context 'when balance is sent negative' do
-      let(:account) {
-        DoubleEntry.account(:savings, :scope => '17', :positive_only => true)
-      }
+    describe '#save' do
+      context 'when balance is sent negative' do
+        let(:account) {
+          DoubleEntry.account(:savings, :scope => '17', :positive_only => true)
+        }
 
-      let(:line) {
-        DoubleEntry::Line.new(
-          :balance => Money.new(-1),
-          :account => account,
-        )
-      }
+        let(:line) {
+          DoubleEntry::Line.new(
+            :balance => Money.new(-1),
+            :account => account,
+          )
+        }
 
-      it 'raises AccountWouldBeSentNegative exception' do
-        expect { line.save }.to raise_error DoubleEntry::AccountWouldBeSentNegative
+        it 'raises AccountWouldBeSentNegative exception' do
+          expect { line.save }.to raise_error DoubleEntry::AccountWouldBeSentNegative
+        end
       end
     end
-  end
 
-  it "has a table name prefixed with double_entry_" do
-    expect(DoubleEntry::Line.table_name).to eq "double_entry_lines"
+    it "has a table name prefixed with double_entry_" do
+      expect(DoubleEntry::Line.table_name).to eq "double_entry_lines"
+    end
   end
-
 end

data/spec/double_entry/locking_spec.rb

@@ -51,8 +51,8 @@ describe DoubleEntry::Locking do
   end
 
   it "takes the balance for new account balance records from the lines table" do
-    DoubleEntry::Line.create!(:account => @account_a, :amount => Money.new(3_00), :balance => Money.new( 3_00), :code => :test)
-    DoubleEntry::Line.create!(:account => @account_a, :amount => Money.new(7_00), :balance => Money.new(10_00), :code => :test)
+    DoubleEntry::Line.create!(:account => @account_a, :partner_account => @account_b, :amount => Money.new(3_00), :balance => Money.new( 3_00), :code => :test)
+    DoubleEntry::Line.create!(:account => @account_a, :partner_account => @account_b, :amount => Money.new(7_00), :balance => Money.new(10_00), :code => :test)
 
     expect do
       DoubleEntry::Locking.lock_accounts(@account_a) { }

data/spec/double_entry/reporting/aggregate_array_spec.rb

@@ -8,12 +8,13 @@ module DoubleEntry
       let(:finish) { nil }
       let(:range_type) { 'year' }
       let(:function) { :sum }
-
+      let(:account) { :savings }
+      let(:transfer_code) { :bonus }
       subject(:aggregate_array) {
         Reporting.aggregate_array(
           function,
-          :savings,
-          :bonus,
+          account,
+          transfer_code,
           :range_type => range_type,
           :start => start,
           :finish => finish,
@@ -69,6 +70,20 @@ module DoubleEntry
         end
       end
 
+      context 'when account is in BTC currency' do
+        let(:account) { :btc_savings }
+        let(:range_type) { 'year' }
+        let(:start) { "#{Time.now.year}-01-01" }
+        let(:transfer_code) { :btc_test_transfer }
+
+        before do
+          perform_btc_deposit(user, 100_000_000)
+          perform_btc_deposit(user, 100_000_000)
+        end
+
+        it { should eq [ Money.new(200_000_000, :btc) ] }
+      end
+
       context 'when called with range type of "invalid_and_should_not_work"' do
         let(:range_type) { 'invalid_and_should_not_work' }
         it 'raises an argument error' do

data/spec/double_entry/reporting/aggregate_spec.rb

@@ -203,5 +203,18 @@ module DoubleEntry
         end
       end
     end
+    describe Aggregate, "currencies" do
+      let(:user) { User.make! }
+      before do
+        perform_btc_deposit(user, 100_000_000)
+        perform_btc_deposit(user, 200_000_000)
+      end
+
+      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))
+        ).to eq Money.new(300_000_000, :btc)
+      end
+    end
   end
 end

data/spec/double_entry/validation/line_check_spec.rb

@@ -80,6 +80,22 @@ module DoubleEntry::Validation
       end
     end
 
+
+    context 'Given a user with a non default currency balance' do
+      before { User.make!(:bitcoin_balance => Money.new(100_00, 'BTC')) }
+      its(:errors_found) { should eq false }
+      context 'And there is a consistency error in lines' do
+        before { DoubleEntry::Line.order(:id).limit(1).update_all('balance = balance + 1') }
+
+        its(:errors_found) { should eq true }
+        it 'should correct the running balance' do
+          expect {
+            LineCheck.perform!
+          }.to change { DoubleEntry::Line.order(:id).first.balance }.by Money.new(-1, 'BTC')
+        end
+      end
+    end
+
     it "has a table name prefixed with double_entry_" do
       expect(LineCheck.table_name).to eq "double_entry_line_checks"
     end

data/spec/double_entry_spec.rb

@@ -97,17 +97,20 @@ describe DoubleEntry do
           accounts.define(:identifier => :savings)
           accounts.define(:identifier => :cash)
           accounts.define(:identifier => :trash)
+          accounts.define(:identifier => :bitbucket, :currency => :btc)
         end
 
         config.define_transfers do |transfers|
           transfers.define(:from => :savings, :to => :cash, :code => :xfer)
+          transfers.define(:from => :trash, :to => :bitbucket, :code => :mismatch_xfer)
         end
       end
     end
 
-    let(:savings) { DoubleEntry.account(:savings) }
-    let(:cash)    { DoubleEntry.account(:cash) }
-    let(:trash)   { DoubleEntry.account(:trash) }
+    let(:savings)   { DoubleEntry.account(:savings) }
+    let(:cash)      { DoubleEntry.account(:cash) }
+    let(:trash)     { DoubleEntry.account(:trash) }
+    let(:bitbucket) { DoubleEntry.account(:bitbucket) }
 
     it 'can transfer from an account to an account, if the transfer is allowed' do
       DoubleEntry.transfer(
@@ -149,6 +152,17 @@ describe DoubleEntry do
         )
       }.to raise_error DoubleEntry::TransferNotAllowed
     end
+
+    it 'raises an exception when the transfer is not allowed (mismatched currencies)' do
+      expect {
+        DoubleEntry.transfer(
+          Money.new(100_00),
+          :from => trash,
+          :to   => bitbucket,
+          :code => :mismatch_xfer
+        )
+      }.to raise_error DoubleEntry::MismatchedCurrencies
+    end
   end
 
   describe 'lines' do
@@ -219,10 +233,12 @@ describe DoubleEntry do
 
   describe 'balances' do
 
-    let(:work)    { DoubleEntry.account(:work) }
-    let(:savings) { DoubleEntry.account(:savings) }
-    let(:cash)    { DoubleEntry.account(:cash) }
-    let(:store)   { DoubleEntry.account(:store) }
+    let(:work)       { DoubleEntry.account(:work) }
+    let(:savings)    { DoubleEntry.account(:savings) }
+    let(:cash)       { DoubleEntry.account(:cash) }
+    let(:store)      { DoubleEntry.account(:store) }
+    let(:btc_store)  { DoubleEntry.account(:btc_store) }
+    let(:btc_wallet) { DoubleEntry.account(:btc_wallet) }
 
     before do
       DoubleEntry.configure do |config|
@@ -231,6 +247,8 @@ describe DoubleEntry do
           accounts.define(:identifier => :cash)
           accounts.define(:identifier => :savings)
           accounts.define(:identifier => :store)
+          accounts.define(:identifier => :btc_store, :currency => 'BTC')
+          accounts.define(:identifier => :btc_wallet, :currency => 'BTC')
         end
 
         config.define_transfers do |transfers|
@@ -240,6 +258,7 @@ describe DoubleEntry do
           transfers.define(:code => :purchase, :from => :cash,    :to => :store)
           transfers.define(:code => :layby,    :from => :cash,    :to => :store)
           transfers.define(:code => :deposit,  :from => :cash,    :to => :store)
+          transfers.define(:code => :btc_ex,   :from => :btc_store,    :to => :btc_wallet)
         end
       end
 
@@ -267,7 +286,8 @@ describe DoubleEntry do
       end
 
       Timecop.freeze 1.week.from_now do
-        # go to the star wars convention AND ROCK OUT IN YOUR ACE DARTH VADER COSTUME!!!
+        # it's the future, man
+        DoubleEntry.transfer(Money.new(200_00, 'BTC'), :from => btc_store, :code => :btc_ex, :to => btc_wallet)
       end
     end
 
@@ -276,14 +296,19 @@ describe DoubleEntry do
       expect(cash.balance).to eq Money.new(100_00)
       expect(savings.balance).to eq Money.new(300_00)
       expect(store.balance).to eq Money.new(600_00)
+      expect(btc_wallet.balance).to eq Money.new(200_00, 'BTC')
     end
 
     it 'should have correct account balance records' do
-      [work, cash, savings, store].each do |account|
+      [work, cash, savings, store, btc_wallet].each do |account|
         expect(DoubleEntry::AccountBalance.find_by_account(account).balance).to eq account.balance
       end
     end
 
+    it 'should have correct account balance currencies' do
+      expect(DoubleEntry::AccountBalance.find_by_account(btc_wallet).balance.currency).to eq 'BTC'
+    end
+
     it 'affects origin/destination balance after transfer' do
       savings_balance = savings.balance
       cash_balance = cash.balance
@@ -303,6 +328,10 @@ describe DoubleEntry do
       expect(cash.balance(:from => 3.weeks.ago, :to => 2.weeks.ago)).to eq Money.new(500_00)
     end
 
+    it 'can be queried between two points in time, even in the future' do
+      expect(btc_wallet.balance(:from => Time.now, :to => 2.weeks.from_now)).to eq Money.new(200_00, 'BTC')
+    end
+
     it 'can report on balances, scoped by code' do
       expect(cash.balance(:code => :salary)).to eq Money.new(1_000_00)
     end
@@ -341,6 +370,8 @@ describe DoubleEntry do
     end
 
     let(:bank) { DoubleEntry.account(:bank) }
+    let(:cash) { DoubleEntry.account(:cash) }
+    let(:savings) { DoubleEntry.account(:savings) }
 
     let(:john) { User.make! }
     let(:johns_cash) { DoubleEntry.account(:cash, :scope => john) }
@@ -386,5 +417,4 @@ describe DoubleEntry do
       expect(DoubleEntry.balance(:savings)).to eq ryans_savings.balance + johns_savings.balance
     end
   end
-
 end

data/spec/spec_helper.rb

@@ -5,11 +5,19 @@ require 'active_support'
 
 db_engine = ENV['DB'] || 'mysql'
 
-ActiveRecord::Base.establish_connection YAML.load_file(File.expand_path("../support/database.yml", __FILE__))[db_engine]
-
+FileUtils.mkdir_p 'tmp'
 FileUtils.mkdir_p 'log'
 FileUtils.rm 'log/test.log', :force => true
 
+database_config_file = File.expand_path("../support/database.yml", __FILE__)
+if File.exists?(database_config_file)
+  ActiveRecord::Base.establish_connection YAML.load_file(database_config_file)[db_engine]
+else
+  puts "Please configure your spec/support/database.yml file."
+  puts "See spec/support/database.example.yml"
+  exit 1
+end
+
 # Buffered Logger was deprecated in ActiveSupport 4.0.0 and was removed in 4.1.0
 # Logger was added in ActiveSupport 4.0.0
 if defined? ActiveSupport::Logger
@@ -33,16 +41,14 @@ RSpec.configure do |config|
   config.include DoubleEntrySpecHelper
 
   config.before(:suite) do
-    DatabaseCleaner.strategy = :deletion
-    DatabaseCleaner.clean_with(:deletion)
+    DatabaseCleaner.strategy = :truncation
   end
 
-  config.before(:each) do
-    DatabaseCleaner.start
+  config.before do
+    DatabaseCleaner.clean
   end
 
-  config.after(:each) do
+  config.after do
     Timecop.return
-    DatabaseCleaner.clean
   end
 end

data/spec/support/accounts.rb

@@ -5,15 +5,19 @@ DoubleEntry.configure do |config|
   # A set of accounts to test with
   config.define_accounts do |accounts|
     user_scope = accounts.active_record_scope_identifier(User)
-    accounts.define(:identifier => :savings,  :scope_identifier => user_scope, :positive_only => true)
-    accounts.define(:identifier => :checking, :scope_identifier => user_scope, :positive_only => true)
-    accounts.define(:identifier => :test,     :scope_identifier => user_scope)
+    accounts.define(:identifier => :savings,     :scope_identifier => user_scope, :positive_only => true)
+    accounts.define(:identifier => :checking,    :scope_identifier => user_scope, :positive_only => true)
+    accounts.define(:identifier => :test,        :scope_identifier => user_scope)
+    accounts.define(:identifier => :btc_test,    :scope_identifier => user_scope, :currency => "BTC")
+    accounts.define(:identifier => :btc_savings, :scope_identifier => user_scope, :currency => "BTC")
   end
 
   # A set of allowed transfers between accounts
   config.define_transfers do |transfers|
-    transfers.define(:from => :test, :to => :savings,  :code => :bonus)
-    transfers.define(:from => :test, :to => :checking, :code => :pay)
+    transfers.define(:from => :test,     :to => :savings,     :code => :bonus)
+    transfers.define(:from => :test,     :to => :checking,    :code => :pay)
+    transfers.define(:from => :savings,  :to => :test,        :code => :test_withdrawal)
+    transfers.define(:from => :btc_test, :to => :btc_savings, :code => :btc_test_transfer)
   end
 
 end

data/spec/support/blueprints.rb

@@ -2,6 +2,7 @@ class UserBlueprint < Machinist::ActiveRecord::Blueprint
   def make!(attributes = {})
     savings_balance = attributes.delete(:savings_balance)
     checking_balance = attributes.delete(:checking_balance)
+    bitcoin_balance = attributes.delete(:bitcoin_balance)
     user = super(attributes)
     if savings_balance
       DoubleEntry.transfer(
@@ -19,6 +20,14 @@ class UserBlueprint < Machinist::ActiveRecord::Blueprint
         :code => :pay,
       )
     end
+    if bitcoin_balance
+      DoubleEntry.transfer(
+        bitcoin_balance,
+        :from => DoubleEntry.account(:btc_test, :scope => user),
+        :to   => DoubleEntry.account(:btc_savings, :scope => user),
+        :code => :btc_test_transfer,
+      )
+    end
     user
   end
 end

data/spec/support/database.example.yml

@@ -17,5 +17,5 @@ mysql:
 sqlite:
   adapter: sqlite3
   encoding: utf8
-  database: db/double_entry_test.sqlite3
+  database: tmp/double_entry_test.sqlite3
   pool: 100

data/spec/support/database.travis.yml

@@ -20,5 +20,5 @@ postgres:
 sqlite:
   adapter: sqlite3
   encoding: utf8
-  database: db/double_entry_test.sqlite3
+  database: tmp/double_entry_test.sqlite3
   pool: 100

data/spec/support/double_entry_spec_helper.rb

@@ -16,4 +16,12 @@ module DoubleEntrySpecHelper
     )
   end
 
+  def perform_btc_deposit(user, amount)
+    DoubleEntry.transfer(Money.new(amount, :btc),
+      :from => DoubleEntry.account(:btc_test, :scope => user),
+      :to   => DoubleEntry.account(:btc_savings, :scope => user),
+      :code => :btc_test_transfer,
+    )
+  end
+
 end

data/{gemfiles/Gemfile.rails-3.2.0 → spec/support/gemfiles/Gemfile.rails-3.2.x}

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gemspec :path => '../'
+gemspec :path => '../../../'
 
 gem 'i18n', '0.6.11'
-gem 'rails', '~>3.2.0'
+gem 'rails', '~> 3.2.0'

data/spec/support/gemfiles/Gemfile.rails-4.0.x

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec :path => '../../../'
+
+gem 'rails', '~> 4.0.0'

data/spec/support/gemfiles/Gemfile.rails-4.1.x

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec :path => '../../../'
+
+gem 'rails', '~> 4.1.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: double_entry
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Anthony Sellitti
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-10 00:00:00.000000000 Z
+date: 2014-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
@@ -23,70 +23,56 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0
-- !ruby/object:Gem::Dependency
-  name: encapsulate_as_money
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.9
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.9
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -249,11 +235,7 @@ files:
 - LICENSE.md
 - README.md
 - Rakefile
-- db/.gitkeep
 - double_entry.gemspec
-- gemfiles/Gemfile.rails-3.2.0
-- gemfiles/Gemfile.rails-4.0.0
-- gemfiles/Gemfile.rails-4.1.0
 - lib/active_record/locking_extensions.rb
 - lib/double_entry.rb
 - lib/double_entry/account.rb
@@ -308,6 +290,9 @@ files:
 - spec/support/database.example.yml
 - spec/support/database.travis.yml
 - spec/support/double_entry_spec_helper.rb
+- spec/support/gemfiles/Gemfile.rails-3.2.x
+- spec/support/gemfiles/Gemfile.rails-4.0.x
+- spec/support/gemfiles/Gemfile.rails-4.1.x
 - spec/support/reporting_configuration.rb
 - spec/support/schema.rb
 homepage: https://github.com/envato/double_entry
@@ -359,5 +344,8 @@ test_files:
 - spec/support/database.example.yml
 - spec/support/database.travis.yml
 - spec/support/double_entry_spec_helper.rb
+- spec/support/gemfiles/Gemfile.rails-3.2.x
+- spec/support/gemfiles/Gemfile.rails-4.0.x
+- spec/support/gemfiles/Gemfile.rails-4.1.x
 - spec/support/reporting_configuration.rb
 - spec/support/schema.rb

data/gemfiles/Gemfile.rails-4.0.0

@@ -1,5 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec :path => '../'
-
-gem 'rails', '~>4.0.0'

data/gemfiles/Gemfile.rails-4.1.0

@@ -1,5 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec :path => '../'
-
-gem 'rails', '~>4.1.0'