money_helper 3.0.0 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fc38d5c4921667c0f06286f5058378d60658b3f991dd7a343f5ab597384560c
-  data.tar.gz: c88db16a193d5674d9f902466aace23c8b7b1a0f71b89733589a05be7059049b
+  metadata.gz: bb985ae46b6f1d331cdb546b36399e4fc2feb0c8124386c8caf6d928cb219d85
+  data.tar.gz: a76132d24051dcd2a01e56562f85062fa1a1d7f2e90478c99ae2ed84d755f243
 SHA512:
-  metadata.gz: 1c258cca4d8ac444695faedd9245d1f805bcb5534bcf6f864dffdcfe330bf8f54f6c10caf800e32c1c2621bc523f6277acde3821a16c6a11edf31b777cdbdc6b
-  data.tar.gz: 8133b959081243c17b6d160ec72a802ed79648989c60ebaca8546a8509cc145b1148f89de4cc1e4ee89cc51459cc0e54fcf58f29a7d5fd412b4f1a93a85744fa
+  metadata.gz: 65875f337079054720b379eb8201b6c2a37168aafa60034f76e9dbf43e062cacb43c1bdf4a4e174a03a44692a64c73c676a11359f4b54766d48f15d835216301
+  data.tar.gz: 3f9168ad1f54e3d3b4ad333596b79de2a875cd2d1aa039ea1c2a185971b8636ff8446ba2223958104f3b4846927e928be627f4134e48c3f828f91b13c4c16998

data/Appraisals

@@ -13,7 +13,7 @@ appraise 'activesupport_61' do
 end
 
 appraise 'activesupport_edge' do
-  git 'git://github.com/rails/rails.git' do
+  git 'https://github.com/rails/rails.git', branch: 'main' do
     gem 'activesupport', require: 'active_support'
   end
 end

data/CHANGELOG.md

@@ -1,7 +1,16 @@
-### 3.0.0 (Next)
+### X.X.X (Next)
 
-* [#27](https://github.com/artsy/money_helper/pull/27): Update `money_to_text` to pass `format` options to `Money#format` for additional features such as `no_cents` - [@agrberg](https://github.com/agrberg).
 * Your contribution here.
+### 3.0.2 (2023-03-22)
+
+* [#30](https://github.com/artsy/money_helper/pull/30): Update `money_range_to_text` to receive `format` parameter for optional formatting - [@leamotta](https://github.com/leamotta).
+### 3.0.1 (2023-03-21)
+
+* [#29](https://github.com/artsy/money_helper/pull/29): Update `money_range_to_text` to receive `with_currency` parameter for optional ISO code printing - [@leamotta](https://github.com/leamotta).
+
+### 3.0.0 (2022-02-16)
+
+* [#27](https://github.com/artsy/money_helper/pull/27): Update `money_to_text` to pass `format` options to `Money#format` for additional features such as `no_cents` - [@agrberg](https://github.com/agrberg).
 
 ### 2.0.0 (2021-09-20)
 

data/gemfiles/activesupport_edge.gemfile

@@ -4,7 +4,7 @@
 
 source 'http://rubygems.org'
 
-git 'git://github.com/rails/rails.git' do
+git 'https://github.com/rails/rails.git', branch: 'main' do
   gem 'activesupport', require: 'active_support'
 end
 

data/lib/money_helper.rb

@@ -70,18 +70,22 @@ module MoneyHelper
   #   high: (Integer) amount in minor unit
   #   currency: (String) optional ISO currency code, defaulting to USD
   #   delimiter: (String) optional
-  def self.money_range_to_text(low, high, currency: 'USD', delimiter: ' - ')
+  #   with_currency: (Boolean) optional flag to include ISO currency code, defaulting to true
+  # 　format: (Hash) optional formatting options to pass to `Money#format` e.g.:
+  #     no_cents: (Boolean) optional flag to exclude cents, defaulting to false
+  #     symbol: (Boolean) optional flag to include currency symbol, defaulting to true
+  def self.money_range_to_text(low, high, currency: 'USD', delimiter: ' - ', with_currency: true, format: {})
     if low.blank? && high.blank?
       ''
     elsif low.blank?
-      "Under #{money_to_text(high, currency: currency)}"
+      "Under #{money_to_text(high, currency: currency, with_currency: with_currency, format: format)}"
     elsif high.blank?
-      "#{money_to_text(low, currency: currency)} and up"
+      "#{money_to_text(low, currency: currency, with_currency: with_currency, format: format)} and up"
     elsif low == high
-      money_to_text(low, currency: currency)
+      money_to_text(low, currency: currency, with_currency: with_currency, format: format)
     else
-      formatted_low = money_to_text(low, currency: currency)
-      formatted_high = money_to_text(high, currency: currency, with_currency: false, format: { symbol: false })
+      formatted_low = money_to_text(low, currency: currency, with_currency: with_currency, format: format)
+      formatted_high = money_to_text(high, currency: currency, with_currency: false, format: { symbol: false }.merge(format))
       [formatted_low, formatted_high].compact.join(delimiter)
     end
   end

data/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MoneyHelper
-  VERSION = '3.0.0'
+  VERSION = '3.0.2'
 end

data/spec/money_helper_spec.rb

@@ -205,18 +205,49 @@ describe MoneyHelper do
       expect(MoneyHelper.money_range_to_text(nil, 40_983_27, currency: 'USD')).to eql('Under USD $40,983.27')
     end
 
+    it "prefixes the text 'Under ' when low amount not given and omits ISO code when with_currency is false" do
+      expect(MoneyHelper.money_range_to_text(nil, 40_983_27, currency: 'USD', with_currency: false)).to eql('Under $40,983.27')
+    end
+
     it "appends the text ' and up' when high amount not given" do
       expect(MoneyHelper.money_range_to_text(30_175_93, nil, currency: 'USD')).to eql('USD $30,175.93 and up')
     end
 
+    it "appends the text ' and up' when high amount not given and omits ISO code when with_currency is false" do
+      expect(MoneyHelper.money_range_to_text(30_175_93, nil, currency: 'USD', with_currency: false)).to eql('$30,175.93 and up')
+    end
+
     it 'treats as a single price when low amount and high amount are identical' do
       expect(MoneyHelper.money_range_to_text(30_175_93, 30_175_93, currency: 'USD')).to eql('USD $30,175.93')
     end
 
+    it 'treats as a single price when low amount and high amount are identical and omits ISO code when with_currency is false' do
+      expect(MoneyHelper.money_range_to_text(30_175_93, 30_175_93, currency: 'USD', with_currency: false)).to eql('$30,175.93')
+    end
+
     it 'returns empty string when both amounts are nil' do
       expect(MoneyHelper.money_range_to_text(nil, nil, currency: 'USD')).to eql('')
     end
 
+    it 'omits ISO code when with_currency is false' do
+      expect(MoneyHelper.money_range_to_text(30_175_93, 40_983_27, currency: 'EUR', with_currency: false)).to eql('€30.175,93 - 40.983,27')
+      expect(MoneyHelper.money_range_to_text(30_175_93, 40_983_27, currency: 'AUD', with_currency: false)).to eql('$30,175.93 - 40,983.27')
+      expect(MoneyHelper.money_range_to_text(30_175_93, 40_983_27, currency: 'AMD', with_currency: false)).to eql('դր.30,175.93 - 40,983.27')
+    end
+
+    it 'omits cents when `format: no_cents:` is true' do
+      expect(MoneyHelper.money_range_to_text(30_175_93, 40_983_27, with_currency: false, format: { no_cents: true })).to eql('$30,175 - 40,983')
+      expect(MoneyHelper.money_range_to_text(30_175_93, 40_983_27, currency: 'EUR', with_currency: false, format: { no_cents: true })).to eql('€30.175 - 40.983')
+      expect(MoneyHelper.money_range_to_text(30_175_93, 30_175_93, currency: 'EUR', with_currency: false, format: { no_cents: true })).to eql('€30.175')
+      expect(MoneyHelper.money_range_to_text(nil, 30_175_93, currency: 'EUR', with_currency: false, format: { no_cents: true })).to eql('Under €30.175')
+      expect(MoneyHelper.money_range_to_text(30_175_93, nil, currency: 'EUR', with_currency: false, format: { no_cents: true })).to eql('€30.175 and up')
+    end
+
+    it 'omits cents when `format: no_cents:` is true, omits symbol when `format: symbol:` is false' do
+      expect(MoneyHelper.money_range_to_text(30_175_93, 40_983_27, with_currency: false, format: { no_cents: true, symbol: false })).to eql('30,175 - 40,983')
+      expect(MoneyHelper.money_range_to_text(30_175_93, 40_983_27, currency: 'EUR', with_currency: false, format: { no_cents: true, symbol: false })).to eql('30.175 - 40.983')
+    end
+
     it "raises an exception when currency can't be found" do
       expect do
         MoneyHelper.money_range_to_text(10_000, 20_000, currency: 'ITL')

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: money_helper
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.2
 platform: ruby
 authors:
 - Sahil Yakhmi
 - Joey Aghion
 - Matt Zikherman
 - Sarah Weir
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-16 00:00:00.000000000 Z
+date: 2023-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -102,7 +102,7 @@ homepage: https://github.com/artsy/money_helper
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -117,8 +117,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.2.27
-signing_key:
+rubygems_version: 3.1.2
+signing_key: 
 specification_version: 4
 summary: MoneyHelper international price formatting utility.
 test_files: