latinum 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c055e958ac724d131bdbb261f18f6f8b6e6f475a77d633710077a0722c19ffc
-  data.tar.gz: 258a4c2c4233bc9e030a9e5cec7b685c0f7563bb012427809a6c6901067f69f1
+  metadata.gz: 1d47aa25865b0ac4f8a71378e34f3ab3d2747cbcc53028aa39cf5db59ee7c283
+  data.tar.gz: 73244a39809482164e21800ac18a18831cd57c625e9a98d4036fc9a13e02ec71
 SHA512:
-  metadata.gz: cd104cf3d2664d37fde830088298544795148a782ff3ad37f9265acfbbac0d1e159d5aba27cbb8dfbac1679f25771fb0a26e902835f3b3417c465defa117d3ea
-  data.tar.gz: 6891feee50ec8cb81c7d6f99857ad555d8ad283a1d3729efdf4ed8f92204a3699beae4ef457e06d6e905d7890f5cca6464beb4f92c552da0853682ba3e671da5
+  metadata.gz: af1494045eaecbf9ca00635bd7f9e02355554116d4227dc4fc8ef61326ab0be480b8891624352ad5f89639db482a0d7ed101e38ec47276523f93ab66d30059e1
+  data.tar.gz: f03166e50246ff382aa4423c3e1438d5fbfefb66f5da4c6cd043a40e7f64282e37eb1c27e424c0f290f9aa30f790746bf0d9813eec3b21818e5be65c3350f1e9

data/lib/latinum/bank.rb

@@ -124,18 +124,28 @@ module Latinum
 			parts = string.strip.split(/\s+/, 2)
 			
 			if parts.size == 2
-				return Resource.new(parts[0].gsub(/[^\-\.0-9]/, ''), parts[1])
+				return parse_named_resource(parts[1], parts[0])
 			else
 				# Lookup the named symbol, e.g. '$', and get the highest priority name:
 				symbol = @symbols.fetch(string.gsub(/[\-\.,0-9]/, ''), []).last
 				
 				if symbol
-					return Resource.new(string.gsub(/[^\-\.0-9]/, ''), symbol.last.to_s)
+					name = symbol.last.to_s
 				elsif default_name
-					return Resource.new(string.gsub(/[^\-\.0-9]/, ''), default_name.to_s)
+					name = default_name
 				else
-					raise ArgumentError.new("Could not parse #{string}, could not determine currency!")
+					raise ArgumentError, "Could not parse #{string}, could not determine resource name!"
 				end
+				
+				return parse_named_resource(name, string)
+			end
+		end
+		
+		private def parse_named_resource(name, value)
+			if formatter = @formatters[name]
+				return Resource.new(formatter.parse(value), name)
+			else
+				raise ArgumentError, "No formatter found for #{name}!"
 			end
 		end
 		

data/lib/latinum/currencies/global.rb

@@ -76,7 +76,7 @@ module Latinum
 			:name => 'EUR',
 			:description => 'Euro',
 			:formatter => Formatters::DecimalCurrencyFormatter,
-			#:delimeter => '.',
+			#:delimiter => '.',
 			#:separator => ','
 		}
 		
@@ -90,6 +90,18 @@ module Latinum
 			:formatter => Formatters::DecimalCurrencyFormatter
 		}
 		
+		# @name Global[:BRL]
+		# @attribute [Hash] The Brazilian Real configuration.
+		Global[:BRL] = {
+			:precision => 2,
+			:symbol => 'R$',
+			:name => 'BRL',
+			:description => 'Brazilian Real',
+			:formatter => Formatters::DecimalCurrencyFormatter,
+			:delimiter => '.',
+			:separator => ','
+		}
+		
 		# @name Global[:BTC]
 		# @attribute [Hash] The Bitcoin configuration.
 		Global[:BTC] = {

data/lib/latinum/formatters.rb

@@ -28,6 +28,12 @@ module Latinum
 				@name = name
 			end
 			
+			# Parse a string into an amount.
+			# @returns [BigDecimal] The parsed amount.
+			def parse(string)
+				BigDecimal(string)
+			end
+			
 			# Formats the amount using a general notation.
 			# e.g. "5.0 NZD".
 			# @returns [String] The formatted string.
@@ -55,7 +61,7 @@ module Latinum
 			def initialize(**options)
 				@symbol = options[:symbol] || '$'
 				@separator = options[:separator] || '.'
-				@delimeter = options[:delimeter] || ','
+				@delimiter = options[:delimiter] || ','
 				@places = options[:precision] || 2
 				@zero = options[:zero] || '0'
 				
@@ -66,7 +72,15 @@ module Latinum
 				return amount.round(@places)
 			end
 			
-			# Formats the amount using the configured symbol, separator, delimeter, and places.
+			# Parse a string into an amount using the configured separator and delimiter.
+			# @returns [BigDecimal] The parsed amount.
+			def parse(string)
+				BigDecimal(
+					string.gsub(/[^\-0-9#{@separator}]/, '').gsub(@separator, '.')
+				)
+			end
+			
+			# Formats the amount using the configured symbol, separator, delimiter, and places.
 			# e.g. "$5,000.00 NZD". Rounds the amount to the specified number of decimal places.
 			# @returns [String] The formatted string.
 			def format(amount, places: @places, **options)
@@ -87,7 +101,7 @@ module Latinum
 				groups.unshift(integral[0...remainder]) if remainder > 0
 				
 				symbol = options.fetch(:symbol, @symbol)
-				value = "#{sign}#{symbol}#{groups.join(@delimeter)}"
+				value = "#{sign}#{symbol}#{groups.join(@delimiter)}"
 				
 				name = options.fetch(:name, @name)
 				suffix = name ? " #{name}" : ''

data/lib/latinum/version.rb

@@ -21,5 +21,5 @@
 # THE SOFTWARE.
 
 module Latinum
-	VERSION = "1.7.0"
+	VERSION = "1.7.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: latinum
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-14 00:00:00.000000000 Z
+date: 2021-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Provides immutable resource and money computations.