pycall 0.1.0.alpha.20170309 → 0.1.0.alpha.20170311

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9498fcad907f67277117e9e637247b85228485e
-  data.tar.gz: b0981d9a5d30e35d80480905381210323d86d852
+  metadata.gz: b0fa9f2771f8c95a9d13d448e0369e9b7e9480f6
+  data.tar.gz: 4995b342604508cb01faadde8d6c90f35a402783
 SHA512:
-  metadata.gz: 20a307abbe8494a1bfb584d1a9c7acceea1f10ad1c7416e01adb2320a8c62f3a315ab1c25693c227ee984319c8139d0c78498df9c2fbee5f5fa8af63679ce678
-  data.tar.gz: 17aae937f321ae1590e4c8bbf089b6024288defe20457282908d090fb6c56a3c7641dd171d5dd832115ac2515b459236364a6f6ee1310c7507b19eb69032bb1a
+  metadata.gz: 107f426b7baa846f92dee733e1e2fa797f8a8fe9690e6690257254d3bf9e0d996f83b733c5d31c71136880fa9d1872c22bc4e8d3290319ff19b21c8844a63ccf
+  data.tar.gz: 31a974c8e52b665b61b73078edb3f366f8ff736d1828762f6ca4f1ad103e42208362a2a202b9aaa7d30c8189fcd00d6a3d08a12c24830e51da480a98e35ad745

data/lib/pycall/conversion.rb

@@ -26,8 +26,54 @@ module PyCall
       @python_type_map << TypePair.new(pytype, rbtype)
     end
 
-    def self.to_ruby(pyobj)
-      pyobj = PyObject.new(pyobj) if pyobj.kind_of? LibPython::PyObjectStruct
+    # Convert a PyCall::PyObjectStruct object to a Ruby object
+    #
+    # @param [PyCall::PyObjectStruct] pyptr  a PyObjectStruct object.
+    #
+    # @return a Ruby object converted from `pyptr`.
+    def self.to_ruby(pyptr)
+      return nil if pyptr.null? || PyCall.none?(pyptr)
+
+      case
+      when PyCall::Types.pyisinstance(pyptr, LibPython.PyType_Type)
+        return TypeObject.new(pyptr)
+
+      when PyCall::Types.pyisinstance(pyptr, LibPython.PyBool_Type)
+        return Conversions.convert_to_boolean(pyptr)
+
+      when PyCall::Types.pyisinstance(pyptr, LibPython.PyInt_Type)
+        return Conversions.convert_to_integer(pyptr)
+
+      when PyCall::Types.pyisinstance(pyptr, LibPython.PyLong_Type)
+        # TODO: should make Bignum
+
+      when PyCall::Types.pyisinstance(pyptr, LibPython.PyFloat_Type)
+        return Conversions.convert_to_float(pyptr)
+
+      when PyCall::Types.pyisinstance(pyptr, LibPython.PyComplex_Type)
+        return Conversions.convert_to_complex(pyptr)
+
+      when PyCall::Types.pyisinstance(pyptr, LibPython.PyString_Type)
+        return Conversions.convert_to_string(pyptr)
+
+      when PyCall::Types.pyisinstance(pyptr, LibPython.PyUnicode_Type)
+        py_str_ptr = LibPython.PyUnicode_AsUTF8String(pyptr)
+        return Conversions.convert_to_string(py_str_ptr).force_encoding(Encoding::UTF_8)
+
+      when PyCall::Types.pyisinstance(pyptr, LibPython.PyList_Type)
+        return PyCall::List.new(pyptr)
+
+      when PyCall::Types.pyisinstance(pyptr, LibPython.PyTuple_Type)
+        return Conversions.convert_to_tuple(pyptr)
+
+      when PyCall::Types.pyisinstance(pyptr, LibPython.PyDict_Type)
+        return PyCall::Dict.new(pyptr)
+
+      when PyCall::Types.pyisinstance(pyptr, LibPython.PySet_Type)
+        return PyCall::Set.new(pyptr)
+      end
+
+      pyobj = PyObject.new(pyptr)
       each_type_pair do |tp|
         pytype, rbtype = tp.to_a
         next unless pyobj.kind_of?(pytype)
@@ -67,6 +113,8 @@ module PyCall
         from_ruby(obj.to_s)
       when Array
         PyCall::List.new(obj).__pyobj__
+      when Hash
+        PyCall::Dict.new(obj).__pyobj__
       else
         PyCall.None
       end
@@ -119,47 +167,6 @@ module PyCall
 
   class LibPython::PyObjectStruct
     def to_ruby
-      return nil if self.null? || PyCall.none?(self)
-
-      case 
-      when PyCall::Types.pyisinstance(self, LibPython.PyType_Type)
-        return TypeObject.new(self)
-
-      when PyCall::Types.pyisinstance(self, LibPython.PyBool_Type)
-        return Conversions.convert_to_boolean(self)
-
-      when PyCall::Types.pyisinstance(self, LibPython.PyInt_Type)
-        return Conversions.convert_to_integer(self)
-
-      when PyCall::Types.pyisinstance(self, LibPython.PyLong_Type)
-        # TODO: should make Bignum
-
-      when PyCall::Types.pyisinstance(self, LibPython.PyFloat_Type)
-        return Conversions.convert_to_float(self)
-
-      when PyCall::Types.pyisinstance(self, LibPython.PyComplex_Type)
-        return Conversions.convert_to_complex(self)
-
-      when PyCall::Types.pyisinstance(self, LibPython.PyString_Type)
-        return Conversions.convert_to_string(self)
-
-      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 PyCall::Types.pyisinstance(self, LibPython.PyList_Type)
-        return PyCall::List.new(self)
-
-      when PyCall::Types.pyisinstance(self, LibPython.PyTuple_Type)
-        return Conversions.convert_to_tuple(self)
-
-      when PyCall::Types.pyisinstance(self, LibPython.PyDict_Type)
-        return PyCall::Dict.new(self)
-
-      when PyCall::Types.pyisinstance(self, LibPython.PySet_Type)
-        return PyCall::Set.new(self)
-      end
-
       Conversions.to_ruby(self)
     end
   end

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 = Conversions.to_ruby(LibPython::PyObjectStruct.new(ptype.read(:pointer)))
-      value = Conversions.to_ruby(LibPython::PyObjectStruct.new(pvalue.read(:pointer)))
-      traceback = Conversions.to_ruby(LibPython::PyObjectStruct.new(ptraceback.read(:pointer)))
+      type = Conversions.to_ruby(ptype.read(:pointer))
+      value = Conversions.to_ruby(pvalue.read(:pointer))
+      traceback = Conversions.to_ruby(ptraceback.read(:pointer))
       new(type, value, traceback)
     end
 
@@ -22,9 +22,9 @@ module PyCall
 
     attr_reader :type, :value, :traceback
 
-    def message
+    def to_s
       "#{type}: #{value}".tap do |msg|
-        unless traceback.null?
+        unless traceback&.null?
           if (o = PyCall.format_traceback(traceback))
             msg.concat("\n", *o)
           end

data/lib/pycall/pyobject_wrapper.rb

@@ -49,6 +49,7 @@ module PyCall
     end
 
     def initialize(pyobj)
+      pyobj = LibPython::PyObjectStruct.new(pyobj) if pyobj.kind_of? FFI::Pointer
       pyobj = pyobj.__pyobj__ unless pyobj.kind_of? LibPython::PyObjectStruct
       @__pyobj__ = pyobj
     end
@@ -86,8 +87,7 @@ module PyCall
       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)
+      other = Conversions.from_ruby(other)
       return other.null? if __pyobj__.null?
       return false if other.null?
 

data/lib/pycall/types.rb

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

data/lib/pycall/utils.rb

@@ -46,8 +46,15 @@ module PyCall
     end
 
     def none?(pyobj)
-      pyobj = pyobj.__pyobj__ unless pyobj.kind_of? LibPython::PyObjectStruct
-      pyobj.to_ptr == self.None.to_ptr
+      case pyobj
+      when FFI::Pointer
+        ptr = pyobj
+      when LibPython::PyObjectStruct
+        ptr = pyobj.to_ptr
+      else
+        pyobj = pyobj.__pyobj__.to_ptr
+      end
+      ptr == self.None.to_ptr
     end
 
     def slice(*args)

data/lib/pycall/version.rb

@@ -1,3 +1,3 @@
 module PyCall
-  VERSION = "0.1.0.alpha.20170309"
+  VERSION = "0.1.0.alpha.20170311"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pycall
 version: !ruby/object:Gem::Version
-  version: 0.1.0.alpha.20170309
+  version: 0.1.0.alpha.20170311
 platform: ruby
 authors:
 - Kenta Murata
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-09 00:00:00.000000000 Z
+date: 2017-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi