matplotlib 0.1.0.alpha.20170226 → 0.1.0.alpha.20170302

data/lib/matplotlib.rb

@@ -5,8 +5,8 @@ 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
-    next unless obj.kind_of? PyCall::LibPython.PyFunction_Type
+    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)
@@ -14,6 +14,10 @@ module Matplotlib
   end
 
   class << self
+    def __pyobj__
+      @matplotlib
+    end
+
     def method_missing(name, *args, **kwargs)
       return super unless PyCall.hasattr?(@matplotlib, name)
       PyCall.getattr(@matplotlib, name)
@@ -28,8 +32,7 @@ module Matplotlib
 
   class Error < StandardError
   end
-
-  class Figure
-    include PyCall::PyObjectWrapper
-  end
 end
+
+require 'matplotlib/axes'
+require 'matplotlib/figure'

data/lib/matplotlib/axes.rb

@@ -0,0 +1,28 @@
+module Matplotlib
+  class Axes3D
+    include PyCall::PyObjectWrapper
+
+    @__pyobj__ = PyCall.import_module('matplotlib.axes').Axes
+
+    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
+end

data/lib/matplotlib/axes_3d.rb

@@ -0,0 +1,28 @@
+module Matplotlib
+  class Axes3D
+    include PyCall::PyObjectWrapper
+
+    @__pyobj__ = PyCall.import_module('mpl_toolkits.mplot3d').Axes3D
+
+    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
+end

data/lib/matplotlib/figure.rb

@@ -0,0 +1,28 @@
+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
+end

data/lib/matplotlib/iruby.rb

@@ -32,8 +32,6 @@ module Matplotlib
       # NOTE: This method is translated from `IPython.core.activate_matplotlib` function.
       def activate(gui=:inline)
         require 'matplotlib/pyplot'
-        figure_class = Pyplot.__pyobj__.Figure
-        PyCall::Conversions.python_type_mapping(figure_class, Figure)
       end
     end
   end

data/lib/matplotlib/pyplot.rb

@@ -5,8 +5,8 @@ module Matplotlib
     @pyplot = PyCall.import_module('matplotlib.pyplot')
     PyCall.dir(@pyplot).each do |name|
       obj = PyCall.getattr(@pyplot, name)
-      next unless obj.kind_of? PyCall::PyObject
-      next unless obj.kind_of? PyCall::LibPython.PyFunction_Type
+      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)

data/lib/matplotlib/version.rb

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

data/matplotlib.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "pycall", ">= 0.1.0.alpha.20170226"
+  spec.add_dependency "pycall", ">= 0.1.0.alpha.20170302"
 
   spec.add_development_dependency "bundler", "~> 1.13"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: matplotlib
 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: pycall
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0.alpha.20170226
+        version: 0.1.0.alpha.20170302
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0.alpha.20170226
+        version: 0.1.0.alpha.20170302
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -96,9 +96,16 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- examples/classifier_comparison.ipynb
+- examples/forest_importances.ipynb
 - examples/iruby_integration.ipynb
+- examples/lorenz_attractor.ipynb
 - examples/noisy_sin.rb
+- examples/polar_axes.ipynb
 - lib/matplotlib.rb
+- lib/matplotlib/axes.rb
+- lib/matplotlib/axes_3d.rb
+- lib/matplotlib/figure.rb
 - lib/matplotlib/iruby.rb
 - lib/matplotlib/pyplot.rb
 - lib/matplotlib/version.rb