rr 0.3.5 → 0.3.6

data/CHANGES

@@ -1,3 +1,6 @@
+* 0.3.6
+- Fixed [#12765] Issues with ObjectSpace._id2ref
+
 * 0.3.5
 - trim_backtrace is only set for Test::Unit
 

data/Rakefile

@@ -25,7 +25,7 @@ def run_suite
 end
 
 PKG_NAME = "rr"
-PKG_VERSION = "0.3.5"
+PKG_VERSION = "0.3.6"
 PKG_FILES = FileList[
   '[A-Z]*',
   '*.rb',

data/examples/example_suite.rb

@@ -5,7 +5,7 @@ class ExampleSuite
   def run
     options = ::Spec::Runner::OptionParser.new.parse(ARGV.dup, STDERR, STDOUT, false)
     $behaviour_runner = options.create_behaviour_runner
-    
+
     require_specs
 
     puts "Running Example Suite"

data/examples/rr/space/hash_with_object_id_key_example.rb

@@ -0,0 +1,86 @@
+require "examples/example_helper"
+
+module RR
+describe HashWithObjectIdKey, "#[] and #[]=" do
+  it "stores object via object id" do
+    hash = HashWithObjectIdKey.new
+    array_1 = []
+    hash[array_1] = 1
+    array_2 = []
+    hash[array_2] = 2
+
+    hash[array_1].should_not == hash[array_2]
+  end
+
+  it "stores the passed in object" do
+    hash = HashWithObjectIdKey.new
+    obj = Object.new
+    hash[obj] = 1
+    hash.instance_eval {@keys}.should == {obj.__id__ => obj}
+  end
+end
+
+describe HashWithObjectIdKey, "#each" do
+  it "iterates through the items in the hash" do
+    hash = HashWithObjectIdKey.new
+    hash['one'] = 1
+    hash['two'] = 2
+
+    keys = []
+    values = []
+    hash.each do |key, value|
+      keys << key
+      values << value
+    end
+
+    keys.sort.should == ['one', 'two']
+    values.sort.should == [1, 2]
+  end
+end
+
+describe HashWithObjectIdKey, "#delete" do
+  before do
+    @hash = HashWithObjectIdKey.new
+    @key = Object.new
+    @hash[@key] = 1
+  end
+
+  it "removes the object from the hash" do
+    @hash.delete(@key)
+    @hash[@key].should == {}
+  end
+
+  it "removes the object from the keys hash" do
+    @hash.delete(@key)
+    @hash.instance_eval {@keys}.should == {}
+  end
+end
+
+describe HashWithObjectIdKey, "#keys" do
+  before do
+    @hash = HashWithObjectIdKey.new
+    @key = Object.new
+    @hash[@key] = 1
+  end
+
+  it "returns an array of the keys" do
+    @hash.keys.should == [@key]
+  end
+end
+
+describe HashWithObjectIdKey, "#include?" do
+  before do
+    @hash = HashWithObjectIdKey.new
+    @key = Object.new
+    @hash[@key] = 1
+  end
+
+  it "returns true when the key is in the Hash" do
+    @hash.should include(@key)
+  end
+
+  it "returns false when the key is not in the Hash" do
+    @hash.should_not include(Object.new)
+  end
+end
+end

data/lib/rr.rb

@@ -1,5 +1,3 @@
-require "forwardable"
-
 require "rr/errors/rr_error"
 require "rr/errors/scenario_definition_error"
 require "rr/errors/scenario_not_found_error"

data/lib/rr/hash_with_object_id_key.rb

@@ -1,28 +1,37 @@
 module RR
 class HashWithObjectIdKey < ::Hash
+  def initialize
+    @keys = {}
+    super do |hash, subject_object|
+      hash.set_with_object_id(subject_object, {})
+    end
+  end
+
   alias_method :get_with_object_id, :[]
   def [](key)
+    @keys[key.__id__] = key
     super(key.__id__)
   end
 
   alias_method :set_with_object_id, :[]=
   def []=(key, value)
+    @keys[key.__id__] = key
     super(key.__id__, value)
   end
 
   def each
     super do |object_id, value|
-      yield ObjectSpace._id2ref(object_id), value
+      yield @keys[object_id], value
     end
   end
 
   def delete(key)
+    @keys.delete(key.__id__)
     super(key.__id__)
   end
 
   def keys
-    raw_keys = super
-    raw_keys.collect {|raw_key| ObjectSpace._id2ref(raw_key)}
+    @keys.values
   end
 
   def include?(key)

data/lib/rr/space.rb

@@ -18,9 +18,7 @@ module RR
     attr_reader :doubles, :ordered_scenarios
     attr_accessor :trim_backtrace
     def initialize
-      @doubles = HashWithObjectIdKey.new do |hash, subject_object|
-        hash.set_with_object_id(subject_object, HashWithObjectIdKey.new)
-      end
+      @doubles = HashWithObjectIdKey.new
       @ordered_scenarios = []
       @trim_backtrace = false
     end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.3
 specification_version: 1
 name: rr
 version: !ruby/object:Gem::Version 
-  version: 0.3.5
-date: 2007-07-29 00:00:00 -07:00
+  version: 0.3.6
+date: 2007-08-01 00:00:00 -07:00
 summary: RR (Double Ruby) is a double framework that features a rich selection of double techniques and a terse syntax. http://xunitpatterns.com/Test%20Double.html
 require_paths: 
 - lib
@@ -95,6 +95,7 @@ files:
 - examples/rr/space/space_create_example.rb
 - examples/rr/space/space_helper.rb
 - examples/rr/space/space_example.rb
+- examples/rr/space/hash_with_object_id_key_example.rb
 - examples/rr/space/space_register_example.rb
 - examples/rr/expectations/is_a_argument_equality_expectation_example.rb
 - examples/rr/expectations/any_argument_expectation_example.rb