pycall 0.1.0.alpha.20170307 → 0.1.0.alpha.20170308

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bff90008a927b2cb383fe47fa5b7c9e4447c01ec
-  data.tar.gz: 4de66d04dad27fc929fe5071bc9ce8bcf06019cd
+  metadata.gz: 438d4095d0ef876b3a9593ee86a5608851cc5384
+  data.tar.gz: 044d40dcceed8e34a5c3a701a60fa7baf7879d5f
 SHA512:
-  metadata.gz: 9fbb882c47f5a771f58b83e56e92deae332b5ca5348bc205594c0bbc5f4c3141d13bb121459b320790d1bdda2e98134323bd70498a94cf7650bb71d377be8128
-  data.tar.gz: de2fd8a4eceaa84b3ce58918f4fd15cd19b5f3f8256ab1e44abdb32c3e48eeed8527ee853f08b828aadb78635fb0c3b2552a75a1da297b3f45c52a3399fd0226
+  metadata.gz: 9928a513029558ef850a99c209ab9a821037a9473406f5f6159d873d535a72ca9869ccd82a241444bcf64a25909b1c6c41e1b2a4393a7cd89645f3063efb9a7e
+  data.tar.gz: e04f844e7d2d239556ca4e32c82a6ea4e8a40bc7f53dcd9bf30700bdd02269abed6c63a81d060a36954d87897db170021c0da4fee7a80740eace43df65c4b023

data/lib/pycall/conversion.rb

@@ -27,9 +27,7 @@ module PyCall
     end
 
     def self.to_ruby(pyobj)
-      unless pyobj.kind_of? PyObject
-        raise
-      end
+      pyobj = PyObject.new(pyobj) if pyobj.kind_of? LibPython::PyObjectStruct
       each_type_pair do |tp|
         pytype, rbtype = tp.to_a
         next unless pyobj.kind_of?(pytype)
@@ -47,9 +45,7 @@ module PyCall
 
     def self.from_ruby(obj)
       case obj
-      when PyObject
-        obj
-      when PyObjectWrapper
+      when PyObject, PyObjectWrapper
         obj.__pyobj__
       when TrueClass, FalseClass
         LibPython.PyBool_FromLong(obj ? 1 : 0)
@@ -119,43 +115,46 @@ module PyCall
     end
   end
 
-  class PyObject
+  class LibPython::PyObjectStruct
     def to_ruby
-      return nil if self.null? || self.py_none?
+      return nil if self.null? || PyCall.none?(self)
+
+      case 
+      when PyCall::Types.pyisinstance(self, LibPython.PyType_Type)
+        return TypeObject.new(self)
 
-      case self
-      when LibPython.PyBool_Type
+      when PyCall::Types.pyisinstance(self, LibPython.PyBool_Type)
         return Conversions.convert_to_boolean(self)
 
-      when LibPython.PyInt_Type
+      when PyCall::Types.pyisinstance(self, LibPython.PyInt_Type)
         return Conversions.convert_to_integer(self)
 
-      when LibPython.PyLong_Type
+      when PyCall::Types.pyisinstance(self, LibPython.PyLong_Type)
         # TODO: should make Bignum
 
-      when LibPython.PyFloat_Type
+      when PyCall::Types.pyisinstance(self, LibPython.PyFloat_Type)
         return Conversions.convert_to_float(self)
 
-      when LibPython.PyComplex_Type
+      when PyCall::Types.pyisinstance(self, LibPython.PyComplex_Type)
         return Conversions.convert_to_complex(self)
 
-      when LibPython.PyString_Type
+      when PyCall::Types.pyisinstance(self, LibPython.PyString_Type)
         return Conversions.convert_to_string(self)
 
-      when LibPython.PyUnicode_Type
+      when PyCall::Types.pyisinstance(self, LibPython.PyUnicode_Type)
         py_str_ptr = LibPython.PyUnicode_AsUTF8String(self)
         return Conversions.convert_to_string(py_str_ptr).force_encoding(Encoding::UTF_8)
 
-      when LibPython.PyList_Type
+      when PyCall::Types.pyisinstance(self, LibPython.PyList_Type)
         return PyCall::List.new(self)
 
-      when LibPython.PyTuple_Type
+      when PyCall::Types.pyisinstance(self, LibPython.PyTuple_Type)
         return Conversions.convert_to_tuple(self)
 
-      when LibPython.PyDict_Type
+      when PyCall::Types.pyisinstance(self, LibPython.PyDict_Type)
         return PyCall::Dict.new(self)
 
-      when LibPython.PySet_Type
+      when PyCall::Types.pyisinstance(self, LibPython.PySet_Type)
         return PyCall::Set.new(self)
       end
 

data/lib/pycall/dict.rb

@@ -4,7 +4,7 @@ module PyCall
 
     def self.new(init=nil)
       case init
-      when PyObject
+      when LibPython::PyObjectStruct
         super
       when nil
         new(LibPython.PyDict_New())
@@ -19,10 +19,6 @@ module PyCall
       end
     end
 
-    def initialize(pyobj)
-      super(pyobj, LibPython.PyDict_Type)
-    end
-
     def [](key)
       key = key.to_s if key.is_a? Symbol
       value = if key.is_a? String
@@ -32,7 +28,7 @@ module PyCall
               end
     ensure
       case value
-      when PyObject
+      when LibPython::PyObjectStruct
         PyCall.incref(value)
       when PyObjectWrapper
         PyCall.incref(value.__pyobj__)
@@ -42,6 +38,7 @@ module PyCall
     def []=(key, value)
       key = key.to_s if key.is_a? Symbol
       value = Conversions.from_ruby(value)
+      value = value.__pyobj__ unless value.kind_of? LibPython::PyObjectStruct
       if key.is_a? String
         LibPython.PyDict_SetItemString(__pyobj__, key, value)
       else

data/lib/pycall/eval.rb

@@ -3,8 +3,8 @@ module PyCall
     Py_eval_input = 258
 
     def self.eval(str, filename: "pycall")
