latinum 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4a1959c3b1c833751fdc2536ce1db9c040e48be
-  data.tar.gz: a870124602130bfcfc036ba61abdbcc529af9645
+  metadata.gz: f7ea6c1821dd5955481bf78aeddadb8df92d6f4e
+  data.tar.gz: 27b5bf126b861190724bf689e6d04ee534b789b0
 SHA512:
-  metadata.gz: 85efa5c7e88b2a0e5b41f039054daae59f55848060d24f9d6d0d8a88e406391a77309febdf727c10db505e4bd2de76e656de1e6e996eed485c3f396fdcc72027
-  data.tar.gz: c620f6a689945b472cee3290a01f89c4fef33d192c6600fbe5f14346b0071b92c46cb0c5d865b38ffce630d2f4b38825edbca8c9a098692f565c6d50c3a3f496
+  metadata.gz: fb53fc6b6c7067acb3129351b160a7b105e0eea8fa9395326106470bb23a66dbbd051f217bbca59820cf8cfb89f65fbf3e28d42c1e166f98a969600fe47ab7c4
+  data.tar.gz: b2d02183d4da42c3cf2477e96964439e99fa8ec0fcc00e27775f08c9761e68ad06986963fd90ce6cc1a59951f145d1534b07d387468e3d7073e8e3ebbe1489ad

data/lib/latinum/resource.rb

@@ -89,13 +89,16 @@ module Latinum
 			"#<#{self.class.name} #{self.to_s.dump}>"
 		end
 		
+		# Compare with another resource or a Numeric value.
 		def <=> other
-			return nil unless other and other.is_a? self.class
-			
-			if @name == other.name
-				@amount <=> other.amount
-			else
-				@name <=> other.name
+			if other.is_a? self.class
+				result = @amount <=> other.amount
+				return result unless result == 0
+
+				result = @name <=> other.name
+				return result
+			elsif other.is_a? Numeric
+				@amount <=> other
 			end
 		end
 		

data/lib/latinum/version.rb

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

data/spec/latinum/comparison_spec.rb

@@ -0,0 +1,42 @@
+# 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/resource'
+
+module Latinum::ComparisonSpec
+	describe Latinum::Resource do
+		it "should be comparable to numeric values" do
+			resource = Latinum::Resource.load("10 NZD")
+			
+			expect(resource).to be < 20
+			expect(resource).to be > 5
+			expect(resource).to be == 10
+		end
+		
+		it "should compare with nil" do
+			a = Latinum::Resource.load("10 NZD")
+			
+			expect{a <=> nil}.to_not raise_exception
+			expect{a == nil}.to_not raise_exception
+			expect(a <=> nil).to be == nil
+			expect(a == nil).to be == false
+		end
+	end
+end

data/spec/latinum/resource_spec.rb

@@ -72,14 +72,5 @@ module Latinum::ResourceSpec
 			
 			expect(original_price / 2.0).to be == Latinum::Resource.load("5 NZD")
 		end
-		
-		it "should compare with nil" do
-			a = Latinum::Resource.load("10 NZD")
-			
-			expect{a <=> nil}.to_not raise_exception
-			expect{a == nil}.to_not raise_exception
-			expect(a <=> nil).to be == nil
-			expect(a == nil).to be == false
-		end
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: latinum
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-20 00:00:00.000000000 Z
+date: 2015-10-07 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/comparison_spec.rb
 - spec/latinum/formatters_spec.rb
 - spec/latinum/integrals_spec.rb
 - spec/latinum/resource_spec.rb
@@ -104,6 +105,7 @@ 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/comparison_spec.rb
 - spec/latinum/formatters_spec.rb
 - spec/latinum/integrals_spec.rb
 - spec/latinum/resource_spec.rb