shopify-money 0.11.4 → 0.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83c2db01e42a2e8495d522c5e2d1e8f1f0503503
-  data.tar.gz: 57aee0d1d639f9564792794add56654d4adfd8ef
+  metadata.gz: 9441b8dab64b7077e0d960f6a81dc069c283ac90
+  data.tar.gz: 3fddaf1c805956ee9ca67c9295047698dfeb19f3
 SHA512:
-  metadata.gz: e994c9974a9c75e5a3307fb93babbfbff2adaa44606b5eff744586a94ffc5ee4e596894d01fdf03488fc3023090db19fdd5b6e032a33adbe4d9ca3276e795341
-  data.tar.gz: 0cb26b9374ff0c6dbf583d5415f2c2e2e1390d490b3ce02ac03f86c27ca31cc23aa69e835e66f1149a026b0475aa64164ab7f0787da7e8235f97e1e7a8681494
+  metadata.gz: d3c7e5ff1f9ac0a66bbcf0097f5cfdc5c7fa2b202d499850ab5c6620dcece9d96936c3b1e9a8abd6c387be910b8c92d7ef42263755752b4766dcedbac187546e
+  data.tar.gz: 36ac7078e3b1960f91d399517c468c29c62744a1068525c23263c4401ab075aae0be8c6e7f166e64050be2a1d6d78dfdcb3f26daab97000a97493a2e3bf41464

data/lib/money/deprecations.rb

@@ -8,7 +8,7 @@ Money.class_eval do
   def self.deprecate(message)
     if ACTIVE_SUPPORT_DEFINED
       external_callstack = caller_locations.reject do |location|
-        location.to_s.include?('gems/money')
+        location.to_s.include?('gems/shopify-money')
       end
       active_support_deprecator.warn("[Shopify/Money] #{message}\n", external_callstack)
     else

data/lib/money/version.rb

@@ -1,3 +1,3 @@
 class Money
-  VERSION = "0.11.4"
+  VERSION = "0.11.5"
 end

data/lib/money_column/active_record_hooks.rb

@@ -49,13 +49,13 @@ module MoneyColumn
       end
 
       currency_raw_source = options[:currency] || (send(options[:currency_column]) rescue nil)
-      currency_source = Money::Helpers.value_to_currency(currency_raw_source)
 
       if !money.is_a?(Money)
-        return self[column] = Money.new(money, currency_source).value
+        return self[column] = Money.new(money, currency_raw_source).value
       end
 
-      if currency_raw_source && !currency_source.compatible?(money.currency)
+      currency_source = currency_raw_source ? Money::Helpers.value_to_currency(currency_raw_source) : Money::NULL_CURRENCY
+      unless currency_source.compatible?(money.currency)
         Money.deprecate("[money_column] currency mismatch between #{currency_source} and #{money.currency}.")
       end
 

data/spec/money_column_spec.rb

@@ -367,4 +367,28 @@ RSpec.describe 'MoneyColumn' do
       expect(MoneyClassInheritance2.instance_variable_get(:@money_column_options).keys).to_not include('prix')
     end
   end
+
+  describe 'default_currency = nil' do
+    around do |example|
+      default_currency = Money.default_currency
+      Money.default_currency = nil
+      example.run
+      Money.default_currency = default_currency
+    end
+
+    it 'writes currency from input value to the db' do
+      record.update(currency: nil)
+      record.update(price: Money.new(7, 'GBP'))
+      record.reload
+      expect(record.price.value).to eq(7)
+      expect(record.price.currency.to_s).to eq('GBP')
+    end
+
+    it 'raises missing currency error when input is not a money object' do
+      record.update(currency: nil)
+
+      expect { record.update(price: 3) }
+        .to raise_error(ArgumentError, 'missing currency')
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-money
 version: !ruby/object:Gem::Version
-  version: 0.11.4
+  version: 0.11.5
 platform: ruby
 authors:
 - Shopify Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-22 00:00:00.000000000 Z
+date: 2018-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler