Rewrite for the latest pycall

Author: mrkn

Gemfile

@@ -3,4 +3,4 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in matplotlib.gemspec
 gemspec
 
-gem 'pycall', github: 'mrkn/pycall'
+gem 'pycall', github: 'mrkn/pycall', branch: 'rewrite'

lib/matplotlib.rb

@@ -1,33 +1,16 @@
-require "matplotlib/version"
-require 'pycall/import'
+require 'matplotlib/version'
+require 'pycall'
 
-module Matplotlib
-  @matplotlib = PyCall.import_module('matplotlib')
-  PyCall.dir(@matplotlib).each do |name|
-    obj = PyCall.getattr(@matplotlib, name)
-    next unless obj.kind_of?(PyCall::PyObject) || obj.kind_of?(PyCall::PyObjectWrapper)
-    next unless PyCall.callable?(obj)
-
-    define_singleton_method(name) do |*args, **kwargs|
-      obj.(*args, **kwargs)
-    end
-  end
+Matplotlib = PyCall.import_module('matplotlib')
 
-  class << self
-    def __pyobj__
-      @matplotlib
-    end
-
-    def method_missing(name, *args, **kwargs)
-      return super unless PyCall.hasattr?(@matplotlib, name)
-      PyCall.getattr(@matplotlib, name)
-    end
-  end
+module Matplotlib
+  VERSION = MATPLOTLIB_VERSION
+  Object.class_eval { remove_const :MATPLOTLIB_VERSION }
 
   # FIXME: MacOSX backend is unavailable via pycall.
   #        I don't know why it is.
-  if Matplotlib.get_backend() == 'MacOSX'
-    Matplotlib.use('TkAgg')
+  if get_backend == 'MacOSX'
+    use('TkAgg')
   end
 
   class Error < StandardError
@@ -40,4 +23,4 @@ class Error < StandardError
 require 'matplotlib/figure'
 require 'matplotlib/spines'
 
-PyCall.append_sys_path(File.expand_path('../matplotlib/python', __FILE__))
+PyCall.sys.path.insert(0, File.expand_path('../matplotlib/python', __FILE__))

lib/matplotlib/axes.rb

@@ -1,6 +1,4 @@
 module Matplotlib
-  class Axes
-    include PyCall::PyObjectWrapper
-    wrap_class PyCall.import_module('matplotlib.axes').Axes
-  end
+  Axes = PyCall.import_module('matplotlib.axes').Axes
+  Axes.__send__ :register_python_type_mapping
 end

lib/matplotlib/axis.rb

@@ -1,21 +1,16 @@
 module Matplotlib
-  class XTick
-    include PyCall::PyObjectWrapper
-    wrap_class PyCall.import_module('matplotlib.axis').XTick
-  end
+  Axis = PyCall.import_module('matplotlib.axis')
+  module Axis
+    XTick = self.XTick
+    XTick.__send__ :register_python_type_mapping
 
-  class YTick
-    include PyCall::PyObjectWrapper
-    wrap_class PyCall.import_module('matplotlib.axis').YTick
-  end
+    YTick = self.YTick
+    YTick.__send__ :register_python_type_mapping
 
-  class XAxis
-    include PyCall::PyObjectWrapper
-    wrap_class PyCall.import_module('matplotlib.axis').XAxis
-  end
+    XAxis = self.XAxis
+    XAxis.__send__ :register_python_type_mapping
 
-  class YAxis
-    include PyCall::PyObjectWrapper
-    wrap_class PyCall.import_module('matplotlib.axis').YAxis
+    YAxis = self.YAxis
+    YAxis.__send__ :register_python_type_mapping
   end
 end

lib/matplotlib/figure.rb

@@ -1,28 +1,4 @@
 module Matplotlib
-  class Figure
-    include PyCall::PyObjectWrapper
-
-    @__pyobj__ = PyCall.import_module('matplotlib.figure').Figure
-
-    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
-      attr_reader :__pyobj__
-
-      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
+  Figure = PyCall.import_module('matplotlib.figure').Figure
+  Figure.__send__ :register_python_type_mapping
 end

lib/matplotlib/polar_axes.rb

@@ -1,6 +1,4 @@
 module Matplotlib
-  class PolarAxes
-    include PyCall::PyObjectWrapper
-    wrap_class PyCall.import_module('matplotlib.projections.polar').PolarAxes
-  end
+  PolarAxes = PyCall.import_module('matplotlib.projections.polar').PolarAxes
+  PolarAxes.__send__ :register_python_type_mapping
 end

lib/matplotlib/pyplot.rb

@@ -1,31 +1,11 @@
 require 'matplotlib'
 
 module Matplotlib
+  Pyplot = PyCall.import_module('matplotlib.pyplot')
   module Pyplot
-    @pyplot = PyCall.import_module('matplotlib.pyplot')
-    PyCall.dir(@pyplot).each do |name|
-      obj = PyCall.getattr(@pyplot, name)
-      next unless obj.kind_of?(PyCall::PyObject) || obj.kind_of?(PyCall::PyObjectWrapper)
-      next unless PyCall.callable?(obj)
-
-      define_singleton_method(name) do |*args, **kwargs|
-        obj.(*args, **kwargs)
-      end
-    end
-
-    class << self
-      def __pyobj__
-        @pyplot
-      end
-
-      def xkcd(scale: 1, length: 100, randomness: 2, &block)
-        PyCall.with(super.(scale: scale, length: length, randomness: randomness), &block)
-      end
-
-      def method_missing(name, *args, **kwargs)
-        return super unless PyCall.hasattr?(@pyplot, name)
-        PyCall.getattr(@pyplot, name)
-      end
+    def self.xkcd(scale: 1, length: 100, randomness: 2, &block)
+      ctx = super(scale: scale, length: length, randomness: randomness)
+      PyCall.with(ctx, &block)
     end
   end
 end

lib/matplotlib/spines.rb

@@ -1,6 +1,4 @@
 module Matplotlib
-  class Spine
-    include PyCall::PyObjectWrapper
-    wrap_class PyCall.import_module('matplotlib.spines').Spine
-  end
+  Spine = PyCall.import_module('matplotlib.spines').Spine
+  Spine.__send__ :register_python_type_mapping
 end

lib/matplotlib/version.rb

@@ -1,3 +1 @@
-module Matplotlib
-  VERSION = "0.1.0.alpha.20170426"
-end
+MATPLOTLIB_VERSION = "1.0.0.alpha.20170905"

matplotlib.gemspec

@@ -5,7 +5,7 @@ require 'matplotlib/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "matplotlib"
-  spec.version       = Matplotlib::VERSION
+  spec.version       = MATPLOTLIB_VERSION
   spec.authors       = ["Kenta Murata"]
   spec.email         = ["mrkn@mrkn.jp"]