rubypython 0.5.3 → 0.6.0

data/lib/rubypython/legacy.rb

@@ -1,29 +1,8 @@
 require 'rubypython'
 
-# A quick way to active <em>Legacy Mode</em> for a project. Requiring
+# A quick way to activate <em>Legacy Mode</em> for a project. Requiring
 # +'rubypython/legacy' automatically activates +RubyPython.legacy_mode+ on
-# the project.
-#
-# This mode may be phased out for RubyPython 1.0.
-#
-# === Default
-#   require 'rubypython'
-#
-#   RubyPython.session do
-#     string = RubyPython.import 'string'
-#     ascii_letters = string.ascii_letters
-#     puts ascii_letters.isalpha # => True
-#     puts ascii_letters.rubify.isalpha # throws NoMethodError
-#   end
-#
-# === Legacy Mode
-#   require 'rubypython/legacy'
-#
-#   RubyPython.session do
-#     string = RubyPython.import 'string'
-#     ascii_letters = string.ascii_letters
-#     puts ascii_letters.isalpha # throws NoMethodError
-#   end
+# the project. This mode is deprecated and will be removed.
 module RubyPython::LegacyMode
   # Enables +RubyPython.legacy_mode+.
   def self.setup_legacy

data/lib/rubypython/operators.rb

@@ -106,13 +106,17 @@ module RubyPython::Operators
     RubyPython::PyMain.cmp(self, other)
   end
 
-  # Called by RubyPython when the interpreter is started or stopped so that the
-  # necessary preparation or cleanup can be done. For internal use only.
-  def self.update(status)
-    case status
-    when :stop
-      @@operator = nil
+  class << self
+    # Called by RubyPython when the interpreter is started or stopped so
+    # that the necessary preparation or cleanup can be done. For internal
+    # use only.
+    def python_interpreter_update(status)
+      case status
+      when :stop
+        @@operator = nil
+      end
     end
+    private :python_interpreter_update
   end
 
   # Aliases eql? to == for Python objects.

data/lib/rubypython/pymainclass.rb

@@ -63,15 +63,16 @@ module RubyPython
     end
 
     # Called by RubyPython when the interpreter is started or stopped so
-    # that the neccesary preperation or cleanup can be done. For internal
+    # that the neccesary preparation or cleanup can be done. For internal
     # use only.
-    def update(status)
+    def python_interpreter_update(status)
       case status
       when :stop
         @main = nil
         @builtin = nil
       end
     end
+    private :python_interpreter_update
   end
 
   # The accessible instance of PyMainClass.

data/lib/rubypython/pyobject.rb

@@ -35,12 +35,13 @@ class RubyPython::PyObject # :nodoc: all
       # Called by RubyPython when the interpreter is started or stopped so
       # that the necessary preparation or cleanup can be done. For internal
       # use only.
-      def update(status)
+      def python_interpreter_update(status)
         case status
         when :stop
           current_pointers.clear
         end
       end
+      private :python_interpreter_update
     end
 
     self.current_pointers = {}

data/lib/rubypython/python.rb

@@ -1,198 +1,195 @@
 require 'ffi'
-require 'rubypython/options'
-require 'rubypython/pythonexec'
+require 'thread'
+require 'rubypython/interpreter'
 
 module RubyPython
-  unless defined? PYTHON_RB
-    PYTHON_RB = __FILE__
-    PYTHON_RB.freeze
+  # This module will hold the loaded RubyPython interpreter.
+  module Python #:nodoc: all
   end
-
-  module Python; end
 end
 
