qml 0.0.3 → 0.0.4

data/ext/qml/weakvaluereference.cpp

@@ -13,7 +13,7 @@ struct WeakValueReference::Data
 
     static VALUE finalize(VALUE args, VALUE data) {
         Q_UNUSED(args);
-        auto variant = wrapperRubyClass<Ext::AnyWrapper>().unwrap(data)->value();
+        auto variant = wrapperRubyClass<Ext_AnyWrapper>().unwrap(data)->value();
         auto sp = variant.value<std::shared_ptr<Data>>();
         sp->invalidiate();
         return Qnil;
@@ -33,7 +33,7 @@ WeakValueReference::WeakValueReference(RubyValue value) :
     d->mValue = value;
     static auto objspace = RubyModule::fromPath("ObjectSpace");
     protect([&] {
-        auto proc = rb_proc_new((VALUE (*)(...))&Data::finalize, Ext::AnyWrapper::create(QVariant::fromValue(d)));
+        auto proc = rb_proc_new((VALUE (*)(...))&Data::finalize, Ext_AnyWrapper::create(QVariant::fromValue(d)));
         VALUE args[] = { value };
         rb_funcall_with_block(objspace, RUBYQML_INTERN("define_finalizer"), 1, args, proc);
     });

data/lib/qml.rb

@@ -4,6 +4,7 @@ require 'qml/qml'
 require 'qml/geometry'
 require 'qml/reactive'
 
+require 'qml/init'
 require 'qml/meta_object'
 require 'qml/plugin_loader'
 require 'qml/component'
@@ -19,25 +20,3 @@ require 'qml/dispatchable'
 
 require 'qml/data'
 require 'qml/test_util'
-
-module QML
-
-  def initialized?
-    Kernel.initialized?
-  end
-
-  # Initializes ruby-qml.
-  # @param [Hash] opts
-  # @option opts [Boolean] :offscreen (false) set this to true to run application offscreen (without GUI)
-  def init(opts = {})
-    opts = {offscreen: false}.merge opts
-    fail AlreadyInitializedError, "ruby-qml already initialized" if initialized?
-    argv = [$PROGRAM_NAME]
-    argv += %w{-platform offscreen} if opts[:offscreen]
-    Kernel.init(argv)
-    application.events_processed.each do
-      Dispatcher.instance.run_tasks
-    end
-  end
-  module_function :initialized?, :init
-end

data/lib/qml/application.rb

@@ -23,17 +23,9 @@ module QML
       fail ApplicationError, "cannot create Application instance manually"
     end
 
-    # @!method events_processed
-    # This signal is emitted every time events are processed in the event loop.
-    # @return [Reactive::Signal]
-    signal :events_processed, []
-
     def initialize
       super()
       @extension = Plugins.core.createApplicationExtension(self)
-      @extension.events_processed.each do
-        events_processed.call
-      end
     end
 
     # @return [Engine] The engine of the application.

data/lib/qml/dispatcher.rb

@@ -10,12 +10,13 @@ module QML
     MAX_DURATION = 1/10.to_r
 
     def initialize
-      @tasks = []
       super
+      @tasks = []
     end
 
     def add_task(&task)
       synchronize do
+        Kernel.set_event_loop_hook_enabled_later true if @tasks.empty?
         @tasks << task
       end
     end
@@ -35,10 +36,18 @@ module QML
           task = @tasks.shift
           task.call
         end
+        Kernel.set_event_loop_hook_enabled_later false if @tasks.empty?
       end
     end
   end
 
+  on_init do
+    Kernel.event_loop_hook_timer.timeout.connect do
+      puts "======== run tasks"
+      Dispatcher.instance.run_tasks
+    end
+  end
+
   # Runs a block asynchronously within the event loop.
   #
   # QML UI is not thread-safe and can only be accessed from the main thread.

data/lib/qml/init.rb

@@ -0,0 +1,29 @@
+module QML
+
+  # @return [Boolean] whether {#init} is already called.
+  def initialized?
+    Kernel.initialized?
+  end
+
+  # Initializes ruby-qml.
+  # @param [Hash] opts
+  # @option opts [Boolean] :offscreen (false) set this to true to run application offscreen (without GUI)
+  def init(opts = {})
+    opts = {offscreen: false}.merge opts
+    fail AlreadyInitializedError, "ruby-qml already initialized" if initialized?
+    argv = [$PROGRAM_NAME]
+    argv += %w{-platform offscreen} if opts[:offscreen]
+    Kernel.init(argv)
+    @on_init.each(&:call)
+  end
+
+  @on_init = []
+
+  # Registers a block to be called just after {#init} is called.
+  # @yield
+  def on_init(&block)
+    @on_init << block
+  end
+
+  module_function :initialized?, :init, :on_init
+end

data/lib/qml/version.rb

@@ -1,3 +1,3 @@
 module QML
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/spec/qml/dispatchable_spec.rb

@@ -10,6 +10,7 @@ describe QML::Dispatchable do
     it 'queues a method call as a task to the dispatcher' do
       foo = DispatchableFoo.new
       foo.later.value = 'hoge'
+      QML.application.process_events # wait for event loop hook to be enabled
       expect(foo.value).to be_nil
       QML.application.process_events
       expect(foo.value).to eq 'hoge'

data/spec/qml/dispatcher_spec.rb

@@ -19,17 +19,40 @@ describe QML::Dispatcher do
     end
   end
 
+  describe '#add_task' do
+    before do
+      dispatcher.add_task {}
+    end
+
+    it 'adds a task' do
+      expect(dispatcher.empty?).to eq false
+    end
+
+    it 'sets the event loop hook enabled later' do
+      QML.application.process_events
+      expect(QML::Kernel.event_loop_hook_timer.active).to eq true
+    end
+  end
+
   describe '#run_tasks' do
-    it 'runs queued tasks' do
-      finished = []
+    let(:finished) { [] }
+    before do
       2.times.each do |i|
         dispatcher.add_task do
           finished[i] = true
         end
       end
       dispatcher.run_tasks until dispatcher.empty?
+    end
+
+    it 'runs queued tasks' do
       expect(finished).to eq [true, true]
     end
+
+    it 'sets the event loop hook disabled when finished later' do
+      QML.application.process_events
+      expect(QML::Kernel.event_loop_hook_timer.active).to eq false
+    end
   end
 end
 
@@ -40,6 +63,7 @@ describe QML do
       QML.later do
         finished = true
       end
+      QML.application.process_events # wait for event loop hook to be enabled
       expect(finished).to eq false
       QML.application.process_events
       expect(finished).to eq true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qml
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ryohei Ikegami
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-22 00:00:00.000000000 Z
+date: 2014-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -159,11 +159,9 @@ files:
 - ext/qml/accessclass.h
 - ext/qml/accessobject.cpp
 - ext/qml/accessobject.h
-- ext/qml/application.cpp
-- ext/qml/application.h
 - ext/qml/common.h
-- ext/qml/ext_accesssupport.cpp
-- ext/qml/ext_accesssupport.h
+- ext/qml/ext_accesswrapperfactory.cpp
+- ext/qml/ext_accesswrapperfactory.h
 - ext/qml/ext_anywrapper.cpp
 - ext/qml/ext_anywrapper.h
 - ext/qml/ext_kernel.cpp
@@ -185,6 +183,8 @@ files:
 - ext/qml/foreignobject.h
 - ext/qml/functioninfo.h
 - ext/qml/init.cpp
+- ext/qml/kernel.cpp
+- ext/qml/kernel.h
 - ext/qml/listmodel.cpp
 - ext/qml/listmodel.h
 - ext/qml/markable.h
@@ -255,6 +255,7 @@ files:
 - lib/qml/geometry/rectangle.rb
 - lib/qml/geometry/size.rb
 - lib/qml/image_provider.rb
+- lib/qml/init.rb
 - lib/qml/meta_object.rb
 - lib/qml/models.rb
 - lib/qml/name_helper.rb

data/ext/qml/application.cpp

@@ -1,54 +0,0 @@
-#include "application.h"
-#include "util.h"
-
-namespace RubyQml {
-namespace Application {
-
-namespace {
-
-int argc;
-QList<QByteArray> argData;
-char **argv;
-
-QApplication *application_;
-QQmlEngine *engine_;
-
-}
-
-void failIfUninitialized()
-{
-    if (!initialized()) {
-        fail("QML::UninitializedError", "ruby-qml not yet initialized");
-    }
-}
-
-QApplication *application()
-{
-    failIfUninitialized();
-    return application_;
-}
-
-QQmlEngine *engine()
-{
-    failIfUninitialized();
-    return engine_;
-}
-
-bool initialized()
-{
-    return application_;
-}
-
-void init(const QList<QByteArray> &args)
-{
-    argc = args.size();
-    argData = args;
-    argv = new char*[argc];
-    std::transform(argData.begin(), argData.end(), argv, [](QByteArray &ba) { return ba.data(); });
-
-    application_ = new QApplication(argc, argv);
-    engine_ = new QQmlEngine();
-}
-
-}
-} // namespace RubyQml

data/ext/qml/application.h

@@ -1,17 +0,0 @@
-#pragma once
-
-#include <QList>
-#include <QApplication>
-#include <QQmlEngine>
-
-namespace RubyQml {
-namespace Application {
-
-QApplication *application();
-QQmlEngine *engine();
-bool initialized();
-
-void init(const QList<QByteArray> &args);
-
-}
-} // namespace RubyQml