bean_sprout 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f8703dcac93814b06f78ef5c7f6081d41e3809c
-  data.tar.gz: 3d50d400de7ff74305f88db06a0feef6c6816658
+  metadata.gz: c152d339fb6536aa158b1c41060934381664be78
+  data.tar.gz: ecaed26f13bbbdfdb2befa88bad5336d4e02fb62
 SHA512:
-  metadata.gz: 73181700e7e1a3e20b552bc4010cdd4820718fc19c7990968183fad0e8f3e4aa99a49b043099e261e5a60556b06a7d5e56de2744516f54babbb0776dcba93c41
-  data.tar.gz: 85fb4800498552ed1a3a5f3b491c07456467044f048682ea3198387bef22f1ff407634449f8723ca9991d5646939242f7c58fd9b9a9c7c0edc24559b76e32757
+  metadata.gz: e0836bf16fac2e63bcf6484eee2bfddf6cb5e8902fd2044b211c4fe6be68de4c4747287dfa62531845659932779d9447c0763b8d1235bad551a83c22f3e360de
+  data.tar.gz: 5b665a4661aa28f7f5167e052f1892d13a532da3da38c6f1d02ad5bc5f4039dd0ea782a07321c3550d79d0028b46c784d83f696727671c5d63e1963ff03dd85f

data/lib/bean_sprout/entry.rb

@@ -7,29 +7,23 @@ module BeanSprout
   # 1. The account owns the entry, the currency of which is defined as the local
   # currency;
   # 2. The amount to be added to the account balance, in local currency;
-  # 3. Convention rate from local currency to the base currency;
-  # 4. Other arbitrary data.
+  # 3. Other arbitrary data.
   class Sprout
     include PackagePrivate::InternalClass
-    attr_reader :id, :bean, :amount, :rate
+    attr_reader :id, :bean, :amount
 
     define_public_interface :Entry
 
-    def initialize id, bean, amount, rate = 1
+    def initialize id, bean, amount
       @id = id
       @bean = bean
       @amount = amount.to_d
-      @rate = rate
-    end
-
-    def unified_amount
-      amount * rate
     end
   end
 
   # Public Interface.
   class Entry < PackagePrivate::PublicInterfaceBase
-    def_default_delegators :amount, :unified_amount, :rate
+    def_default_delegators :amount
     def_private_default_delegators :bean
 
     def account

data/lib/bean_sprout/ledger.rb

@@ -13,6 +13,7 @@ module BeanSprout
       @beans = SparseArray.new
       @sprout_bunches = SparseArray.new
       @sprouts = SparseArray.new
+      @dummy_accounts = {}
     end
 
     def create_account currency, other_data: nil
@@ -23,21 +24,14 @@ module BeanSprout
       Account.new(bean, other_data)
     end
 
-    def create_entry account, amount, rate = nil, other_data: nil
+    def create_entry account, amount, other_data: nil
       bean = get_target account
       if not @beans.has_key? bean.id
         raise "Unkown account #{bean.to_account} refered."
       end
 
-      if not (rate or bean.currency == base_currency)
-        raise "Rate must be specified if account is not in base currency " +
-          "#{base_currency}."
-      end
-      rate ||= 1
-
-
       sprout = @sprouts.store do |next_id|
-        Sprout.new(next_id, bean, amount, rate)
+        Sprout.new(next_id, bean, amount)
       end
 
       Entry.new(sprout, other_data)
@@ -62,21 +56,12 @@ module BeanSprout
       commit_entries [entry0, entry1]
     end
 
-    def base_currency_forex_transfer from_acc, to_acc, from_amount, to_amount
-      raise "Amount can't be 0." unless from_amount != 0 && to_amount != 0
-
-      rate0 = rate1 = nil
-      if from_acc.currency == @base_currency
-        rate1 = from_amount / to_amount
-      elsif to_acc.currency == @base_currency
-        rate0 = to_amount / from_amount
-      else
-        raise "Forex transfer must be to or from an account of base currency."
-      end
-
-      entry0 = create_entry from_acc, -from_amount, rate0
-      entry1 = create_entry to_acc, to_amount, rate1
-      commit_entries [entry0, entry1]
+    def forex_transfer from_acc, to_acc, from_amount, to_amount
+      entry0 = create_entry from_acc, -from_amount
+      entry1 = create_entry (dummy_account from_acc.currency), from_amount
+      entry2 = create_entry to_acc, to_amount
+      entry3 = create_entry (dummy_account to_acc.currency), -to_amount
+      commit_entries [entry0, entry1, entry2, entry3]
     end
 
     # TODO: clients can't access ID.
@@ -111,8 +96,10 @@ module BeanSprout
       end
     end
 
-    def dummy_account
-      @dummy_account ||= create_account @base_currency, other_data: "This is a dummy account."
+    def dummy_account currency = nil
+      currency ||= @base_currency
+      acc = create_account currency, other_data: "This is a dummy account for #{currency}."
+      @dummy_accounts[currency] ||= acc
     end
 
     private

data/lib/bean_sprout/transaction.rb

@@ -20,11 +20,14 @@ module BeanSprout
     end
 
     def balanced?
-      balance = 0
+      balances = Hash.new(0)
       @sprouts.each do |sprout|
-        balance += sprout.unified_amount
+        currency = sprout.bean.currency
+        balances[currency] += sprout.amount
+      end
+      balances.values.inject(true) do |acc, currency_balance|
+        acc && currency_balance == 0
       end
-      balance == 0
     end
 
     def balanced!

data/lib/bean_sprout/version.rb

@@ -1,3 +1,3 @@
 module BeanSprout
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bean_sprout
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Liqing Muyi