rubypython 0.2.2 → 0.2.3

data/History.txt

@@ -1,3 +1,17 @@
+== 0.2.3 2008-08-29
+* 2 Major Enhancements
+	* Introduced PyMain object to 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.
+	* 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 	
+		on certain systems.
+		
 == 0.2.2 2008-08-07
 * Major Enhancements
 	* Wrapped classes and instances should now behave as expected.

data/config/hoe.rb

@@ -63,7 +63,9 @@ $hoe = Hoe.new(GEM_NAME, VERS) do |p|
   p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
   #p.extra_deps = EXTRA_DEPENDENCIES
 
-    #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
+  p.spec_extras = {
+    :requirements => ["Python, ~>2.4"]
+  }    # A hash of extra values to set in the gemspec.
   end
 
 CHANGES = $hoe.paragraphs_of('History.txt', 0..1).join("\\n\\n")

data/ext/rubypython_bridge/config.h

@@ -1,6 +1,6 @@
 #ifndef _PYTHON_H_
 #define _PYTHON_H_
-#include "python2.5/Python.h"
+#include "Python.h"
 #endif /* _PYTHON_H_ */
 
 #ifndef _STDLIB_H_

data/ext/rubypython_bridge/extconf.rb

@@ -1,7 +1,22 @@
 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
+end
 
 dir_config("rubypython_bridge")
-find_library("python2.5",nil)
-find_header("python2.5/Python.h")
+if(!`which python-config`)
+  print "Can't configure with python_config"
+  exit -1
+end
+
+unless find_library("python2.5",nil)||find("python2.4",nil)
+  puts "Could not find python libraries"
+  exit -1
+end
+
+find_header("Python.h",*`python-config --includes`.split.map{|s| s[2..-1]<<"/"})
 
 create_makefile("rubypython_bridge")

data/ext/rubypython_bridge/ptor.c

@@ -47,7 +47,7 @@ VALUE ptor_long(PyObject* pNum)
 	cNum=PyLong_AsLong(pNum);
 	if(PyErr_ExceptionMatches(PyExc_OverflowError))
 	{
-		raise_PyError();
+		rp_pythonerror();
 		return Qnil;
 	}
 	rNum=INT2NUM(cNum);

data/ext/rubypython_bridge/rp_object.c

@@ -1,8 +1,8 @@
 #include "rp_object.h"
 #include "stdio.h"
 
-extern VALUE mRubyPythonBridge;
-extern VALUE ePythonError;
+RUBY_EXTERN VALUE mRubyPythonBridge;
+RUBY_EXTERN VALUE ePythonError;
 
 VALUE cRubyPyObject;
 VALUE cRubyPyModule;

data/ext/rubypython_bridge/rtop.c

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

data/ext/rubypython_bridge/rubypython_bridge.c

@@ -1,9 +1,9 @@
 #include "rubypython_bridge.h"
 
 VALUE mRubyPythonBridge;
-extern VALUE cRubyPyObject;
-extern VALUE cRubyPyModule;
-extern VALUE cRubyPyClass;
+RUBY_EXTERN VALUE cRubyPyObject;
+RUBY_EXTERN VALUE cRubyPyModule;
+RUBY_EXTERN VALUE cRubyPyClass;
 
 
 /*

data/lib/rubypython/version.rb

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

data/lib/rubypython/wrapper_extensions.rb

@@ -1,3 +1,4 @@
+require 'singleton'
 class RubyPythonBridge::RubyPyObject
   def inspect
     "<#{self.class}:#{__name}>"
@@ -5,6 +6,47 @@ class RubyPythonBridge::RubyPyObject
 end
 
 
+# A singleton object providing access to the python __main__ and __builtin__ modules.
+# This can be conveniently accessed through the already instaniated PyMain constant.
+# The __main__ namespace is searched beofre the __builtin__ namespace. As such,
+# naming clashes will be resolved in that order.
+#
+# == Block Syntax
+# 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
+  include Singleton
+  #:nodoc:
+  def main
+    @main||=RubyPython.import "__main__"
+  end
+  
+  #:nodoc:
+  def builtin
+    @builtin||=RubyPython.import "__builtin__"
+  end
+  
+  #:nodoc:
+  def method_missing(name,*args,&block)
+    begin
+      result=main.send(name,*args)
+    rescue NoMethodError
+      begin
+        result=builtin.send(name,*args)
+      rescue NoMethodError
+        super(name,*args)
+      end
+    end
+    if(block)
+      return block.call(result)
+    end
+  end
+end
+
+# See _PyMainClass_
+PyMain=PyMainClass.instance
+
 # A wrapper class for Python Modules.
 # 
 # Methods calls are delegated to the equivalent Python methods/functions. Attribute references

data/test/test_rubypython.rb

@@ -30,14 +30,14 @@ class TestRubypython < Test::Unit::TestCase
     assert(RubyPython.stop)
   end
   
-  def test_double_import
+  def test_two_imports
     RubyPython.start
     RubyPython.import "cPickle"
     RubyPython.import "urllib"
     RubyPython.stop
   end
   
-  def test_handle_error
+  def test_propogate_python_errror
     RubyPython.start
     assert_raise PythonError do
       RubyPython.import "slasdfj"

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.2</a>
+      <a href="http://rubyforge.org/projects/rubypython" class="numbers">0.2.3</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.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Zach Raines
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-07 00:00:00 -04:00
+date: 2008-08-29 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -102,8 +102,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version 
       version: "0"
   version: 
-requirements: []
-
+requirements: 
+- Python, ~>2.4
 rubyforge_project: rubypython
 rubygems_version: 1.2.0
 signing_key: