double_entry 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 614ed4f674917475306caf7d8ebbd2d71c72a5b0
-  data.tar.gz: ff2a94aa12cb75fa558ecab769c47a59cf40226e
+  metadata.gz: 32faa0991a3e20450e5c310ed76831804f8f8489
+  data.tar.gz: b4d643d8739f316dc7d0b3404bfd13d6bbc5f678
 SHA512:
-  metadata.gz: 1c98e390fa45e02e0e117c7283964db04b6eb7d4b5c27d3de54f8d541284c40c6c557c46c47ef15d6caadb94db5341da1c4095f6adaa269675f6c5e0f100329f
-  data.tar.gz: da1243b2adf4f047a90250cd30ecefb49d478869dc1ed2b44bb3d0263e34ed831e8afd155bdfcf7d5c33cba077f282e1e0ac6ae28c2a20a202bda8c5131d12a2
+  metadata.gz: 3f23c6af662e48e0dd8e520111628faf5f9d59e5d6b3e10d5a9cd3cb94ec9f6f5d9829d5bc86636ec4f5cac7dc6ca502a6ef011baba6e4c3b70aa7944b5a042d
+  data.tar.gz: 34d17bcd0b139a5dad177a588c737a5ef2b3704db52b83812b6dae3e2ac600a4eef4a2b4a642d11474e2cf074eeaebdb3d64e489e1c34033f4c67283bcb0791d

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.1.4
+  - 2.1.5
   - 1.9.3
 env:
   - DB=mysql

data/README.md

@@ -21,7 +21,7 @@ DoubleEntry is tested against:
 
 Ruby
  * 1.9.3
- * 2.1.4
+ * 2.1.5
 
 Rails
  * 3.2.x

data/lib/double_entry.rb

@@ -41,7 +41,7 @@ module DoubleEntry
     #   match that defined on the account.
     #
     def account(identifier, options = {})
-      Account.account(configuration.accounts, identifier, options)
+      Account.account(identifier, options)
     end
 
     # Transfer money from one account to another.
@@ -77,7 +77,7 @@ module DoubleEntry
     #   accounts with the provided code is not allowed. Check configuration.
     #
     def transfer(amount, options = {})
-      Transfer.transfer(configuration.transfers, amount, options)
+      Transfer.transfer(amount, options)
     end
 
     # Get the current or historic balance of an account.
@@ -135,14 +135,6 @@ 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

@@ -2,21 +2,24 @@
 module DoubleEntry
   class Account
 
-    # @api private
-    def self.account(defined_accounts, identifier, options = {})
-      account = defined_accounts.find(identifier, options[:scope].present?)
-      DoubleEntry::Account::Instance.new(:account => account, :scope => options[:scope])
-    end
+    class << self
+      attr_writer :accounts
 
-    # @api private
-    def self.currency(defined_accounts, account)
-      code = account.is_a?(Symbol) ? account : account.identifier
+      # @api private
+      def accounts
+        @accounts ||= Set.new
+      end
 
-      found_account = defined_accounts.detect do |account|
-        account.identifier == code
+      # @api private
+      def account(identifier, options = {})
+        account = accounts.find(identifier, options[:scope].present?)
+        Instance.new(:account => account, :scope => options[:scope])
       end
 
-      found_account.currency
+      # @api private
+      def currency(identifier)
+        accounts.detect { |a| a.identifier == identifier }.try(:currency)
+      end
     end
 
     # @api private
@@ -66,11 +69,12 @@ module DoubleEntry
     end
 
     class Instance
-      attr_accessor :account, :scope
+      attr_reader :account, :scope
       delegate :identifier, :scope_identifier, :scoped?, :positive_only, :currency, :to => :account
 
-      def initialize(attributes)
-        attributes.each { |name, value| send("#{name}=", value) }
+      def initialize(args)
+        @account = args[:account]
+        @scope = args[:scope]
         ensure_scope_is_valid
       end
 
@@ -128,11 +132,13 @@ module DoubleEntry
       end
     end
 
-    attr_accessor :identifier, :scope_identifier, :positive_only, :currency
+    attr_reader :identifier, :scope_identifier, :positive_only, :currency
 
-    def initialize(attributes)
-      attributes.each { |name, value| send("#{name}=", value) }
-      self.currency ||= Money.default_currency
+    def initialize(args)
+      @identifier = args[:identifier]
+      @scope_identifier = args[:scope_identifier]
+      @positive_only = args[:positive_only]
+      @currency = args[:currency] || Money.default_currency
     end
 
     def scoped?

data/lib/double_entry/balance_calculator.rb

@@ -17,11 +17,10 @@ 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), currency)
+        Money.new(lines.sum(:amount), account.currency)
       else
         # all other lookups can be performed with running balances
         result = lines.
@@ -29,7 +28,7 @@ module DoubleEntry
           order('id DESC').
           limit(1).
           pluck(:balance)
-        result.empty? ? Money.zero(currency) : Money.new(result.first, currency)
+        result.empty? ? Money.zero(account.currency) : Money.new(result.first, account.currency)
       end
     end
 

data/lib/double_entry/configuration.rb

@@ -3,12 +3,8 @@ module DoubleEntry
   include Configurable
 
   class Configuration
-    attr_accessor :accounts, :transfers
-
-    def initialize #:nodoc:
-      @accounts = Account::Set.new
-      @transfers = Transfer::Set.new
-    end
+    delegate :accounts, :accounts=, :to => "DoubleEntry::Account"
+    delegate :transfers, :transfers=, :to => "DoubleEntry::Transfer"
 
     def define_accounts
       yield accounts

data/lib/double_entry/reporting/aggregate.rb

@@ -47,7 +47,7 @@ module DoubleEntry
     end
 
     def currency
-      DoubleEntry.currency(account)
+      DoubleEntry::Account.currency(account)
     end
 
     def clear_old_aggregates

data/lib/double_entry/reporting/aggregate_array.rb

@@ -64,7 +64,7 @@ module DoubleEntry
     end
 
     def currency
-      DoubleEntry.currency(account)
+      DoubleEntry::Account.currency(account)
     end
   end
  end

data/lib/double_entry/transfer.rb

@@ -2,13 +2,23 @@
 module DoubleEntry
   class Transfer
 
-    # @api private
-    def self.transfer(defined_transfers, amount, options = {})
-      raise TransferIsNegative if amount < Money.zero
-      from, to, code, detail = options[:from], options[:to], options[:code],  options[:detail]
-      defined_transfers.
-        find!(from, to, code).
-        process(amount, from, to, code, detail)
+    class << self
+      attr_writer :transfers
+
+      # @api private
+      def transfers
+        @transfers ||= Set.new
+      end
+
+      # @api private
+      def transfer(amount, options = {})
+        raise TransferIsNegative if amount < Money.zero
+        from = options[:from]
+        to = options[:to]
+        code = options[:code]
+        detail = options[:detail]
+        transfers.find!(from, to, code).process(amount, from, to, code, detail)
+      end
     end
 
     # @api private

data/lib/double_entry/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: double_entry
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Anthony Sellitti
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-17 00:00:00.000000000 Z
+date: 2014-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money