-      globals_ptr = main_dict
-      locals_ptr = main_dict
+      globals_ptr = main_dict.__pyobj__
+      locals_ptr = main_dict.__pyobj__
       defer_sigint do
         py_code_ptr = LibPython.Py_CompileString(str, filename, Py_eval_input)
         raise PyError.fetch if py_code_ptr.null?
@@ -17,7 +17,7 @@ module PyCall
 
       def main_dict
         @main_dict ||= PyCall.import_module("__main__") do |main_module|
-          PyCall.incref(LibPython.PyModule_GetDict(main_module))
+          PyCall.incref(LibPython.PyModule_GetDict(main_module.__pyobj__)).to_ruby
         end
       end
 
@@ -38,7 +38,7 @@ module PyCall
     begin
       yield value
     ensure
-      PyCall.decref(value)
+      PyCall.decref(value.__pyobj__)
     end
   end
 

data/lib/pycall/libpython.rb

@@ -1,20 +1,28 @@
 require 'ffi'
 
 module PyCall
-  class PyObject < FFI::Struct
-    layout ob_refcnt: :ssize_t,
-           ob_type:   :pointer
-  end
-
-  class PyTypeObject < FFI::Struct
-    layout ob_base: PyObject,
-           ob_size: :ssize_t,
-           tp_name: :string
-  end
-
   module LibPython
     extend FFI::Library
 
+    class PyObjectStruct < FFI::Struct
+      layout ob_refcnt: :ssize_t,
+             ob_type:   PyObjectStruct.by_ref
+
+      def self.null
+        new(FFI::Pointer::NULL)
+      end
+
+      def py_none?
+        PyCall.none?(self)
+      end
+
+      def kind_of?(klass)
+        klass = klass.__pyobj__ if klass.kind_of? PyObjectWrapper
+        return super unless klass.kind_of? PyObjectStruct
+        PyCall::Types.pyisinstance(self, klass)
+      end
+    end
+
     private_class_method
 
     def self.find_libpython(python = nil)
@@ -95,41 +103,43 @@ module PyCall
 
     # --- global variables ---
 
-    attach_variable :_Py_NoneStruct, PyObject
+    attach_variable :_Py_NoneStruct, PyObjectStruct
 
     def self.Py_None
       _Py_NoneStruct
     end
 
+    attach_variable :PyType_Type, PyObjectStruct
+
     if libpython.find_variable('PyInt_Type')
       has_PyInt_Type = true
-      attach_variable :PyInt_Type, PyTypeObject
+      attach_variable :PyInt_Type, PyObjectStruct
     else
       has_PyInt_Type = false
-      attach_variable :PyInt_Type, :PyLong_Type, PyTypeObject
+      attach_variable :PyInt_Type, :PyLong_Type, PyObjectStruct
     end
 
-    attach_variable :PyLong_Type, PyTypeObject
-    attach_variable :PyBool_Type, PyTypeObject
-    attach_variable :PyFloat_Type, PyTypeObject
-    attach_variable :PyComplex_Type, PyTypeObject
-    attach_variable :PyUnicode_Type, PyTypeObject
+    attach_variable :PyLong_Type, PyObjectStruct
+    attach_variable :PyBool_Type, PyObjectStruct
+    attach_variable :PyFloat_Type, PyObjectStruct
+    attach_variable :PyComplex_Type, PyObjectStruct
+    attach_variable :PyUnicode_Type, PyObjectStruct
 
     if libpython.find_symbol('PyString_FromStringAndSize')
       string_as_bytes = false
-      attach_variable :PyString_Type, PyTypeObject
+      attach_variable :PyString_Type, PyObjectStruct
     else
       string_as_bytes = true
-      attach_variable :PyString_Type, :PyBytes_Type, PyTypeObject
+      attach_variable :PyString_Type, :PyBytes_Type, PyObjectStruct
     end
 
-    attach_variable :PyList_Type, PyTypeObject
-    attach_variable :PyTuple_Type, PyTypeObject
-    attach_variable :PyDict_Type, PyTypeObject
-    attach_variable :PySet_Type, PyTypeObject
+    attach_variable :PyList_Type, PyObjectStruct
+    attach_variable :PyTuple_Type, PyObjectStruct
+    attach_variable :PyDict_Type, PyObjectStruct
+    attach_variable :PySet_Type, PyObjectStruct
 
-    attach_variable :PyFunction_Type, PyTypeObject
-    attach_variable :PyMethod_Type, PyTypeObject
+    attach_variable :PyFunction_Type, PyObjectStruct
+    attach_variable :PyMethod_Type, PyObjectStruct
 
     # --- functions ---
 
@@ -139,67 +149,67 @@ module PyCall
 
     # Reference count
 
-    attach_function :Py_IncRef, [PyObject.by_ref], :void
-    attach_function :Py_DecRef, [PyObject.by_ref], :void
+    attach_function :Py_IncRef, [PyObjectStruct.by_ref], :void
+    attach_function :Py_DecRef, [PyObjectStruct.by_ref], :void
 
     # Object
 
-    attach_function :PyObject_RichCompare, [PyObject.by_ref, PyObject.by_ref, :int], PyObject.by_ref
-    attach_function :PyObject_GetAttrString, [PyObject.by_ref, :string], PyObject.by_ref
-    attach_function :PyObject_SetAttrString, [PyObject.by_ref, :string, PyObject.by_ref], :int
-    attach_function :PyObject_HasAttrString, [PyObject.by_ref, :string], :int
-    attach_function :PyObject_GetItem, [PyObject.by_ref, PyObject.by_ref], PyObject.by_ref
-    attach_function :PyObject_SetItem, [PyObject.by_ref, PyObject.by_ref, PyObject.by_ref], :int
-    attach_function :PyObject_DelItem, [PyObject.by_ref, PyObject.by_ref], :int
-    attach_function :PyObject_Call, [PyObject.by_ref, PyObject.by_ref, PyObject.by_ref], PyObject.by_ref
-    attach_function :PyObject_IsInstance, [PyObject.by_ref, PyObject.by_ref], :int
-    attach_function :PyObject_Dir, [PyObject.by_ref], PyObject.by_ref
-    attach_function :PyObject_Repr, [PyObject.by_ref], PyObject.by_ref
-    attach_function :PyObject_Str, [PyObject.by_ref], PyObject.by_ref
-    attach_function :PyObject_Type, [PyObject.by_ref], PyTypeObject.by_ref
-    attach_function :PyCallable_Check, [PyObject.by_ref], :int
+    attach_function :PyObject_RichCompare, [PyObjectStruct.by_ref, PyObjectStruct.by_ref, :int], PyObjectStruct.by_ref
+    attach_function :PyObject_GetAttrString, [PyObjectStruct.by_ref, :string], PyObjectStruct.by_ref
+    attach_function :PyObject_SetAttrString, [PyObjectStruct.by_ref, :string, PyObjectStruct.by_ref], :int
+    attach_function :PyObject_HasAttrString, [PyObjectStruct.by_ref, :string], :int
+    attach_function :PyObject_GetItem, [PyObjectStruct.by_ref, PyObjectStruct.by_ref], PyObjectStruct.by_ref
+    attach_function :PyObject_SetItem, [PyObjectStruct.by_ref, PyObjectStruct.by_ref, PyObjectStruct.by_ref], :int
+    attach_function :PyObject_DelItem, [PyObjectStruct.by_ref, PyObjectStruct.by_ref], :int
+    attach_function :PyObject_Call, [PyObjectStruct.by_ref, PyObjectStruct.by_ref, PyObjectStruct.by_ref], PyObjectStruct.by_ref
+    attach_function :PyObject_IsInstance, [PyObjectStruct.by_ref, PyObjectStruct.by_ref], :int
+    attach_function :PyObject_Dir, [PyObjectStruct.by_ref], PyObjectStruct.by_ref
+    attach_function :PyObject_Repr, [PyObjectStruct.by_ref], PyObjectStruct.by_ref
+    attach_function :PyObject_Str, [PyObjectStruct.by_ref], PyObjectStruct.by_ref
+    attach_function :PyObject_Type, [PyObjectStruct.by_ref], PyObjectStruct.by_ref
+    attach_function :PyCallable_Check, [PyObjectStruct.by_ref], :int
 
     # Bool
 
-    attach_function :PyBool_FromLong, [:long], PyObject.by_ref
+    attach_function :PyBool_FromLong, [:long], PyObjectStruct.by_ref
 
     # Integer
 
     if has_PyInt_Type
-      attach_function :PyInt_AsSsize_t, [PyObject.by_ref], :ssize_t
+      attach_function :PyInt_AsSsize_t, [PyObjectStruct.by_ref], :ssize_t
     else
-      attach_function :PyInt_AsSsize_t, :PyLong_AsSsize_t, [PyObject.by_ref], :ssize_t
+      attach_function :PyInt_AsSsize_t, :PyLong_AsSsize_t, [PyObjectStruct.by_ref], :ssize_t
     end
 
     if has_PyInt_Type
-      attach_function :PyInt_FromSsize_t, [:ssize_t], PyObject.by_ref
+      attach_function :PyInt_FromSsize_t, [:ssize_t], PyObjectStruct.by_ref
     else
-      attach_function :PyInt_FromSsize_t, :PyLong_FromSsize_t, [:ssize_t], PyObject.by_ref
+      attach_function :PyInt_FromSsize_t, :PyLong_FromSsize_t, [:ssize_t], PyObjectStruct.by_ref
     end
 
     # Float
 
-    attach_function :PyFloat_FromDouble, [:double], PyObject.by_ref
-    attach_function :PyFloat_AsDouble, [PyObject.by_ref], :double
+    attach_function :PyFloat_FromDouble, [:double], PyObjectStruct.by_ref
+    attach_function :PyFloat_AsDouble, [PyObjectStruct.by_ref], :double
 
     # Complex
 
-    attach_function :PyComplex_RealAsDouble, [PyObject.by_ref], :double
-    attach_function :PyComplex_ImagAsDouble, [PyObject.by_ref], :double
+    attach_function :PyComplex_RealAsDouble, [PyObjectStruct.by_ref], :double
+    attach_function :PyComplex_ImagAsDouble, [PyObjectStruct.by_ref], :double
 
     # String
 
     if string_as_bytes
-      attach_function :PyString_FromStringAndSize, :PyBytes_FromStringAndSize, [:string, :ssize_t], PyObject.by_ref
+      attach_function :PyString_FromStringAndSize, :PyBytes_FromStringAndSize, [:string, :ssize_t], PyObjectStruct.by_ref
     else
-      attach_function :PyString_FromStringAndSize, [:string, :ssize_t], PyObject.by_ref
+      attach_function :PyString_FromStringAndSize, [:string, :ssize_t], PyObjectStruct.by_ref
     end
 
     # PyString_AsStringAndSize :: (PyPtr, char**, int*) -> int
     if string_as_bytes
-      attach_function :PyString_AsStringAndSize, :PyBytes_AsStringAndSize, [PyObject.by_ref, :pointer, :pointer], :int
+      attach_function :PyString_AsStringAndSize, :PyBytes_AsStringAndSize, [PyObjectStruct.by_ref, :pointer, :pointer], :int
     else
-      attach_function :PyString_AsStringAndSize, [PyObject.by_ref, :pointer, :pointer], :int
+      attach_function :PyString_AsStringAndSize, [PyObjectStruct.by_ref, :pointer, :pointer], :int
     end
 
     # Unicode
@@ -207,96 +217,96 @@ module PyCall
     # PyUnicode_DecodeUTF8
     case
     when libpython.find_symbol('PyUnicode_DecodeUTF8')
-      attach_function :PyUnicode_DecodeUTF8, [:string, :ssize_t, :string], PyObject.by_ref
+      attach_function :PyUnicode_DecodeUTF8, [:string, :ssize_t, :string], PyObjectStruct.by_ref
     when libpython.find_symbol('PyUnicodeUCS4_DecodeUTF8')
-      attach_function :PyUnicode_DecodeUTF8, :PyUnicodeUCS4_DecodeUTF8, [:string, :ssize_t, :string], PyObject.by_ref
+      attach_function :PyUnicode_DecodeUTF8, :PyUnicodeUCS4_DecodeUTF8, [:string, :ssize_t, :string], PyObjectStruct.by_ref
     when libpython.find_symbol('PyUnicodeUCS2_DecodeUTF8')
-      attach_function :PyUnicode_DecodeUTF8, :PyUnicodeUCS2_DecodeUTF8, [:string, :ssize_t, :string], PyObject.by_ref
+      attach_function :PyUnicode_DecodeUTF8, :PyUnicodeUCS2_DecodeUTF8, [:string, :ssize_t, :string], PyObjectStruct.by_ref
     end
 
     # PyUnicode_AsUTF8String
     case
     when libpython.find_symbol('PyUnicode_AsUTF8String')
-      attach_function :PyUnicode_AsUTF8String, [PyObject.by_ref], PyObject.by_ref
+      attach_function :PyUnicode_AsUTF8String, [PyObjectStruct.by_ref], PyObjectStruct.by_ref
     when libpython.find_symbol('PyUnicodeUCS4_AsUTF8String')
-      attach_function :PyUnicode_AsUTF8String, :PyUnicodeUCS4_AsUTF8String, [PyObject.by_ref], PyObject.by_ref
+      attach_function :PyUnicode_AsUTF8String, :PyUnicodeUCS4_AsUTF8String, [PyObjectStruct.by_ref], PyObjectStruct.by_ref
     when libpython.find_symbol('PyUnicodeUCS2_AsUTF8String')
-      attach_function :PyUnicode_AsUTF8String, :PyUnicodeUCS2_AsUTF8String, [PyObject.by_ref], PyObject.by_ref
+      attach_function :PyUnicode_AsUTF8String, :PyUnicodeUCS2_AsUTF8String, [PyObjectStruct.by_ref], PyObjectStruct.by_ref
     end
 
     # Tuple
 
-    attach_function :PyTuple_New, [:ssize_t], PyObject.by_ref
-    attach_function :PyTuple_GetItem, [PyObject.by_ref, :ssize_t], PyObject.by_ref
-    attach_function :PyTuple_SetItem, [PyObject.by_ref, :ssize_t, PyObject.by_ref], :int
-    attach_function :PyTuple_Size, [PyObject.by_ref], :ssize_t
+    attach_function :PyTuple_New, [:ssize_t], PyObjectStruct.by_ref
+    attach_function :PyTuple_GetItem, [PyObjectStruct.by_ref, :ssize_t], PyObjectStruct.by_ref
+    attach_function :PyTuple_SetItem, [PyObjectStruct.by_ref, :ssize_t, PyObjectStruct.by_ref], :int
+    attach_function :PyTuple_Size, [PyObjectStruct.by_ref], :ssize_t
 
     # Slice
 
-    attach_function :PySlice_New, [PyObject.by_ref, PyObject.by_ref, PyObject.by_ref], PyObject.by_ref
+    attach_function :PySlice_New, [PyObjectStruct.by_ref, PyObjectStruct.by_ref, PyObjectStruct.by_ref], PyObjectStruct.by_ref
 
     # List
 
-    attach_function :PyList_New, [:ssize_t], PyObject.by_ref
-    attach_function :PyList_Size, [PyObject.by_ref], :ssize_t
-    attach_function :PyList_GetItem, [PyObject.by_ref, :ssize_t], PyObject.by_ref
-    attach_function :PyList_SetItem, [PyObject.by_ref, :ssize_t, PyObject.by_ref], :int
-    attach_function :PyList_Append, [PyObject.by_ref, PyObject.by_ref], :int
+    attach_function :PyList_New, [:ssize_t], PyObjectStruct.by_ref
+    attach_function :PyList_Size, [PyObjectStruct.by_ref], :ssize_t
+    attach_function :PyList_GetItem, [PyObjectStruct.by_ref, :ssize_t], PyObjectStruct.by_ref
+    attach_function :PyList_SetItem, [PyObjectStruct.by_ref, :ssize_t, PyObjectStruct.by_ref], :int
+    attach_function :PyList_Append, [PyObjectStruct.by_ref, PyObjectStruct.by_ref], :int
 
     # Sequence
 
-    attach_function :PySequence_Size, [PyObject.by_ref], :ssize_t
-    attach_function :PySequence_GetItem, [PyObject.by_ref, :ssize_t], PyObject.by_ref
-    attach_function :PySequence_Contains, [PyObject.by_ref, PyObject.by_ref], :int
+    attach_function :PySequence_Size, [PyObjectStruct.by_ref], :ssize_t
+    attach_function :PySequence_GetItem, [PyObjectStruct.by_ref, :ssize_t], PyObjectStruct.by_ref
+    attach_function :PySequence_Contains, [PyObjectStruct.by_ref, PyObjectStruct.by_ref], :int
 
     # Dict
 
-    attach_function :PyDict_New, [], PyObject.by_ref
-    attach_function :PyDict_GetItem, [PyObject.by_ref, PyObject.by_ref], PyObject.by_ref
-    attach_function :PyDict_GetItemString, [PyObject.by_ref, :string], PyObject.by_ref
-    attach_function :PyDict_SetItem, [PyObject.by_ref, PyObject.by_ref, PyObject.by_ref], :int
-    attach_function :PyDict_SetItemString, [PyObject.by_ref, :string, PyObject.by_ref], :int
-    attach_function :PyDict_DelItem, [PyObject.by_ref, PyObject.by_ref], :int
-    attach_function :PyDict_DelItem, [PyObject.by_ref, :string], :int
-    attach_function :PyDict_Size, [PyObject.by_ref], :ssize_t
-    attach_function :PyDict_Keys, [PyObject.by_ref], PyObject.by_ref
-    attach_function :PyDict_Values, [PyObject.by_ref], PyObject.by_ref
-    attach_function :PyDict_Items, [PyObject.by_ref], PyObject.by_ref
-    attach_function :PyDict_Contains, [PyObject.by_ref, PyObject.by_ref], :int
+    attach_function :PyDict_New, [], PyObjectStruct.by_ref
+    attach_function :PyDict_GetItem, [PyObjectStruct.by_ref, PyObjectStruct.by_ref], PyObjectStruct.by_ref
+    attach_function :PyDict_GetItemString, [PyObjectStruct.by_ref, :string], PyObjectStruct.by_ref
+    attach_function :PyDict_SetItem, [PyObjectStruct.by_ref, PyObjectStruct.by_ref, PyObjectStruct.by_ref], :int
+    attach_function :PyDict_SetItemString, [PyObjectStruct.by_ref, :string, PyObjectStruct.by_ref], :int
+    attach_function :PyDict_DelItem, [PyObjectStruct.by_ref, PyObjectStruct.by_ref], :int
+    attach_function :PyDict_DelItem, [PyObjectStruct.by_ref, :string], :int
+    attach_function :PyDict_Size, [PyObjectStruct.by_ref], :ssize_t
+    attach_function :PyDict_Keys, [PyObjectStruct.by_ref], PyObjectStruct.by_ref
+    attach_function :PyDict_Values, [PyObjectStruct.by_ref], PyObjectStruct.by_ref
+    attach_function :PyDict_Items, [PyObjectStruct.by_ref], PyObjectStruct.by_ref
+    attach_function :PyDict_Contains, [PyObjectStruct.by_ref, PyObjectStruct.by_ref], :int
 
     # Set
 
-    attach_function :PySet_Size, [PyObject.by_ref], :ssize_t
-    attach_function :PySet_Contains, [PyObject.by_ref, PyObject.by_ref], :int
-    attach_function :PySet_Add, [PyObject.by_ref, PyObject.by_ref], :int
-    attach_function :PySet_Discard, [PyObject.by_ref, PyObject.by_ref], :int
+    attach_function :PySet_Size, [PyObjectStruct.by_ref], :ssize_t
+    attach_function :PySet_Contains, [PyObjectStruct.by_ref, PyObjectStruct.by_ref], :int
+    attach_function :PySet_Add, [PyObjectStruct.by_ref, PyObjectStruct.by_ref], :int
+    attach_function :PySet_Discard, [PyObjectStruct.by_ref, PyObjectStruct.by_ref], :int
 
     # Module
 
-    attach_function :PyModule_GetDict, [PyObject.by_ref], PyObject.by_ref
+    attach_function :PyModule_GetDict, [PyObjectStruct.by_ref], PyObjectStruct.by_ref
 
     # Import
 
-    attach_function :PyImport_ImportModule, [:string], PyObject.by_ref
+    attach_function :PyImport_ImportModule, [:string], PyObjectStruct.by_ref
 
     # Operators
 
-    attach_function :PyNumber_Add, [PyObject.by_ref, PyObject.by_ref], PyObject.by_ref
-    attach_function :PyNumber_Subtract, [PyObject.by_ref, PyObject.by_ref], PyObject.by_ref
-    attach_function :PyNumber_Multiply, [PyObject.by_ref, PyObject.by_ref], PyObject.by_ref
-    attach_function :PyNumber_TrueDivide, [PyObject.by_ref, PyObject.by_ref], PyObject.by_ref
-    attach_function :PyNumber_Power, [PyObject.by_ref, PyObject.by_ref, PyObject.by_ref], PyObject.by_ref
+    attach_function :PyNumber_Add, [PyObjectStruct.by_ref, PyObjectStruct.by_ref], PyObjectStruct.by_ref
+    attach_function :PyNumber_Subtract, [PyObjectStruct.by_ref, PyObjectStruct.by_ref], PyObjectStruct.by_ref
+    attach_function :PyNumber_Multiply, [PyObjectStruct.by_ref, PyObjectStruct.by_ref], PyObjectStruct.by_ref
+    attach_function :PyNumber_TrueDivide, [PyObjectStruct.by_ref, PyObjectStruct.by_ref], PyObjectStruct.by_ref
+    attach_function :PyNumber_Power, [PyObjectStruct.by_ref, PyObjectStruct.by_ref, PyObjectStruct.by_ref], PyObjectStruct.by_ref
 
     # Compiler
 
-    attach_function :Py_CompileString, [:string, :string, :int], PyObject.by_ref
-    attach_function :PyEval_EvalCode, [PyObject.by_ref, PyObject.by_ref, PyObject.by_ref], PyObject.by_ref
+    attach_function :Py_CompileString, [:string, :string, :int], PyObjectStruct.by_ref
+    attach_function :PyEval_EvalCode, [PyObjectStruct.by_ref, PyObjectStruct.by_ref, PyObjectStruct.by_ref], PyObjectStruct.by_ref
 
     # Error
 
     attach_function :PyErr_Clear, [], :void
     attach_function :PyErr_Print, [], :void
-    attach_function :PyErr_Occurred, [], PyObject.by_ref
+    attach_function :PyErr_Occurred, [], PyObjectStruct.by_ref
     attach_function :PyErr_Fetch, [:pointer, :pointer, :pointer], :void
     attach_function :PyErr_NormalizeException, [:pointer, :pointer, :pointer], :void
 

data/lib/pycall/list.rb

@@ -5,7 +5,7 @@ module PyCall
 
     def self.new(init=nil)
       case init
-      when PyObject
+      when LibPython::PyObjectStruct
         super
       when nil
         new(0)
@@ -22,20 +22,6 @@ module PyCall
       end
     end
 
-    def initialize(pyobj)
-      super(pyobj, LibPython.PyList_Type)
-    end
-
-    def [](index)
-      LibPython.PyList_GetItem(__pyobj__, index).to_ruby
-    end
-
-    def []=(index, value)
-      value = Conversions.from_ruby(value)
-      LibPython.PyList_SetItem(__pyobj__, index, value)
-      value
-    end
-
     def <<(value)
       value = Conversions.from_ruby(value)
       LibPython.PyList_Append(__pyobj__, value)

data/lib/pycall/pyerror.rb

@@ -7,9 +7,9 @@ module PyCall
       ptraceback = ptrs + 2 * ptrs.type_size
       LibPython.PyErr_Fetch(ptype, pvalue, ptraceback)
       LibPython.PyErr_NormalizeException(ptype, pvalue, ptraceback)
-      type = PyTypeObject.new(ptype.read(:pointer))
-      value = PyObject.new(pvalue.read(:pointer))
-      traceback = PyObject.new(ptraceback.read(:pointer))
+      type = PyObject.new(LibPython::PyObjectStruct.new(ptype.read(:pointer)))
+      value = PyObject.new(LibPython::PyObjectStruct.new(pvalue.read(:pointer)))
+      traceback = PyObject.new(LibPython::PyObjectStruct.new(ptraceback.read(:pointer)))
       new(type, value, traceback)
     end
 

data/lib/pycall/pyobject.rb

@@ -1,171 +1,15 @@
 module PyCall
-  Py_LT = 0
-  Py_LE = 1
-  Py_EQ = 2
-  Py_NE = 3
-  Py_GT = 4
-  Py_GE = 5
-
-  RICH_COMPARISON_OPCODES = {
-    :<  => Py_LT,
-    :<= => Py_LE,
-    :== => Py_EQ,
-    :!= => Py_NE,
-    :>  => Py_GT,
-    :>= => Py_GE
-  }.freeze
-
-  module PyObjectMethods
-    def rich_compare(other, op)
-      opcode = RICH_COMPARISON_OPCODES[op]
-      raise ArgumentError, "Unknown comparison op: #{op}" unless opcode
-
-      other = Conversions.from_ruby(other) unless other.kind_of?(PyObject)
-      return other.null? if self.null?
-      return false if other.null?
-
-      value = LibPython.PyObject_RichCompare(self, other, opcode)
-      raise "Unable to compare: #{self} #{op} #{other}" if value.null?
-      value.to_ruby
-    end
-
-    RICH_COMPARISON_OPCODES.keys.each do |op|
-      define_method(op) {|other| rich_compare(other, op) }
-    end
-
-    def py_none?
-      to_ptr == PyCall.None.to_ptr
-    end
-
-    def kind_of?(klass)
-      case klass
-      when PyObject, PyTypeObject
-        Types.pyisinstance(self, klass)
-      else
-        super
-      end
-    end
-  end
-
-  class PyObject < FFI::Struct
-    include PyObjectMethods
+  class PyObject
+    include PyObjectWrapper
 
     def self.null
-      new(FFI::Pointer::NULL)
-    end
-
-    alias __aref__ []
-    alias __aset__ []=
-
-    def [](*indices)
-      if indices.length == 1
-        indices = indices[0]
-      else
-        indices = PyCall.tuple(*indices)
-      end
-      PyCall.getitem(self, indices)
-    end
-
-    def []=(*indices_and_value)
-      value = indices_and_value.pop
-      indices = indices_and_value
-      if indices.length == 1
-        indices = indices[0]
-      else
-        indices = PyCall.tuple(*indices)
-      end
-      PyCall.setitem(self, indices, value)
-    end
-
-    def +(other)
-      other = Conversions.from_ruby(other)
-      value = LibPython.PyNumber_Add(self, other)
-      return value.to_ruby unless value.null?
-      raise PyError.fetch
-    end
-
-    def -(other)
-      other = Conversions.from_ruby(other)
-      value = LibPython.PyNumber_Subtract(self, other)
-      return value.to_ruby unless value.null?
-      raise PyError.fetch
-    end
-
-    def *(other)
-      other = Conversions.from_ruby(other)
-      value = LibPython.PyNumber_Multiply(self, other)
-      return value.to_ruby unless value.null?
-      raise PyError.fetch
-    end
-
-    def /(other)
-      other = Conversions.from_ruby(other)
-      value = LibPython.PyNumber_TrueDivide(self, other)
-      return value.to_ruby unless value.null?
-      raise PyError.fetch
-    end
-
-    def **(other)
-      other = Conversions.from_ruby(other)
-      value = LibPython.PyNumber_Power(self, other, PyCall.None)
-      return value.to_ruby unless value.null?
-      raise PyError.fetch
-    end
-
-    def coerce(other)
-      [Conversions.from_ruby(other), self]
-    end
-
-    def call(*args, **kwargs)
-      args = PyCall::Tuple[*args]
-      kwargs = kwargs.empty? ? PyObject.null : PyCall::Dict.new(kwargs).__pyobj__
-      res = LibPython.PyObject_Call(self, args.__pyobj__, kwargs)
-      return res.to_ruby if LibPython.PyErr_Occurred().null?
-      raise PyError.fetch
-    end
-
-    def method_missing(name, *args, **kwargs)
-      if PyCall.hasattr?(self, name)
-        PyCall.getattr(self, name)
-      else
-        super
-      end
-    end
-
-    def to_s
-      s = LibPython.PyObject_Repr(self)
-      if s.null?
-        LibPython.PyErr_Clear()
-        s = LibPython.PyObject_Str(self)
-        if s.null?
-          LibPython.PyErr_Clear()
-          return super
-        end
-      end
-      s.to_ruby
-    end
-
-    alias inspect to_s
-
-    def type
-      LibPython.PyObject_Type(self)
-    end
-  end
-
-  class PyTypeObject < FFI::Struct
-    include PyObjectMethods
-
-    def ===(obj)
-      obj.kind_of? self
-    end
-
-    def inspect
-      "pytype(#{self[:tp_name]})"
+      new(LibPython::PyObjectStruct.new(FFI::Pointer::NULL))
     end
   end
 
   def self.getattr(pyobj, name, default=nil)
     name = check_attr_name(name)
+    pyobj = pyobj.__pyobj__ unless pyobj.kind_of? LibPython::PyObjectStruct
     value = LibPython.PyObject_GetAttrString(pyobj, name)
     if value.null?
       return default if default
@@ -177,12 +21,15 @@ module PyCall
   def self.setattr(pyobj, name, value)
     name = check_attr_name(name)
     value = Conversions.from_ruby(value)
+    value = value.__pyobj__ unless pyobj.kind_of? LibPython::PyObjectStruct
+    pyobj = pyobj.__pyobj__ unless pyobj.kind_of? LibPython::PyObjectStruct
     return self unless LibPython.PyObject_SetAttrString(pyobj, name, value) == -1
     raise PyError.fetch
   end
 
   def self.hasattr?(pyobj, name)
     name = check_attr_name(name)
+    pyobj = pyobj.__pyobj__ unless pyobj.kind_of? LibPython::PyObjectStruct
     1 == LibPython.PyObject_HasAttrString(pyobj, name)
   end
 
@@ -194,6 +41,7 @@ module PyCall
   private_class_method :check_attr_name
 
   def self.getitem(pyobj, key)
+    pyobj = pyobj.__pyobj__ unless pyobj.kind_of? LibPython::PyObjectStruct
     pykey = Conversions.from_ruby(key)
     value = LibPython.PyObject_GetItem(pyobj, pykey)
     return value.to_ruby unless value.null?
@@ -201,6 +49,7 @@ module PyCall
   end
 
   def self.setitem(pyobj, key, value)
+    pyobj = pyobj.__pyobj__ unless pyobj.kind_of? LibPython::PyObjectStruct
     pykey = Conversions.from_ruby(key)
     value = Conversions.from_ruby(value)
     return self unless LibPython.PyObject_SetItem(pyobj, pykey, value) == -1

data/lib/pycall/pyobject_wrapper.rb

@@ -1,10 +1,27 @@
 module PyCall
+  Py_LT = 0
+  Py_LE = 1
+  Py_EQ = 2
+  Py_NE = 3
+  Py_GT = 4
+  Py_GE = 5
+
+  RICH_COMPARISON_OPCODES = {
+    :<  => Py_LT,
+    :<= => Py_LE,
+    :== => Py_EQ,
+    :!= => Py_NE,
+    :>  => Py_GT,
+    :>= => Py_GE
+  }.freeze
+
   module PyObjectWrapper
     module ClassMethods
       private
 
-      def wrap_class(pyobj)
-        define_singleton_method(:__pyobj__) { pyobj }
+      def wrap_class(pyclass)
+        pyclass__pyobj__ = pyclass.__pyobj__
+        define_singleton_method(:__pyobj__) { pyclass__pyobj__ }
 
         PyCall.dir(__pyobj__).each do |name|
           obj = PyCall.getattr(__pyobj__, name)
@@ -31,27 +48,123 @@ module PyCall
       mod.extend ClassMethods
     end
 
-    def initialize(pyobj, pytype=nil)
-      check_type pyobj, pytype
-      pytype ||= LibPython.PyObject_Type(pyobj)
+    def initialize(pyobj)
+      pyobj = pyobj.__pyobj__ unless pyobj.kind_of? LibPython::PyObjectStruct
       @__pyobj__ = pyobj
     end
 
     attr_reader :__pyobj__
 
-    def ==(other)
-      case other
-      when self.class
-        __pyobj__ == other.__pyobj__
-      when PyObject
-        __pyobj__ == other
+    def type
+      LibPython.PyObject_Type(__pyobj__).to_ruby
+    end
+
+    def null?
+      __pyobj__.null?
+    end
+
+    def to_ptr
+      __pyobj__.to_ptr
+    end
+
+    def py_none?
+      to_ptr == PyCall.None.to_ptr
+    end
+
+    def kind_of?(klass)
+      case klass
+      when PyObjectWrapper
+        __pyobj__.kind_of? klass.__pyobj__
+      when LibPython::PyObjectStruct
+        __pyobj__.kind_of? klass
       else
         super
       end
     end
 
+    def rich_compare(other, op)
+      opcode = RICH_COMPARISON_OPCODES[op]
+      raise ArgumentError, "Unknown comparison op: #{op}" unless opcode
+
+      other = other.__pyobj__ unless other.kind_of? LibPython::PyObjectStruct
+      other = Conversions.from_ruby(other) unless other.kind_of?(LibPython::PyObjectStruct)
+      return other.null? if __pyobj__.null?
+      return false if other.null?
+
+      value = LibPython.PyObject_RichCompare(__pyobj__, other, opcode)
+      raise "Unable to compare: #{self} #{op} #{other}" if value.null?
+      value.to_ruby
+    end
+
+    RICH_COMPARISON_OPCODES.keys.each do |op|
+      define_method(op) {|other| rich_compare(other, op) }
+    end
+
+    def [](*indices)
+      if indices.length == 1
+        indices = indices[0]
+      else
+        indices = PyCall.tuple(*indices)
+      end
+      PyCall.getitem(self, indices)
+    end
+
+    def []=(*indices_and_value)
+      value = indices_and_value.pop
+      indices = indices_and_value
+      if indices.length == 1
+        indices = indices[0]
+      else
+        indices = PyCall.tuple(*indices)
+      end
+      PyCall.setitem(self, indices, value)
+    end
+
+    def +(other)
+      other = Conversions.from_ruby(other)
+      value = LibPython.PyNumber_Add(self, other)
+      return value.to_ruby unless value.null?
+      raise PyError.fetch
+    end
+
+    def -(other)
+      other = Conversions.from_ruby(other)
+      value = LibPython.PyNumber_Subtract(self, other)
+      return value.to_ruby unless value.null?
+      raise PyError.fetch
+    end
+
+    def *(other)
+      other = Conversions.from_ruby(other)
+      value = LibPython.PyNumber_Multiply(self, other)
+      return value.to_ruby unless value.null?
+      raise PyError.fetch
+    end
+
+    def /(other)
+      other = Conversions.from_ruby(other)
+      value = LibPython.PyNumber_TrueDivide(self, other)
+      return value.to_ruby unless value.null?
+      raise PyError.fetch
+    end
+
+    def **(other)
+      other = Conversions.from_ruby(other)
+      value = LibPython.PyNumber_Power(self, other, PyCall.None)
+      return value.to_ruby unless value.null?
+      raise PyError.fetch
+    end
+
+    def coerce(other)
+      [Conversions.from_ruby(other), self]
+    end
+
     def call(*args, **kwargs)
-      __pyobj__.call(*args, **kwargs)
+      args = PyCall::Tuple[*args]
+      kwargs = kwargs.empty? ? PyObject.null : PyCall::Dict.new(kwargs)
+      res = LibPython.PyObject_Call(__pyobj__, args.__pyobj__, kwargs.__pyobj__)
+      return res.to_ruby if LibPython.PyErr_Occurred().null?
+      raise PyError.fetch
     end
 
     def method_missing(name, *args, **kwargs)
@@ -63,19 +176,18 @@ module PyCall
     end
 
     def to_s
-      __pyobj__.to_s
-    end
-
-    def inspect
-      __pyobj__.inspect
+      s = LibPython.PyObject_Repr(__pyobj__)
+      if s.null?
+        LibPython.PyErr_Clear()
+        s = LibPython.PyObject_Str(__pyobj__)
+        if s.null?
+          LibPython.PyErr_Clear()
+          return super
+        end
+      end
+      s.to_ruby
     end
 
-    private
-
-    def check_type(pyobj, pytype)
-      return if pyobj.kind_of?(PyObject)
-      return if pytype.nil? || pyobj.kind_of?(pytype)
-      raise TypeError, "the argument must be a PyObject of #{pytype}"
-    end
+    alias inspect to_s
   end
 end

data/lib/pycall/set.rb

@@ -3,7 +3,7 @@ module PyCall
     include PyObjectWrapper
 
     def initialize(pyobj)
-      super(pyobj, LibPython.PySet_Type)
+      super(pyobj)
     end
 
     def length

data/lib/pycall/slice.rb

@@ -7,7 +7,7 @@ module PyCall
       case args.length
       when 1
         stop = args[0]
-        return super(stop) if stop.kind_of?(PyObject)
+        return super(stop) if stop.kind_of?(LibPython::PyObjectStruct)
       when 2
         start, stop = args
       when 3
@@ -16,9 +16,9 @@ module PyCall
         much_or_few = args.length > 3 ? 'much' : 'few'
         raise ArgumentError, "too #{much_or_few} arguments (#{args.length} for 1..3)"
       end
-      start = start ? Conversions.from_ruby(start) : PyObject.null
-      stop = stop ? Conversions.from_ruby(stop) : PyObject.null
-      step = step ? Conversions.from_ruby(step) : PyObject.null
+      start = start ? Conversions.from_ruby(start) : LibPython::PyObjectStruct.null
+      stop = stop ? Conversions.from_ruby(stop) : LibPython::PyObjectStruct.null
+      step = step ? Conversions.from_ruby(step) : LibPython::PyObjectStruct.null
       pyobj = LibPython.PySlice_New(start, stop, step)
       return pyobj.to_ruby unless pyobj.null?
       raise PyError.fetch

data/lib/pycall/tuple.rb

@@ -12,7 +12,7 @@ module PyCall
           tuple[index] = obj
         end
         tuple
-      when PyObject
+      when LibPython::PyObjectStruct
         super(init)
       end
     end
@@ -22,10 +22,6 @@ module PyCall
       new(ary)
     end
 
-    def initialize(pyobj)
-      super(pyobj, LibPython.PyTuple_Type)
-    end
-
     def length
       LibPython.PyTuple_Size(__pyobj__)
     end

data/lib/pycall/type_object.rb

@@ -0,0 +1,11 @@
+module PyCall
+  class TypeObject
+    include PyObjectWrapper
+
+    def to_s
+      return "pytype(#{self.__name__})"
+    end
+
+    alias inspect to_s
+  end
+end

data/lib/pycall/types.rb

@@ -1,8 +1,8 @@
 module PyCall
   module Types
     def self.pyisinstance(pyobj, pytype)
-      check_pyobject(pyobj)
-      pytype = PyObject.new(pytype.to_ptr) if pytype.kind_of?(PyTypeObject)
+      pyobj = pyobj.__pyobj__ unless pyobj.kind_of? LibPython::PyObjectStruct
+      pytype = ptype.__pyobj__ unless pytype.kind_of? LibPython::PyObjectStruct
       LibPython.PyObject_IsInstance(pyobj, pytype) == 1
     end
 

data/lib/pycall/utils.rb

@@ -6,19 +6,15 @@ module PyCall
     end
 
     def callable?(pyobj)
-      case pyobj
-      when PyObject
-      when PyTypeObject
-        pyobj = PyObject.new(pyobj.to_ptr)
-      when PyObjectWrapper
+      unless pyobj.kind_of? LibPython::PyObjectStruct
+        raise TypeError, "the argument must be a Python object" unless pyobj.respond_to? :__pyobj__
         pyobj = pyobj.__pyobj__
-      else
-        raise TypeError, "the argument must be a PyObject"
       end
       1 == LibPython.PyCallable_Check(pyobj)
     end
 
     def dir(pyobj)
+      pyobj = pyobj.__pyobj__ unless pyobj.kind_of? LibPython::PyObjectStruct
       value = LibPython.PyObject_Dir(pyobj)
       return value.to_ruby unless value.null?
       raise PyError.fetch
@@ -49,6 +45,11 @@ module PyCall
       LibPython.Py_None
     end
 
+    def none?(pyobj)
+      pyobj = pyobj.__pyobj__ unless pyobj.kind_of? LibPython::PyObjectStruct
+      pyobj.to_ptr == self.None.to_ptr
+    end
+
     def slice(*args)
       Slice.new(*args)
     end

data/lib/pycall/version.rb

@@ -1,3 +1,3 @@
 module PyCall
-  VERSION = "0.1.0.alpha.20170307"
+  VERSION = "0.1.0.alpha.20170308"
 end

data/lib/pycall.rb

@@ -1,11 +1,12 @@
 require "pycall/version"
 require "pycall/libpython"
+require "pycall/pyobject_wrapper"
 require "pycall/pyobject"
 require "pycall/pyerror"
 require "pycall/eval"
 require "pycall/types"
 require "pycall/conversion"
-require "pycall/pyobject_wrapper"
+require "pycall/type_object"
 require "pycall/tuple"
 require "pycall/list"
 require "pycall/dict"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pycall
 version: !ruby/object:Gem::Version
-  version: 0.1.0.alpha.20170307
+  version: 0.1.0.alpha.20170308
 platform: ruby
 authors:
 - Kenta Murata
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-07 00:00:00.000000000 Z
+date: 2017-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -106,6 +106,7 @@ files:
 - lib/pycall/set.rb
 - lib/pycall/slice.rb
 - lib/pycall/tuple.rb
+- lib/pycall/type_object.rb
 - lib/pycall/types.rb
 - lib/pycall/utils.rb
 - lib/pycall/version.rb