rhash 0.0.3 → 0.0.4

data/lib/rhash.rb

@@ -12,7 +12,7 @@ class Info
 		"#{key.inspect} => #{value.inspect}"
 	end
 end
-	
+
 class RHash
 	#
 	# Returns a new, empty RHash.
@@ -71,23 +71,24 @@ class RHash
 		end
 	end	
 	
-	#
-	# Return the contents of this hash as a string.
-	#
-	def inspect		
-		msg = '{'
-		@hash.each_with_index do |info, index|
-			msg += info.to_s
-			msg += ", " if @hash.size > 1 and index + 1 < @hash.size 
-		end
-		msg += '}'
-		msg
-	end
-	
 	#
 	# Returns a RHash orderned by key name or block.
 	# If block is given using Array#sort else sort by name.
 	#
+	#  my_hash = RHash.new
+	#  
+	#  my_hash["cow"] = "mooo..."
+	#
+	#  my_hash["chick"] = "cocó..." 
+	#
+	#  my_hash["bee"] = "ziiii..."
+	#
+	#  my_hash.sort                #=> Returns RHash object.
+	#
+	#  sort_hash = my_hash.sort
+	#
+	#  sort_hash.inspect           #=> {"bee" => "ziiii...", "chick" => "cocó...", "cow" => "mooo..."}
+	#
 	def sort(&block)
 		sort_rhash = RHash.new
 		int_sort(&block).each do |info|
@@ -100,6 +101,16 @@ class RHash
 	# Sorts self.
 	# If block is given using Array#sort else sort by name.
 	#
+	#  my_hash = RHash.new
+	#  
+	#  my_hash["cow"] = "mooo..."
+	#
+	#  my_hash["chick"] = "cocó..." 
+	#
+	#  my_hash["bee"] = "ziiii..."
+	#
+	#  my_hash.sort!.inspect       #=> {"bee" => "ziiii...", "chick" => "cocó...", "cow" => "mooo..."}
+	#
 	def sort!(&block)
 		sort_hash = int_sort(&block)
 		clear
@@ -109,7 +120,7 @@ class RHash
 	end	
 	
 	#
-	# Orderned RHash and calls block once for each key in RHash,
+	# Orders RHash and calls block once for each key in RHash,
 	# passing the key and value to the block as a two-element array
 	#
 	def sort_each(&block)
@@ -119,6 +130,17 @@ class RHash
 		end
 	end
 	
+	#
+	# Orders RHash and calls block once for each key in RHash,
+	# passing the key and value to the block.
+	#
+	def sort_each_pair(&block)
+		new_hash = int_sort
+		new_hash.each do |info|
+			yield info.key, info.value if block_given?
+		end
+	end
+	
 	#
 	# See Hash::each
 	#
@@ -244,13 +266,6 @@ class RHash
 		new_hash
 	end
 
-	#
-	# See RHash::inspect
-	#	
-	def to_s
-		inspect
-	end
-	
 	#
 	# See Hash::merge
 	#	
@@ -292,6 +307,13 @@ class RHash
 		end
 	end
 	
+	#
+	# See Hash::store
+	#
+	def store(key, value)
+		self[key] = value
+	end	
+	
 	#
 	# Returns an array with first key and value found in RHash. 
 	#
@@ -304,7 +326,8 @@ class RHash
 	# Returns an array with last key and value found in RHash. 
 	#
 	def last 
-		@hash.last
+		last = @hash.last
+		[last.key, last.value]
 	end
 	
 	#
@@ -367,10 +390,68 @@ class RHash
 	end	
 	
 	#
-	# See Hash::store
+	# See Hash::values_at
 	#
-	def store(key, value)
-		self[key] = value
+	def values_at(*keys)
+		selected = []
+		@hash.each do |info|
+			selected << info.value if keys.include? info.key
+		end
+		selected
+	end
+	
+	#
+	# See Hash::==
+	# 
+	def ==(other)
+		if other.is_a? Hash
+			return equal(other)
+		end
+		
+		if other.is_a? RHash
+			return equal(other)
+		end	
+		false
+	end
+	
+	#
+	# Returns two arrays with difference between RHash and Hash/RHash.
+	# Each array contains different keys and values have found. 
+	# The first array is related to whom calls the method 
+	# and the second array referring to those who want to diff.
+	#
+	#  n = RHash.new
+	#
+	#  n["r"] = 5
+	#
+	#  n["s"] = 6
+	#
+	#  n["d"] = 5
+	#
+	#  n[:h] = "ola"
+	#
+	#  n[:m] = 5
+	#
+	#  x= RHash.new
+	#
+	#  x["r"] = 5
+	#
+	#  x["s"] = 6
+	#
+	#  x["d"] = 5
+	#
+	#  x["t"] = 5
+	#
+	#  n.diff x        #=> [[:h, "ola"], [:m, 5]], [["t", 5]]
+	#
+	def diff(other)
+		if other.is_a? Hash
+			return int_diff(other)
+		end
+		
+		if other.is_a? RHash
+			return int_diff(other)
+		end	
 	end	
 	
 	#
