pycall 0.1.0.alpha.20170226 → 0.1.0.alpha.20170302

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab504049d683e34fa1e325340601d6577a40cd5e
-  data.tar.gz: c477cf5937dd0499e50512a4829ad3688d8e34e5
+  metadata.gz: f8c5abd1327e908691a79a42fdc536826e48d208
+  data.tar.gz: 4dd793ea028f6b9e47c9e74266d043de5751a74a
 SHA512:
-  metadata.gz: 041fda79cb71ccb7653e442c1831f97b489058adb48159cef581d49174182350047e736192eb5568c6d2c4b61d6e2691e917ccb28f578c2dd5b340d90dca41d3
-  data.tar.gz: eb6af8382a0531729aa8ac151d0880e1c7c613441550490fad77e924b26012723833b5ea1aaab75e6ef9a9f1d9d4e99e416ac4c244c155f7c5a2f7b42c4c5d3c
+  metadata.gz: 6a75c2f1a5df62a881f8eee78fc72f5896bbc30d912610afc4f7b6bc719b43015cdddd03f87b6202a5ab782c4a182fd6fef181923e270cd1299bc9b738ff2709
+  data.tar.gz: 6fa5f34b243181d4340c3c265eb3c68b430c971976ba8a2ee8649d77a3df5ce547afa69b86d9e253cca7eb801f06e78647bc39ab2343198ebfb667f5e78f1a23

data/.travis.yml

@@ -2,10 +2,15 @@ sudo: false
 language: ruby
 
 rvm:
-  - 2.1.10
-  - 2.2.5
-  - 2.3.1
   - ruby-head
+  - 2.4.0
+  - 2.3.1
+  - 2.2.5
+  - 2.1.10
+
+env:
+  - PYTHON=python
+  - PYTHON=python3
 
 addons:
   apt:

data/lib/pycall/libpython.rb

@@ -152,6 +152,7 @@ module PyCall
     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
 
     # Bool
 
@@ -203,9 +204,9 @@ module PyCall
     when libpython.find_symbol('PyUnicode_DecodeUTF8')
       attach_function :PyUnicode_DecodeUTF8, [:string, :ssize_t, :string], PyObject.by_ref
     when libpython.find_symbol('PyUnicodeUCS4_DecodeUTF8')
-      attach_function :PyUnicodeUCS4_DecodeUTF8, [:string, :ssize_t, :string], PyObject.by_ref
+      attach_function :PyUnicode_DecodeUTF8, :PyUnicodeUCS4_DecodeUTF8, [:string, :ssize_t, :string], PyObject.by_ref
     when libpython.find_symbol('PyUnicodeUCS2_DecodeUTF8')
-      attach_function :PyUnicodeUCS2_DecodeUTF8, [:string, :ssize_t, :string], PyObject.by_ref
+      attach_function :PyUnicode_DecodeUTF8, :PyUnicodeUCS2_DecodeUTF8, [:string, :ssize_t, :string], PyObject.by_ref
     end
 
     # PyUnicode_AsUTF8String
@@ -279,6 +280,7 @@ module PyCall
     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
 
     # Compiler
 

data/lib/pycall/pyobject.rb

@@ -78,29 +78,40 @@ module PyCall
     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, LibPython.Py_None)
+      return value.to_ruby unless value.null?
+      raise PyError.fetch
+    end
+
     def coerce(other)
       [Conversions.from_ruby(other), self]
     end
@@ -135,6 +146,10 @@ module PyCall
     end
 
     alias inspect to_s
+
+    def type
+      LibPython.PyObject_Type(self)
+    end
   end
 
   class PyTypeObject < FFI::Struct

data/lib/pycall/utils.rb

@@ -1,5 +1,18 @@
 module PyCall
   module Utils
+    def callable?(pyobj)
+      case pyobj
+      when PyObject
+      when PyTypeObject
+        pyobj = PyObject.new(pyobj.to_ptr)
+      when PyObjectWrapper
+        pyobj = pyobj.__pyobj__
+      else
+        raise TypeError, "the argument must be a PyObject"
+      end
+      1 == LibPython.PyCallable_Check(pyobj)
+    end
+
     def dir(pyobj)
       value = LibPython.PyObject_Dir(pyobj)
       return value.to_ruby unless value.null?

data/lib/pycall/version.rb

@@ -1,3 +1,3 @@
 module PyCall
-  VERSION = "0.1.0.alpha.20170226"
+  VERSION = "0.1.0.alpha.20170302"
 end

metadata

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