rubypython 0.2.11 → 0.3.0

data/ext/rubypython_bridge/rp_error.h

@@ -1,11 +0,0 @@
-#include "config.h"
-
-#ifndef _RP_ERROR_H_
-#define _RP_ERROR_H_
-
-void rpPythonError();
-
-void rpRubyPyError(char*);
-inline void Init_RubyPyError();
-
-#endif /* _RP_ERROR_H_ */

data/ext/rubypython_bridge/rp_function.c

@@ -1,31 +0,0 @@
-#include "rp_function.h"
-#include "rp_object.h"
-
-RUBY_EXTERN VALUE mRubyPythonBridge;
-RUBY_EXTERN VALUE cRubyPyObject;
-
-VALUE cRubyPyFunction;
-
-VALUE rpFunctionFromPyObject(PyObject *pFunc)
-{
-	PObj* self;
-	VALUE rFunc = rb_class_new_instance(0, NULL, cRubyPyFunction);
-	
-	Data_Get_Struct(rFunc, PObj, self);
-	
-	self->pObject = pFunc;
-	
-	return rFunc;
-}
-
-
-// 
-// A wrapper class for Python functions and methods.
-// 
-// This is used internally to aid RubyPyClass in delegating method calls.
-// 
-
-inline void Init_RubyPyFunction()
-{
-	cRubyPyFunction = rb_define_class_under(mRubyPythonBridge,"RubyPyFunction", cRubyPyObject);
-}

data/ext/rubypython_bridge/rp_function.h

@@ -1,7 +0,0 @@
-#include "config.h"
-
-#ifndef _RP_FUNCTION_H_
-#define _RP_FUNCTION_H_
-VALUE rpFunctionFromPyObject(PyObject*);
-inline void Init_RubyPyFunction();
-#endif

data/ext/rubypython_bridge/rp_instance.c

@@ -1,164 +0,0 @@
-#include "rp_instance.h"
-
-#include "rp_object.h"
-#include "rp_function.h"
-#include "rp_util.h"
-
-RUBY_EXTERN VALUE mRubyPythonBridge;
-
-RUBY_EXTERN VALUE cRubyPyObject;
-RUBY_EXTERN VALUE cRubyPyFunction;
-
-VALUE cRubyPyInstance;
-
-VALUE rpInstanceFromPyObject(PyObject* pInst)
-{
-	PObj* self;
-	PyObject *pClassDict,*pClass,*pInstDict;
-	VALUE rInstDict, rClassDict;	
-	VALUE rInst = rb_class_new_instance(0, NULL, cRubyPyInstance);
-
-	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 = rpObjectFromPyObject(pClassDict);
-	rInstDict = rpObjectFromPyObject(pInstDict);
-	
-	rb_iv_set(rInst,"@pclassdict", rClassDict);
-	rb_iv_set(rInst,"@pinstdict", rInstDict);
-	
-	return rInst;
-}
-
-static
-VALUE rpInstanceSetAttr(VALUE self, VALUE args)
-{
-	VALUE name, name_string, rClassDict, rInstDict;
-	
-	char* cname;
-	
-	PObj *pClassDict,*pInstDict,*pDict;
-	
-	PyObject* pName;
-	
-	name = rb_ary_shift(args);
-	name_string = rb_funcall(name, rb_intern("to_s"), 0);
-	
-	rb_funcall(name_string, rb_intern("chop!"), 0);
-	
-	if(!rpHasSymbol(self, name_string))
-	{		
-		int argc;		
-		VALUE* argv;
-		
-		argc = RARRAY_LEN(args);
-		argv = ALLOC_N(VALUE, argc);
-		MEMCPY(argv, RARRAY_PTR(args), VALUE, argc);
-		return rb_call_super(argc, argv);
-	}
-	
-	cname = STR2CSTR(name_string);
-	
-	if((NUM2INT(rb_funcall(args, rb_intern("size"), 0)) == 1))
-	{
-		args = rb_ary_entry(args, 0);
-	}
-	
-	rClassDict = rb_iv_get(self,"@pclassdict");
-	rInstDict = rb_iv_get(self,"@pinstdict");
-	
-	Data_Get_Struct(rClassDict, PObj, pClassDict);
-	Data_Get_Struct(rInstDict, PObj, pInstDict);
-	
-	pName = PyString_FromString(cname);
-	
-	if(PyDict_Contains(pInstDict->pObject, pName))
-	{
-		pDict = pInstDict;
-
-	}
-	else
-	{
-		pDict = pClassDict;
-		
-	}
-	
-	Py_XDECREF(pName);
-	PyDict_SetItemString(pDict->pObject, STR2CSTR(name_string), rtopObject(args, 0));
-	
-	return Qtrue;
-}
-
-//:nodoc:
-static
-VALUE rpInstanceDelegate(VALUE self, VALUE args)
-{
-	VALUE name, name_string, rClassDict, result, rInstDict;
-	VALUE ret;
-	char* cname;
-	PObj *pClassDict,*pInstDict;
-	PyObject* pCalled;
-	
-	if(rpSymbolIsSetter(args))
-	{
-		return rpInstanceSetAttr(self, args);
-	}
-	
-	if(!rpHasSymbol(self, rb_ary_entry(args, 0)))
-	{		
-		int argc;
-		VALUE* argv;
-		
-		argc = RARRAY_LEN(args);
-		argv = ALLOC_N(VALUE, argc);
-		MEMCPY(argv, RARRAY_PTR(args), 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 = ptorObjectKeep(pCalled);
-	
-	if(rb_obj_is_instance_of(result, cRubyPyFunction))
-	{
-		Py_XINCREF(rpObjectGetPyObject(self));
-		rb_ary_unshift(args, self);
-		ret = rpCall(pCalled, args);
-		return ret;
-	}
-	
-	return result;
-	
-}
-
-
-inline void Init_RubyPyInstance()
-{
-	cRubyPyInstance = rb_define_class_under(mRubyPythonBridge,"RubyPyInstance", cRubyPyObject);
-	rb_define_method(cRubyPyInstance,"method_missing", rpInstanceDelegate,- 2);
-}
-
-

data/ext/rubypython_bridge/rp_instance.h

@@ -1,7 +0,0 @@
-#include "config.h"
-
-#ifndef _RP_INSTANCE_H_
-#define _RP_INSTANCE_H_
-VALUE rpInstanceFromPyObject(PyObject*);
-inline void Init_RubyPyInstance();
-#endif

data/ext/rubypython_bridge/rp_module.c

@@ -1,160 +0,0 @@
-#include "rp_module.h"
-
-#include "rp_object.h"
-#include "rp_function.h"
-#include "rp_util.h"
-
-VALUE cRubyPyModule;
-
-RUBY_EXTERN VALUE mRubyPythonBridge;
-RUBY_EXTERN VALUE cRubyPyFunction;
-RUBY_EXTERN VALUE cRubyPyClass;
-RUBY_EXTERN VALUE cRubyPyObject;
-
-//static
-//VALUE rpModuleCallFunction(VALUE self, VALUE func_name, VALUE args)
-//{
-//	PyObject *pModule,*pFunc;
-//	VALUE rReturn;
-//	
-//	pModule = rpObjectGetPyObject(self);
-//	
-//	pFunc = rpGetFunctionWithModule(pModule, func_name);
-//	rReturn = rpCall(pFunc, args);
-//	Py_XDECREF(pFunc);
-//	
-//	return rReturn;
-//	
-//}
-
-//:nodoc:
-static
-VALUE rpModuleInit(VALUE self, VALUE mname)
-{
-	PObj* cself;
-	VALUE rDict;
-	PyObject *pModuleDict;
-	
-	Data_Get_Struct(self, PObj, cself);
-	cself->pObject = rpGetModule(mname);
-	
-	pModuleDict = PyModule_GetDict(cself->pObject);
-	Py_XINCREF(pModuleDict);
-	
-	rDict = rpObjectFromPyObject(pModuleDict);
-	
-	rb_iv_set(self,"@pdict", rDict);
-	
-	return self;
-}
-
-static
-VALUE rpModuleSetAttr(VALUE self, VALUE args)
-{
-	VALUE rDict;
-	PyObject* pDict;
-	
-	VALUE mname = rb_ary_shift(args);
-	VALUE name_string = rb_funcall(mname, rb_intern("to_s"), 0);
-	
-	//The method name ends with "=" because it is a setter.
-	//We must chop that off before we pass the string to python.
-	rb_funcall(name_string, rb_intern("chop!"), 0);
-	
-	//The wrapped python object does not have method or attribute with the
-	//request named. Check for it in the Ruby superclass.
-	if(!rpHasSymbol(self, name_string))
-	{		
-		int argc;
-		
-		VALUE* argv;
-		argc = RARRAY_LEN(args);
-		
-		argv = ALLOC_N(VALUE, argc);
-		MEMCPY(argv, RARRAY_PTR(args), VALUE, argc);
-		
-		return rb_call_super(argc, argv);
-	}
-	
-	if(NUM2INT(rb_funcall(args, rb_intern("size"), 0)) == 1)
-	{
-		args = rb_ary_entry(args, 0);
-	}
-	
-	rDict = rb_iv_get(self,"@pdict");
-	
-	pDict = rpObjectGetPyObject(rDict);
-	
-	PyDict_SetItemString(pDict, STR2CSTR(name_string), rtopObject(args, 0));
-	
-	return Qtrue;
-}
-
-//:nodoc:
-VALUE rpModuleDelegate(VALUE self, VALUE args)
-{
-	VALUE name, name_string, rDict, result;
-	VALUE ret;
-	PyObject *pCalled, *pDict;
-	
-	if(rpSymbolIsSetter(args))
-	{
-		return rpModuleSetAttr(self, args);
-	}
-	
-	// if(rpSymbolIsDoubleBang)
-	// {
-	// 	return rp_mod_attr_db(args);
-	// }
-	if(!rpHasSymbol(self, rb_ary_entry(args, 0)))
-	{		
-		int argc;
-		
-		VALUE *argv;
-		argc = RARRAY_LEN(args);
-		argv = ALLOC_N(VALUE, argc);
-		MEMCPY(argv, RARRAY_PTR(args), VALUE, argc);
-		return rb_call_super(argc, argv);
-	}
-	name = rb_ary_shift(args);
-	name_string = rb_funcall(name, rb_intern("to_s"), 0);
-		
-	rDict = rb_iv_get(self,"@pdict");
-	
-	pDict = rpObjectGetPyObject(rDict);
-	
-	pCalled = PyDict_GetItemString(pDict, STR2CSTR(name_string));
-	Py_XINCREF(pCalled);
-	
-	result = ptorObjectKeep(pCalled);
-	
-	if(rb_obj_is_instance_of(result, cRubyPyFunction))
-	{
-		ret = rpCall(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 = rpCall(pCalled, args);
-		return ret;
-	}
-	
-	return result;
-	
-}
-
-
-/*
-A wrapper class for Python Modules.
-
-Methods calls are delegated to the equivalent Python methods / functions. Attribute references
-return either the equivalent attribute converted to a native Ruby type, or wrapped reference 
-to a Python object. RubyPyModule instances should be created through the use of RubyPython.import.
-
-*/
-inline void Init_RubyPyModule()
-{
-	cRubyPyModule = rb_define_class_under(mRubyPythonBridge,"RubyPyModule", cRubyPyObject);
-	rb_define_method(cRubyPyModule,"initialize", rpModuleInit, 1);
-	rb_define_method(cRubyPyModule,"method_missing", rpModuleDelegate,- 2);
-}

data/ext/rubypython_bridge/rp_module.h

@@ -1,8 +0,0 @@
-#include "config.h"
-
-#ifndef _RP_MODULE_H_
-#define _RP_MODULE_H_
-// Ruby wrapper for Python Modules
-VALUE rpModuleDelegate(VALUE, VALUE);
-inline void Init_RubyPyModule();
-#endif

data/ext/rubypython_bridge/rp_object.c

@@ -1,194 +0,0 @@
-#include "rp_object.h"
-
-RUBY_EXTERN VALUE ePythonError;
-RUBY_EXTERN VALUE mRubyPythonBridge;
-RUBY_EXTERN VALUE cBlankObject;
-
-VALUE cRubyPyObject;
-
-
-static void rpObjectMark(PObj*);
-static void rpObjectFree(PObj*);
-static VALUE rpObjectAlloc(VALUE);
-
-//Create a new RubyPyObject
-static
-VALUE rpObjectAlloc(VALUE klass)
-{
-	PObj* self = ALLOC(PObj);
-	self->pObject = NULL;
-	
-	return Data_Wrap_Struct(klass, rpObjectMark, rpObjectFree, self);
-}
-
-//Mark subsidiary objects for deletion
-static
-void rpObjectMark(PObj* self)
-{}
-
-//Delete a RubyPyObject
-static
-void rpObjectFree(PObj* self)
-{
-	if(Py_IsInitialized() && self->pObject)
-	{
-		//Make sure we decrement the object count on our wrapped
-		//object before we free the ruby wrapper
-		Py_XDECREF(self->pObject);
-	}
-	free(self);
-}
-
-
-/*
-Decreases the reference count on the object wrapped by this instance.
-This is used for cleanup in RubyPython.stop. RubyPyObject instances automatically
-decrease the reference count on their associated objects before they are garbage collected.
-*/
-static
-VALUE rpObjectFreePobj(VALUE self)
-{
-	PObj *cself;
-	
-	Data_Get_Struct(self, PObj, cself);
-	
-	if(Py_IsInitialized() && cself->pObject)
-	{
-		Py_XDECREF(cself->pObject);
-		cself->pObject = NULL;
-		return Qtrue;
-	}
-	else
-	{
-		cself->pObject = NULL;
-	}
-	
-	return Qfalse;
-}
-
-//Fetchs the wrapped Python object from a RubyPyObject
-PyObject* rpObjectGetPyObject(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;
-}
-
-
-//Creates a new RubyPyObject to wrap a python object
-VALUE rpObjectFromPyObject
-(PyObject* pObj)
-{
-	PObj* self;
-	
-	VALUE rObj = rb_class_new_instance(0, NULL, cRubyPyObject);
-	
-	Data_Get_Struct(rObj, PObj, self);
-	
-	self->pObject = pObj;
-	
-	return rObj;
-}
-
-/*
-Returns the name of the Python object which this instance wraps.
-
-If it cannot determine a reasonable name it just gives up.
-*/
-static
-VALUE rpObjectectGetName(VALUE self)
-{
-	//It only makes sense to query a python object if the interpreter is running.
-	if(Py_IsInitialized())
-	{
-		PyObject *pObject,*pName,*pRepr;
-		VALUE rName;
-		
-		pObject = rpObjectGetPyObject(self);
-		
-		
-		pName = PyObject_GetAttrString(pObject,"__name__");
-		
-		if(!pName)
-		{
-			PyErr_Clear();
-			
-			pName = PyObject_GetAttrString(pObject,"__class__");
-	 		pRepr = PyObject_Repr(pName);
-			rName = ptorString(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 = ptorString(pName);
-		
-		Py_XDECREF(pName);
-		
-		return rName;
-	}
-	
-	return rb_str_new2("__FREED__");
-
-}
-
-//Test to see the RubyPyObj has the supplied symbol as an attribute
-int rpHasSymbol(VALUE self, VALUE symbol)
-{
-	PObj *cself;
-	VALUE rName;
-	
-	Data_Get_Struct(self, PObj, cself);
-	rName = rb_funcall(symbol, rb_intern("to_s"), 0);
-	
-	if(PyObject_HasAttrString(cself->pObject, STR2CSTR(rName))) return 1;
-	
-	return 0;
-}
-
-/* Tests whether the wrapped object will respond to the given method*/
-VALUE rpRespondsTo(VALUE self, VALUE mname)
-{
-	if(rpHasSymbol(self, mname))
-	{
-		return Qtrue;
-	}
-	
-	return Qfalse;
-}
-
-/*
-A wrapper class for Python objects that allows them to manipulated from within ruby.
-
-Important wrapper functionality is found in the RubyPyModule, RubyPyClass, and RubyPyFunction
-classes which wrap Python objects of similar names.
-
-*/
-inline void Init_RubyPyObject()
-{
-	cRubyPyObject = rb_define_class_under(mRubyPythonBridge,"RubyPyObject", cBlankObject);
-	rb_define_alloc_func(cRubyPyObject, rpObjectAlloc);
-	rb_define_method(cRubyPyObject,"free_pobj", rpObjectFreePobj, 0);
-	rb_define_method(cRubyPyObject,"__name", rpObjectectGetName, 0);
-	rb_define_method(cRubyPyObject,"respond_to?", rpRespondsTo, 1);
-	
-}