pycall 0.1.0.alpha.20170711 → 1.0.0

data/lib/pycall/python/PyCall/__init__.py

@@ -0,0 +1 @@
+

data/lib/pycall/python/PyCall/six.py

@@ -0,0 +1,23 @@
+import sys
+
+PY3 = sys.version_info[0] == 3
+
+if PY3:
+  import builtins
+else:
+  import __builtin__ as builtins
+
+if PY3:
+  exec_ = getattr(builtins, 'exec')
+else:
+  def exec_(_code_, _globals_=None, _locals_=None):
+    """Execute code in a namespace."""
+    if _globals_ is None:
+      frame = sys._getframe(1)
+      _globals_ = frame.f_globals
+      if _locals_ is None:
+        _locals_ = frame.f_locals
+      del frame
+    elif _locals_ is None:
+      _locals_ = _globals_
+    exec("""exec _code_ in _globals_, _locals_""")

data/lib/pycall/pytypeobject_wrapper.rb

@@ -0,0 +1,79 @@
+require 'pycall/pyobject_wrapper'
+
+module PyCall
+  module PyTypeObjectWrapper
+    include PyObjectWrapper
+
+    def self.extend_object(cls)
+      unless cls.kind_of? Class
+        raise TypeError, "PyTypeObjectWrapper cannot extend non-class objects"
+      end
+      pyptr = cls.instance_variable_get(:@__pyptr__)
+      unless pyptr.kind_of? PyTypePtr
+        raise TypeError, "@__pyptr__ should have PyCall::PyTypePtr object"
+      end
+      super
+      cls.include PyObjectWrapper
+    end
+
+    def inherited(subclass)
+      subclass.instance_variable_set(:@__pyptr__, __pyptr__)
+    end
+
+    def new(*args)
+      wrap_pyptr(LibPython::Helpers.call_object(__pyptr__, *args))
+    end
+
+    def wrap_pyptr(pyptr)
+      return pyptr if pyptr.kind_of? self
+      pyptr = pyptr.__pyptr__ if pyptr.kind_of? PyObjectWrapper
+      unless pyptr.kind_of? PyPtr
+        raise TypeError, "unexpected argument type #{pyptr.class} (expected PyCall::PyPtr)"
+      end
+      unless pyptr.kind_of? __pyptr__
+        raise TypeError, "unexpected argument Python type #{pyptr.__ob_type__.__tp_name__} (expected #{__pyptr__.__tp_name__})"
+      end
+      allocate.tap do |obj|
+        obj.instance_variable_set(:@__pyptr__, pyptr)
+      end
+    end
+
+    private
+
+    def register_python_type_mapping
+      PyCall::Conversion.register_python_type_mapping(__pyptr__, self)
+    end
+  end
+
+  module_function
+
+  class WrapperClassCache < WrapperObjectCache
+    def initialize
+      types = [LibPython::API::PyType_Type]
+      types << LibPython::API::PyClass_Type if defined? LibPython::API::PyClass_Type
+      super(*types)
+    end
+
+    def check_wrapper_object(wrapper_object)
+      unless wrapper_object.kind_of?(Class) && wrapper_object.kind_of?(PyTypeObjectWrapper)
+        raise TypeError, "unexpected type #{wrapper_object.class} (expected Class extended by PyTypeObjectWrapper)"
+      end
+    end
+
+    def self.instance
+      @instance ||= self.new
+    end
+  end
+
+  private_constant :WrapperClassCache
+
+  def wrap_class(pytypeptr)
+    check_isclass(pytypeptr)
+    WrapperClassCache.instance.lookup(pytypeptr) do
+      Class.new do |cls|
+        cls.instance_variable_set(:@__pyptr__, pytypeptr)
+        cls.extend PyTypeObjectWrapper
+      end
+    end
+  end
+end

data/lib/pycall/slice.rb

@@ -1,27 +1,8 @@
 module PyCall
+  Slice = builtins.slice
   class Slice
-    include PyObjectWrapper
-
-    def self.new(*args)
-      start, stop, step = nil
-      case args.length
-      when 1
-        stop = args[0]
-        return super(stop) if stop.kind_of?(LibPython::PyObjectStruct)
-      when 2
-        start, stop = args
-      when 3
-        start, stop, step = args
-      else
-        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) : 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
+    def self.all
+      new(nil)
     end
   end
 end

data/lib/pycall/tuple.rb

@@ -38,13 +38,7 @@ module PyCall
     end
 
     def to_a
-      [].tap do |ary|
-        i, n = 0, length
-        while i < n
-          ary << self[i]
-          i += 1
-        end
-      end
+      Array.new(length) {|i| self[i] }
     end
 
     alias to_ary to_a

data/lib/pycall/version.rb

@@ -1,3 +1,3 @@
 module PyCall
-  VERSION = "0.1.0.alpha.20170711"
+  VERSION = "1.0.0"
 end

data/lib/pycall/wrapper_object_cache.rb

@@ -0,0 +1,61 @@
+module PyCall
+  class WrapperObjectCache
+    def initialize(*restricted_pytypes)
+      unless restricted_pytypes.empty?
+        restricted_pytypes.each do |pytype|
+          next if pytype.kind_of? PyTypePtr
+          raise TypeError, "unexpected type of object in the arguments (#{pytype.class} for PyCall::PyTypePtr)"
+        end
+      end
+      @restricted_pytypes = restricted_pytypes
+      @wrapper_object_table = {}
+      @wrapped_pyptr_table = {}
+      @weakref_table = {}
+    end
+
+    def lookup(pyptr)
+      # TODO: check pytypeptr type
+      unless pyptr.kind_of? PyPtr
+        raise TypeError, "unexpected argument type #{pyptr.class} (expected PyCall::PyPtr)"
+      end
+
+      unless @restricted_pytypes.empty?
+        unless @restricted_pytypes.any? {|pytype| pyptr.kind_of? pytype }
+          raise TypeError, "unexpected argument Python type #{pyptr.__ob_type__.__name__} (expected either of them in [#{@restricted_pytypes.map(&:__tp_name__).join(', ')}])"
+        end
+      end
+
+      wrapper_object_id = @wrapper_object_table[pyptr.__address__]
+      if wrapper_object_id
+        wrapper_object = ObjectSpace._id2ref(wrapper_object_id) rescue nil
+        return wrapper_object if wrapper_object
+      end
+
+      wrapper_object = yield(pyptr)
+      check_wrapper_object(wrapper_object)
+      register_wrapper_object(pyptr, wrapper_object)
+
+      wrapper_object
+    end
+
+    def check_wrapper_object(wrapper_object)
+      unless wrapper_object.kind_of?(PyObjectWrapper)
+        raise TypeError, "unexpected wrapper object (expected an object extended by PyObjectWrapper)"
+      end
+    end
+
+    def register_wrapper_object(pyptr, wrapper_object)
+      @wrapper_object_table[pyptr.__address__] = wrapper_object.__id__
+      @wrapped_pyptr_table[wrapper_object.__id__] = pyptr.__address__
+      ObjectSpace.define_finalizer(wrapper_object, &method(:unregister_wrapper_object))
+      # TODO: weakref
+      self
+    end
+
+    def unregister_wrapper_object(wrapper_object_id)
+      pyptr_addr = @wrapped_pyptr_table.delete(wrapper_object_id)
+      @wrapper_object_table.delete(pyptr_addr) if pyptr_addr
+      self
+    end
+  end
+end

data/pycall.gemspec

@@ -27,12 +27,14 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-
-  spec.add_dependency "ffi"
+  spec.extensions    = ["ext/pycall/extconf.rb"]
 
   spec.add_development_dependency "bundler", "~> 1.13"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake-compiler"
+  spec.add_development_dependency "rake-compiler-dock"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "launchy"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "pry-byebug"
 end

data/tasks/pycall.rake

@@ -0,0 +1,7 @@
+namespace :pycall do
+  desc 'Show PYTHON_DESCRIPTION'
+  task :PYTHON_DESCRIPTION do
+    require 'pycall'
+    puts PyCall::PYTHON_DESCRIPTION
+  end
+end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: pycall
 version: !ruby/object:Gem::Version
-  version: 0.1.0.alpha.20170711
+  version: 1.0.0
 platform: ruby
 authors:
 - Kenta Murata
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-11 00:00:00.000000000 Z
+date: 2017-09-07 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: ffi
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +38,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler-dock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -94,16 +108,32 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: pycall
 email:
 - mrkn@mrkn.jp
 executables: []
-extensions: []
+extensions:
+- ext/pycall/extconf.rb
 extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGES.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -130,33 +160,41 @@ files:
 - examples/notebooks/xkcd_style.ipynb
 - examples/plot_forest_importances_faces.rb
 - examples/sum_benchmarking.rb
+- ext/pycall/extconf.rb
+- ext/pycall/gc.c
+- ext/pycall/libpython.c
+- ext/pycall/pycall.c
+- ext/pycall/pycall_internal.h
+- ext/pycall/range.c
+- ext/pycall/ruby_wrapper.c
 - lib/pycall.rb
 - lib/pycall/conversion.rb
 - lib/pycall/dict.rb
-- lib/pycall/eval.rb
-- lib/pycall/exception.rb
+- lib/pycall/error.rb
 - lib/pycall/gc_guard.rb
 - lib/pycall/import.rb
 - lib/pycall/init.rb
 - lib/pycall/iruby_helper.rb
 - lib/pycall/libpython.rb
+- lib/pycall/libpython/finder.rb
 - lib/pycall/libpython/pyobject_struct.rb
 - lib/pycall/libpython/pytypeobject_struct.rb
 - lib/pycall/list.rb
+- lib/pycall/pretty_print.rb
 - lib/pycall/pyerror.rb
-- lib/pycall/pyobject.rb
 - lib/pycall/pyobject_wrapper.rb
+- lib/pycall/python/PyCall/__init__.py
+- lib/pycall/python/PyCall/six.py
 - lib/pycall/python/investigator.py
-- lib/pycall/ruby_wrapper.rb
+- lib/pycall/pytypeobject_wrapper.rb
 - 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
+- lib/pycall/wrapper_object_cache.rb
 - pycall.gemspec
 - tasks/docker.rake
+- tasks/pycall.rake
 homepage: https://github.com/mrkn/pycall
 licenses:
 - MIT
@@ -172,12 +210,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: pycall

data/lib/pycall/eval.rb

@@ -1,57 +0,0 @@
-module PyCall
-  module Eval
-    Py_file_input = 257
-    Py_eval_input = 258
-
-    def self.input_type(sym)
-      return Py_file_input if sym == :file
-      return Py_eval_input if sym == :eval
-      raise ArgumentError, "Unknown input_type for compile Python code"
-    end
-
-    def self.eval(str, filename: "pycall", input_type: :eval)
-      input_type = self.input_type(input_type)
-      globals_ptr = main_dict.__pyobj__
-      locals_ptr = main_dict.__pyobj__
-      defer_sigint do
-        py_code_ptr = LibPython.Py_CompileString(str, filename, input_type)
-        raise PyError.fetch if py_code_ptr.null?
-        LibPython.PyEval_EvalCode(py_code_ptr, globals_ptr, locals_ptr)
-      end
-    end
-
-    class << self
-      private
-
-      def main_dict
-        @main_dict ||= PyCall.import_module("__main__") do |main_module|
-          PyCall.incref(LibPython.PyModule_GetDict(main_module.__pyobj__)).to_ruby
-        end
-      end
-
-      def defer_sigint
-        # TODO: should be implemented
-        yield
-      end
-    end
-  end
-
-  def self.import_module(name)
-    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)
-    raise PyError.fetch if value.null?
-    value = value.to_ruby
-    return value unless block_given?
-    begin
-      yield value
-    ensure
-      PyCall.decref(value.__pyobj__)
-    end
-  end
-
-  def self.eval(str, conversion: true, filename: "pycall", input_type: :eval)
-    result = Eval.eval(str, filename: filename, input_type: input_type)
-    conversion ? result.to_ruby : result
-  end
-end