pycall 1.0.1-x64-mingw32 → 1.0.2-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e05704810bf423cd918b04254332b5b369cb0ba
-  data.tar.gz: ad4f82816aa125aba4c980ee7830848bd350ed7d
+  metadata.gz: '089189762ae2cbdb8d8f7d5d472f3f5e8b8b7620'
+  data.tar.gz: 3340df4342ea9a2938699d862bc04f17c7cd6259
 SHA512:
-  metadata.gz: a770626b71328e7395a8cd87090831bbe80396322e63501637a656ce111869581dee3ef006c24fc33d0cd695f4a09e9d675c3017bcddf01b6551043d3d2446cb
-  data.tar.gz: d9a7e3aa1fa1626cec08ee829ca79bb1f520a4b1230f4e31271bb5ff6a761d9e492286d02e9bea506ed864a8e16cf0bcdfc6a8f013d597e7097b3dfd3b317c45
+  metadata.gz: 33a6396abff3be597d56630663635100b034a17ed28326b6d8cd136f9d9bb9edfe0e9dec3ecf67af6dd7b5079e035e94ca5cd5eaff7678e1fe662f01da9ab5be
+  data.tar.gz: dd4a2ca053b6b992bc25665f4b90d728e98869c9543932e8874289ecf7f739ddec58aa9649760ebfdfedfdb58aaf59f5558e667306d60d2aa4f202a50daab4cd

data/.travis.yml

@@ -12,9 +12,9 @@ env:
   global:
   - PYCALL_DEBUG_FIND_LIBPYTHON=1
   matrix:
-  - PYTHON=python
-  - PYTHON=python3 LIBPYTHON=wrong_value
-  - LIBPYTHON=/opt/python/3.5.3/lib/libpython3.5m.so
+  - PYTHON=python PYENV_VERSION=system
+  - PYTHON=python3 PYENV_VERSION=3.5.3 LIBPYTHON=wrong_value
+  - PYENV_VERSION=3.5.3 LIBPYTHON=/opt/python/3.5.3/lib/libpython3.5m.so
 
 addons:
   apt:
@@ -33,8 +33,8 @@ before_script:
   - echo === python investigator.py ===
   - python lib/pycall/python/investigator.py
   - python3 lib/pycall/python/investigator.py
-  - pip install numpy
-  - pip3 install numpy
+  - travis_retry pip install --user numpy
+  - PYENV_VERSION=3.5.3 travis_retry pip3 install --user numpy
 
 matrix:
   allow_failures:

data/CHANGES.md

@@ -1,5 +1,10 @@
 # The change history of PyCall
 
+## 1.0.2
+
+* Fix the bug that a large Python string is broken when it converted to Ruby string
+  https://github.com/mrkn/pycall.rb/issues/32
+
 ## 1.0.1
 
 * Add PyTypeObject#===.

data/README.md

@@ -1,7 +1,7 @@
 # PyCall: Calling Python functions from the Ruby language
 
-[![Build Status](https://travis-ci.org/mrkn/pycall.svg?branch=master)](https://travis-ci.org/mrkn/pycall)
-[![Build status](https://ci.appveyor.com/api/projects/status/071is0f4iu0vy8lp/branch/master?svg=true)](https://ci.appveyor.com/project/mrkn/pycall/branch/master)
+[![Build Status](https://travis-ci.org/mrkn/pycall.rb.svg?branch=1.0)](https://travis-ci.org/mrkn/pycall.rb)
+[![Build status](https://ci.appveyor.com/api/projects/status/naw56ldru71w7qsw/branch/1.0?svg=true)](https://ci.appveyor.com/project/mrkn/pycall-rb/branch/1.0)
 
 This library provides the features to directly call and partially interoperate
 with Python from the Ruby language.  You can import arbitrary Python modules
@@ -77,7 +77,7 @@ version, push git commits and tags, and push the `.gem` file to
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at
-https://github.com/mrkn/pycall.
+https://github.com/mrkn/pycall.rb.
 
 
 ## Acknowledgement

data/ext/pycall/pycall.c

@@ -1,4 +1,5 @@
 #include "pycall_internal.h"
+#include <ruby/encoding.h>
 
 #include <stdarg.h>
 
@@ -1317,7 +1318,10 @@ pycall_pyobject_to_ruby(PyObject *pyobj)
   if (pyobj->ob_type == Py_API(PyLong_Type))
     return pycall_pylong_to_ruby(pyobj);
 
-  if (pyobj->ob_type == Py_API(PyUnicode_Type) || pyobj->ob_type == Py_API(PyString_Type))
+  if (pyobj->ob_type == Py_API(PyUnicode_Type))
+    return pycall_pyunicode_to_ruby(pyobj);
+
+  if (pyobj->ob_type == Py_API(PyString_Type))
     return pycall_pystring_to_ruby(pyobj);
 
   Py_API(Py_IncRef)(pyobj);
@@ -1469,24 +1473,46 @@ pycall_pystring_to_ruby(PyObject *pyobj)
 {
   char *str = NULL;
   Py_ssize_t len = 0;
-  int res = -1;
+  int res;
+
+  /* TODO: PyString_Check */
+  if (pyobj->ob_type != Py_API(PyString_Type)) {
+    return Qnil;
+  }
+
+  res = Py_API(PyString_AsStringAndSize)(pyobj, &str, &len);
+  if (res < 0) {
+    return Qnil;
+  }
+
+  return rb_enc_str_new(str, len, rb_enc_from_index(rb_ascii8bit_encindex()));
+}
+
+VALUE
+pycall_pyunicode_to_ruby(PyObject *pyobj)
+{
+  char *str = NULL;
+  Py_ssize_t len = 0;
+  int res;
 
   /* TODO: PyUnicode_Check */
-  if (pyobj->ob_type == Py_API(PyUnicode_Type)) {
-    pyobj = Py_API(PyUnicode_AsUTF8String)(pyobj);
-    res = Py_API(PyString_AsStringAndSize)(pyobj, &str, &len);
-    pycall_Py_DecRef(pyobj);
+  if (pyobj->ob_type != Py_API(PyUnicode_Type)) {
+    return Qnil;
   }
-  /* TODO: PyString_Check */
-  else if (pyobj->ob_type == Py_API(PyString_Type)) {
-    res = Py_API(PyString_AsStringAndSize)(pyobj, &str, &len);
+
+  pyobj = Py_API(PyUnicode_AsUTF8String)(pyobj);
+  if (!pyobj) {
+    Py_API(PyErr_Clear)();
+    return Qnil;
   }
 
+  res = Py_API(PyString_AsStringAndSize)(pyobj, &str, &len);
   if (res < 0) {
+    pycall_Py_DecRef(pyobj);
     return Qnil;
   }
 
-  return rb_str_new(str, len);
+  return rb_enc_str_new(str, len, rb_enc_from_index(rb_utf8_encindex()));
 }
 
 static VALUE

data/ext/pycall/pycall_internal.h

@@ -646,6 +646,7 @@ VALUE pycall_pyfloat_to_ruby(PyObject *);
 VALUE pycall_pyint_to_ruby(PyObject *);
 VALUE pycall_pylong_to_ruby(PyObject *);
 VALUE pycall_pystring_to_ruby(PyObject *);
+VALUE pycall_pyunicode_to_ruby(PyObject *);
 VALUE pycall_pyobject_to_a(PyObject *);
 
 VALUE pycall_conv_to_str(VALUE);

data/lib/pycall.rb

@@ -89,3 +89,5 @@ module PyCall
     end
   end
 end
+
+require 'pycall/iruby_helper' if defined? IRuby

data/lib/pycall/iruby_helper.rb

@@ -5,21 +5,19 @@ module PyCall
   module IRubyHelper
     private
 
-    def check_pyobject_respond_to_format_method(obj, method_name)
-      return false unless obj.kind_of? PyObject
-      return false unless PyCall.hasattr?(obj, method_name)
-      PyCall.getattr(obj, method_name).kind_of? PyCall::LibPython.PyMethod_Type
+    def check_python_object_respond_to_format_method(obj, method_name)
+      return false unless obj.kind_of? PyObjectWrapper
+      return false unless obj.respond_to? method_name
+      true
     end
 
-    def register_pyobject_formatter(format_name, mime, priority_value=0)
+    def register_python_object_formatter(format_name, mime, priority_value=0)
       method_name = :"_repr_#{format_name}_"
       match do |obj|
-        check_pyobject_respond_to_format_method(obj, method_name)
+        check_python_object_respond_to_format_method(obj, method_name)
       end
       priority priority_value
-      format mime do |obj|
-        PyCall.getattr(obj, method_name).()
-      end
+      format mime, &method_name
     end
   end
 end
@@ -27,14 +25,14 @@ end
 ::IRuby::Display::Registry.module_eval do
   extend PyCall::IRubyHelper
 
-  register_pyobject_formatter :html, 'text/html'
-  register_pyobject_formatter :markdown, 'text/markdown'
-  register_pyobject_formatter :svg, 'image/svg+xml'
-  register_pyobject_formatter :png, 'image/png'
-  register_pyobject_formatter :jpeg, 'image/jpeg'
-  register_pyobject_formatter :latex, 'text/latex'
-  register_pyobject_formatter :json, 'application/json'
-  register_pyobject_formatter :javascript, 'application/javascript'
-  register_pyobject_formatter :pdf, 'application/pdf'
-  register_pyobject_formatter :pretty, 'text/plain', -1000
+  register_python_object_formatter :html, 'text/html', 1
+  register_python_object_formatter :markdown, 'text/markdown', 1
+  register_python_object_formatter :svg, 'image/svg+xml', 1
+  register_python_object_formatter :png, 'image/png', 1
+  register_python_object_formatter :jpeg, 'image/jpeg', 1
+  register_python_object_formatter :latex, 'text/latex', 1
+  register_python_object_formatter :json, 'application/json', 1
+  register_python_object_formatter :javascript, 'application/javascript', 1
+  register_python_object_formatter :pdf, 'application/pdf', 1
+  register_python_object_formatter :pretty, 'text/plain', -1000
 end

data/lib/pycall/version.rb

@@ -1,3 +1,3 @@
 module PyCall
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pycall
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: x64-mingw32
 authors:
 - Kenta Murata
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-08 00:00:00.000000000 Z
+date: 2017-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler