qml 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88ec8d13931b6285ad6961a33b0fb5dd0e30582b
-  data.tar.gz: da96d985867d7ef034edcb60174cb4f64410783f
+  metadata.gz: 481b84b8d826ec6fd5a2f307d8edfe4f33ad3d8f
+  data.tar.gz: d4394d24401e9b9c4d244b240670d46ec063d28c
 SHA512:
-  metadata.gz: 07886e4fd25d9f242bf9fd8e8eca6e4ed8a3bb7886fdac811b16d9ca0b699cc8269899fe2299e4fcb6d5ad51456e7749831cde2437f70cd4453bc971ee0cd488
-  data.tar.gz: bde9ec75fa9b85c9e54d319f686a3d98a54ae6fd23af31f94e0bda49192903f818b04b0c47df34cc4b52621332dc4c54ce19a343563fdcdcec1e12a5a1b366e9
+  metadata.gz: 0b0219afde5a224d1018d1561571f5667da11aa4716f37720a3d85df8addbd52de3687924ff2c7fa3c508b7cb60e2f000928f600da3f8e983a72463436e99ed8
+  data.tar.gz: eec31c2af2ca479301637ea4b87cf6dd29e0968a80d2b2278e5dc6078a86e641e8d2f7e7ce68c4febbf24114a31a138b9470bef2a3469d2994c074138e51f606

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 rvm:
+  - 2.2.0-rc1
   - 2.1.2
   - 2.0.0
   - 1.9.3

data/README.md

@@ -456,7 +456,7 @@ end
 You can also use [em-synchrony](https://github.com/igrigorik/em-synchrony) to
 write callback-free asynchronous operation for ruby-qml.
 
-```
+```ruby
 require 'qml'
 require 'eventmachine'
 require 'em-synchrony'
@@ -489,11 +489,42 @@ end
 
 ## Contributing
 
-Contributions are welcome. When you are contributing to ruby-qml:
+### Install dependencies
+
+```
+$ bundle install
+```
+
+### Build native extension
+
+Before running ruby-qml in development, the native extension of ruby-qml needs to have been built.
+To build it, run the following commands:
+
+```
+$ cd ext/qml
+$ bundle exec ruby extconf.rb --with-qt-dir=/path/to/qt --with-libffi-dir=/path/to/libffi
+$ make -j4
+```
+
+### Run tests
+
+Tests for ruby-qml is written in RSpec. To run tests, do:
+
+```
+$ bundle exec rspec
+```
+
+### Run examples
+
+```
+$ bundle exec ruby examples/fizzbuzz/fizzbuzz.rb
+```
+
+### Send pull requests
 
 1. Fork it ( http://github.com/seanchas116/ruby-qml/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Write some tests if possible
+4. Write some tests
 5. Push to the branch (`git push origin my-new-feature`)
 6. Create new Pull Request

data/changes.md

@@ -1,3 +1,8 @@
+## 0.0.7 (2014-12-25)
+
+* Support Ruby 2.2 (rc1) and Qt 5.4
+* Add `Engine#add_import_path` and `Engine#import_paths` by @tokoro10g
+
 ## 0.0.6 (2014-08-19)
 
 * Fix problems when using Fiber with ruby-qml
@@ -21,7 +26,7 @@
 ## 0.0.2 (2014-07-21)
 
 * Improve list models
-  
+
   * Add ArrayModel#replace
   * Add QueryModel for ORMs
   * Specify column names in ListModel#initialize

data/ext/qml/extconf.rb

@@ -91,7 +91,10 @@ class Configurator
     end
     $CPPFLAGS += " -DHAVE_RUBY_THREAD_H" if have_header('ruby/thread.h')
 
-    $CPPFLAGS += " -std=c++11 -Wall -Wextra -pipe"
+    have_func('rb_rational_num')
+    have_func('rb_rational_den')
+
+    $CPPFLAGS += " -std=c++11 -Wall -Wextra -pipe -Wno-reserved-user-defined-literal"
     if @debug_enabled
       $CPPFLAGS += " -O0 -ggdb3"
     else

data/ext/qml/plugins/core/engineextension.cpp

@@ -1,6 +1,7 @@
 #include "engineextension.h"
 #include "imageprovider.h"
 #include <QQmlEngine>
+#include <QStringList>
 
 namespace RubyQml {
 
@@ -19,6 +20,21 @@ void EngineExtension::addImageProvider(const QString &id, ImageProvider *provide
     mEngine->addImageProvider(id, provider);
 }
 
+void EngineExtension::addImportPath(const QString &path)
+{
+    mEngine->addImportPath(path);
+}
+
+QVariantList EngineExtension::importPaths() const
+{
+    QStringList pathList = mEngine->importPathList();
+    QVariantList varList;
+    for(auto path : pathList){
+        varList << path;
+    }
+    return varList;
+}
+
 void EngineExtension::collectGarbage()
 {
     mEngine->collectGarbage();

data/ext/qml/plugins/core/engineextension.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <QObject>
+#include <QVariantList>
 
 class QQmlEngine;
 class QQmlContext;
@@ -19,6 +20,8 @@ public:
 
 public slots:
     void addImageProvider(const QString &id, RubyQml::ImageProvider *provider);
+    void addImportPath(const QString &path);
+    QVariantList importPaths() const;
     void collectGarbage();
 
 private:

data/ext/qml/rubyvalue.cpp

@@ -7,6 +7,7 @@
 #include "accessobject.h"
 #include "listmodel.h"
 #include "ext_accesswrapperfactory.h"
+#include "kernel.h"
 #include <ruby/intern.h>
 #define ONIG_ESCAPE_UCHAR_COLLISION
 #include <ruby/encoding.h>
@@ -14,6 +15,25 @@
 #include <QDateTime>
 #include <QRect>
 #include <QSet>
+#include <QJSValue>
+
+#ifndef HAVE_RB_RATIONAL_NUM
+
+VALUE rb_rational_num(VALUE rat)
+{
+  return RRATIONAL(rat)->num;
+}
+
+#endif
+
+#ifndef HAVE_RB_RATIONAL_DEN
+
+VALUE rb_rational_den(VALUE rat)
+{
+  return RRATIONAL(rat)->den;
+}
+
+#endif
 
 namespace RubyQml {
 
@@ -71,6 +91,8 @@ struct ConverterHash
         add<QRect>();
         add<QRectF>();
 
+        add<QJSValue>();
+
         add<QObject *>();
         add<const QMetaObject *>();
 
@@ -148,7 +170,7 @@ template <> QDateTime Conversion<QDateTime>::from(RubyValue time)
         offset = time.send(RUBYQML_INTERN("gmt_offset")).to<int>();
     } else { // DateTime
         VALUE dayOffset = time.send(RUBYQML_INTERN("offset"));
-        offset = RubyValue(RRATIONAL(dayOffset)->num).to<int>() * 24 * 60 * 60 / RubyValue(RRATIONAL(dayOffset)->den).to<int>();
+        offset = RubyValue(rb_rational_num(dayOffset)).to<int>() * 24 * 60 * 60 / RubyValue(rb_rational_den(dayOffset)).to<int>();
         time = time.send(RUBYQML_INTERN("to_time"));
     }
     timeval at = rb_time_timeval(time);
@@ -292,6 +314,16 @@ template <> RubyValue Conversion<const QMetaObject *>::to(const QMetaObject *met
     return Ext_MetaObject::fromMetaObject(metaobj);
 }
 
+template <> QJSValue Conversion<QJSValue>::from(RubyValue x)
+{
+    return Kernel::instance()->engine()->toScriptValue(x.to<QVariant>());
+}
+
+template <> RubyValue Conversion<QJSValue>::to(const QJSValue &jsValue)
+{
+    return RubyValue::from(jsValue.toVariant());
+}
+
 } // namespace detail
 
 Q_GLOBAL_STATIC(QSet<int>, enumeratorMetaTypes)

data/ext/qml/rubyvalue.h

@@ -4,6 +4,7 @@
 #include <array>
 
 class QVariant;
+class QJSValue;
 
 namespace RubyQml {
 

data/lib/qml/engine.rb

@@ -43,6 +43,21 @@ module QML
       @extension.add_image_provider(id, provider.qt_image_provider)
       provider
     end
+
+    # Adds a QML import path to the {Engine}.
+    # @param path [String]
+    # @see http://doc.qt.io/qt-5/qtqml-syntax-imports.html#qml-import-path
+    def add_import_path(path)
+      @extension.add_import_path(path)
+    end
+
+    # Gets an array of QML import paths.
+    # @see add_import_path
+    # @return [Array]
+    def import_paths()
+      @extension.import_paths()
+    end
+
   end
 
   # @return [Engine] the instance of {Engine}.

data/lib/qml/version.rb

@@ -1,3 +1,3 @@
 module QML
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

data/spec/assets/testmodule/qmldir

@@ -0,0 +1,2 @@
+module testmodule
+Test 1.0 test.qml

data/spec/assets/testmodule/test.qml

@@ -0,0 +1,5 @@
+import QtQuick 2.0
+
+QtObject {
+  property string name: 'poyo'
+}

data/spec/qml/dispatchable_spec.rb

@@ -11,7 +11,6 @@ describe QML::Dispatchable 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'
     end

data/spec/qml/dispatcher_spec.rb

@@ -64,7 +64,6 @@ describe QML 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
     end

data/spec/qml/engine_spec.rb

@@ -6,6 +6,37 @@ describe QML::Engine do
       expect { QML::Engine.new }.to raise_error(QML::EngineError)
     end
   end
+
+  describe '#import_paths' do
+    it 'returns array' do
+      expect(QML.engine.import_paths()).to be_a(Array)
+    end
+  end
+
+  describe '#add_import_path' do
+    context 'with test module' do
+      let(:path) { (QML::ROOT_PATH + 'spec/assets').to_s }
+
+      it 'adds QML import path' do
+        QML.engine.add_import_path(path)
+        paths = QML.engine.import_paths()
+        expect(paths[0]).to eq path
+      end
+
+      let(:data) do
+        <<-EOS
+          import QtQuick 2.0
+          import testmodule 1.0
+          Test {}
+        EOS
+      end
+      let(:component) { QML::Component.new data: data }
+
+      it 'loads a module' do
+        expect(component.create.name).to eq 'poyo'
+      end
+    end
+  end
 end
 
 describe QML do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qml
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Ryohei Ikegami
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-19 00:00:00.000000000 Z
+date: 2014-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -289,6 +289,8 @@ files:
 - lib/qml/wrappable.rb
 - qml.gemspec
 - spec/assets/test.png
+- spec/assets/testmodule/qmldir
+- spec/assets/testmodule/test.qml
 - spec/assets/testobj.qml
 - spec/qml/access_spec.rb
 - spec/qml/application_spec.rb
@@ -339,12 +341,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A QML / Qt Quick wrapper for Ruby
 test_files:
 - spec/assets/test.png
+- spec/assets/testmodule/qmldir
+- spec/assets/testmodule/test.qml
 - spec/assets/testobj.qml
 - spec/qml/access_spec.rb
 - spec/qml/application_spec.rb
@@ -375,4 +379,3 @@ test_files:
 - spec/shared/qml/data/list_model.rb
 - spec/shared/qml/reactive/object.rb
 - spec/spec_helper.rb
-has_rdoc: