monetize 1.11.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10b41ae5e40bb51d6d3fae9eb49cdd73c7be8542dd80c43467a12483f1c8e63b
-  data.tar.gz: 86ccb9489502a681cc271cca544eb2f1dbf9268034f1a7b83e2d1ddaa97d4f9a
+  metadata.gz: fec107ece48dc97d0e602c4176dc4bee8e9dd7be4172c0a507df4efa941ddc12
+  data.tar.gz: d15c4dd9bfc270948d69e6ffb9483baa9cde97743111d0fb68b3f6f1db8d6c9d
 SHA512:
-  metadata.gz: c25475d1877bc00dceb06e01cb6863e4e805e87128320b6f77f2a7847930d22e1930ec9ee7cbe0f7efc462428348c05937121b2c45830cbf8f2003fd89dcd64c
-  data.tar.gz: fe0a09adc661a2d4afbbc7ee7ee7327d55fef5be9045f8c54d487121e6cc7057d9b53e1fa3890abad382fb8a71e178c69da04a2d95c069cd07880ae22f5f6818
+  metadata.gz: 2bae292db1e6349b333248bab902017130ee85741e0321e8429216c83ca17c79003f36355eaced3e21fa8e9969df5a29f8fe538fe79ecef7f951b882f8cafe10
+  data.tar.gz: f5cc392537c1d8487c3117c680f9e49d0d38ec0db67fcda73594a4a7ce0dfddd8224338eaf5e97da880a86a5e31b4181fb287b9dd8b079f47ec104fd0edbfd49

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 1.12.0
+- Update `to_money` to match money-rails to_hash.
+
 ## 1.11.0
 - When parsing a string assume a single separator to be a decimal mark when number starts with 0
 

data/lib/monetize/core_extensions/hash.rb

@@ -2,7 +2,16 @@
 
 class Hash
   def to_money(currency = nil)
-    hash_currency = self[:currency].is_a?(Hash) ? self[:currency][:iso_code] : self[:currency]
-    Money.new(self[:cents] || self[:fractional], hash_currency || currency || Money.default_currency)
+    money_hash = self.respond_to?(:with_indifferent_access) ? self.with_indifferent_access : self
+
+    hash_currency = if money_hash[:currency].is_a?(Hash)
+                      money_hash[:currency][:iso_code]
+                    elsif money_hash[:currency_iso] && !money_hash[:currency_iso].empty?
+                      money_hash[:currency_iso]
+                    else
+                      money_hash[:currency]
+                    end
+
+    Money.new(money_hash[:cents] || money_hash[:fractional], hash_currency || currency || Money.default_currency)
   end
 end

data/lib/monetize/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Monetize
-  VERSION = '1.11.0'
+  VERSION = '1.12.0'
 end

data/spec/core_extensions_spec.rb

@@ -230,6 +230,14 @@ describe Monetize, 'core extensions' do
           expect(hash.to_money).to eq(Money.new(100, 'USD'))
         end
       end
+        
+      context 'when Money to_hash is used' do
+        subject(:hash) { { cents: 100, currency_iso: 'SGD' } }
+
+        it 'converts Hash to Money, interpreting fractional as cents' do
+          expect(hash.to_money).to eq(Money.new(100, 'SGD'))
+        end
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: monetize
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.12.0
 platform: ruby
 authors:
 - Shane Emmons
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-04 00:00:00.000000000 Z
+date: 2022-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: A library for converting various objects into `Money` objects.