qml 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 281f3641f4c5a3441c260dd874168fe99e6ce991
-  data.tar.gz: 46b5c43d00a8a73d1553b327910581fe4569d147
+  metadata.gz: 88ec8d13931b6285ad6961a33b0fb5dd0e30582b
+  data.tar.gz: da96d985867d7ef034edcb60174cb4f64410783f
 SHA512:
-  metadata.gz: 77c9acdfec3b5689b21425bcdfe4a5a11c2b27e615388faf520dc5c134cde441cfa1700b14f231d59a1a56d3dcc84f8c809b5400d1a4dbc6d5ffc3e8a52ab22b
-  data.tar.gz: 83496cea61eb036a083457ee84d7be63b7b7b46d4c8968384eff708ad062b2cc1c5171716bec20c4ec9378a6e93f0d450491bd26835fe9e40ab0d04db94c0663
+  metadata.gz: 07886e4fd25d9f242bf9fd8e8eca6e4ed8a3bb7886fdac811b16d9ca0b699cc8269899fe2299e4fcb6d5ad51456e7749831cde2437f70cd4453bc971ee0cd488
+  data.tar.gz: bde9ec75fa9b85c9e54d319f686a3d98a54ae6fd23af31f94e0bda49192903f818b04b0c47df34cc4b52621332dc4c54ce19a343563fdcdcec1e12a5a1b366e9

data/README.md

@@ -46,9 +46,9 @@ Both libffi and Qt5 are keg-only in Homebrew, so you must specify their paths ex
 If you use [official Qt installation](http://qt-project.org/downloads), for example:
 
     $ brew install pkg-config libffi
-    $ gem install qml -- --with-libffi-dir=$(brew --prefix libffi) --with-qt-dir=~/Qt/5.3/clang_64
+    $ gem install qml -- --with-libffi-dir=$(brew --prefix libffi) --with-qt-dir=$HOME/Qt/5.3/clang_64
 
-The Qt installation path (`~/Qt/5.3/clang_64` in this example) depends on your Qt installation configuration and Qt version.
+The Qt installation path (`$HOME/Qt/5.3/clang_64` in this example) depends on your Qt installation configuration and Qt version.
 
 ### General (OSX and Linux)
 
@@ -87,7 +87,7 @@ The following code loads a QML file and shows an application window titled "Hell
 ```ruby
 require 'qml'
 
-QML.application do |app|
+QML.run do |app|
   app.load_path Pathname(__FILE__) + '../main.qml'
 end
 ```
@@ -215,7 +215,7 @@ class Foo
   end
 end
 
-QML.application do |app|
+QML.run do |app|
   app.context[:foo] = Foo.new
   app.load_path Pathname(__FILE__) + '../main.qml'
 end
@@ -434,6 +434,59 @@ obj = plugin.create_object
 obj.prefer_managed false
 ```
 
+### Use with EventMachine
+
+You can use [EventMachine](https://github.com/eventmachine/eventmachine) with ruby-qml.
+It is more powerful than the default ruby-qml event loop.
+
+Instead of using `QML.run`, start an EventMachine event loop by `EM.run` and
+process QML events periodically by `QML::Application#process_events`.
+
+```ruby
+require 'qml'
+require 'eventmachine'
+
+EM.run do
+  QML.init
+  EM.add_periodic_timer(0.01) { QML.application.process_events }
+  QML.application.load_path(Pathname.pwd + 'main.qml')
+end
+```
+
+You can also use [em-synchrony](https://github.com/igrigorik/em-synchrony) to
+write callback-free asynchronous operation for ruby-qml.
+
+```
+require 'qml'
+require 'eventmachine'
+require 'em-synchrony'
+require 'em-http-request'
+
+class Controller
+  include QML::Access
+  property :result, ''
+
+  def get
+    EM.synchrony do
+      content = EM::Synchrony.sync EM::HttpRequest.new('http://www.example.com/').get
+      self.result = content.response
+    end
+  end
+
+  def quit
+    EM.stop
+  end
+
+  register_to_qml under: 'Example', version: '0.1'
+end
+
+EM.run do
+  QML.init
+  EM.add_periodic_timer(0.01) { QML.application.process_events }
+  QML.application.load_path(Pathname.pwd + 'main.qml')
+end
+```
+
 ## Contributing
 
 Contributions are welcome. When you are contributing to ruby-qml:

data/changes.md

@@ -1,3 +1,11 @@
+## 0.0.6 (2014-08-19)
+
+* Fix problems when using Fiber with ruby-qml
+
+* Rename block-receiving `QML.application` to `QML.run`
+
+  * `QML.application` without block is still the same name
+
 ## 0.0.5 (2014-07-31)
 
 * Support official Qt installation on Mac

data/examples/fizzbuzz/fizzbuzz.rb

@@ -38,6 +38,6 @@ module Examples
   end
 end
 
-QML.application do |app|
+QML.run do |app|
   app.load_path Pathname(__FILE__) + '../main.qml'
 end

data/examples/imageprovider/imageprovider.rb

@@ -51,7 +51,7 @@ module Examples
   end
 end
 
-QML.application do |app|
+QML.run do |app|
   app.engine.add_image_provider 'example', Examples::ImageProvider::Provider.new
   app.load_path Pathname(__FILE__) + '../main.qml'
 end

data/examples/todo_array/todo_array.rb

@@ -28,6 +28,6 @@ module Examples
   end
 end
 
-QML.application do |app|
+QML.run do |app|
   app.load_path Pathname(__FILE__) + '../main.qml'
 end

data/examples/todo_sequel/todo_sequel.rb

@@ -61,6 +61,6 @@ module Examples
   end
 end
 
-QML.application do |app|
+QML.run do |app|
   app.load_path Pathname(__FILE__) + '../main.qml'
 end

data/examples/twitter/twitter.rb

@@ -72,6 +72,6 @@ module Examples
   end
 end
 
-QML.application do |app|
+QML.run do |app|
   app.load_path Pathname(__FILE__) + '../main.qml'
 end

data/ext/qml/accessclass.cpp

@@ -8,11 +8,9 @@ namespace RubyQml {
 AccessClass::AccessClass(RubyValue className, RubyValue methodInfos, RubyValue signalInfos, RubyValue propertyInfos)
 {
     setClassName(className.to<QByteArray>());
-    protect([&] {
-        rb_check_array_type(methodInfos);
-        rb_check_array_type(signalInfos);
-        rb_check_array_type(propertyInfos);
-    });
+    rb_check_array_type(methodInfos);
+    rb_check_array_type(signalInfos);
+    rb_check_array_type(propertyInfos);
     for (int i = 0; i < RARRAY_LEN(VALUE(methodInfos)); ++i) {
         RubyValue info = RARRAY_AREF(VALUE(methodInfos), i);
         auto nameSym = info.send("name");
@@ -46,10 +44,8 @@ QVariant AccessClass::callMethod(ForeignObject *obj, size_t id, const QVariantLi
         std::vector<VALUE> values(args.size());
         std::transform(args.begin(), args.end(), values.begin(), &RubyValue::from<QVariant>);
         RubyValue retValue;
-        protect([&] {
-            rescueNotify([&] {
-                retValue = rb_funcall2(self, id, values.size(), values.data());
-            });
+        rescueNotify([&] {
+            retValue = rb_funcall2(self, id, values.size(), values.data());
         });
         ret = retValue.to<QVariant>();
     });

data/ext/qml/conversionerror.h

@@ -0,0 +1,14 @@
+#pragma once
+
+#include <stdexcept>
+#include <QString>
+
+namespace RubyQml {
+
+class ConversionError : public std::runtime_error
+{
+public:
+    ConversionError(const QString &str) : std::runtime_error(str.toStdString()) {}
+};
+
+}

data/ext/qml/ext_metaobject.cpp

@@ -18,13 +18,11 @@ namespace {
 
 RubyValue idListToArray(const QList<ID> &xs)
 {
-    return protect([&] {
-        auto ary = rb_ary_new();
-        for (ID id : xs) {
-            rb_ary_push(ary, ID2SYM(id));
-        }
-        return ary;
-    });
+    auto ary = rb_ary_new();
+    for (ID id : xs) {
+        rb_ary_push(ary, ID2SYM(id));
+    }
+    return ary;
 }
 
 }
@@ -148,9 +146,8 @@ RubyValue Ext_MetaObject::invokeMethod(RubyValue object, RubyValue methodName, R
 
     auto methodIndexes = findMethods(methodName);
 
-    protect([&] {
-        args = rb_check_array_type(args);
-    });
+    args = rb_check_array_type(args);
+
     auto obj = wrapperRubyClass<Ext_Pointer>().unwrap(object)->fetchQObject();
     for (int i : methodIndexes) {
         MethodInvoker invoker(args, mMetaObject->method(i));
@@ -158,17 +155,17 @@ RubyValue Ext_MetaObject::invokeMethod(RubyValue object, RubyValue methodName, R
             return invoker.invoke(obj);
         }
     }
-    protect([&] {
-        auto to_class = rb_funcall(ID2SYM(rb_intern("class")), rb_intern("to_proc"), 0);
-        auto classes = rb_funcall_with_block(args, rb_intern("map"), 0, nullptr, to_class);
-        auto classes_str = rb_funcall(classes, rb_intern("to_s"), 0);
 
-        rb_raise(rb_path2class("QML::MethodError"),
-                 "method mismatch (%s with params %s in %s)",
-                 mMetaObject->method(methodIndexes.first()).name().data(),
-                 StringValueCStr(classes_str),
-                 mMetaObject->className());
-    });
+    auto to_class = rb_funcall(ID2SYM(rb_intern("class")), rb_intern("to_proc"), 0);
+    auto classes = rb_funcall_with_block(args, rb_intern("map"), 0, nullptr, to_class);
+    auto classes_str = rb_funcall(classes, rb_intern("to_s"), 0);
+
+    rb_raise(rb_path2class("QML::MethodError"),
+             "method mismatch (%s with params %s in %s)",
+             mMetaObject->method(methodIndexes.first()).name().data(),
+             StringValueCStr(classes_str),
+             mMetaObject->className());
+
     return Qnil;
 }
 
@@ -190,11 +187,9 @@ RubyValue Ext_MetaObject::connectSignal(RubyValue object, RubyValue signalName,
         new SignalForwarder(obj, method, proc);
         return Qnil;
     }
-    protect([&] {
-        rb_raise(rb_path2class("QML::MethodError"),
-                 "signal not found (%s in %s)",
-                 rb_id2name(id), mMetaObject->className());
-    });
+    rb_raise(rb_path2class("QML::MethodError"),
+             "signal not found (%s in %s)",
+             rb_id2name(id), mMetaObject->className());
     return Qnil;
 }
 
@@ -223,11 +218,9 @@ RubyValue Ext_MetaObject::setProperty(RubyValue object, RubyValue name, RubyValu
 
     auto metaProperty = mMetaObject->property(findProperty(name));
     if (!newValue.isConvertibleTo(metaProperty.userType())) {
-        protect([&] {
-            rb_raise(rb_path2class("QML::PropertyError"),
-                     "type mismatch (%s for %s)",
-                     rb_obj_classname(newValue), metaProperty.typeName());
-        });
+        rb_raise(rb_path2class("QML::PropertyError"),
+                 "type mismatch (%s for %s)",
+                 rb_obj_classname(newValue), metaProperty.typeName());
     }
 
     auto qobj = wrapperRubyClass<Ext_Pointer>().unwrap(object)->fetchQObject();
@@ -264,12 +257,10 @@ QList<int> Ext_MetaObject::findMethods(RubyValue name) const
     auto id = name.toID();
     auto methodIndexes = mMethodHash.values(id);
     if (methodIndexes.size() == 0) {
-        protect([&] {
-            rb_raise(rb_path2class("QML::MethodError"),
-                     "method not found (%s in %s)",
-                     rb_id2name(id),
-                     mMetaObject->className());
-        });
+        rb_raise(rb_path2class("QML::MethodError"),
+                 "method not found (%s in %s)",
+                 rb_id2name(id),
+                 mMetaObject->className());
     }
     return methodIndexes;
 }
@@ -278,11 +269,9 @@ int Ext_MetaObject::findProperty(RubyValue name) const
 {
     auto id = name.toID();
     if (!mPropertyHash.contains(id)) {
-        protect([&] {
-            rb_raise(rb_path2class("QML::PropertyError"),
-                     "property not found (%s in %s)",
-                     rb_id2name(id), mMetaObject->className());
-        });
+        rb_raise(rb_path2class("QML::PropertyError"),
+                 "property not found (%s in %s)",
+                 rb_id2name(id), mMetaObject->className());
     }
     return mPropertyHash[id];
 }

data/ext/qml/init.cpp

@@ -48,7 +48,7 @@ void cleanup()
 
 void setupEndProc()
 {
-    rb_set_end_proc([](VALUE) { unprotect(cleanup); }, Qnil);
+    rb_set_end_proc([](VALUE) { cleanup(); }, Qnil);
 }
 
 }
@@ -60,10 +60,8 @@ void Init_qml()
     rb_require("qml/errors");
     rb_require("qml/error_converter");
 
-    unprotect([&] {
-        defineMetaTypes();
-        defineClasses();
-        setupGlobalGCMarking();
-        setupEndProc();
-    });
+    defineMetaTypes();
+    defineClasses();
+    setupGlobalGCMarking();
+    setupEndProc();
 }

data/ext/qml/rubyclass.cpp

@@ -15,16 +15,12 @@ RubyModule::RubyModule(RubyValue moduleValue) :
 
 RubyModule::RubyModule(const char *name)
 {
-    protect([&] {
-        mValue = rb_define_module(name);
-    });
+    mValue = rb_define_module(name);
 }
 
 RubyModule::RubyModule(const RubyModule &under, const char *name)
 {
-    protect([&] {
-        mValue = rb_define_module_under(under.toValue(), name);
-    });
+    mValue = rb_define_module_under(under.toValue(), name);
 }
 
 RubyModule &RubyModule::operator=(const RubyModule &other)
@@ -36,23 +32,17 @@ RubyModule &RubyModule::operator=(const RubyModule &other)
 
 RubyModule RubyModule::fromPath(const char *path)
 {
-    RubyValue ret;
-    protect([&] {
-        ret = rb_path2class(path);
-    });
-    return ret;
+    return rb_path2class(path);
 }
 
 void RubyModule::aliasMethod(const char *newName, const char *originalName)
 {
-    protect([&] {
-        rb_alias(mValue, rb_intern(newName), rb_intern(originalName));
-    });
+    rb_alias(mValue, rb_intern(newName), rb_intern(originalName));
 }
 
 void RubyModule::checkType()
 {
-    if (!protect([&] { return rb_obj_is_kind_of(mValue, rb_cModule); })) {
+    if (!mValue.isKindOf(rb_cModule)) {
         throw std::logic_error("expected Module value");
     }
 }
@@ -67,9 +57,7 @@ namespace {
 
 RubyValue defineClass(const RubyModule &under, const char *name)
 {
-    return protect([&] {
-        return rb_define_class_under(under.toValue(), name, rb_cObject);
-    });
+    return rb_define_class_under(under.toValue(), name, rb_cObject);
 }
 
 }

data/ext/qml/rubyclass.h

@@ -30,26 +30,24 @@ public:
         auto func = (VALUE (*)(...))wrapper::apply;
         auto argc = wrapper::argc - 1;
 
-        protect([&] {
-            switch (type) {
-            case MethodType::InstanceMethod:
-                switch (access) {
-                case MethodAccess::Public:
-                    rb_define_method(mValue , name, func, argc);
-                    break;
-                case MethodAccess::Protected:
-                    rb_define_protected_method(mValue, name, func, argc);
-                    break;
-                case MethodAccess::Private:
-                    rb_define_private_method(mValue, name, func, argc);
-                    break;
-                }
+        switch (type) {
+        case MethodType::InstanceMethod:
+            switch (access) {
+            case MethodAccess::Public:
+                rb_define_method(mValue , name, func, argc);
                 break;
-            case MethodType::ModuleFunction:
-                rb_define_module_function(mValue, name, func, argc);
+            case MethodAccess::Protected:
+                rb_define_protected_method(mValue, name, func, argc);
+                break;
+            case MethodAccess::Private:
+                rb_define_private_method(mValue, name, func, argc);
                 break;
             }
-        });
+            break;
+        case MethodType::ModuleFunction:
+            rb_define_module_function(mValue, name, func, argc);
+            break;
+        }
     }
 
     template <typename T>
@@ -92,7 +90,7 @@ private:
             RubyValue ret;
             // use tuple to avoid gcc 4.8's bug (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=55914)
             auto tuple = std::make_tuple(args...);
-            unprotect([&] {
+            convertCppErrors([&] {
                 ret = applyWithTuple(function, tuple);
             });
             return ret;
@@ -133,19 +131,17 @@ public:
         }
         mInstance.reset(new WrapperRubyClass(*this));
 
-        protect([&] {
-            rb_define_alloc_func(toValue(), &alloc);
-        });
+        rb_define_alloc_func(toValue(), &alloc);
     }
 
     T *unwrap(RubyValue value)
     {
         auto klass = this->toValue();
-        protect([&] {
-            if (!RTEST(rb_obj_is_kind_of(value, klass))) {
-                rb_raise(rb_eTypeError, "expected %s, got %s", rb_class2name(klass), rb_obj_classname(value));
-            }
-        });
+
+        if (!RTEST(rb_obj_is_kind_of(value, klass))) {
+            rb_raise(rb_eTypeError, "expected %s, got %s", rb_class2name(klass), rb_obj_classname(value));
+        }
+
         T *ptr;
         Data_Get_Struct(VALUE(value), T, ptr);
         return ptr;