latinum 0.2.3 → 0.2.4

data/README.md

@@ -43,8 +43,7 @@ To add multiple currencies together, use a collection:
 
 	> currencies = Set.new
 	> collection = Latinum::Collection.new(currencies)
-	> collection << ten
-	> collection << twenty
+	> collection << [ten, twenty]
 	> currencies.collect {|currency| collection[currency]}
 	=> [10.0 NZD, 20.0 AUD]
 

data/lib/latinum/collection.rb

@@ -31,12 +31,34 @@ module Latinum
 		attr :names
 		attr :resources
 		
-		def << resource
+		def add resource
 			@resources[resource.name] += resource.amount
+		end
+		
+		def << object
+			case object
+			when Resource
+				add(object)
+			when Array
+				object.each { |resource| add(resource) }
+			when Collection
+				object.resources.each { |name, amount| @resources[name] += amount }
+			end
 			
 			return self
 		end
 		
+		def others
+			self.dup
+			
+			case others
+			when Array
+				others.each { |resource| self << resource }
+			when Collection
+				
+			end
+		end
+		
 		def [] key
 			Resource.new(@resources[key], key)
 		end

data/lib/latinum/version.rb

@@ -22,7 +22,7 @@ module Latinum
 	module VERSION
 		MAJOR = 0
 		MINOR = 2
-		TINY  = 3
+		TINY  = 4
 
 		STRING = [MAJOR, MINOR, TINY].join('.')
 	end

data/test/test_collection.rb

@@ -24,4 +24,21 @@ class CollectionTest < Test::Unit::TestCase
 		collection << resource
 		assert_equal resource * 2, collection["NZD"]
 	end
+	
+	def test_additions
+		resources = [
+			Latinum::Resource.new("10", "NZD"),
+			Latinum::Resource.new("10", "AUD"),
+			Latinum::Resource.new("10", "USD"),
+			Latinum::Resource.new("10", "NZD"),
+			Latinum::Resource.new("10", "AUD"),
+			Latinum::Resource.new("10", "USD")
+		]
+		
+		collection = Latinum::Collection.new
+		collection << resources
+		
+		assert_equal resources[0] * 2, collection["NZD"]
+		assert_equal Set.new(["NZD", "AUD", "USD"]), collection.names
+	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: latinum
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-27 00:00:00.000000000 Z
+date: 2012-07-31 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: samuel.williams@oriontransfer.co.nz