ruby-qt6-qtqml 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a64a83438df3a6dcd48ba10f027a1d238399c8af1a1c931a5af4a51bab38bcf
-  data.tar.gz: ad329b554f17012c5583217bdf16decb528b1a21f82bb070e1531ae8c99b14d9
+  metadata.gz: b7ab7eba455c40653749b949d706a5b39a67ce52f5c9507cbb74440b6b5cf143
+  data.tar.gz: 19bb20c5aafd5043a6eb1a6795f9e3344997d707e59461dbe96a151d4e0ff370
 SHA512:
-  metadata.gz: a6827511920247a9079fccecda5c20f226c12b3265fde82e02436ccb33ee021b8ad381b6f594aa69387d91c1aa185f71d6b4a825088786a91e098d71b1515788
-  data.tar.gz: 981cb2744339442689b67a538286d3545882909545c7c080e641a5498507010b3856e76179fc21acf47af70bcde560b0e0cd89528bd2cbf9f008e0d23fd68d2c
+  metadata.gz: 5672935ea4d72630c2088a3a7b1416bac27d36c3820a3f7d4ff87a2da7882ff864631125bc34793c26d9da9bc9ac5fa40c0a6801ca455d5a02aa9963951d1fc1
+  data.tar.gz: 7d73a267fe0f7da0316c9a60788a338ab85cb7b4de8221f32dfd4be1e08590f861a6114bddfd7cba50ccb3fb4025a331aea7a45eaee40caa1082b008580ab10e

data/Rakefile

@@ -8,6 +8,10 @@ Rake::ExtensionTask.new("qtqml", GEMSPEC) do |ext|
   ext.ext_dir = "ext/qt6/qtqml"
   ext.lib_dir = "lib/qt6/qtqml"
 end
+Rake::Task["rake:compile"].enhance do
+  mkdir_p Pathname.new(GEMSPEC.gem_build_complete_path).parent
+  touch GEMSPEC.gem_build_complete_path
+end
 
 require "rubocop/rake_task"
 RuboCop::RakeTask.new

data/ext/qt6/qtqml/extconf.rb

@@ -1,16 +1,6 @@
 # frozen_string_literal: true
 
-RUBYQT6_RICE_LIB_PATH = File.join(__dir__, "../../../../rice/lib")
-if File.exist?(RUBYQT6_RICE_LIB_PATH)
-  require File.join(RUBYQT6_RICE_LIB_PATH, "mkmf-rubyqt6.rb")
-else
-  require "mkmf-rubyqt6"
-end
+RUBYQT6_RICE_GEM_PATH = Gem::Specification.find_by_name("ruby-qt6-rice").full_gem_path
+require File.join(RUBYQT6_RICE_GEM_PATH, "lib/mkmf-rubyqt6.rb")
 
-includedir = qt_install_headers
-append_cppflags("-I#{includedir}")
-append_cppflags("-I#{includedir}/QtCore")
-append_cppflags("-I#{includedir}/QtQml")
-abort "libQt6Qml is missing, please install qt6-declarative" unless have_library("Qt6Qml")
-
-create_makefile("qt6/qtqml/qtqml")
+rubyqt6_extconf("QtQml", depends: ["QtCore"])

data/ext/qt6/qtqml/qjsengine-rb.cpp

@@ -1,11 +1,11 @@
 #include "qjsengine-rb.hpp"
 #include <qjsengine.h>
 
-using namespace Rice;
+RICE4RUBYQT6_USE_NAMESPACE
 
-Rice::Class rb_cQJSEngine;
+Class rb_cQJSEngine;
 
-void Init_qjsengine(Rice::Module rb_mQt6QtQml)
+void Init_qjsengine(Module rb_mQt6QtQml)
 {
     rb_cQJSEngine =
         // RubyQt6::QtQml::QJSEngine
@@ -19,7 +19,6 @@ void Init_qjsengine(Rice::Module rb_mQt6QtQml)
             .define_method("collect_garbage", &QJSEngine::collectGarbage)
             .define_method("evaluate", &QJSEngine::evaluate, Arg("program"), Arg("file_name") = static_cast<const QString &>(QString()), Arg("line_number") = static_cast<int>(1), Arg("exception_stack_trace") = static_cast<QStringList *>(nullptr))
             .define_method("global_object", &QJSEngine::globalObject)
-            // .define_method("handle", &QJSEngine::handle)
             .define_method("has_error", &QJSEngine::hasError)
             .define_method("import_module", &QJSEngine::importModule, Arg("file_name"))
             .define_method("install_extensions", &QJSEngine::installExtensions, Arg("extensions"), Arg("object") = static_cast<const QJSValue &>(QJSValue()))
@@ -38,7 +37,7 @@ void Init_qjsengine(Rice::Module rb_mQt6QtQml)
             .define_method<void (QJSEngine::*)(const QString &)>("throw_error", &QJSEngine::throwError, Arg("message"))
             .define_method("ui_language", &QJSEngine::uiLanguage)
             // Signals
-            .define_method("ui_language_changed", &QJSEngine::uiLanguageChanged)
+            // .define_method("ui_language_changed", &QJSEngine::uiLanguageChanged)
             // Static Public Members
             .define_singleton_function("object_ownership", &QJSEngine::objectOwnership, Arg("obj"))
             .define_singleton_function("set_object_ownership", &QJSEngine::setObjectOwnership, Arg("obj"), Arg("ownership"));

data/ext/qt6/qtqml/qjsengine-rb.hpp

@@ -1,4 +1,5 @@
-#include <rice/rice.hpp>
-#include <rice/stl.hpp>
+#include <rice/qt6.hpp>
 
-void Init_qjsengine(Rice::Module rb_mQt6QtQml);
+RICE4RUBYQT6_USE_NAMESPACE
+
+void Init_qjsengine(Module rb_mQt6QtQml);

data/ext/qt6/qtqml/qqmlapplicationengine-rb.cpp

@@ -1,11 +1,11 @@
 #include "qqmlapplicationengine-rb.hpp"
 #include <qqmlapplicationengine.h>
 
-using namespace Rice;
+RICE4RUBYQT6_USE_NAMESPACE
 
-Rice::Class rb_cQQmlApplicationEngine;
+Class rb_cQQmlApplicationEngine;
 
-void Init_qqmlapplicationengine(Rice::Module rb_mQt6QtQml)
+void Init_qqmlapplicationengine(Module rb_mQt6QtQml)
 {
     rb_cQQmlApplicationEngine =
         // RubyQt6::QtQml::QQmlApplicationEngine
@@ -22,8 +22,8 @@ void Init_qqmlapplicationengine(Rice::Module rb_mQt6QtQml)
             .define_method("load_data", &QQmlApplicationEngine::loadData, Arg("data"), Arg("url") = static_cast<const QUrl &>(QUrl()))
             .define_method("load_from_module", &QQmlApplicationEngine::loadFromModule, Arg("uri"), Arg("type_name"))
             .define_method("set_extra_file_selectors", &QQmlApplicationEngine::setExtraFileSelectors, Arg("extra_file_selectors"))
-            .define_method("set_initial_properties", &QQmlApplicationEngine::setInitialProperties, Arg("initial_properties"))
+            .define_method("_set_initial_properties", &QQmlApplicationEngine::setInitialProperties, Arg("initial_properties"));
             // Signals
-            .define_method("object_created", &QQmlApplicationEngine::objectCreated, Arg("object"), Arg("url"))
-            .define_method("object_creation_failed", &QQmlApplicationEngine::objectCreationFailed, Arg("url"));
+            // .define_method("object_created", &QQmlApplicationEngine::objectCreated, Arg("object"), Arg("url"))
+            // .define_method("object_creation_failed", &QQmlApplicationEngine::objectCreationFailed, Arg("url"));
 }

data/ext/qt6/qtqml/qqmlapplicationengine-rb.hpp

@@ -1,4 +1,5 @@
-#include <rice/rice.hpp>
-#include <rice/stl.hpp>
+#include <rice/qt6.hpp>
 
-void Init_qqmlapplicationengine(Rice::Module rb_mQt6QtQml);
+RICE4RUBYQT6_USE_NAMESPACE
+
+void Init_qqmlapplicationengine(Module rb_mQt6QtQml);

data/ext/qt6/qtqml/qqmlcontext-rb.cpp

@@ -0,0 +1,43 @@
+#include "qqmlcontext-rb.hpp"
+#include <qqmlcontext.h>
+
+#include <QQmlEngine>
+
+RICE4RUBYQT6_USE_NAMESPACE
+
+Class rb_cQQmlContext;
+Class rb_cQQmlContextPropertyPair;
+
+void Init_qqmlcontext(Module rb_mQt6QtQml)
+{
+    rb_cQQmlContext =
+        // RubyQt6::QtQml::QQmlContext
+        define_class_under<QQmlContext, QObject>(rb_mQt6QtQml, "QQmlContext")
+            // RubyQt6-Defined Functions
+            .define_singleton_function("_static_meta_object", []() -> const QMetaObject * { return &QQmlContext::staticMetaObject; })
+            // Constructor
+            .define_constructor(Constructor<QQmlContext, QQmlEngine *, QObject *>(), Arg("engine"), Arg("parent"))
+            // Public Functions
+            .define_method("base_url", &QQmlContext::baseUrl)
+            .define_method("context_object", &QQmlContext::contextObject)
+            .define_method("context_property", &QQmlContext::contextProperty, Arg("name"))
+            .define_method("engine", &QQmlContext::engine)
+            .define_method("imported_script", &QQmlContext::importedScript, Arg("name"))
+            .define_method("valid?", &QQmlContext::isValid)
+            .define_method("name_for_object", &QQmlContext::nameForObject, Arg("object"))
+            .define_method("object_for_name", &QQmlContext::objectForName, Arg("name"))
+            .define_method("parent_context", &QQmlContext::parentContext)
+            .define_method("resolved_url", &QQmlContext::resolvedUrl, Arg("src"))
+            .define_method("set_base_url", &QQmlContext::setBaseUrl, Arg("base_url"))
+            .define_method("set_context_object", &QQmlContext::setContextObject, Arg("object"))
+            .define_method("set_context_properties", &QQmlContext::setContextProperties, Arg("properties"))
+            .define_method<void (QQmlContext::*)(const QString &, QObject *)>("_set_context_property", &QQmlContext::setContextProperty, Arg("name"), Arg("value"))
+            .define_method<void (QQmlContext::*)(const QString &, const QVariant &)>("_set_context_property", &QQmlContext::setContextProperty, Arg("name"), Arg("value"));
+
+    rb_cQQmlContextPropertyPair =
+        // RubyQt6::QtQml::QQmlContext::PropertyPair
+        define_class_under<QQmlContext::PropertyPair>(rb_cQQmlContext, "PropertyPair")
+            .define_constructor(Constructor<QQmlContext::PropertyPair>())
+            .define_attr("name", &QQmlContext::PropertyPair::name)
+            .define_attr("value", &QQmlContext::PropertyPair::value);
+}

data/ext/qt6/qtqml/qqmlcontext-rb.hpp

@@ -0,0 +1,5 @@
+#include <rice/qt6.hpp>
+
+RICE4RUBYQT6_USE_NAMESPACE
+
+void Init_qqmlcontext(Module rb_mQt6QtQml);

data/ext/qt6/qtqml/qqmlengine-rb.cpp

@@ -4,11 +4,11 @@
 #include <QQmlContext>
 #include <QQmlIncubationController>
 
-using namespace Rice;
+RICE4RUBYQT6_USE_NAMESPACE
 
-Rice::Class rb_cQQmlEngine;
+Class rb_cQQmlEngine;
 
-void Init_qqmlengine(Rice::Module rb_mQt6QtQml)
+void Init_qqmlengine(Module rb_mQt6QtQml)
 {
     rb_cQQmlEngine =
         // RubyQt6::QtQml::QQmlEngine
@@ -52,10 +52,10 @@ void Init_qqmlengine(Rice::Module rb_mQt6QtQml)
             // Public Slots
             .define_method("retranslate", &QQmlEngine::retranslate)
             // Signals
-            .define_method("exit", &QQmlEngine::exit, Arg("ret_code"))
-            .define_method("offline_storage_path_changed", &QQmlEngine::offlineStoragePathChanged)
-            .define_method("quit", &QQmlEngine::quit)
-            .define_method("warnings", &QQmlEngine::warnings, Arg("warnings"))
+            // .define_method("exit", &QQmlEngine::exit, Arg("ret_code"))
+            // .define_method("offline_storage_path_changed", &QQmlEngine::offlineStoragePathChanged)
+            // .define_method("quit", &QQmlEngine::quit)
+            // .define_method("warnings", &QQmlEngine::warnings, Arg("warnings"))
             // Static Public Members
             .define_singleton_function("context_for_object", &QQmlEngine::contextForObject, Arg("obj"))
             .define_singleton_function("set_context_for_object", &QQmlEngine::setContextForObject, Arg("obj"), Arg("context"));

data/ext/qt6/qtqml/qqmlengine-rb.hpp

@@ -1,4 +1,5 @@
-#include <rice/rice.hpp>
-#include <rice/stl.hpp>
+#include <rice/qt6.hpp>
 
-void Init_qqmlengine(Rice::Module rb_mQt6QtQml);
+RICE4RUBYQT6_USE_NAMESPACE
+
+void Init_qqmlengine(Module rb_mQt6QtQml);

data/ext/qt6/qtqml/qtqml-rb.cpp

@@ -4,17 +4,21 @@
 #include "qjsengine-rb.hpp"
 #include "qqmlengine-rb.hpp"
 #include "qqmlapplicationengine-rb.hpp"
+#include "qqmlcontext-rb.hpp"
+
+RICE4RUBYQT6_USE_NAMESPACE
 
 extern "C" void Init_qtqml()
 {
-    return Rice::detail::cpp_protect([] {
-        Rice::Module rb_mQt6 = Rice::define_module("RubyQt6");
-        Rice::Module rb_mQt6QtQml = define_module_under(rb_mQt6, "QtQml");
+    return detail::cpp_protect([] {
+        Module rb_mQt6 = define_module("RubyQt6");
+        Module rb_mQt6QtQml = define_module_under(rb_mQt6, "QtQml");
 
         Init_qtqmlversion(rb_mQt6QtQml);
 
         Init_qjsengine(rb_mQt6QtQml);
         Init_qqmlengine(rb_mQt6QtQml);
         Init_qqmlapplicationengine(rb_mQt6QtQml);
+        Init_qqmlcontext(rb_mQt6QtQml);
     });
 }

data/ext/qt6/qtqml/qtqml-rb.hpp

@@ -1,3 +1,3 @@
-#include <rice/rice.hpp>
+#include <rice/qt6.hpp>
 
 extern "C" void Init_qtqml();

data/ext/qt6/qtqml/qtqmlversion-rb.cpp

@@ -1,9 +1,9 @@
 #include "qtqmlversion-rb.hpp"
 #include <qtqmlversion.h>
 
-using namespace Rice;
+RICE4RUBYQT6_USE_NAMESPACE
 
-void Init_qtqmlversion(Rice::Module rb_mQt6QtQml)
+void Init_qtqmlversion(Module rb_mQt6QtQml)
 {
     rb_mQt6QtQml.define_constant("QTQML_VERSION", QTQML_VERSION_STR);
 }

data/ext/qt6/qtqml/qtqmlversion-rb.hpp

@@ -1,4 +1,5 @@
-#include <rice/rice.hpp>
-#include <rice/stl.hpp>
+#include <rice/qt6.hpp>
 
-void Init_qtqmlversion(Rice::Module rb_mQt6QtQml);
+RICE4RUBYQT6_USE_NAMESPACE
+
+void Init_qtqmlversion(Module rb_mQt6QtQml);

data/lib/qt6/qtqml/qqmlapplicationengine.rb

@@ -25,6 +25,11 @@ module RubyQt6
         _initialize(parent)
         _take_ownership_from_ruby(self)
       end
+
+      # @!visibility private
+      def set_initial_properties(**properties)
+        _set_initial_properties(T.to_qvariantmap(properties))
+      end
     end
   end
 end

data/lib/qt6/qtqml/qqmlcontext.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module RubyQt6
+  module QtQml
+    # @see https://doc.qt.io/qt-6/qqmlcontext.html
+    class QQmlContext < RubyQt6::QtCore::QObject
+      # @!parse
+      q_object do
+      end
+
+      # @!visibility private
+      alias_method :_initialize, :initialize
+
+      # @param engine [QQmlEngine]
+      # @param parent [QObject]
+      # @return [QQmlContext]
+      def initialize(engine, parent = nil)
+        _initialize(engine, parent)
+        _take_ownership_from_ruby(self)
+      end
+
+      # @!visibility private
+      def set_context_property(name, value)
+        _set_context_property(T.to_qstr(name), value)
+      end
+    end
+  end
+end

data/lib/qt6/qtqml/version.rb

@@ -2,6 +2,6 @@
 
 module RubyQt6
   module QtQml
-    QTQML_RUBYGEM_VERSION = "1.0.0"
+    QTQML_RUBYGEM_VERSION = "2.0.0"
   end
 end

data/lib/qt6/qtqml.rb

@@ -9,3 +9,4 @@ require_relative "qtqml/qtqmlversion"
 require_relative "qtqml/qjsengine"
 require_relative "qtqml/qqmlengine"
 require_relative "qtqml/qqmlapplicationengine"
+require_relative "qtqml/qqmlcontext"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-qt6-qtqml
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - John Doe
@@ -15,28 +15,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: ruby-qt6-qtcore
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.0.0
 description: Ruby Bindings for Qt Qml.
 email:
 - johndoe@example.com
@@ -55,6 +55,8 @@ files:
 - ext/qt6/qtqml/qjsengine-rb.hpp
 - ext/qt6/qtqml/qqmlapplicationengine-rb.cpp
 - ext/qt6/qtqml/qqmlapplicationengine-rb.hpp
+- ext/qt6/qtqml/qqmlcontext-rb.cpp
+- ext/qt6/qtqml/qqmlcontext-rb.hpp
 - ext/qt6/qtqml/qqmlengine-rb.cpp
 - ext/qt6/qtqml/qqmlengine-rb.hpp
 - ext/qt6/qtqml/qtqml-rb.cpp
@@ -64,15 +66,16 @@ files:
 - lib/qt6/qtqml.rb
 - lib/qt6/qtqml/qjsengine.rb
 - lib/qt6/qtqml/qqmlapplicationengine.rb
+- lib/qt6/qtqml/qqmlcontext.rb
 - lib/qt6/qtqml/qqmlengine.rb
 - lib/qt6/qtqml/qtqmlversion.rb
 - lib/qt6/qtqml/version.rb
-homepage: https://github.com/souk4711/ruby-qt6/qtqml
+homepage: https://github.com/souk4711/ruby-qt6
 licenses: []
 metadata:
-  homepage_uri: https://github.com/souk4711/ruby-qt6/qtqml
-  source_code_uri: https://github.com/souk4711/ruby-qt6/qtqml
-  changelog_uri: https://github.com/souk4711/ruby-qt6/qtqml
+  homepage_uri: https://github.com/souk4711/ruby-qt6
+  source_code_uri: https://github.com/souk4711/ruby-qt6
+  changelog_uri: https://github.com/souk4711/ruby-qt6
 rdoc_options: []
 require_paths:
 - lib
@@ -80,7 +83,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="