rubypython 0.2.4 → 0.2.5

data/History.txt

@@ -1,3 +1,7 @@
+== 0.2.5 2009-3-18
+* Bug Fixes
+	* Updated to build and run under Ruby 1.9.
+
 == 0.2.4 2008-10-24
 * Major Enhancements
 	* Provided setter methods for object attributes. Python object attributes can now be set 
@@ -8,13 +12,13 @@
 	* Changed part of extconf.rb file that would not work under windows.
 == 0.2.3 2008-08-29
 * 2 Major Enhancements
-	* Introduced PyMain object to as a singleton wrapper for the Python __main__ and 
+	* Introduced PyMain object as a singleton wrapper for the Python __main__ and 
 		__builtin__ modules.
 	* Introduced block functionality for PyMain object.
 	
 * Compatibility Updates
-	* Changed some declarations in the C code make RubyPython more compatible with the style 						
-		conventions of the Ruby C API.
+	* Changed some declarations in the C code to make RubyPython more compatible with the 	
+		style conventions of the Ruby C API.
 	* Update how RubyPython locates the Python headers and library.
 * 1 Bug Fix
 	* Fixed an error in ptor.c that might have prevented RubyPython from building correctly 	

data/ext/rubypython_bridge/config.h

@@ -11,4 +11,4 @@
 #ifndef _RUBY_H_
 #define _RUBY_H_
 #include "ruby.h"
-#endif /* _RUBY_H_ */
+#endif /* _RUBY_H_ */

data/ext/rubypython_bridge/extconf.rb

@@ -25,6 +25,11 @@ unless find_library("python2.5",nil)||find("python2.4",nil)
   exit -1
 end
 
+if RUBY_VERSION=~/1\.9/ then
+	puts "Building for Ruby 1.9"
+	$CPPFLAGS += " -DRUBY_19"
+end
+
 find_header("Python.h",*`python-config --includes`.split.map{|s| s[2..-1]<<"/"})
 
 create_makefile("rubypython_bridge")

data/ext/rubypython_bridge/rp_object.c

@@ -7,8 +7,10 @@ RUBY_EXTERN VALUE ePythonError;
 VALUE cBlankObject;
 
 // :nodoc:
-VALUE blank_undef_if(VALUE mname,VALUE klass)
+VALUE blank_undef_if(VALUE name,VALUE klass)
 {
+	VALUE mname=rb_funcall(name,rb_intern("to_s"),0);
+	printf("OH SHIT\n");
 	if(rb_funcall(mname,rb_intern("match"),1,rb_str_new2("(?:^__)|(?:\\?$)|(?:^send$)|(?:^class$)"))==Qnil)
 	{
 		rb_undef_method(klass,STR2CSTR(mname));
@@ -49,7 +51,7 @@ void rp_obj_free(PObj* self)
 
 /*
 Decreases the reference count on the object wrapped by this instance.
-This is used for cleanup in RubyPython.stop. RubyPyObject instance automatically
+This is used for cleanup in RubyPython.stop. RubyPyObject instances automatically
 decrease the reference count on their associated objects before they are garbage collected.
 */
 VALUE rp_obj_free_pobj(VALUE self)
@@ -164,29 +166,30 @@ VALUE rp_inst_attr_set(VALUE self,VALUE args)
 	char *cname;
 	PObj *pClassDict,*pInstDict,*pDict;
 	PyObject *pName;
-
-	if(!rp_has_attr(self,rb_ary_entry(args,0)))
+	name=rb_ary_shift(args);
+	name_string=rb_funcall(name,rb_intern("to_s"),0);
+	rb_funcall(name_string,rb_intern("chop!"),0);	
+	if(!rp_has_attr(self,name_string))
 	{		
-		int argc;
-		
+		int argc;		
 		VALUE *argv;
-		argc=RARRAY(args)->len;
+		argc=RARRAY_LEN(args);
 		argv=ALLOC_N(VALUE,argc);
-		MEMCPY(argv,RARRAY(args)->ptr,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);
-	rb_funcall(name_string,rb_intern("chop!"),0);
 	
-	if(NUM2INT(rb_funcall(args,rb_intern("size"),0))==1)
+	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);
@@ -223,9 +226,9 @@ VALUE rp_inst_delegate(VALUE self,VALUE args)
 		int argc;
 		
 		VALUE *argv;
-		argc=RARRAY(args)->len;
+		argc=RARRAY_LEN(args);
 		argv=ALLOC_N(VALUE,argc);
-		MEMCPY(argv,RARRAY(args)->ptr,VALUE,argc);
+		MEMCPY(argv,RARRAY_PTR(args),VALUE,argc);
 		return rb_call_super(argc,argv);
 	}
 	name=rb_ary_shift(args);
@@ -391,9 +394,9 @@ VALUE rp_mod_attr_set(VALUE self,VALUE args)
 		int argc;
 		
 		VALUE *argv;
-		argc=RARRAY(args)->len;
+		argc=RARRAY_LEN(args);
 		argv=ALLOC_N(VALUE,argc);
-		MEMCPY(argv,RARRAY(args)->ptr,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)
@@ -426,9 +429,9 @@ VALUE rp_mod_delegate(VALUE self,VALUE args)
 		int argc;
 		
 		VALUE *argv;
-		argc=RARRAY(args)->len;
+		argc=RARRAY_LEN(args);
 		argv=ALLOC_N(VALUE,argc);
-		MEMCPY(argv,RARRAY(args)->ptr,VALUE,argc);
+		MEMCPY(argv,RARRAY_PTR(args),VALUE,argc);
 		return rb_call_super(argc,argv);
 	}
 	name=rb_ary_shift(args);
@@ -523,4 +526,4 @@ 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/rtop.c

@@ -46,6 +46,7 @@ PyObject* rtop_hash(VALUE rHash)
 	int i;
 	
 	pDict=PyDict_New();
+	
 	for(i=0;i<RARRAY(rKeys)->len;i++)
 	{
 		rKey=rb_ary_entry(rKeys,i);
@@ -92,7 +93,7 @@ PyObject* rtop_true()
 PyObject* rtop_symbol(VALUE rSymbol)
 {
 	PyObject* pString;
-	pString=PyString_FromString(rb_id2name(rSymbol));
+	pString=PyString_FromString(STR2CSTR(rb_funcall(rSymbol,rb_intern("to_s"),0)));
 	return pString;
 
 }

data/ext/rubypython_bridge/rubypython_bridge.h

@@ -1,7 +1,11 @@
+#ifndef RUBY_19
+#define RARRAY_LEN(arr) (RARRAY(arr)->len)
+#define RARRAY_PTR(arr) (RARRAY(arr)->ptr)
+#endif
 #include "config.h"
 
 #include "ptor.h" //PyObject to VALUE conversion
 #include "rtop.h" //VALUE to PyObject conversion
 #include "cbridge.h" //General interface functions
 #include "rp_error.h"
-#include "rp_object.h"
+#include "rp_object.h"

data/lib/rubypython/version.rb

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

data/test/test_rubypython.rb

@@ -101,7 +101,10 @@ class TestRubypython < Test::Unit::TestCase
   
   def test_setter_instance
     RubyPython.session do
-      
+      urllib2=RubyPython.import "urllib2"
+      req=urllib2.Request("google.com")
+      req.headers={:a=>"2","k"=>4}
+      assert_equal({"a"=>"2","k"=>4},req.headers)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubypython
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - Zach Raines
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-24 00:00:00 -04:00
+date: 2009-03-18 00:00:00 -04:00
 default_executable: 
 dependencies: []