money-collection 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31d48e73a143672af436d2128462573a8f9b7d70
-  data.tar.gz: 2c8528a4f6163392762d25ddea387eb6649d860a
+  metadata.gz: 9dbf6e30305deef2f8b131375fbd5db5431d17f7
+  data.tar.gz: eaec499c10c2a72b21b855c099840f53508be107
 SHA512:
-  metadata.gz: 9027fda3114e23db23061ab4a88d31e071a89d690a11c4de994c0c8b6517d6a41f5e28aa1620dff27285be12aac433612e95871ff3609d6bc457aeb82d358603
-  data.tar.gz: 85632bb6ae43b0eac67779762a35909c1d00894ba67c51cb727413f78f977538d3349d1af189c1094e5f2822c55390dfefe098bf2f0dd3b34eedf5bdb3bb3313
+  metadata.gz: cf26ece7e7182b27b578456681969abc24586b6ef3d212dc536b086e4f1901b54047d62b037855f8c50d2685c7cd03147263d1c32d47b68fddb8cd9d33262bfe
+  data.tar.gz: c133ab32c399853444bcd1e681a283963d32f9ec97c7a08ba578b67752668b1727be287372e8e705affe6a1ba356908eef18035e0f84d0f780b5d6fd45680d90

data/lib/money/collection.rb

@@ -20,29 +20,26 @@ class Money
 
       if @group_by_currency.size == 1
         sum = self.class.sum_single_currency(@collection)
+        if target_currency
+          sum = sum.exchange_to(target_currency)
+        end
       else
         sums_per_currency = @group_by_currency.values.map{|moneys|
           self.class.sum_single_currency(moneys)
         }
 
-        # If target_currency is specified, and is in collection,
-        # move it to the front so it has precedence over other currencies.
+        # Convert to target_currency if specified
         if target_currency
-          target_currency = self.class.convert_to_currency_object(target_currency)
-          if index = sums_per_currency.find_index{|money| money.currency == target_currency}
-            money = sums_per_currency.delete_at(index)
-            sums_per_currency.unshift money
-          end
+          target_currency = Money::Currency.wrap(target_currency)
+          sums_per_currency.map!{|s|
+            s.exchange_to(target_currency)
+          }
         end
 
         sum = self.class.sum_basic(sums_per_currency)
       end
 
-      if target_currency.nil?
-        return sum
-      else
-        return sum.exchange_to(target_currency)
-      end
+      sum
     end
 
     def max
@@ -112,14 +109,5 @@ class Money
       total_fractional = moneys.reduce(0){|fractional, money| fractional += money.fractional }
       Money.new(total_fractional, moneys[0].currency)
     end
-
-    def self.convert_to_currency_object(currency)
-      case currency
-      when String, Symbol
-        ::Money::Currency.new(currency)
-      when ::Money::Currency
-        currency
-      end
-    end
   end
 end

data/lib/money/collection/version.rb

@@ -1,5 +1,5 @@
 class Money
   class Collection
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/spec/money/collection_spec.rb

@@ -12,6 +12,16 @@ describe Money::Collection do
 
     Money.add_rate("FOO", "USD", 0.5)
     Money.add_rate("USD", "FOO", 2)
+
+
+    bar = {
+      :iso_code        => "BAR",
+      :subunit_to_unit => 100,
+    }
+    Money::Currency.register(bar)
+
+    Money.add_rate("BAR", "FOO", 1)
+    Money.add_rate("FOO", "BAR", nil) # Disallow conversion
   end
 
   it 'has version' do
@@ -89,6 +99,17 @@ describe Money::Collection do
       c.sum('usd').must_equal Money.new(11,:usd)
     end
 
+    it 'returns sum in the specified currency and without unnecessary intermediate conversion' do
+      ary = [
+        Money.new(10,:usd),
+        Money.new(1,:bar),
+      ]
+
+      c = Money::Collection.new(ary)
+
+      c.sum('foo').must_equal Money.new(21,:foo)
+    end
+
     it 'returns sum large number of Money' do
       10.times do
         # force first bunch to be FOO, the a bunch of USD,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: money-collection
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - lulalala
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-28 00:00:00.000000000 Z
+date: 2014-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money