-if RubyPython.load_ffi?
-  # This module provides access to the \Python C API functions via the Ruby
-  # FFI gem.
-  #
-  # === Documentation
-  # * {Python C API}[http://docs.python.org/c-api/]
-  # * {Ruby FFI}[http://rdoc.info/projects/ffi/ffi]
-  module RubyPython::Python # :nodoc: all
-    extend FFI::Library
-
-    EXEC = RubyPython::PythonExec.new(RubyPython.options[:python_exe])
-
-    PYTHON_LIB = EXEC.library
-    # FFI::DynamicLibrary::RTLD_LAZY | FFI::DynamicLibrary::RTLD_GLOBAL
-    ffi_lib_flags :lazy, :global
-    ffi_lib EXEC.library
-
-    # The class is a little bit of a hack to extract the address of global
-    # structs. If someone knows a better way please let me know.
-    class DummyStruct < FFI::Struct # :nodoc:
-      layout :dummy_var, :int
-    end
-
-    PY_FILE_INPUT = 257
-    PY_EVAL_INPUT = 258
-
-    # Function methods & constants
-    METH_VARARGS = 0x0001
-    attach_function :PyCFunction_New, [:pointer, :pointer], :pointer
-    callback :PyCFunction, [:pointer, :pointer], :pointer
-
-    attach_function :PyRun_String, [:string, :int, :pointer, :pointer], :pointer
-    attach_function :PyRun_SimpleString, [:string], :pointer
-    attach_function :Py_CompileString, [:string, :string, :int], :pointer
-    attach_function :PyEval_EvalCode, [:pointer, :pointer, :pointer], :pointer
-    attach_function :PyErr_SetString, [:pointer, :string], :void
-
-    # Python interpreter startup and shutdown
-    attach_function :Py_IsInitialized, [], :int
-    attach_function :Py_Initialize, [], :void
-    attach_function :Py_Finalize, [], :void
-
-    # Module methods
-    attach_function :PyImport_ImportModule, [:string], :pointer
-
-    # Object Methods
-    attach_function :PyObject_HasAttrString, [:pointer, :string], :int
-    attach_function :PyObject_GetAttrString, [:pointer, :string], :pointer
-    attach_function :PyObject_SetAttrString, [:pointer, :string, :pointer], :int
-    attach_function :PyObject_Dir, [:pointer], :pointer
-
-    attach_function :PyObject_Compare, [:pointer, :pointer], :int
-
-    attach_function :PyObject_Call, [:pointer, :pointer, :pointer], :pointer
-    attach_function :PyObject_CallObject, [:pointer, :pointer], :pointer
-    attach_function :PyCallable_Check, [:pointer], :int
-
-    ### Python To Ruby Conversion
-    # String Methods
-    attach_function :PyString_AsString, [:pointer], :string
-    attach_function :PyString_FromString, [:string], :pointer
-    attach_function :PyString_AsStringAndSize, [:pointer, :pointer, :pointer], :int
-    attach_function :PyString_FromStringAndSize, [:buffer_in, :ssize_t], :pointer
-
-    # List Methods
-    attach_function :PyList_GetItem, [:pointer, :int], :pointer
-    attach_function :PyList_Size, [:pointer], :int
-    attach_function :PyList_New, [:int], :pointer
-    attach_function :PyList_SetItem, [:pointer, :int, :pointer], :void
-
-    # Integer Methods
-    attach_function :PyInt_AsLong, [:pointer], :long
-    attach_function :PyInt_FromLong, [:long], :pointer
-
-    attach_function :PyLong_AsLong, [:pointer], :long
-    attach_function :PyLong_FromLong, [:pointer], :long
-
-    # Float Methods
-    attach_function :PyFloat_AsDouble, [:pointer], :double
-    attach_function :PyFloat_FromDouble, [:double], :pointer
-
-    # Tuple Methods
-    attach_function :PySequence_List, [:pointer], :pointer
-    attach_function :PySequence_Tuple, [:pointer], :pointer
-    attach_function :PyTuple_Pack, [:int, :varargs], :pointer
-
-    # Dict/Hash Methods
-    attach_function :PyDict_Next, [:pointer, :pointer, :pointer, :pointer], :int
-    attach_function :PyDict_New, [], :pointer
-    attach_function :PyDict_SetItem, [:pointer, :pointer, :pointer], :int
-    attach_function :PyDict_Contains, [:pointer, :pointer], :int
-    attach_function :PyDict_GetItem, [:pointer, :pointer], :pointer
-
-    # Error Methods
-    attach_variable :PyExc_Exception, DummyStruct.by_ref
-    attach_variable :PyExc_StopIteration, DummyStruct.by_ref
-    attach_function :PyErr_SetNone, [:pointer], :void
-    attach_function :PyErr_Fetch, [:pointer, :pointer, :pointer], :void
-    attach_function :PyErr_Occurred, [], :pointer
-    attach_function :PyErr_Clear, [], :void
-
-    # Reference Counting
-    attach_function :Py_IncRef, [:pointer], :void
-    attach_function :Py_DecRef, [:pointer], :void
-
-    # Type Objects
-    # attach_variable :PyBaseObject_Type, DummyStruct.by_value # built-in 'object' 
-    # attach_variable :PyBaseString_Type, DummyStruct.by_value
-    # attach_variable :PyBool_Type, DummyStruct.by_value
-    # attach_variable :PyBuffer_Type, DummyStruct.by_value
-    # attach_variable :PyByteArrayIter_Type, DummyStruct.by_value
-    # attach_variable :PyByteArray_Type, DummyStruct.by_value
-    attach_variable :PyCFunction_Type, DummyStruct.by_value
-    # attach_variable :PyCObject_Type, DummyStruct.by_value
-    # attach_variable :PyCallIter_Type, DummyStruct.by_value
-    # attach_variable :PyCapsule_Type, DummyStruct.by_value
-    # attach_variable :PyCell_Type, DummyStruct.by_value
-    # attach_variable :PyClassMethod_Type, DummyStruct.by_value
-    attach_variable :PyClass_Type, DummyStruct.by_value
-    # attach_variable :PyCode_Type, DummyStruct.by_value
-    # attach_variable :PyComplex_Type, DummyStruct.by_value
-    # attach_variable :PyDictItems_Type, DummyStruct.by_value
-    # attach_variable :PyDictIterItem_Type, DummyStruct.by_value
-    # attach_variable :PyDictIterKey_Type, DummyStruct.by_value
-    # attach_variable :PyDictIterValue_Type, DummyStruct.by_value
-    # attach_variable :PyDictKeys_Type, DummyStruct.by_value
-    # attach_variable :PyDictProxy_Type, DummyStruct.by_value
-    # attach_variable :PyDictValues_Type, DummyStruct.by_value
-    attach_variable :PyDict_Type, DummyStruct.by_value
-    # attach_variable :PyEllipsis_Type, DummyStruct.by_value
-    # attach_variable :PyEnum_Type, DummyStruct.by_value
-    # attach_variable :PyFile_Type, DummyStruct.by_value
-    attach_variable :PyFloat_Type, DummyStruct.by_value
-    # attach_variable :PyFrame_Type, DummyStruct.by_value
-    # attach_variable :PyFrozenSet_Type, DummyStruct.by_value
-    attach_variable :PyFunction_Type, DummyStruct.by_value
-    # attach_variable :PyGen_Type, DummyStruct.by_value
-    # attach_variable :PyGetSetDescr_Type, DummyStruct.by_value
-    # attach_variable :PyInstance_Type, DummyStruct.by_value
-    attach_variable :PyInt_Type, DummyStruct.by_value
-    attach_variable :PyList_Type, DummyStruct.by_value
-    attach_variable :PyLong_Type, DummyStruct.by_value
-    # attach_variable :PyMemberDescr_Type, DummyStruct.by_value
-    # attach_variable :PyMemoryView_Type, DummyStruct.by_value
-    attach_variable :PyMethod_Type, DummyStruct.by_value
-    # attach_variable :PyModule_Type, DummyStruct.by_value
-    # attach_variable :PyNullImporter_Type, DummyStruct.by_value
-    # attach_variable :PyProperty_Type, DummyStruct.by_value
-    # attach_variable :PyRange_Type, DummyStruct.by_value
-    # attach_variable :PyReversed_Type, DummyStruct.by_value
-    # attach_variable :PySTEntry_Type, DummyStruct.by_value
-    # attach_variable :PySeqIter_Type, DummyStruct.by_value
-    # attach_variable :PySet_Type, DummyStruct.by_value
-    # attach_variable :PySlice_Type, DummyStruct.by_value
-    # attach_variable :PyStaticMethod_Type, DummyStruct.by_value
-    attach_variable :PyString_Type, DummyStruct.by_value
-    # attach_variable :PySuper_Type, DummyStruct.by_value # built-in 'super' 
-    # attach_variable :PyTraceBack_Type, DummyStruct.by_value
-    attach_variable :PyTuple_Type, DummyStruct.by_value
-    attach_variable :PyType_Type, DummyStruct.by_value
-    # attach_variable :PyUnicode_Type, DummyStruct.by_value
-    # attach_variable :PyWrapperDescr_Type, DummyStruct.by_value
-
-    attach_variable :Py_TrueStruct, :_Py_TrueStruct, DummyStruct.by_value
-    attach_variable :Py_ZeroStruct, :_Py_ZeroStruct, DummyStruct.by_value
-    attach_variable :Py_NoneStruct, :_Py_NoneStruct, DummyStruct.by_value
-
-    # This is an implementation of the basic structure of a Python PyObject
-    # struct. The C struct is actually much larger, but since we only access
-    # the first two data members via FFI and always deal with struct
-    # pointers there is no need to mess around with the rest of the object.
-    class PyObjectStruct < FFI::Struct
-      layout :ob_refcnt, :ssize_t,
-             :ob_type, :pointer
-    end
+class RubyPython::Interpreter
+  # Infects the provided module with the Python FFI. Once a single module
+  # has been infected, the #infect! method is removed from
+  # RubyPython::Interpreter.
+  def infect!(mod)
+    Mutex.new.synchronize do
+      self.class.class_eval do
+        undef :infect!
+      end
+
+      mod.extend FFI::Library
+      # FFI::DynamicLibrary::RTLD_LAZY | FFI::DynamicLibrary::RTLD_GLOBAL
+      mod.ffi_lib_flags :lazy, :global
+      mod.ffi_lib self.library
+
+      # This class is a little bit of a hack to extract the address of
+      # global structs. If someone knows a better way please let me know.
+      mod.module_eval do
+        self.const_set :DummyStruct, Class.new(FFI::Struct)
+        self::DummyStruct.layout :dummy_var, :int
+
+        self.const_set(:PY_FILE_INPUT, 257)
+        self.const_set(:PY_EVAL_INPUT, 258)
+        self.const_set(:METH_VARARGS, 0x0001)
+
+        # Function methods & constants
+        attach_function :PyCFunction_New, [:pointer, :pointer], :pointer
+        callback :PyCFunction, [:pointer, :pointer], :pointer
+
+        attach_function :PyRun_String, [:string, :int, :pointer, :pointer], :pointer
+        attach_function :PyRun_SimpleString, [:string], :pointer
+        attach_function :Py_CompileString, [:string, :string, :int], :pointer
+        attach_function :PyEval_EvalCode, [:pointer, :pointer, :pointer], :pointer
+        attach_function :PyErr_SetString, [:pointer, :string], :void
+
+        # Python interpreter startup and shutdown
+        attach_function :Py_IsInitialized, [], :int
+        attach_function :Py_Initialize, [], :void
+        attach_function :Py_Finalize, [], :void
+
+        # Module methods
+        attach_function :PyImport_ImportModule, [:string], :pointer
+
+        # Object Methods
+        attach_function :PyObject_HasAttrString, [:pointer, :string], :int
+        attach_function :PyObject_GetAttrString, [:pointer, :string], :pointer
+        attach_function :PyObject_SetAttrString, [:pointer, :string, :pointer], :int
+        attach_function :PyObject_Dir, [:pointer], :pointer
+
+        attach_function :PyObject_Compare, [:pointer, :pointer], :int
+
+        attach_function :PyObject_Call, [:pointer, :pointer, :pointer], :pointer
+        attach_function :PyObject_CallObject, [:pointer, :pointer], :pointer
+        attach_function :PyCallable_Check, [:pointer], :int
+
+        ### Python To Ruby Conversion
+        # String Methods
+        attach_function :PyString_AsString, [:pointer], :string
+        attach_function :PyString_FromString, [:string], :pointer
+        attach_function :PyString_AsStringAndSize, [:pointer, :pointer, :pointer], :int
+        attach_function :PyString_FromStringAndSize, [:buffer_in, :ssize_t], :pointer
+
+        # List Methods
+        attach_function :PyList_GetItem, [:pointer, :int], :pointer
+        attach_function :PyList_Size, [:pointer], :int
+        attach_function :PyList_New, [:int], :pointer
+        attach_function :PyList_SetItem, [:pointer, :int, :pointer], :void
+
+        # Integer Methods
+        attach_function :PyInt_AsLong, [:pointer], :long
+        attach_function :PyInt_FromLong, [:long], :pointer
+
+        attach_function :PyLong_AsLong, [:pointer], :long
+        attach_function :PyLong_FromLong, [:pointer], :long
+
+        # Float Methods
+        attach_function :PyFloat_AsDouble, [:pointer], :double
+        attach_function :PyFloat_FromDouble, [:double], :pointer
+
+        # Tuple Methods
+        attach_function :PySequence_List, [:pointer], :pointer
+        attach_function :PySequence_Tuple, [:pointer], :pointer
+        attach_function :PyTuple_Pack, [:int, :varargs], :pointer
+
+        # Dict/Hash Methods
+        attach_function :PyDict_Next, [:pointer, :pointer, :pointer, :pointer], :int
+        attach_function :PyDict_New, [], :pointer
+        attach_function :PyDict_SetItem, [:pointer, :pointer, :pointer], :int
+        attach_function :PyDict_Contains, [:pointer, :pointer], :int
+        attach_function :PyDict_GetItem, [:pointer, :pointer], :pointer
+
+        # Error Methods
+        attach_variable :PyExc_Exception, self::DummyStruct.by_ref
+        attach_variable :PyExc_StopIteration, self::DummyStruct.by_ref
+        attach_function :PyErr_SetNone, [:pointer], :void
+        attach_function :PyErr_Fetch, [:pointer, :pointer, :pointer], :void
+        attach_function :PyErr_Occurred, [], :pointer
+        attach_function :PyErr_Clear, [], :void
+
+        # Reference Counting
+        attach_function :Py_IncRef, [:pointer], :void
+        attach_function :Py_DecRef, [:pointer], :void
+
+        # Type Objects
+        # attach_variable :PyBaseObject_Type, self::DummyStruct.by_value # built-in 'object' 
+        # attach_variable :PyBaseString_Type, self::DummyStruct.by_value
+        # attach_variable :PyBool_Type, self::DummyStruct.by_value
+        # attach_variable :PyBuffer_Type, self::DummyStruct.by_value
+        # attach_variable :PyByteArrayIter_Type, self::DummyStruct.by_value
+        # attach_variable :PyByteArray_Type, self::DummyStruct.by_value
+        attach_variable :PyCFunction_Type, self::DummyStruct.by_value
+        # attach_variable :PyCObject_Type, self::DummyStruct.by_value
+        # attach_variable :PyCallIter_Type, self::DummyStruct.by_value
+        # attach_variable :PyCapsule_Type, self::DummyStruct.by_value
+        # attach_variable :PyCell_Type, self::DummyStruct.by_value
+        # attach_variable :PyClassMethod_Type, self::DummyStruct.by_value
+        attach_variable :PyClass_Type, self::DummyStruct.by_value
+        # attach_variable :PyCode_Type, self::DummyStruct.by_value
+        # attach_variable :PyComplex_Type, self::DummyStruct.by_value
+        # attach_variable :PyDictItems_Type, self::DummyStruct.by_value
+        # attach_variable :PyDictIterItem_Type, self::DummyStruct.by_value
+        # attach_variable :PyDictIterKey_Type, self::DummyStruct.by_value
+        # attach_variable :PyDictIterValue_Type, self::DummyStruct.by_value
+        # attach_variable :PyDictKeys_Type, self::DummyStruct.by_value
+        # attach_variable :PyDictProxy_Type, self::DummyStruct.by_value
+        # attach_variable :PyDictValues_Type, self::DummyStruct.by_value
+        attach_variable :PyDict_Type, self::DummyStruct.by_value
+        # attach_variable :PyEllipsis_Type, self::DummyStruct.by_value
+        # attach_variable :PyEnum_Type, self::DummyStruct.by_value
+        # attach_variable :PyFile_Type, self::DummyStruct.by_value
+        attach_variable :PyFloat_Type, self::DummyStruct.by_value
+        # attach_variable :PyFrame_Type, self::DummyStruct.by_value
+        # attach_variable :PyFrozenSet_Type, self::DummyStruct.by_value
+        attach_variable :PyFunction_Type, self::DummyStruct.by_value
+        # attach_variable :PyGen_Type, self::DummyStruct.by_value
+        # attach_variable :PyGetSetDescr_Type, self::DummyStruct.by_value
+        # attach_variable :PyInstance_Type, self::DummyStruct.by_value
+        attach_variable :PyInt_Type, self::DummyStruct.by_value
+        attach_variable :PyList_Type, self::DummyStruct.by_value
+        attach_variable :PyLong_Type, self::DummyStruct.by_value
+        # attach_variable :PyMemberDescr_Type, self::DummyStruct.by_value
+        # attach_variable :PyMemoryView_Type, self::DummyStruct.by_value
+        attach_variable :PyMethod_Type, self::DummyStruct.by_value
+        # attach_variable :PyModule_Type, self::DummyStruct.by_value
+        # attach_variable :PyNullImporter_Type, self::DummyStruct.by_value
+        # attach_variable :PyProperty_Type, self::DummyStruct.by_value
+        # attach_variable :PyRange_Type, self::DummyStruct.by_value
+        # attach_variable :PyReversed_Type, self::DummyStruct.by_value
+        # attach_variable :PySTEntry_Type, self::DummyStruct.by_value
+        # attach_variable :PySeqIter_Type, self::DummyStruct.by_value
+        # attach_variable :PySet_Type, self::DummyStruct.by_value
+        # attach_variable :PySlice_Type, self::DummyStruct.by_value
+        # attach_variable :PyStaticMethod_Type, self::DummyStruct.by_value
+        attach_variable :PyString_Type, self::DummyStruct.by_value
+        # attach_variable :PySuper_Type, self::DummyStruct.by_value # built-in 'super' 
+        # attach_variable :PyTraceBack_Type, self::DummyStruct.by_value
+        attach_variable :PyTuple_Type, self::DummyStruct.by_value
+        attach_variable :PyType_Type, self::DummyStruct.by_value
+        # attach_variable :PyUnicode_Type, self::DummyStruct.by_value
+        # attach_variable :PyWrapperDescr_Type, self::DummyStruct.by_value
+
+        attach_variable :Py_TrueStruct, :_Py_TrueStruct, self::DummyStruct.by_value
+        attach_variable :Py_ZeroStruct, :_Py_ZeroStruct, self::DummyStruct.by_value
+        attach_variable :Py_NoneStruct, :_Py_NoneStruct, self::DummyStruct.by_value
+
+        # This is an implementation of the basic structure of a Python PyObject
+        # struct. The C struct is actually much larger, but since we only access
+        # the first two data members via FFI and always deal with struct
+        # pointers there is no need to mess around with the rest of the object.
+        self.const_set :PyObjectStruct, Class.new(FFI::Struct)
+        self::PyObjectStruct.layout :ob_refcnt, :ssize_t,
+          :ob_type, :pointer
+
+        # This struct is used when defining Python methods.
+        self.const_set :PyMethodDef, Class.new(FFI::Struct)
+        self::PyMethodDef.layout :ml_name, :pointer,
+          :ml_meth, :PyCFunction,
+          :ml_flags, :int,
+          :ml_doc, :pointer
+      end
 
-    # This struct is used when defining Python methods.
-    class PyMethodDef < FFI::Struct
-      layout :ml_name, :pointer,
-             :ml_meth, :PyCFunction,
-             :ml_flags, :int,
-             :ml_doc, :pointer
     end
   end
+  private :infect!
 end