money_helper 1.0.0 → 1.0.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZWIyMmI3OTU3NmUxMjQ2OTBhMDMwMWE3OGI0YTZmYWNlMWIxM2I5MA==
-  data.tar.gz: !binary |-
-    MGFjMWQ5MTRlMzVkYWRjMTA0ZGI1NDQxNjk3NzUzNDRjZWEzM2ZmOA==
+SHA1:
+  metadata.gz: 0ec1d057d296f1729ab55b1becee98afad5c50b7
+  data.tar.gz: 786a1ae33bf67e9d1215be82a7856c0138d5c292
 SHA512:
-  metadata.gz: !binary |-
-    OWIzN2QxZDUwOTMyNWFiMTZmZTdhNzIwZDMwZDBkMmJmMWMzMjQ5YjNiMGE4
-    YzgxYWRlN2YyMGYyODJkNDI4NmI4ZjliZmM4MTM0ZTMzYTc1MWRjOWFlOTE4
-    YmJiY2NiMmU4YzFhM2JlNjM0M2EyYzE2ZGI3MmIzY2YwOGQ3MDA=
-  data.tar.gz: !binary |-
-    ZTVkOWYyZDMzOWM1NmY5NDc1MTRlYmFkNDIwNjk3N2VkNDUwNDI5YWZkZGVi
-    NTAzM2ZhYmQzZWJmNDA3YTllYTg5ZTg1MDcwYjQ0ZmY2MjJlMmI2MGEyMTFj
-    M2NlMjllZDczMDgxZWE2NDhiMzMwYTc0MGZmMzYxMzlhYTUzMDU=
+  metadata.gz: a3ee33d19f4019bfae4b788fb62ca1ccf11d7264c6794b2f5acd5a39cb3ed3ceb967d9897d94c3e6d85ccd99a0e9416d298f688052ad2a6e1ab12affd356ac2f
+  data.tar.gz: 038e37ac696e39834b2a88cd00bdc43fd0771aed279a9dde5d499a5e719e6e46a1a9e3ffbe7d3effe907175163f72c93b713fd656680c634810b1a2f01cfbe9c

data/lib/money_helper.rb

@@ -25,19 +25,27 @@ module MoneyHelper
   #   currency: (String)
   #   number_only: (Boolean) optional flag to exclude currency indicators (retains number formatting
   #     specific to currency)
-  def self.money_to_text(amount, currency, number_only = false)
+  def self.money_to_text(amount, currency, number_only = false, options = {})
     return nil unless amount.present?
     currency = "USD" if currency.blank?
     valid_currency = code_valid?(currency) ? currency : "USD"
     symbol = symbol_for_code(currency)
     include_symbol = !number_only && symbol.present? && OK_SYMBOLS.include?(symbol)
     subunit_factor = Money::Currency.new(valid_currency).subunit_to_unit
+    money_options = { no_cents: true, symbol_position: :before, symbol: include_symbol }.merge(options)
     (number_only || SYMBOL_ONLY.include?(currency) ? "" : currency + " ") +
-      Money.new(amount*subunit_factor.ceil, valid_currency).format({
-        no_cents: true,
-        symbol_position: :before,
-        symbol: include_symbol
-      }).delete(' ')
+      Money.new(amount*subunit_factor.ceil, valid_currency).format(money_options).delete(' ')
+  end
+
+  def self.symbol_with_optional_iso_code(currency = 'USD')
+    symbol = symbol_for_code(currency)
+    if SYMBOL_ONLY.include?(currency)
+      symbol
+    elsif symbol && OK_SYMBOLS.include?(symbol)
+      "#{iso_for_currency(currency)} #{symbol}"
+    else
+      "#{iso_for_currency(currency)}"
+    end
   end
 
   ##
@@ -76,11 +84,17 @@ module MoneyHelper
     Money::Currency.stringified_keys.include?(code.downcase)
   end
 
