pycall 0.1.0.alpha.20170302 → 0.1.0.alpha.20170307

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8c5abd1327e908691a79a42fdc536826e48d208
-  data.tar.gz: 4dd793ea028f6b9e47c9e74266d043de5751a74a
+  metadata.gz: bff90008a927b2cb383fe47fa5b7c9e4447c01ec
+  data.tar.gz: 4de66d04dad27fc929fe5071bc9ce8bcf06019cd
 SHA512:
-  metadata.gz: 6a75c2f1a5df62a881f8eee78fc72f5896bbc30d912610afc4f7b6bc719b43015cdddd03f87b6202a5ab782c4a182fd6fef181923e270cd1299bc9b738ff2709
-  data.tar.gz: 6fa5f34b243181d4340c3c265eb3c68b430c971976ba8a2ee8649d77a3df5ce547afa69b86d9e253cca7eb801f06e78647bc39ab2343198ebfb667f5e78f1a23
+  metadata.gz: 9fbb882c47f5a771f58b83e56e92deae332b5ca5348bc205594c0bbc5f4c3141d13bb121459b320790d1bdda2e98134323bd70498a94cf7650bb71d377be8128
+  data.tar.gz: de2fd8a4eceaa84b3ce58918f4fd15cd19b5f3f8256ab1e44abdb32c3e48eeed8527ee853f08b828aadb78635fb0c3b2552a75a1da297b3f45c52a3399fd0226

data/lib/pycall/conversion.rb

@@ -8,8 +8,17 @@ module PyCall
       end
     end
 
+    def self.each_type_pair
+      i, n = 1, @python_type_map.length
+      while i <= n
+        yield @python_type_map[n - i]
+        i += 1
+      end
+      self
+    end
+
     def self.python_type_mapping(pytype, rbtype)
-      @python_type_map.each_with_index do |type_pair, index|
+      each_type_pair do |type_pair|
         next unless pytype == type_pair.pytype
         type_pair.rbtype = rbtype
         return
@@ -21,7 +30,7 @@ module PyCall
       unless pyobj.kind_of? PyObject
         raise
       end
-      @python_type_map.each do |tp|
+      each_type_pair do |tp|
         pytype, rbtype = tp.to_a
         next unless pyobj.kind_of?(pytype)
         case
@@ -61,7 +70,7 @@ module PyCall
       when Array
         PyCall::List.new(obj).__pyobj__
       else
-        LibPython.Py_None
+        PyCall.None
       end
     end
 

data/lib/pycall/dict.rb

@@ -25,10 +25,17 @@ module PyCall
 
     def [](key)
       key = key.to_s if key.is_a? Symbol
-      if key.is_a? String
-        LibPython.PyDict_GetItemString(__pyobj__, key).to_ruby
-      else
-        LibPython.PyDict_GetItem(__pyobj__, key).to_ruby
+      value = if key.is_a? String
+                LibPython.PyDict_GetItemString(__pyobj__, key).to_ruby
+              else
+                LibPython.PyDict_GetItem(__pyobj__, key).to_ruby
+              end
+    ensure
+      case value
+      when PyObject
+        PyCall.incref(value)
+      when PyObjectWrapper
+        PyCall.incref(value.__pyobj__)
       end
     end
 

data/lib/pycall/eval.rb

@@ -3,8 +3,8 @@ module PyCall
     Py_eval_input = 258
 
     def self.eval(str, filename: "pycall")
-      globals_ptr = maindict_ptr
-      locals_ptr = maindict_ptr
+      globals_ptr = main_dict
+      locals_ptr = main_dict
       defer_sigint do
         py_code_ptr = LibPython.Py_CompileString(str, filename, Py_eval_input)
         raise PyError.fetch if py_code_ptr.null?
@@ -15,12 +15,10 @@ module PyCall
     class << self
       private
 
-      def main_module
-        @main_module ||= PyCall.import_module("__main__")
-      end
-
-      def maindict_ptr
-        @maindict_ptr ||= LibPython.PyModule_GetDict(main_module)
+      def main_dict
+        @main_dict ||= PyCall.import_module("__main__") do |main_module|
+          PyCall.incref(LibPython.PyModule_GetDict(main_module))
+        end
       end
 
       def defer_sigint
@@ -34,11 +32,18 @@ module PyCall
     name = name.to_s if name.kind_of? Symbol
     raise TypeError, "name must be a String" unless name.kind_of? String
     value = LibPython.PyImport_ImportModule(name)
-    return value.to_ruby unless value.null?
-    raise PyError.fetch
+    raise PyError.fetch if value.null?
+    value = value.to_ruby
+    return value unless block_given?
+    begin
+      yield value
+    ensure
+      PyCall.decref(value)
+    end
   end
 
-  def self.eval(str)
-    Eval.eval(str).to_ruby
+  def self.eval(str, conversion: true)
+    result = Eval.eval(str)
+    conversion ? result.to_ruby : result
   end
 end

data/lib/pycall/libpython.rb

@@ -137,6 +137,11 @@ module PyCall
     attach_function :Py_InitializeEx, [:int], :void
     attach_function :Py_IsInitialized, [], :int
 
+    # Reference count
+
+    attach_function :Py_IncRef, [PyObject.by_ref], :void
+    attach_function :Py_DecRef, [PyObject.by_ref], :void
+
     # Object
 
     attach_function :PyObject_RichCompare, [PyObject.by_ref, PyObject.by_ref, :int], PyObject.by_ref

data/lib/pycall/pyobject.rb

@@ -34,7 +34,7 @@ module PyCall
     end
 
     def py_none?
-      to_ptr == LibPython.Py_None.to_ptr
+      to_ptr == PyCall.None.to_ptr
     end
 
     def kind_of?(klass)
@@ -107,7 +107,7 @@ module PyCall
 
     def **(other)
       other = Conversions.from_ruby(other)
-      value = LibPython.PyNumber_Power(self, other, LibPython.Py_None)
+      value = LibPython.PyNumber_Power(self, other, PyCall.None)
       return value.to_ruby unless value.null?
       raise PyError.fetch
     end

data/lib/pycall/pyobject_wrapper.rb

@@ -1,5 +1,36 @@
 module PyCall
   module PyObjectWrapper
+    module ClassMethods
+      private
+
+      def wrap_class(pyobj)
+        define_singleton_method(:__pyobj__) { pyobj }
+
+        PyCall.dir(__pyobj__).each do |name|
+          obj = PyCall.getattr(__pyobj__, name)
+          next unless obj.kind_of?(PyCall::PyObject) || obj.kind_of?(PyCall::PyObjectWrapper)
+          next unless PyCall.callable?(obj)
+
+          define_method(name) do |*args, **kwargs|
+            PyCall.getattr(__pyobj__, name).(*args, **kwargs)
+          end
+        end
+
+        class << self
+          def method_missing(name, *args, **kwargs)
+            return super unless PyCall.hasattr?(__pyobj__, name)
+            PyCall.getattr(__pyobj__, name)
+          end
+        end
+
+        PyCall::Conversions.python_type_mapping(__pyobj__, self)
+      end
+    end
+
+    def self.included(mod)
+      mod.extend ClassMethods
+    end
+
     def initialize(pyobj, pytype=nil)
       check_type pyobj, pytype
       pytype ||= LibPython.PyObject_Type(pyobj)

data/lib/pycall/utils.rb

@@ -1,5 +1,10 @@
 module PyCall
   module Utils
+    def append_sys_path(path_str)
+      pyobj = LibPython.PyUnicode_DecodeUTF8(path_str, path_str.bytesize, nil)
+      sys.path.append.(pyobj)
+    end
+
     def callable?(pyobj)
       case pyobj
       when PyObject
@@ -19,6 +24,17 @@ module PyCall
       raise PyError.fetch
     end
 
+    def incref(pyobj)
+      LibPython.Py_IncRef(pyobj)
+      pyobj
+    end
+
+    def decref(pyobj)
+      LibPython.Py_DecRef(pyobj)
+      pyobj.send :pointer=, FFI::Pointer::NULL
+      pyobj
+    end
+
     def int(pyobj)
       @int ||= PyCall.eval('int')
       @int.(pyobj)
@@ -29,6 +45,10 @@ module PyCall
       @len.(pyobj)
     end
 
+    def None
+      LibPython.Py_None
+    end
+
     def slice(*args)
       Slice.new(*args)
     end
@@ -38,6 +58,10 @@ module PyCall
       @str.(pyobj)
     end
 
+    def sys
+      @sys ||= PyCall.import_module('sys')
+    end
+
     def tuple(*args)
       PyCall::Tuple[*args]
     end

data/lib/pycall/version.rb

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

metadata

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