rubypython 0.2.3 → 0.2.4

data/History.txt

@@ -1,3 +1,11 @@
+== 0.2.4 2008-10-24
+* Major Enhancements
+	* Provided setter methods for object attributes. Python object attributes can now be set 
+		from within ruby.
+	* Made wrapper classes a subclass of custom made blank object class to try to avoid name 	
+		collisions.
+* Bug Fix
+	* 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 

data/README.txt

@@ -22,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. 
+	Python must be installed. Currently, RubyPython requires python2.5 but it may soon be  able to work with other versions. It should work fine with Python 2.4 but you may experience issues with lower versions. 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/extconf.rb

@@ -1,13 +1,21 @@
 require 'mkmf'
 require 'open3'
 
-if (Open3.popen3("python --version") { |i,o,e| e.read}.chomp.split[1].to_f < 2.4)
-  puts "I'm sorry you need at least Python 2.4 to use rubypython"
-  exit -1
+begin
+  if (Open3.popen3("python --version") { |i,o,e| e.read}.chomp.split[1].to_f < 2.4)
+    puts "I'm sorry you need at least Python 2.4 to use rubypython"
+    exit -1
+  end
+rescue
+  puts "Could not check python version. Do you have Python 2.4 or higher? (y/n)"
+  if(gets.chomp == "n")
+    puts "Please install Python 2.4 or higher"
+    exit
+  end
+  puts "Okay."
 end
-
 dir_config("rubypython_bridge")
-if(!`which python-config`)
+if(!system("which python-config"))
   print "Can't configure with python_config"
   exit -1
 end

data/ext/rubypython_bridge/rp_object.c

@@ -4,6 +4,30 @@
 RUBY_EXTERN VALUE mRubyPythonBridge;
 RUBY_EXTERN VALUE ePythonError;
 
+VALUE cBlankObject;
+
+// :nodoc:
+VALUE blank_undef_if(VALUE mname,VALUE klass)
+{
+	if(rb_funcall(mname,rb_intern("match"),1,rb_str_new2("(?:^__)|(?:\\?$)|(?:^send$)|(?:^class$)"))==Qnil)
+	{
+		rb_undef_method(klass,STR2CSTR(mname));
+		return Qtrue;
+	}
+	else
+	{
+		return Qfalse;
+	}
+}
+
+// :nodoc:
+VALUE blank_obj_prep(VALUE self)
+{
+	VALUE instance_methods=rb_funcall(self,rb_intern("instance_methods"),0);
+	rb_iterate(rb_each,instance_methods,blank_undef_if,self);
+	return self;
+}
+
 VALUE cRubyPyObject;
 VALUE cRubyPyModule;
 VALUE cRubyPyClass;
@@ -132,6 +156,55 @@ VALUE rp_inst_from_instance(PyObject *pInst)
 	return rInst;
 }
 
+VALUE rp_inst_attr_set(VALUE self,VALUE args)
+{
+	VALUE name,name_string,rClassDict,result,rInstDict;
+	VALUE ret;
+	int instance;
+	char *cname;
+	PObj *pClassDict,*pInstDict,*pDict;
+	PyObject *pName;
+
+	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);
+	rb_funcall(name_string,rb_intern("chop!"),0);
+	
+	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),rtop_obj(args,0));
+	return Qtrue;
+}
+
 //:nodoc:
 VALUE rp_inst_delegate(VALUE self,VALUE args)
 {
@@ -140,6 +213,11 @@ VALUE rp_inst_delegate(VALUE self,VALUE args)
 	char *cname;
 	PObj *pClassDict,*pInstDict;
 	PyObject *pCalled;
+	
+	if(rp_equal(args))
+	{
+		return rp_inst_attr_set(self,args);
+	}
 	if(!rp_has_attr(self,rb_ary_entry(args,0)))
 	{		
 		int argc;
@@ -201,6 +279,22 @@ VALUE rp_func_from_function(PyObject *pFunc)
 	return rFunc;
 }
 
+VALUE rp_obj_wrap(PyObject* pObj)
+{
+	VALUE rObj;
+	if(PyFunction_Check(pObj)||PyMethod_Check(pObj)||!PyObject_HasAttrString(pObj,"__dict__"))
+	{
+		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 rp_mod_call_func(VALUE self,VALUE func_name,VALUE args)
 {
 	PObj *cself;
@@ -268,6 +362,50 @@ VALUE rp_obj_responds(VALUE self,VALUE mname)
 	}
 	return Qfalse;
 }
+
+int rp_equal(VALUE args)
+{
+	VALUE mname=rb_ary_entry(args,0);
+	VALUE name_string=rb_funcall(mname,rb_intern("to_s"),0);
+	return Qtrue==rb_funcall(name_string,rb_intern("end_with?"),1,rb_str_new2("="));
+}
+
+
+
+int rp_double_bang(VALUE args)
+{
+	VALUE mname=rb_ary_entry(args,0);
+	VALUE name_string=rb_funcall(mname,rb_intern("to_s"),0);
+	return Qtrue==rb_funcall(name_string,rb_intern("end_with?"),1,rb_str_new2("!!"));
+}
+
+VALUE rp_mod_attr_set(VALUE self,VALUE args)
+{
+	VALUE rDict;
+	PObj *pDict;
+	VALUE mname=rb_ary_shift(args);
+	VALUE name_string=rb_funcall(mname,rb_intern("to_s"),0);
+	rb_funcall(name_string,rb_intern("chop!"),0);
+	if(!rp_has_attr(self,name_string))
+	{		
+		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);
+	}
+	if(NUM2INT(rb_funcall(args,rb_intern("size"),0))==1)
+	{
+		args=rb_ary_entry(args,0);
+	}
+	rDict=rb_iv_get(self,"@pdict");
+	Data_Get_Struct(rDict,PObj,pDict);
+	PyDict_SetItemString(pDict->pObject,STR2CSTR(name_string),rtop_obj(args,0));
+	return Qtrue;
+}
+
 //:nodoc:
 VALUE rp_mod_delegate(VALUE self,VALUE args)
 {
@@ -275,6 +413,14 @@ VALUE rp_mod_delegate(VALUE self,VALUE args)
 	VALUE ret;
 	PObj *pDict;
 	PyObject *pCalled;
+	if(rp_equal(args))
+	{
+		return rp_mod_attr_set(self,args);
+	}
+	// if(rp_double_bang)
+	// {
+	// 	return rp_mod_attr_db(args);
+	// }
 	if(!rp_has_attr(self,rb_ary_entry(args,0)))
 	{		
 		int argc;
@@ -307,6 +453,13 @@ VALUE rp_mod_delegate(VALUE self,VALUE args)
 	
 }
 
+// :nodoc:
+inline void Init_BlankObject()
+{
+	cBlankObject=rb_define_class_under(mRubyPythonBridge,"BlankObject",rb_cObject);
+	blank_obj_prep(cBlankObject);
+}
+
 /*
 A wrapper class for Python objects that allows them to manipulated from within ruby.
 
@@ -316,7 +469,7 @@ classes which wrap Python objects of similar names.
 */
 inline void Init_RubyPyObject()
 {
-	cRubyPyObject=rb_define_class_under(mRubyPythonBridge,"RubyPyObject",rb_cObject);
+	cRubyPyObject=rb_define_class_under(mRubyPythonBridge,"RubyPyObject",cBlankObject);
 	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);

data/ext/rubypython_bridge/rp_object.h

@@ -51,5 +51,18 @@ VALUE rp_cla_new_inst(VALUE self,VALUE args);
 
 VALUE rp_obj_responds(VALUE self,VALUE mname);
 
+VALUE blank_undef_if(VALUE mname,VALUE klass);
+
+VALUE blank_obj_prep(VALUE self);
+
+int rp_equal(VALUE args);
+
+int rp_double_bang(VALUE args);
+
+VALUE rp_mod_attr_set(VALUE self,VALUE args);
+
+VALUE rp_inst_attr_set(VALUE self, VALUE args);
+
+VALUE rp_obj_wrap(PyObject* pObj);
 
 #endif /* _RP_OBJECT_H_ */

data/ext/rubypython_bridge/rtop.c

@@ -1,6 +1,7 @@
 #include "rtop.h"
 
 RUBY_EXTERN VALUE cRubyPyObject;
+RUBY_EXTERN PyObject* rp_obj_pobject(VALUE self);
 
 PyObject* rtop_string(VALUE rString)
 {

data/ext/rubypython_bridge/rubypython_bridge.c

@@ -4,6 +4,7 @@ VALUE mRubyPythonBridge;
 RUBY_EXTERN VALUE cRubyPyObject;
 RUBY_EXTERN VALUE cRubyPyModule;
 RUBY_EXTERN VALUE cRubyPyClass;
+RUBY_EXTERN VALUE cBlankObject;
 
 
 /*
@@ -84,6 +85,7 @@ void Init_rubypython_bridge()
 	rb_define_module_function(mRubyPythonBridge,"start",rp_start,0);
 	rb_define_module_function(mRubyPythonBridge,"stop",rp_stop,0);
 	rb_define_module_function(mRubyPythonBridge,"import",rp_import,1);
+	Init_BlankObject();
 	Init_RubyPyObject();
 	Init_RubyPyModule();
 	Init_RubyPyClass();

data/lib/rubypython/version.rb

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

data/lib/rubypython/wrapper_extensions.rb

@@ -15,8 +15,9 @@ end
 # The PyMainClass object provides somewhat experimental block support.
 # A block may be passed to a method call and the object returned by the function call
 # will be passed as an argument to the block.
-class PyMainClass
+class PyMainClass < RubyPythonBridge::BlankObject
   include Singleton
+  attr_writer :main, :builtin
   #:nodoc:
   def main
     @main||=RubyPython.import "__main__"
@@ -41,6 +42,7 @@ class PyMainClass
     if(block)
       return block.call(result)
     end
+    result
   end
 end
 

data/lib/rubypython.rb

@@ -30,6 +30,33 @@ This allows one to do something like the following:
     puts cPickle.dumps "RubyPython is still awesome!"
   end
 
+The downside to the above method is that the block has no access to the encompassing scope. An
+alternative is to use <tt>RubyPython.session</tt>. The downside to this approach is that the module
+methods are not available by their unqualified names: i.e.
+  irb(main):001:0>   RubyPython.session do
+  irb(main):002:1*     cPickle=import "cPickle"
+  irb(main):003:1>   end
+  NoMethodError: undefined method `import' for main:Object
+  	from (irb):2
+  	from ./rubypython.rb:93:in `call'
+  	from ./rubypython.rb:93:in `session'
+  	from (irb):1
+  	
+However:
+  irb(main):001:0> RubyPython.session do
+  irb(main):002:1*   cPickle=RubyPython.import "cPickle"
+  irb(main):003:1>   puts cPickle.dumps "RubyPython is still awesome!"
+  irb(main):004:1> end
+  S'RubyPython is still awesome!'
+  .
+  => nil
+
+A compromise can be achieved by just including the RubyPython module into the scope you're
+working in.
+
+If you really wish to be free of dealing with the interpreter, just import 'rubypython/session'.
+This will start the interpreter on import and will halt it when execution ends.
+  
 ==Errors
 The RubyPythonModule defines a new error object, PythonError. Should any error occur within
 the Python interpreter, the class and value of the error will be passed back into ruby within
@@ -64,6 +91,8 @@ module RubyPython
     ObjectSpace.each_object(RubyPythonBridge::RubyPyObject) do |o|
       o.free_pobj
     end
+    PyMain.main=nil
+    PyMain.builtin=nil
     RubyPythonBridge.stop
   end
   
@@ -74,11 +103,24 @@ module RubyPython
   
   # Handles the setup and cleanup involved with using the interpreter for you.
   # Note that all Python object will be effectively scope to within the block
-  # as the embedded interpreter will be halted at its end.
+  # as the embedded interpreter will be halted at its end. The supplied block is
+  # run within the scope of the RubyPython module.
+  #
+  # Alternatively the user may prefer RubyPython.session which simples handles
+  # initialization and cleanup of the interpreter.
   def self.run(&block)
     start
       module_eval(&block)
     stop
   end
+  
+  # Simply starts the interpreter, runs the supplied block, and stops the interpreter.
+  def self.session(&block)
+    start
+    retval=block.call
+    stop
+    return retval
+  end
+end
+
 
-end

data/test/test_rubypython.rb

@@ -5,13 +5,14 @@ class TestRubypython < Test::Unit::TestCase
   def setup
   end
   
+
   def test_simple
     assert RubyPython.start
     assert RubyPython.import "urllib"
     assert(RubyPython.stop)
     assert(!RubyPython.stop)
   end
-  
+
   def test_delegation
     RubyPython.start
     cPickle=RubyPython.import("cPickle")
@@ -29,14 +30,14 @@ class TestRubypython < Test::Unit::TestCase
     end
     assert(RubyPython.stop)
   end
-  
+
   def test_two_imports
     RubyPython.start
     RubyPython.import "cPickle"
     RubyPython.import "urllib"
     RubyPython.stop
   end
-  
+
   def test_propogate_python_errror
     RubyPython.start
     assert_raise PythonError do
@@ -44,7 +45,7 @@ class TestRubypython < Test::Unit::TestCase
     end
     RubyPython.stop
   end
-  
+
   def test_run_method
     unpickled=nil
     RubyPython.run do
@@ -55,7 +56,7 @@ class TestRubypython < Test::Unit::TestCase
     assert_equal(unpickled,{"a"=>"n", [1, "2"]=>4})
     assert(!RubyPython.stop)
   end
-  
+
   def test_instance_method_delegation
     RubyPython.start
     wave=RubyPython.import "wave"
@@ -64,4 +65,44 @@ class TestRubypython < Test::Unit::TestCase
     w.close
     RubyPython.stop
   end
+
+  def test_pymain_delegation
+    RubyPython.start
+    assert_equal(PyMain.float(42),42.to_f)
+    RubyPython.stop
+  end
+
+  def test_block_syntax
+    returned=""
+    RubyPython.start
+    returned=PyMain.float(22) do |f|
+      f*2
+    end
+    assert_equal(returned,44.0)
+    RubyPython.stop
+  end
+  
+  def test_session_function
+    RubyPython.session do
+      cPickle=RubyPython.import "cPickle"
+      cPickle.inspect
+      assert_equal(cPickle.loads("(dp1\nS'a'\nS'n'\ns(I1\nS'2'\ntp2\nI4\ns."),{"a"=>"n", [1, "2"]=>4})
+    end
+  end
+
+  
+  def test_setter_ary
+    RubyPython.session do
+      sys=RubyPython.import 'sys'
+      sys.path=[""]
+      assert_equal([""],sys.path)
+    end
+  end
+  
+  def test_setter_instance
+    RubyPython.session do
+      
+    end
+  end
+
 end

data/test/test_session.rb

@@ -0,0 +1,6 @@
+class TestSessionImport < Test::Unit::TestCase
+  def test_session
+    require 'rubypython/session'
+    assert RubyPython.import "cPickle"
+  end
+end

data/website/index.html

@@ -33,7 +33,7 @@
     <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.3</a>
+      <a href="http://rubyforge.org/projects/rubypython" class="numbers">0.2.4</a>
     </div>
     <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 />

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubypython
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Zach Raines
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-29 00:00:00 -04:00
+date: 2008-10-24 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -113,3 +113,4 @@ test_files:
 - test/test_helper.rb
 - test/test_rubypython.rb
 - test/test_rubypython_bridge_extn.rb
+- test/test_session.rb