@@ -385,15 +466,24 @@ class RHash
 	end	
 	
 	#
-	# See Hash::values_at
+	# Return the contents of this hash as a string.
 	#
-	def values_at(*keys)
-		selected = []
-		@hash.each do |info|
-			selected << info.value if keys.include? info.key
+	def inspect		
+		msg = '{'
+		@hash.each_with_index do |info, index|
+			msg += info.to_s
+			msg += ", " if @hash.size > 1 and index + 1 < @hash.size 
 		end
-		selected
+		msg += '}'
+		msg
 	end
+
+	#
+	# See RHash::inspect
+	#	
+	def to_s
+		inspect
+	end	
 	
 	#
 	# Converts to a Hash.
@@ -408,6 +498,44 @@ class RHash
 	
 	private
 	
+	def equal(other)
+		if other.size == self.size
+			hits = other.size
+			self.each_pair do |key, value|
+				other.each_pair do |k,v|
+					hits = hits - 1 if (key == k) and (value == v)						
+				end					
+			end
+			return (hits == 0)? true : false
+		else
+			return false	
+		end
+	end
+	
+	def int_diff(other)
+		my_diff    = []
+		other_diff = []
+		is_member  = false
+		self.each_pair do |key, value|
+			other.each_pair do |k,v|
+				is_member = true if (key == k) and (value == v)						
+			end
+			my_diff << [key, value] unless is_member
+			is_member = false		
+		end
+		
+		is_member  = false
+		other.each_pair do |key, value|
+			self.each_pair do |k,v|
+				is_member = true if (key == k) and (value == v)						
+			end
+			other_diff << [key, value] unless is_member
+			is_member = false		
+		end
+		
+		return my_diff, other_diff
+	end
+	
 	def int_sort(&block)
 		new_hash = []
 		if !block_given?

data/test/test.rb

@@ -1,75 +1,27 @@
 require 'lib/rhash'
-
+require 'rubygems'
+#require 'test/unit'
 n = RHash.new
-n['b'] = 400
-n['g'] = 5
-n["a"] = 8
-n["x"] = 105
-n["xx"] = 1054
+n["r"] = 5
+n["s"] = 6
+n["d"] = 5
+n[:h] = "ola"
+n[:m] = 5
+
+#x= {}
+#x["s"] = 5
+#x["r"] = 6
+
+x= RHash.new
+x["r"] = 5
+x["s"] = 6
+x["d"] = 5
+x["t"] = 5
+
+#puts n == x
+#puts n == 5
 
-#puts n.inspect
-#n.sort!{|i,j| i[0] <=> j[0]}
-#puts n.inspect
-#x = n.sort{|i,j| i[1] <=> j[1]}
-#puts x.class
-#puts x.inspect
-#puts n.inspect
-#puts n[:s] 
-#n.sort_each{|i| puts i}
-#n.each{|i| puts i}
-#n.each_pair{|i, j| puts i; puts j+1}
-#n.each_value{|i| puts i+10}
-#n.each_key{|i| puts i.inspect}
-puts n.select{|i| i.value > 100}
-#puts n.keys.inspect
-#puts n.values.inspect
-#puts n.has_key?("a")
-#puts n.has_key?(:a)
-#puts n.has_value?(50)
-#puts n.has_value?(105)
-#n.delete_if{|i, j| i == :g}
-#puts n.inspect
-#puts n.delete(:gh){|i| puts "Key #{i} not found"}
-#puts n.inspect
-#puts n.invert
-#puts n.length
-#puts n.size
-#m = RHash.new
-#m[:h] = :garrafa
-#m[:b] = "a"
-#m = {:h => "garrafas", :b => :a}
-#n.merge! m
-#x = n.merge m
-#puts "Hash pós merge"
-#puts x.inspect
-#puts "Hash original"
-#puts n.inspect
-#puts n.inspect
-#puts n.first
-#puts n.last
-#puts n.fetch(:hhh){"hahahahaha"}
-#n.clear
-#puts n.inspect
-#h = RHash.new
-#h.default = "5"
-#h.default(5)
-#puts h.inspect
-#h.default= Proc.new {|h, k| h[k] = k.to_i*10}
-#h.default(5)
-#h.default(10)
-#puts h.inspect
-#h = RHash.new{|h, k| h[k] = k.to_i*10}
-#h.default(5)
-#h.default(10)
-#puts h.inspect
-#puts n.inspect
-#n.shift
-#puts n.inspect
-#n.store(666, 0)
-#puts n.inspect
-#puts n.to_a.inspect
-#puts n.empty?
-#m = RHash.new
-#puts m.empty?
-#puts n.values_at(:a, :xxx).inspect
+a,b = n.diff x
 
+puts a.inspect
+puts b.inspect

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhash
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Rodrigo Mello Nardi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-14 00:00:00 -03:00
+date: 2010-07-15 00:00:00 -03:00
 default_executable: 
 dependencies: []