latinum 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 995a66ac306c3adf34324d0e1447dea9df94f16f
-  data.tar.gz: 52277f8cc0847a25babc7ea0631075684c82e452
+  metadata.gz: ebfa6ade645c706ea5fc877d0a2cdc386c477e2f
+  data.tar.gz: e35cf37d0744a36bc805e5e8fba62c4e723e49b9
 SHA512:
-  metadata.gz: 1ab641ec952d92003b562c8cb605e9957b7e06d8c650d351ed237ea61e2f60ee6be321da12ae12a290e7f0723b7ba5f44d300a2b2e0114fafbffb73e891bfb13
-  data.tar.gz: 99b1af25e00450dc0ed9a2be09034bac442e25fa1af3b6b644371ffe30b3af14508fb1f05e6a127533bd507cc077c74ef533d42c78ecd2a8fdd3d54178a016dd
+  metadata.gz: 56f9fc756c232955e17a5c387c4a89ffede5c9a6a415315eab19645b41568583a859b006a40b30bd485efa403e430711e1dbdd5be2118ee61fa1da75d75d176d
+  data.tar.gz: a8764c151ca5831afd4e9ef72aa677f95547aca5d4d36bdb116a825ec3e4399c473e4148325d581ef68d3840f6842d78e17c4b45abfb8c6d56da6de29c3f1c6c

data/lib/latinum/formatters.rb

@@ -70,13 +70,16 @@ module Latinum
 				groups = fix[remainder..-1].scan(/.{3}/).to_a
 				groups.unshift(fix[0...remainder]) if remainder > 0
 
-				whole = "#{sign}#{@symbol}#{groups.join(@delimeter)}"
-				name = (@name && options[:format] == :full) ? " #{@name}" : ''
+				symbol = options.fetch(:symbol, @symbol)
+				value = "#{sign}#{symbol}#{groups.join(@delimeter)}"
+
+				name = options.fetch(:name, @name)
+				suffix = name ? " #{name}" : ''
 
 				if @places > 0
-					"#{whole}#{@separator}#{frac}#{name}"
+					"#{value}#{@separator}#{frac}#{suffix}"
 				else
-					"#{whole}#{name}"
+					"#{value}#{suffix}"
 				end
 			end
 			

data/lib/latinum/resource.rb

@@ -19,6 +19,7 @@
 # THE SOFTWARE.
 
 require 'bigdecimal'
+require 'bigdecimal/util'
 
 module Latinum
 	# A fixed unit in a given named resource

data/lib/latinum/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Latinum
-	VERSION = "0.5.3"
+	VERSION = "0.5.4"
 end

data/lib/latinum.rb

@@ -22,5 +22,3 @@ require 'latinum/bank'
 require 'latinum/resource'
 require 'latinum/collection'
 
-require 'bigdecimal'
-require 'bigdecimal/util'

data/spec/latinum/bank_spec.rb

@@ -35,8 +35,8 @@ module Latinum::BankSpec
 		it "should format the amounts correctly" do
 			resource = Latinum::Resource.new("10", "NZD")
 			
-			expect(@bank.format(resource, :format => :full)).to be == "$10.00 NZD"
-			expect(@bank.format(resource, :format => :compact)).to be == "$10.00"
+			expect(@bank.format(resource)).to be == "$10.00 NZD"
+			expect(@bank.format(resource, name: nil)).to be == "$10.00"
 			
 			resource = Latinum::Resource.new("391", "AUD")
 			expect(@bank.format(resource)).to be == "$391.00 AUD"
@@ -51,7 +51,7 @@ module Latinum::BankSpec
 		it "should round values when formatting" do
 			resource = Latinum::Resource.new("19.9989", "NZD")
 			
-			expect(@bank.format(resource, :format => :full)).to be == "$20.00 NZD"
+			expect(@bank.format(resource)).to be == "$20.00 NZD"
 		end
 		
 		it "should exchange currencies from NZD to AUD" do

data/spec/latinum/formatters_spec.rb

@@ -0,0 +1,58 @@
+# Copyright, 2015, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'latinum/bank'
+require 'latinum/currencies/global'
+require 'latinum/formatters'
+
+module Latinum::FormattersSpec
+	describe Latinum::Formatters::DecimalCurrencyFormatter do
+		before(:all) do
+			@bank = Latinum::Bank.new
+			@bank.import(Latinum::Currencies::Global)
+		end
+		
+		let(:resource) {Latinum::Resource.load("10 NZD")}
+		
+		it "should format output" do
+			expect(@bank.format(resource)).to be == "$10.00 NZD"
+		end
+		
+		it "should format output without name" do
+			expect(@bank.format(resource, name: nil)).to be == "$10.00"
+		end
+		
+		it "should format output with alternative name" do
+			expect(@bank.format(resource, name: "Foo")).to be == "$10.00 Foo"
+		end
+		
+		it "should format output" do
+			expect(@bank.format(resource)).to be == "$10.00 NZD"
+		end
+		
+		it "should format output without symbol" do
+			expect(@bank.format(resource, symbol: nil)).to be == "10.00 NZD"
+		end
+		
+		it "should format output with alternative symbol" do
+			expect(@bank.format(resource, symbol: "!!")).to be == "!!10.00 NZD"
+		end
+	end
+end

data/spec/latinum/resource_spec.rb

@@ -22,11 +22,6 @@ require 'latinum/resource'
 
 module Latinum::ResourceSpec
 	describe Latinum::Resource do
-		before(:all) do
-			@bank = Latinum::Bank.new
-			@bank.import(Latinum::Currencies::Global)
-		end
-		
 		it "should load and dump resources" do
 			resource = Latinum::Resource.load("10 NZD")
 			string_representation = Latinum::Resource.dump(resource)
@@ -41,6 +36,13 @@ module Latinum::ResourceSpec
 			expect(Latinum::Resource.dump(nil)).to be nil
 		end
 		
+		it "should load and dump resources correctly" do
+			resource = Latinum::Resource.new(10, 'NZD')
+			
+			expect(Latinum::Resource.load("10.0 NZD")).to be == resource
+			expect(Latinum::Resource.dump(resource)).to be == "10.0 NZD"
+		end
+		
 		it "should inspect nicely" do
 			resource = Latinum::Resource.load("10 NZD")
 			

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: latinum
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-17 00:00:00.000000000 Z
+date: 2015-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,6 +73,7 @@ files:
 - lib/latinum/version.rb
 - spec/latinum/bank_spec.rb
 - spec/latinum/collection_spec.rb
+- spec/latinum/formatters_spec.rb
 - spec/latinum/integrals_spec.rb
 - spec/latinum/resource_spec.rb
 homepage: ''
@@ -103,5 +104,6 @@ summary: Latinum is a simple gem for managing resource computations, including m
 test_files:
 - spec/latinum/bank_spec.rb
 - spec/latinum/collection_spec.rb
+- spec/latinum/formatters_spec.rb
 - spec/latinum/integrals_spec.rb
 - spec/latinum/resource_spec.rb