sender 1.4.2 → 1.4.3

data/CHANGELOG.rdoc

@@ -35,4 +35,8 @@ __sender__ and __caller__ now work for :initialize and return the object and met
 
 === 1.4.1-2 2010-06-29
 
-Fixed path problem for VERSION.rdoc.
+Fixed path problem for VERSION.rdoc.
+
+=== 1.4.3 2010-06-29
+
+Fixed problems with superclass method definitions so __sender__ and __caller__ return the caller to the first method in the class chain.

data/README.rdoc

@@ -28,7 +28,7 @@ which allows contents of the backtrace to be queried.
 
 == EXAMPLE:
 
-	require '../sender/lib/sender/sender'
+	require 'sender'
 
 	require 'pp'
 
@@ -51,18 +51,27 @@ which allows contents of the backtrace to be queried.
 	    test2.and_another_test_in_another_object
 	  end
     
+	  def and_another_test_in_another_object
+	    puts 'In method <Test>:and_another_test_in_another_object'
+	    puts 'Sender was: ' + __sender__.pretty_inspect.to_s
+	    puts 'Caller was: ' + __caller__.to_s
+	  end
+    
 	end
 
-	class Test2
+	class Test2 < Test
   
 	  def initialize
 	    puts 'In method <Test2>:initialize'
+	    super
 	    puts 'Sender was: ' + __sender__.pretty_inspect.to_s
 	    puts 'Caller was: ' + __caller__.to_s
+	    pp Kernel.backtrace
 	  end
   
 	  def and_another_test_in_another_object
 	    puts 'In method <Test2>:and_another_test_in_another_object'
+	    super
 	    pp self
 	    puts 'Sender was: ' + __sender__.pretty_inspect.to_s
 	    puts 'Caller was: ' + __caller__.to_s
@@ -87,7 +96,7 @@ which allows contents of the backtrace to be queried.
 
 	puts 'Finished Test.'
 	exit
-	
+
 == EXAMPLE's OUTPUT:
 	
 	In method <Test>:initialize
@@ -96,34 +105,56 @@ which allows contents of the backtrace to be queried.
 	In <Test>:test
 	In method <Test>:another_test
 	In method <Test2>:initialize
-	Sender was: #<Test:0x0000010180ddf8>
+	In method <Test>:initialize
+	Sender was: #<Test:0x0000010102a400>
 	Caller was: another_test
+	Sender was: #<Test:0x0000010102a400>
+	Caller was: another_test
+	[{:object=>#<Test2:0x00000100823030>,
+	  :file=>"sender_test.rb",
+	  :line=>40,
+	  :method=>:initialize},
+	 {:object=>Test2, :file=>nil, :line=>nil, :method=>:new},
+	 {:object=>#<Test:0x0000010102a400>,
+	  :file=>"sender_test.rb",
+	  :line=>20,
+	  :method=>:another_test},
+	 {:object=>#<Test:0x0000010102a400>,
+	  :file=>"sender_test.rb",
+	  :line=>15,
+	  :method=>:test},
+	 {:object=>main, :file=>"sender_test.rb", :line=>66, :method=>:"<main>"},
+	 {:object=>main, :file=>"<main>", :line=>0, :method=>:"<main>"}]
 	In method <Test2>:and_another_test_in_another_object
-	#<Test2:0x0000010180b158>
-	Sender was: #<Test:0x0000010180ddf8>
+	In method <Test>:and_another_test_in_another_object
+	This is the super method for :and_another_test_in_another_object
+	Sender was: #<Test2:0x00000100823030>
 	Caller was: another_test
-	[{:object=>#<Test2:0x0000010180b158>,
+	#<Test2:0x00000100823030>
+	Sender was: #<Test:0x0000010102a400>
+	Caller was: another_test
+	[{:object=>#<Test2:0x00000100823030>,
 	  :file=>"sender_test.rb",
-	  :line=>39,
-	  :method=>"and_another_test_in_another_object"},
-	 {:object=>#<Test:0x0000010180ddf8>,
+	  :line=>49,
+	  :method=>:and_another_test_in_another_object},
+	 {:object=>#<Test:0x0000010102a400>,
 	  :file=>"sender_test.rb",
 	  :line=>21,
-	  :method=>"another_test"},
-	 {:object=>#<Test:0x0000010180ddf8>,
+	  :method=>:another_test},
+	 {:object=>#<Test:0x0000010102a400>,
 	  :file=>"sender_test.rb",
 	  :line=>15,
-	  :method=>"test"},
-	 {:object=>main, :file=>"sender_test.rb", :line=>56, :method=>"<main>"},
-	 {:object=>main, :file=>"<main>", :line=>0, :method=>"<main>"}]
-	[{:object=>#<Test2:0x0000010180b158>,
+	  :method=>:test},
+	 {:object=>main, :file=>"sender_test.rb", :line=>66, :method=>:"<main>"},
+	 {:object=>main, :file=>"<main>", :line=>0, :method=>:"<main>"}]
+	[{:object=>#<Test2:0x00000100823030>,
 	  :file=>"sender_test.rb",
-	  :line=>40,
-	  :method=>"and_another_test_in_another_object"},
-	 {:object=>#<Test:0x0000010180ddf8>,
+	  :line=>50,
+	  :method=>:and_another_test_in_another_object},
+	 {:object=>#<Test:0x0000010102a400>,
 	  :file=>"sender_test.rb",
 	  :line=>21,
-	  :method=>"another_test"}]
+	  :method=>:another_test}]
 	These should be true:
 	true
 	true

data/VERSION.rdoc

@@ -1 +1 @@
-1.4.2
+1.4.3

data/ext/sender/rb_Global.c

@@ -43,16 +43,38 @@ VALUE rb_RPRuby_Sender___sender__()	{
 	VALUE	rb_backtrace_limit		=	INT2FIX( 3 );
 
 	VALUE	rb_backtrace_array		=	rb_RPRuby_Sender_Kernel_backtrace(	1,
-																		& rb_backtrace_limit,
-																		rb_mKernel );
-
-	VALUE	rb_backtrace_frame_hash	=	rb_ary_entry( rb_backtrace_array, 1 );
+																			& rb_backtrace_limit,
+																			rb_mKernel );
+	
+	int		c_backtrace_index		=	1;
+	
+	VALUE	rb_backtrace_frame_hash	=	rb_ary_entry( rb_backtrace_array, c_backtrace_index );
 													
 	VALUE	rb_caller	=	rb_hash_aref(	rb_backtrace_frame_hash,
 											ID2SYM( rb_intern( "method" ) ) );
 	
+	//	if we get :initialize as our caller and our __method__ is :initialize, we need to go up the chain
+	//	until our caller is no longer :initialize or :new
+	while ( rb_caller == ID2SYM( rb_intern( "initialize" ) ) )	{	
+		c_backtrace_index++;
+		rb_backtrace_frame_hash	=	rb_ary_entry( rb_backtrace_array, c_backtrace_index );
+		rb_caller	=	rb_hash_aref(	rb_backtrace_frame_hash,
+										ID2SYM( rb_intern( "method" ) ) );
+										
+		//	we have one parent past our current method; if that is also :initialize, get the whole backtrace
+		if ( c_backtrace_index == 2 )	{
+			rb_backtrace_array		=	rb_RPRuby_Sender_Kernel_backtrace( 0, NULL, rb_mKernel );
+		}
+	}	
+
+	//	if we get "new" as our caller we need to get the next level, as we are in :initialize
+	//	and want to know what called :new
+	//
+	//	since we might have had to go up the chain from :initialize through parents before getting here we
+	//	want to use a separate if statement
 	if ( rb_caller == ID2SYM( rb_intern( "new" ) ) )	{	
-		rb_backtrace_frame_hash	=	rb_ary_entry( rb_backtrace_array, 2 );
+		c_backtrace_index++;
+		rb_backtrace_frame_hash	=	rb_ary_entry( rb_backtrace_array, c_backtrace_index );
 	}
 	
 	VALUE	rb_sender	=	rb_hash_aref(	rb_backtrace_frame_hash,
@@ -82,17 +104,43 @@ VALUE rb_RPRuby_Sender___caller__()	{
 	VALUE	rb_backtrace_limit		=	INT2FIX( 3 );
 	
 	VALUE	rb_backtrace_array		=	rb_RPRuby_Sender_Kernel_backtrace(	1,
-																		  & rb_backtrace_limit,
-																		  rb_mKernel );
+																			& rb_backtrace_limit,
+																			rb_mKernel );
+	
+	int		c_backtrace_index		=	1;
 	
-	VALUE	rb_backtrace_frame_hash	=	rb_ary_entry( rb_backtrace_array, 1 );
+	VALUE	rb_backtrace_frame_hash	=	rb_ary_entry( rb_backtrace_array, c_backtrace_index );
 	
 	VALUE	rb_caller	=	rb_hash_aref(	rb_backtrace_frame_hash,
-										 ID2SYM( rb_intern( "method" ) ) );
+											ID2SYM( rb_intern( "method" ) ) );
 	
-	if ( rb_caller == ID2SYM( rb_intern( "new" ) ) )	{	
-		rb_backtrace_frame_hash	=	rb_ary_entry( rb_backtrace_array, 2 );
+	//	we want to compare our caller as we go up the chain to our first caller to deal with super methods
+	//	we have a symbol so no cloning is necessary (or appropriate)
+	VALUE	rb_first_caller	=	rb_hash_aref(	rb_ary_entry( rb_backtrace_array, 0 ),
+												ID2SYM( rb_intern( "method" ) ) );
+	
+	//	if we get :initialize as our caller and our __method__ is :initialize, we need to go up the chain
+	//	until our caller is no longer :initialize or :new
+	while ( rb_caller == rb_first_caller )	{	
+		c_backtrace_index++;
+		rb_backtrace_frame_hash	=	rb_ary_entry( rb_backtrace_array, c_backtrace_index );
+		rb_caller	=	rb_hash_aref(	rb_backtrace_frame_hash,
+										ID2SYM( rb_intern( "method" ) ) );
 		
+		//	we have one parent past our current method; if that is also :initialize, get the whole backtrace
+		if ( c_backtrace_index == 2 )	{
+			rb_backtrace_array		=	rb_RPRuby_Sender_Kernel_backtrace( 0, NULL, rb_mKernel );
+		}
+	}	
+	
+	//	if we get "new" as our caller we need to get the next level, as we are in :initialize
+	//	and want to know what called :new
+	//
+	//	since we might have had to go up the chain from :initialize through parents before getting here we
+	//	want to use a separate if statement	
+	if ( rb_caller == ID2SYM( rb_intern( "new" ) ) )	{	
+		c_backtrace_index++;
+		rb_backtrace_frame_hash	=	rb_ary_entry( rb_backtrace_array, c_backtrace_index );		
 		rb_caller	=	rb_hash_aref(	rb_backtrace_frame_hash,
 										ID2SYM( rb_intern( "method" ) ) );
 	}

data/lib/VERSION.rdoc

@@ -1 +1 @@
-1.4.2
+1.4.3

data/sender.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sender}
-  s.version = "1.4.2"
+  s.version = "1.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Asher"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sender
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 1
   - 4
-  - 2
-  version: 1.4.2
+  - 3
+  version: 1.4.3
 platform: ruby
 authors: 
 - Asher