+  def self.iso_for_currency(code)
+    return unless code && code_valid?(code)
+    Money::Currency.new(code).iso_code.tap do |iso_code|
+      iso_code.strip! if iso_code.present?
+    end
+  end
+
   def self.symbol_for_code(code)
     return unless code && code_valid?(code)
     Money::Currency.new(code).symbol.tap do |symbol|
       symbol.strip! if symbol.present?
     end
   end
-
 end

data/spec/money_helper_spec.rb

@@ -145,6 +145,23 @@ describe MoneyHelper do
       expect(MoneyHelper.money_to_text(10_000, "ITL")).to eql("ITL 10,000")
       expect(MoneyHelper.money_to_text(10_000, "ITL", true)).to eql("10,000")
     end
+    it 'allows options to be passed through and cents displayed' do
+      expect(MoneyHelper.money_to_text(10_000.1, 'USD', nil, no_cents: false)).to eq '$10,000.10'
+      expect(MoneyHelper.money_to_text(10_000.1, 'USD')).to eq '$10,000'
+    end
+  end
+  describe 'symbol_with_optional_iso_code' do
+    it 'just includes the symbol for USD GBP EUR and MYR' do
+      expect(MoneyHelper.symbol_with_optional_iso_code("EUR")).to eql("€")
+      expect(MoneyHelper.symbol_with_optional_iso_code("GBP")).to eql("£")
+      expect(MoneyHelper.symbol_with_optional_iso_code("MYR")).to eql("RM")
+      expect(MoneyHelper.symbol_with_optional_iso_code("USD")).to eql("$")
+    end
+    it 'includes the iso code as well for other currencies' do
+      expect(MoneyHelper.symbol_with_optional_iso_code("AUD")).to eql("AUD $")
+      expect(MoneyHelper.symbol_with_optional_iso_code("UZS")).to eql("UZS")
+      expect(MoneyHelper.symbol_with_optional_iso_code("JPY")).to eql("JPY ¥")
+    end
   end
   describe "money_range_to_text" do
     it "includes no indicator for currency for the upper amount in range" do
@@ -175,4 +192,19 @@ describe MoneyHelper do
       expect(MoneyHelper.money_range_to_text(10_000, 20_000, "ITL")).to eql("ITL 10,000 - 20,000")
     end
   end
+  describe "symbol_with_optional_iso_code" do
+    it "returns the symbol only if currency is in SYMBOL_ONLY list" do
+      expect(MoneyHelper.symbol_with_optional_iso_code("EUR")).to eql("€")
+      expect(MoneyHelper.symbol_with_optional_iso_code("USD")).to eql("$")
+    end
+    it "returns iso code and symbol if symbol is in OK_SYMBOLS" do
+      expect(MoneyHelper.symbol_with_optional_iso_code("INR")).to eql("INR ₹")
+      expect(MoneyHelper.symbol_with_optional_iso_code("KHR")).to eql("KHR ៛")
+      expect(MoneyHelper.symbol_with_optional_iso_code("KPW")).to eql("KPW ₩")
+    end
+    it "returns only the iso code if symbol is not in OK_SYMBOLS" do
+      expect(MoneyHelper.symbol_with_optional_iso_code("CHF")).to eql("CHF")
+      expect(MoneyHelper.symbol_with_optional_iso_code("YER")).to eql("YER")
+    end
+  end
 end

metadata

@@ -1,11 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: money_helper
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Sahil Yakhmi
 - Joey Aghion
+- Matt Zikherman
+- Sarah Weir
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -29,16 +31,16 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -55,14 +57,14 @@ dependencies:
         version: '3'
 description: A simple module to assist in formatting unambiguous prices and price
   ranges in international currencies in a Roman Script context.
-email: sahil@artsymail.net
+email: matt@artsymail.net
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/money_helper.rb
 - spec/money_helper_spec.rb
-homepage: https://github.com/syakhmi/money_helper
+homepage: https://github.com/artsy/money_helper
 licenses:
 - MIT
 metadata: {}
@@ -72,12 +74,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -88,3 +90,4 @@ specification_version: 4
 summary: MoneyHelper international price formatting utility
 test_files:
 - spec/money_helper_spec.rb
+has_rdoc: