rubypython 0.2.1 → 0.2.2

data/History.txt

@@ -1,3 +1,15 @@
+== 0.2.2 2008-08-07
+* Major Enhancements
+	* Wrapped classes and instances should now behave as expected.
+	* Gave RubyPyClasses a "new" method for creating instances.
+	* Callable class can now be called provided that at least one argument is given
+	* A wrapped object's respond_to? method now has some relation to its actually methods.
+	
+* Bug fixes
+	* Fixed bug with inspect method of RubyPyObject that caused a bus error when inspecting
+		certain objects
+
+
 == 0.2.1 2008-08-02
 * 1 Bug Fix
 	* Incorrect require fixed

data/License.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2008 FIXME full name
+Copyright (c) 2008 Zach Raines
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Manifest.txt

@@ -21,7 +21,6 @@ ext/rubypython_bridge/rtop.c
 ext/rubypython_bridge/rtop.h
 ext/rubypython_bridge/rubypython_bridge.c
 ext/rubypython_bridge/rubypython_bridge.h
-ext/rubypython_bridge/test.rb
 lib/rubypython.rb
 lib/rubypython/version.rb
 lib/rubypython/wrapper_extensions.rb
@@ -35,6 +34,7 @@ tasks/environment.rake
 tasks/extconf.rake
 tasks/extconf/rubypython_bridge.rake
 tasks/website.rake
+test/test.wav
 test/test_helper.rb
 test/test_rubypython.rb
 test/test_rubypython_bridge_extn.rb

data/PostInstall.txt

@@ -1,6 +1,8 @@
 
-For more information on rubypython, see http://rubypython.rubyforge.org
+For more information on RubyPython, see http://rubypython.rubyforge.org
 
 If you find a bug, or have any suggestions, email me at: achatesavc+rubypython@gmail.com
 
+If you would like to help develop RubyPython, also send me an email.
+
 

data/README.txt

@@ -4,7 +4,7 @@
 
 == DESCRIPTION:
 
-	RubyPython is a a C bridge between ruby and python with a ruby interface.
+	RubyPython is a C bridge between Ruby and Python with a Ruby interface. It's aim is to make the power of the Python's great standard library available to Ruby programmers from within Ruby.
 
 == FEATURES/PROBLEMS:
 
@@ -13,9 +13,7 @@
 	* Can import python modules
 	* Can execute arbitrary methods on imported modules and return the result
 	* Python objects can be treated as Ruby objects!
-	
-	Problems:
-	* Issues with the run method
+	* Python's standard library available to you from within ruby.
 
 == SYNOPSIS:
 	RubyPython.start
@@ -24,7 +22,7 @@
 	RubyPython.stop
 	
 == REQUIREMENTS:
-
+	Python must be installed. Currently, RubyPython requires python2.5 but it may soon be  able to work on other platforms. I have only tested it on Mac OSX 10.5, so I'm not sure what parts may need correcting for other systems. 
 
 == INSTALL:
 

data/ext/rubypython_bridge/cbridge.c

@@ -122,6 +122,7 @@ VALUE rp_call_func(PyObject* pFunc, VALUE args)
 	PyObject *pReturn,*pArgs;
 	if(!(TYPE(args)==T_ARRAY))
 	{
+		
 		rArgs=rb_ary_new();
 		rb_ary_push(rArgs,args);
 	}
@@ -139,11 +140,8 @@ VALUE rp_call_func(PyObject* pFunc, VALUE args)
 		rp_pythonerror();
 		return Qnil;
 	}
-	rReturn=ptor_obj(pReturn);
+	rReturn=ptor_obj_no_destruct(pReturn);
 	
 	Py_XDECREF(pArgs);
-	Py_XDECREF(pReturn);
-	
 	return rReturn;
 }
-

data/ext/rubypython_bridge/ptor.c

@@ -160,7 +160,12 @@ static VALUE ptor_obj_core(PyObject *pObj,int destructive)
 	{
 		return rp_func_from_function(pObj);
 
-	}	
+	}
+	if(PyInstance_Check(pObj))
+	{
+		rObj=rp_inst_from_instance(pObj);
+		return rObj;
+	}
 	return rp_cla_from_class(pObj);
 }
 VALUE ptor_obj_no_destruct(PyObject *pObj)

data/ext/rubypython_bridge/rp_error.c

@@ -9,7 +9,7 @@ void rp_pythonerror()
 	PyErr_Fetch(&pType,&pValue,&pTraceback);
 	pTypeName=PyObject_GetAttrString(pType,"__name__");
 	Py_XDECREF(pType);
-	rb_raise(ePythonError,"%s:(%s)\n",STR2CSTR(ptor_obj(pTypeName)),STR2CSTR(ptor_obj(pValue)));
+	rb_raise(ePythonError,"%s:(%s)\n",STR2CSTR(ptor_obj(pTypeName)),STR2CSTR(rb_inspect(ptor_obj(pValue))));
 	Py_XDECREF(pTraceback);
 }
 

data/ext/rubypython_bridge/rp_object.c

@@ -2,11 +2,13 @@
 #include "stdio.h"
 
 extern VALUE mRubyPythonBridge;
+extern VALUE ePythonError;
 
 VALUE cRubyPyObject;
 VALUE cRubyPyModule;
 VALUE cRubyPyClass;
 VALUE cRubyPyFunction;
+VALUE cRubyPyInstance;
 
 void rp_obj_mark(PObj* self)
 {}
@@ -36,6 +38,10 @@ VALUE rp_obj_free_pobj(VALUE self)
 		cself->pObject=NULL;
 		return Qtrue;
 	}
+	else
+	{
+		cself->pObject=NULL;
+	}
 	return Qfalse;
 }
 
@@ -51,6 +57,10 @@ PyObject* rp_obj_pobject(VALUE self)
 {
 	PObj *cself;
 	Data_Get_Struct(self,PObj,cself);
+	if(!cself->pObject)
+	{
+		rb_raise(ePythonError,"RubyPython tried to access a freed object");
+	}
 	return cself->pObject;
 }
 
@@ -62,9 +72,32 @@ VALUE rp_obj_name(VALUE self)
 {
 	if(Py_IsInitialized())
 	{
-	PyObject *pObject;
-	pObject=rp_obj_pobject(self);
-	return ptor_obj(PyObject_GetAttrString(pObject,"__name__"));		
+		PyObject *pObject,*pName,*pRepr;
+		VALUE rName;
+		pObject=rp_obj_pobject(self);
+		pName=PyObject_GetAttrString(pObject,"__name__");
+		if(!pName)
+		{
+			PyErr_Clear();
+			pName=PyObject_GetAttrString(pObject,"__class__");
+	 		pRepr=PyObject_Repr(pName);
+			rName=ptor_string(pRepr);
+			Py_XDECREF(pRepr);
+			return rb_str_concat(rb_str_new2("An instance of "),rName);
+			if(!pName)
+			{
+				PyErr_Clear();
+				pName=PyObject_Repr(pObject);
+				if(!pName)
+				{
+					PyErr_Clear();
+					return rb_str_new2("__Unnameable__");
+				}
+			}
+		}
+		rName=ptor_string(pName);
+		Py_XDECREF(pName);
+		return rName;
 	}
 	return rb_str_new2("__FREED__");
 
@@ -79,13 +112,83 @@ VALUE rp_obj_from_pyobject(PyObject *pObj)
 	return rObj;
 }
 
+VALUE rp_inst_from_instance(PyObject *pInst)
+{
+	PObj* self;
+	VALUE rInst=rb_class_new_instance(0,NULL,cRubyPyInstance);
+	PyObject *pClassDict,*pClass,*pInstDict;
+	VALUE rInstDict,rClassDict;
+	Data_Get_Struct(rInst,PObj,self);
+	self->pObject=pInst;
+	pClass=PyObject_GetAttrString(pInst,"__class__");
+	pClassDict=PyObject_GetAttrString(pClass,"__dict__");
+	pInstDict=PyObject_GetAttrString(pInst,"__dict__");
+	Py_XINCREF(pClassDict);
+	Py_XINCREF(pInstDict);
+	rClassDict=rp_obj_from_pyobject(pClassDict);
+	rInstDict=rp_obj_from_pyobject(pInstDict);
+	rb_iv_set(rInst,"@pclassdict",rClassDict);
+	rb_iv_set(rInst,"@pinstdict",rInstDict);
+	return rInst;
+}
+
+//:nodoc:
+VALUE rp_inst_delegate(VALUE self,VALUE args)
+{
+	VALUE name,name_string,rClassDict,result,rInstDict;
+	VALUE ret;
+	char *cname;
+	PObj *pClassDict,*pInstDict;
+	PyObject *pCalled;
+	if(!rp_has_attr(self,rb_ary_entry(args,0)))
+	{		
+		int argc;
+		
+		VALUE *argv;
+		argc=RARRAY(args)->len;
+		argv=ALLOC_N(VALUE,argc);
+		MEMCPY(argv,RARRAY(args)->ptr,VALUE,argc);
+		return rb_call_super(argc,argv);
+	}
+	name=rb_ary_shift(args);
+	name_string=rb_funcall(name,rb_intern("to_s"),0);
+	cname=STR2CSTR(name_string);
+		
+	rClassDict=rb_iv_get(self,"@pclassdict");
+	rInstDict=rb_iv_get(self,"@pinstdict");
+	Data_Get_Struct(rClassDict,PObj,pClassDict);
+	Data_Get_Struct(rInstDict,PObj,pInstDict);
+	pCalled=PyDict_GetItemString(pInstDict->pObject,cname);
+	if(!pCalled)
+	{
+		pCalled=PyDict_GetItemString(pClassDict->pObject,cname);
+	}
+	Py_XINCREF(pCalled);
+	result=ptor_obj_no_destruct(pCalled);
+	if(rb_obj_is_instance_of(result,cRubyPyFunction))
+	{
+		Py_XINCREF(rp_obj_pobject(self));
+		rb_ary_unshift(args,self);
+		ret=rp_call_func(pCalled,args);
+		return ret;
+	}
+	return result;
+	
+}
+
 
 VALUE rp_cla_from_class(PyObject *pClass)
 {
 	PObj* self;
 	VALUE rClass=rb_class_new_instance(0,NULL,cRubyPyClass);
+	PyObject *pClassDict;
+	VALUE rDict;
 	Data_Get_Struct(rClass,PObj,self);
 	self->pObject=pClass;
+	pClassDict=PyObject_GetAttrString(pClass,"__dict__");
+	Py_XINCREF(pClassDict);
+	rDict=rp_obj_from_pyobject(pClassDict);
+	rb_iv_set(rClass,"@pdict",rDict);
 	return rClass;
 }
 
@@ -114,6 +217,7 @@ VALUE rp_mod_call_func(VALUE self,VALUE func_name,VALUE args)
 	
 }
 
+
 int rp_has_attr(VALUE self,VALUE func_name)
 {
 	
@@ -135,7 +239,7 @@ VALUE rp_mod_init(VALUE self, VALUE mname)
 	PyObject *pModuleDict;
 	pModuleDict=PyModule_GetDict(cself->pObject);
 	Py_XINCREF(pModuleDict);
-	rDict=rp_cla_from_class(pModuleDict);
+	rDict=rp_obj_from_pyobject(pModuleDict);
 	rb_iv_set(self,"@pdict",rDict);
 	return self;
 }
@@ -149,10 +253,26 @@ int rp_is_func(VALUE pObj)
 	return (PyFunction_Check(self->pObject)||PyMethod_Check(self->pObject));
 }
 
+VALUE rp_cla_new_inst(VALUE self,VALUE args)
+{
+	PyObject *pSelf;
+	pSelf=rp_obj_pobject(self);
+	return rp_call_func(pSelf,args);
+}
+
+VALUE rp_obj_responds(VALUE self,VALUE mname)
+{
+	if(rp_has_attr(self,mname))
+	{
+		return Qtrue;
+	}
+	return Qfalse;
+}
 //:nodoc:
 VALUE rp_mod_delegate(VALUE self,VALUE args)
 {
 	VALUE name,name_string,rDict,result;
+	VALUE ret;
 	PObj *pDict;
 	PyObject *pCalled;
 	if(!rp_has_attr(self,rb_ary_entry(args,0)))
@@ -167,14 +287,21 @@ VALUE rp_mod_delegate(VALUE self,VALUE args)
 	}
 	name=rb_ary_shift(args);
 	name_string=rb_funcall(name,rb_intern("to_s"),0);
-	
+		
 	rDict=rb_iv_get(self,"@pdict");
 	Data_Get_Struct(rDict,PObj,pDict);
 	pCalled=PyDict_GetItemString(pDict->pObject,STR2CSTR(name_string));
+	Py_XINCREF(pCalled);
 	result=ptor_obj_no_destruct(pCalled);
 	if(rb_obj_is_instance_of(result,cRubyPyFunction))
 	{
-		return rp_call_func(pCalled,args);
+		ret=rp_call_func(pCalled,args);
+		return ret;
+	}
+	else if(rb_obj_is_instance_of(result,cRubyPyClass)&&(rb_funcall(args,rb_intern("empty?"),0)==Qfalse)&&PyCallable_Check(pCalled))
+	{
+		ret=rp_call_func(pCalled,args);
+		return ret;
 	}
 	return result;
 	
@@ -193,6 +320,7 @@ inline void Init_RubyPyObject()
 	rb_define_alloc_func(cRubyPyObject,rp_obj_alloc);
 	rb_define_method(cRubyPyObject,"free_pobj",rp_obj_free_pobj,0);
 	rb_define_method(cRubyPyObject,"__name",rp_obj_name,0);
+	rb_define_method(cRubyPyObject,"respond_to?",rp_obj_responds,1);
 	
 }
 
@@ -223,6 +351,8 @@ its existence.
 void Init_RubyPyClass()
 {
 	cRubyPyClass=rb_define_class_under(mRubyPythonBridge,"RubyPyClass",cRubyPyObject);
+	rb_define_method(cRubyPyClass,"method_missing",rp_mod_delegate,-2);
+	rb_define_method(cRubyPyClass,"new",rp_cla_new_inst,-2);
 }
 
 // 
@@ -234,4 +364,10 @@ void Init_RubyPyClass()
 void Init_RubyPyFunction()
 {
 	cRubyPyFunction=rb_define_class_under(mRubyPythonBridge,"RubyPyFunction",cRubyPyObject);
+}
+
+void Init_RubyPyInstance()
+{
+	cRubyPyInstance=rb_define_class_under(mRubyPythonBridge,"RubyPyInstance",cRubyPyObject);
+	rb_define_method(cRubyPyInstance,"method_missing",rp_inst_delegate,-2);
 }

data/ext/rubypython_bridge/rp_object.h

@@ -43,4 +43,13 @@ int rp_is_func(VALUE pObj);
 
 VALUE rp_obj_from_pyobject(PyObject *pObj);
 
+VALUE rp_inst_from_instance(PyObject *pInst);
+
+VALUE rp_inst_delegate(VALUE self,VALUE args);
+
+VALUE rp_cla_new_inst(VALUE self,VALUE args);
+
+VALUE rp_obj_responds(VALUE self,VALUE mname);
+
+
 #endif /* _RP_OBJECT_H_ */

data/ext/rubypython_bridge/rtop.c

@@ -1,5 +1,7 @@
 #include "rtop.h"
 
+extern VALUE cRubyPyObject;
+
 PyObject* rtop_string(VALUE rString)
 {
 	PyObject* pString;
@@ -93,6 +95,7 @@ PyObject* rtop_symbol(VALUE rSymbol)
 	return pString;
 
 }
+
 PyObject* rtop_obj(VALUE rObj,int is_key)
 {
 	PyObject *pObj;
@@ -144,8 +147,15 @@ PyObject* rtop_obj(VALUE rObj,int is_key)
 			break;
 		
 		default:
-			rInspect=rb_inspect(rObj);
-			pObj=rtop_string(rInspect);
+			if(rb_obj_is_kind_of(rObj,cRubyPyObject)==Qtrue)
+			{
+				pObj=rp_obj_pobject(rObj);
+			}
+			else
+			{
+				rInspect=rb_inspect(rObj);
+				pObj=rtop_string(rInspect);
+			}
 	}
 	return pObj;
 }

data/ext/rubypython_bridge/rubypython_bridge.c

@@ -5,6 +5,15 @@ extern VALUE cRubyPyObject;
 extern VALUE cRubyPyModule;
 extern VALUE cRubyPyClass;
 
+
+/*
+call-seq: func(modname,funcname,*args)
+Given a python module name _modname_ and a function name _funcname_ calls the given function
+with the supplied arguments.
+
+Use builtins as the module for a built in function.
+
+*/
 static VALUE func_with_module(VALUE self, VALUE args)
 {
 	int started_here=safe_start();
@@ -17,40 +26,20 @@ static VALUE func_with_module(VALUE self, VALUE args)
 	return return_val;
 }
 
-static VALUE rp_import_module(VALUE self,VALUE module)
-{
-	VALUE instance=rb_class_instance_new(1,&module,cRubyPyModule);
-	return instance;
-}
-
-
-
 /*
 * call-seq: import(modname)
 * 
-* imports a python file_module using the interpreter and returns a ruby wrapper
-
+* Imports the python module _modname_ using the interpreter and returns a ruby wrapper
 */
 static VALUE rp_import(VALUE self,VALUE mname)
 {
 	return rb_class_new_instance(1,&mname,cRubyPyModule);
 }
 
-static VALUE rp_python_block(VALUE self)
-{
-	rb_funcall(self,rb_intern("start"),0);
-	rb_obj_instance_eval(0,NULL,self);
-	rb_funcall(self,rb_intern("stop"),0);
-	
-}
-
-
-
 /*
 * call-seq: start()
 *
 * Starts the python interpreter
-* 	RubyPythonBridge.start
 */
 VALUE rp_start(VALUE self)
 {
@@ -64,6 +53,11 @@ VALUE rp_start(VALUE self)
 	return Qtrue;
 }
 
+/*
+* call-seq: stop()
+*
+* Stop the python interpreter
+*/
 VALUE rp_stop(VALUE self)
 {
 	
@@ -87,14 +81,14 @@ void Init_rubypython_bridge()
 {
 	mRubyPythonBridge=rb_define_module("RubyPythonBridge");
 	rb_define_module_function(mRubyPythonBridge,"func",func_with_module,-2);
-	rb_define_module_function(mRubyPythonBridge,"import_module",rp_import_module,1); 
 	rb_define_module_function(mRubyPythonBridge,"start",rp_start,0);
 	rb_define_module_function(mRubyPythonBridge,"stop",rp_stop,0);
-	rb_define_module_function(mRubyPythonBridge,"run",rp_python_block,0);
 	rb_define_module_function(mRubyPythonBridge,"import",rp_import,1);
 	Init_RubyPyObject();
 	Init_RubyPyModule();
 	Init_RubyPyClass();
 	Init_RubyPyFunction();
 	Init_RubyPyError();
+	Init_RubyPyInstance();
+	
 }

data/lib/rubypython.rb

@@ -77,7 +77,7 @@ module RubyPython
   # as the embedded interpreter will be halted at its end.
   def self.run(&block)
     start
-    module_eval(&block)
+      module_eval(&block)
     stop
   end
 

data/lib/rubypython/version.rb

@@ -2,7 +2,7 @@ module RubyPython
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/rubypython/wrapper_extensions.rb

@@ -1,6 +1,6 @@
 class RubyPythonBridge::RubyPyObject
   def inspect
-    "<#{self.class}:  #{__name}>"
+    "<#{self.class}:#{__name}>"
   end
 end
 
@@ -15,7 +15,7 @@ class RubyPythonBridge::RubyPyModule
 end
 
 
-# A wrapper class for Python classes and instances.
+# A wrapper class for Python classes.
 # 
 # This allows objects which cannot easily be converted to native Ruby types to still be accessible
 # from within ruby. Most users need not concern themselves with anything about this class except
@@ -31,4 +31,9 @@ end
 # This is used internally to aid RubyPyClass in delegating method calls.
 class RubyPythonBridge::RubyPyFunction
   
+end
+
+# A wrapper class for Python instances
+class RubyPythonBridge::RubyPyInstance
+  
 end

data/test/test_rubypython.rb

@@ -49,9 +49,19 @@ class TestRubypython < Test::Unit::TestCase
     unpickled=nil
     RubyPython.run do
       cPickle=import "cPickle"
+      cPickle.inspect
       unpickled=cPickle.loads("(dp1\nS'a'\nS'n'\ns(I1\nS'2'\ntp2\nI4\ns.")
     end
     assert_equal(unpickled,{"a"=>"n", [1, "2"]=>4})
     assert(!RubyPython.stop)
   end
+  
+  def test_instance_method_delegation
+    RubyPython.start
+    wave=RubyPython.import "wave"
+    w=wave.open("test/test.wav","rb")
+    assert_equal(w.getframerate,9600)
+    w.close
+    RubyPython.stop
+  end
 end

data/test/test_rubypython_bridge_extn.rb

@@ -3,29 +3,98 @@ require "test/unit"
 $:.unshift File.dirname(__FILE__) + "/../ext/rubypython_bridge"
 require "rubypython_bridge.so"
 
-class TestRubypythonBridgeExtn < Test::Unit::TestCase
+class TestRubyPythonBridgeExtn < Test::Unit::TestCase
   
   def test_func_with_module
     pickle_return=RubyPythonBridge.func("cPickle","loads","(dp1\nS'a'\nS'n'\ns(I1\nS'2'\ntp2\nI4\ns.")
     assert_equal(pickle_return,{"a"=>"n", [1, "2"]=>4})
   end
   
-  def test_module_delegation
+  def test_start_stop
+    assert(RubyPythonBridge.start)
+    assert(!RubyPythonBridge.start)
+    assert(RubyPythonBridge.stop)
+    assert(!RubyPythonBridge.stop)
+  end
+  
+  def test_new_instance
+    RubyPythonBridge.start
+    urllib2=RubyPythonBridge.import "urllib2"
+    assert_instance_of(RubyPythonBridge::RubyPyClass,urllib2.Request)
+    assert_instance_of(RubyPythonBridge::RubyPyInstance,urllib2.Request("google.com"))
+    RubyPythonBridge.stop
+  end
+  
+  def test_new_instance_with_new_method
+    RubyPythonBridge.start
+    urllib2=RubyPythonBridge.import "urllib2"
+    assert_instance_of(RubyPythonBridge::RubyPyClass,urllib2.Request)
+    assert_instance_of(RubyPythonBridge::RubyPyInstance,urllib2.Request.new("google.com"))
+    RubyPythonBridge.stop
+  end
+  
+end
+
+class TestRubyPythonBridgeWithCPickle < Test::Unit::TestCase
+  def setup
     RubyPythonBridge.start
-    cPickle=RubyPythonBridge.import("cPickle")
-    assert_instance_of(RubyPythonBridge::RubyPyModule,cPickle)
-    assert_equal(cPickle.loads("(dp1\nS'a'\nS'n'\ns(I1\nS'2'\ntp2\nI4\ns."),{"a"=>"n", [1, "2"]=>4})
-    dumped_array=cPickle.dumps([1,2,3,4])
-    assert_equal(cPickle.loads(dumped_array),[1,2,3,4])
+    @cPickle=RubyPythonBridge.import "cPickle"
+  end
+  
+  def teardown
+    ObjectSpace.each_object(RubyPythonBridge::RubyPyObject) do |o|
+      o.free_pobj
+    end
+    RubyPythonBridge.stop
+  end
+  
+  def test_mod_respond_to
+    assert(@cPickle.respond_to? :loads)
+  end
+  
+  def test_data_passing
+    assert_equal(@cPickle.loads("(dp1\nS'a'\nS'n'\ns(I1\nS'2'\ntp2\nI4\ns."),{"a"=>"n", [1, "2"]=>4})
+    dumped_array=@cPickle.dumps([1,2,3,4])
+    assert_equal(@cPickle.loads(dumped_array),[1,2,3,4])
+  end
+  
+  def test_method_missing
     assert_raise NoMethodError do
-      cPickle.splack
+      @cPickle.splack
     end
-    assert_instance_of(RubyPythonBridge::RubyPyClass,cPickle.PicklingError)
-    cPickle.free_pobj
+  end
+  
+  def test_class_wrapping
+    assert_instance_of(RubyPythonBridge::RubyPyClass,@cPickle.PicklingError)
+  end
+  
+  def test_module_method_wrapping
+    assert_instance_of(RubyPythonBridge::RubyPyModule,@cPickle)
+  end
+  
+end
+
+
+class TestRubyPythonBridgeWithUrllib2 < Test::Unit::TestCase
+  def setup
+    RubyPythonBridge.start
+    @urllib2=RubyPythonBridge.import "urllib2"
+  end
+  
+  def teardown
     ObjectSpace.each_object(RubyPythonBridge::RubyPyObject) do |o|
       o.free_pobj
     end
-    assert(RubyPythonBridge.stop)
+    RubyPythonBridge.stop
   end
   
-end
+  def test_class_respond_to
+    assert(@urllib2.Request.respond_to? :get_data)
+  end
+  
+  def test_instance_respond_to
+    assert(@urllib2.Request.new("google.com").respond_to? :get_data)
+  end
+  
+end
+

data/website/index.html

@@ -33,22 +33,23 @@
     <h1>rubypython</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/rubypython"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/rubypython" class="numbers">0.2.0</a>
+      <a href="http://rubyforge.org/projects/rubypython" class="numbers">0.2.2</a>
     </div>
-    <h1>&amp;#x2192; &#8216;rubypython&#8217;</h1>
-<h2>What</h2>
-<h2>Installing</h2>
+    <h2>What</h2>
+<p>RubyPython is a C bridge between Ruby and Python with a Ruby interface. It&#8217;s aim is to make the power of the Python&#8217;s great standard library available to Ruby programmers from within Ruby.<br />
+	<br />
+h2. Installing</p>
 <p><pre class='syntax'><span class="ident">sudo</span> <span class="ident">gem</span> <span class="ident">install</span> <span class="ident">rubypython</span></pre></p>
+<p>Don&#8217;t worry if you got some ugly output from <span class="caps">RDOC</span> and RI.</p>
 <h2>The basics</h2>
-<h2>Demonstration of usage</h2>
+<p>Check out the <span class="caps">RDOC</span> pages at <a href="http://rubypython.rubyforge.org/rdoc">http://rubypython.rubyforge.org/rdoc</a></p>
+<p>I have only tested this on Mac OS 10.5 with Python 2.5. If anyone has issues with another setup let me know and I&#8217;ll do what I can.</p>
 <h2>Forum</h2>
 <p><a href="http://groups.google.com/group/rubypython">http://groups.google.com/group/rubypython</a></p>
 <h2>How to submit patches</h2>
 <p>Read the <a href="http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/">8 steps for fixing other people&#8217;s code</a> and for section <a href="http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/#8b-google-groups">8b: Submit patch to Google Groups</a>, use the Google Group above.</p>
-<p>You can fetch the source from either:</p>
-<ul>
-	<li>rubyforge: <a href="http://rubyforge.org/scm/?group_id=6737">http://rubyforge.org/scm/?group_id=6737</a></li>
-</ul>
+<p>You can fetch the source from:</p>
+<p><a href="http://rubyforge.org/scm/?group_id=6737">http://rubyforge.org/scm/?group_id=6737</a></p>
 <pre>git clone git://rubyforge.org/rubypython.git</pre>
 <h3>Build and test instructions</h3>
 <pre>cd rubypython
@@ -59,7 +60,7 @@ rake install_gem</pre>
 <h2>Contact</h2>
 <p>Comments are welcome. Send an email to <a href="mailto:achatesavc+rubypython@gmail.com">Zach Raines</a> email via the <a href="http://groups.google.com/group/rubypython">forum</a></p>
     <p class="coda">
-      <a href="FIXME email">FIXME full name</a>, 2nd August 2008<br>
+      <a href="mailto:achatesavc+rubypython@gmail.com">Zach Raines</a>, 7th August 2008<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

data/website/index.txt

@@ -1,20 +1,21 @@
 h1. rubypython
 
-h1. → 'rubypython'
-
 
 h2. What
 
-
+	RubyPython is a C bridge between Ruby and Python with a Ruby interface. It's aim is to make the power of the Python's great standard library available to Ruby programmers from within Ruby.
+	
 h2. Installing
 
 <pre syntax="ruby">sudo gem install rubypython</pre>
 
-h2. The basics
+Don't worry if you got some ugly output from RDOC and RI.
 
+h2. The basics
 
-h2. Demonstration of usage
+Check out the RDOC pages at "http://rubypython.rubyforge.org/rdoc":http://rubypython.rubyforge.org/rdoc
 
+I have only tested this on Mac OS 10.5 with Python 2.5. If anyone has issues with another setup let me know and I'll do what I can.
 
 
 h2. Forum
@@ -25,10 +26,9 @@ h2. How to submit patches
 
 Read the "8 steps for fixing other people's code":http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/ and for section "8b: Submit patch to Google Groups":http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/#8b-google-groups, use the Google Group above.
 
-You can fetch the source from either:
-
+You can fetch the source from:
 
-* rubyforge: "http://rubyforge.org/scm/?group_id=6737":http://rubyforge.org/scm/?group_id=6737
+"http://rubyforge.org/scm/?group_id=6737":http://rubyforge.org/scm/?group_id=6737
 
 <pre>git clone git://rubyforge.org/rubypython.git</pre>
 

data/website/template.html.erb

@@ -37,7 +37,7 @@
     </div>
     <%= body %>
     <p class="coda">
-      <a href="FIXME email">FIXME full name</a>, <%= modified.pretty %><br>
+      <a href="mailto:achatesavc+rubypython@gmail.com">Zach Raines</a>, <%= modified.pretty %><br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubypython
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Zach Raines
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-02 00:00:00 -04:00
+date: 2008-08-07 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -51,7 +51,6 @@ files:
 - ext/rubypython_bridge/rtop.h
 - ext/rubypython_bridge/rubypython_bridge.c
 - ext/rubypython_bridge/rubypython_bridge.h
-- ext/rubypython_bridge/test.rb
 - lib/rubypython.rb
 - lib/rubypython/version.rb
 - lib/rubypython/wrapper_extensions.rb
@@ -65,6 +64,7 @@ files:
 - tasks/extconf.rake
 - tasks/extconf/rubypython_bridge.rake
 - tasks/website.rake
+- test/test.wav
 - test/test_helper.rb
 - test/test_rubypython.rb
 - test/test_rubypython_bridge_extn.rb
@@ -77,10 +77,12 @@ has_rdoc: true
 homepage: http://rubypython.rubyforge.org
 post_install_message: |+
   
-  For more information on rubypython, see http://rubypython.rubyforge.org
+  For more information on RubyPython, see http://rubypython.rubyforge.org
   
   If you find a bug, or have any suggestions, email me at: achatesavc+rubypython@gmail.com
   
+  If you would like to help develop RubyPython, also send me an email.
+  
   
 rdoc_options: 
 - --main

data/ext/rubypython_bridge/test.rb

@@ -1,25 +0,0 @@
-require "rubypython_bridge"
-p RubyPythonBridge.func_with_module("cPickle","loads","(dp1\nS'a'\nS'n'\ns(I1\nS'2'\ntp2\nI4\ns.")
-RubyPythonBridge.start
-CPickle=RubyPythonBridge.import("cPickle")
-p CPickle
-p CPickle.loads("(dp1\nS'a'\nS'n'\ns(I1\nS'2'\ntp2\nI4\ns.")
-p dumped_array=CPickle.dumps([1,2,3,4])
-p CPickle.loads(dumped_array)
-begin
-  p CPickle.splack
-rescue
-  p $!
-end
-p CPickle.PicklingError
-# p CPickle.instance_variable_get("@pdict")
-# CPickle.free_pobj
-ObjectSpace.each_object(RubyPythonBridge::RubyPyModule) do |o|
-  o.free_pobj
-end
-p RubyPythonBridge.stop
-
-RubyPythonBridge.start
-RubyPythonBridge.import "urllib"
-RubyPythonBridge.import "cPickle"
-RubyPythonBridge.stop