shopify-money 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c62660129723a9f481f8221721c4da317b576a9
-  data.tar.gz: c70fd044ea5a5a1631c24b3725615fed02cf74b8
+  metadata.gz: 2a4ff9c5c0514d928eb29644cca8da3e19123b2f
+  data.tar.gz: 99e5abcead9b256bd4fe950c6c84e9af762074f1
 SHA512:
-  metadata.gz: 8f8a19b78a2c33b5b0952d433e9d9d88f55fd7105c054478e51656a6137d935a92bf220309116960f08ac56392d3ff0fcf4dafdaafcb7d614874d3e442953bc2
-  data.tar.gz: 37f28f245c3ba5f4f1833f60981b1c0075f6391f2a88dbdae73ac489b37fdd4dc8c88c12f1ff25292489e58a065f25c29956ee58c7d61d4b5bf3fc85ba02b23c
+  metadata.gz: 83ff997ed70b2edd7730b950e7557e813e7c01b1b4b85cd10f5e1957773b0e164811dce6ea20860221763443a9cb0f4399ae973f5664060a4097fe53b1ff5c4b
+  data.tar.gz: 58c3dcb9062789668e00758c6cfd78856e7ef3f0b78fe468187a2c605591e6a21c5aaee3589cf86bef7c5a93d458ddd74571d27596392685bc6333503ba63adb

data/lib/money/money.rb

@@ -183,7 +183,16 @@ class Money
     [ReverseOperationProxy.new(other), self]
   end
 
-  def to_money(_currency = nil)
+  def to_money(curr = nil)
+    if !curr.nil? && no_currency?
+      return Money.new(value, curr)
+    end
+
+    curr = Helpers.value_to_currency(curr)
+    unless currency.compatible?(curr)
+      Money.deprecate("mathematical operation not permitted for Money objects with different currencies #{curr} and #{currency}.")
+    end
+
     self
   end
 
@@ -388,9 +397,6 @@ class Money
     raise TypeError, "#{money_or_numeric.class.name} can't be coerced into Money" unless money_or_numeric.respond_to?(:to_money)
     other = money_or_numeric.to_money(currency)
 
-    unless currency.compatible?(other.currency)
-      Money.deprecate("mathematical operation not permitted for Money objects with different currencies #{other.currency} and #{currency}.")
-    end
     yield(other)
   end
 

data/lib/money/version.rb

@@ -1,3 +1,3 @@
 class Money
-  VERSION = "0.11.1"
+  VERSION = "0.11.2"
 end

data/spec/money_spec.rb

@@ -38,6 +38,15 @@ RSpec.describe "Money" do
     expect(money.to_money).to eq(money)
   end
 
+  it "#to_money uses the provided currency when it doesn't already have one" do
+    expect(Money.new(1).to_money('CAD')).to eq(Money.new(1, 'CAD'))
+  end
+
+  it "#to_money doesn't overwrite the money object's currency" do
+    expect(Money).to receive(:deprecate).once
+    expect(Money.new(1, 'USD').to_money('CAD')).to eq(Money.new(1, 'USD'))
+  end
+
   it "defaults to 0 when constructed with no arguments" do
     expect(Money.new).to eq(Money.new(0))
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-money
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors:
 - Shopify Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-23 00:00:00.000000000 Z
+date: 2018-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler