qml 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab6994a5395ab183bdec0c003033822ea4b2ef99
-  data.tar.gz: dbd518f8f5dc09bd4441b82e518c8e086c89e7d3
+  metadata.gz: aeac6eba39f94bf9bd1fdad9ce8d143962b2f0d9
+  data.tar.gz: a213b3aa19785890dce3884961861141c35d1776
 SHA512:
-  metadata.gz: dbaf73bddc72313761f9b2520edc82e2a309cb8e75fc12d8504d396460045773448cd81e060107d3c8935b566996eb6aff1a8a27cf2352fad71e6aac75e12dad
-  data.tar.gz: c36f4bb9facdfa0b85998d12983314d0ab37acfd2a7a4f36b763d45eccdfc44d4a0b9802d5b6e318bacc0037d5daca6070655abe8a2260a5c242292ce1295e57
+  metadata.gz: 1f6242e2dd5f1d9579512235554ea4675dcff7b381e34d3aaecc0e8bf89c627c8bb85defddee8543420ad13109059a57d069a16347971a0bc504317998a01fac
+  data.tar.gz: 2f0a517c2381f2461cf4404acb15d6f123a200f307e9656518c4ea698a306294eca0a8d8fcd02dedaddf6a8386c82dd7f6d6cf38cdfe1e1cea7caeec5b7d52c9

data/README.md

@@ -30,7 +30,7 @@ It provides bindings between QML and Ruby and enables you to use Qt Quick-based
 
 * **Ruby 2.1 or later**
 * **OS X or Linux**
-* Qt 5.2 or later
+* Qt 5.4 or later
 
 ### OS X with Homebrew
 

data/changes.md

@@ -1,3 +1,7 @@
+## 1.0.2 (2015-07-11)
+
+* Fixes error when calling `next_tick` from Ruby threads (#24)
+
 ## 1.0.1 (2015-06-20)
 
 * Fixes 100% CPU usage (#21)

data/ext/qml/lib/libqmlbind/qmlbind/src/api_application.cpp

@@ -5,6 +5,7 @@
 #include <QSharedPointer>
 #include <QTimer>
 #include <QVector>
+#include <functional>
 
 using namespace QmlBind;
 
@@ -40,6 +41,44 @@ private:
     QVector<char *> mArgv;
 };
 
+class NextTickProcessor : public QObject
+{
+public:
+    class Event : public QEvent
+    {
+    public:
+        enum Type {
+            Type = QEvent::User
+        };
+
+        Event(const std::function<void ()> func) : QEvent((QEvent::Type)Type),
+            mFunc(func)
+        {
+        }
+
+        void call() const
+        {
+            mFunc();
+        }
+
+    private:
+        std::function<void ()> mFunc;
+    };
+
+    bool event(QEvent *event) Q_DECL_OVERRIDE
+    {
+        if (event->type() == Event::User) {
+            static_cast<Event *>(event)->call();
+            return true;
+        }
+        else {
+            return QObject::event(event);
+        }
+    }
+};
+
+static auto nextTickProcessor = new NextTickProcessor();
+
 }
 
 extern "C" {
@@ -70,9 +109,9 @@ void qmlbind_process_events()
 
 void qmlbind_next_tick(void (*callback)(void *), void *data)
 {
-    QTimer::singleShot(0, QCoreApplication::instance(), [=] {
+    QCoreApplication::postEvent(nextTickProcessor, new NextTickProcessor::Event([=] {
         callback(data);
-    });
+    }));
 }
 
 }

data/ext/qml/qml.c

@@ -68,11 +68,17 @@ static VALUE qml_engine(VALUE module) {
     return rbqml_engine;
 }
 
-static void nextTickCallback(void *data)
+static void *nextTickCallbackImpl(void *data)
 {
     VALUE block = (VALUE)data;
     rb_proc_call(block, rb_ary_new());
     rb_hash_delete(rbqml_referenced_objects, block);
+    return NULL;
+}
+
+static void nextTickCallback(void *data)
+{
+    rb_thread_call_with_gvl(nextTickCallbackImpl, data);
 }
 
 static VALUE qml_next_tick(int argc, VALUE *argv, VALUE module) {

data/lib/qml/version.rb

@@ -1,3 +1,3 @@
 module QML
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qml
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Ryohei Ikegami
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-20 00:00:00.000000000 Z
+date: 2015-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler