qml 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31d0f1bbab5b1fa3d4b602baa55fc7df071f65a4
-  data.tar.gz: 4ba0b8cecc4f63b26f2284e56f132d19bd176c2b
+  metadata.gz: 531c290e09cd315f45f4cfb07d55d9e16e16fef6
+  data.tar.gz: 5452466222e562568f69b30771a6adc51e00e892
 SHA512:
-  metadata.gz: 29d4ae1d6ff4f3218cea47dd8d40b0b02441beb1a82f678138618c654dcc9ac0bf71f5cac6c11717ae13a6dc6d43cc1fab7fce3d061b01efe6761a308cba8c10
-  data.tar.gz: cb4a008e7083492d416a09d472668f67dc751db63ffd7d31d97d72726e9ec21610d4562e638c410548aaddedda3a1f2bc533bb2b0e7e021f4b9d77ec01e23ff1
+  metadata.gz: 297b2394051b19603dda694d5c4890a39cbeaf1c2123d9365586bc2de30c24d179c76f71c491b4671701e3f9ab6d690de87d0760bb958196874cb560e6e51aa1
+  data.tar.gz: c6a5ef840aa64784c9eb0f4af85261c5ff92a021f1f4eb3a81ddef60f488c6873cd8a97fa3297d317dbd29bcbb3192ff16ab6eefda22ff7c7d6ebb4f4a0ce34d

data/.travis.yml

@@ -2,12 +2,13 @@ language: ruby
 rvm:
   - 2.1.2
   - 2.0.0
+  - 1.9.3
 before_install:
   - sudo apt-add-repository -y ppa:beineri/opt-qt521
   - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
   - sudo apt-get update
-  - sudo apt-get install -y g++-4.8 libffi-dev qt52base qt52declarative qt52declarative
-  - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90
+  - sudo apt-get install -y g++-4.7 libffi-dev qt52base qt52declarative
+  - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.7 90
 before_script:
   - source /opt/qt52/bin/qt52-env.sh
   - cd ext/qml

data/README.md

@@ -7,6 +7,13 @@
 ruby-qml is a QML / Qt Quick wrapper for Ruby.
 It provides bindings between QML and Ruby and enables you to use Qt Quick-based GUI from Ruby.
 
+## What you can do with ruby-qml
+
+* Develop desktop GUI applications only with Ruby and QML
+* Easily combine codes written in C++ and Qt with your Ruby code
+
+## Documentation and Examples
+
 * [Documentation](http://rubydoc.info/github/seanchas116/ruby-qml/master/frames)
 * [Examples](https://github.com/seanchas116/ruby-qml/tree/master/examples)
 
@@ -18,7 +25,7 @@ It provides bindings between QML and Ruby and enables you to use Qt Quick-based
 
 ## Installation
 
-ruby-qml currently requires **Ruby 2.0 or later**.
+ruby-qml requires **Ruby 1.9 or later**.
 
 ### OS X with Homebrew
 
@@ -29,7 +36,7 @@ Run the following commands to install ruby-qml on OS X with Homebrew:
     $ brew install qt5
     $ gem install qml -- --with-libffi-dir=$(brew --prefix libffi) --with-qt-dir=$(brew --prefix qt5)
 
-### General
+### General (OSX and Linux)
 
 #### Requirements
 
@@ -56,7 +63,7 @@ For example:
 
     $ bundle config build.qml --with-libffi-dir=$(brew --prefix libffi) --with-qt-dir=$(brew --prefix qt5)
 
-The configuration will be saved in `~/.bundle/config`
+The configuration will be saved in `~/.bundle/config`.
 
 ## Usage
 
@@ -410,5 +417,6 @@ Contributions are welcome. When you are contributing to ruby-qml:
 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. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+4. Write some tests if possible
+5. Push to the branch (`git push origin my-new-feature`)
+6. Create new Pull Request

data/changes.md

@@ -1,4 +1,8 @@
-# 0.0.2 (2014-07-21)
+## 0.0.3 (2014-07-22)
+
+* Support Ruby 1.9.3
+
+## 0.0.2 (2014-07-21)
 
 * Improve list models
   
@@ -12,6 +16,6 @@
 
 * Improve README
 
-# 0.0.1 (2014-07-19)
+## 0.0.1 (2014-07-19)
 
 * Initial release

data/ext/qml/extconf.rb

@@ -11,6 +11,7 @@ class Configurator
     find_dependencies
     @cppflags = []
     @ldflags = []
+    @debug_enabled = enable_config('debug')
   end
 
   def find_dependencies
@@ -35,9 +36,10 @@ class Configurator
 
   def build_plugins
     puts "building plugins..."
+    qmake_opts = @debug_enabled ? 'CONFIG+=debug' : ''
     Pathname(__FILE__).+("../plugins").children.select(&:directory?).each do |dir|
       Dir.chdir(dir) do
-        system("#{@qmake}") && system('make') or abort "failed to build plugin: #{dir.basename}"
+        system("#{@qmake} #{qmake_opts}") && system('make clean') && system('make') or abort "failed to build plugin: #{dir.basename}"
       end
     end
   end
@@ -64,8 +66,13 @@ class Configurator
       abort "header not found: #{h}" unless have_header(h)
     end
 
+    unless have_func('rb_thread_call_with_gvl') && have_func('rb_thread_call_without_gvl')
+      abort "rb_thread_call_with_gvl and rb_thread_call_without_gvl not found"
+    end
+    $CPPFLAGS += " -DHAVE_RUBY_THREAD_H" if have_header('ruby/thread.h')
+
     $CPPFLAGS += " -std=c++11 -Wall -Wextra -pipe"
-    if enable_config('debug')
+    if @debug_enabled
       $CPPFLAGS += " -O0 -ggdb3"
     else
       $CPPFLAGS += " -O3"

data/ext/qml/rubyvalue.h

@@ -140,7 +140,7 @@ struct Conversion<T, typename std::enable_if<std::is_floating_point<T>::value>::
             if (type == T_FIXNUM || type == T_BIGNUM) {
                 return double(NUM2LL(x));
             } else {
-                return rb_float_value(x);
+                return RFLOAT_VALUE(VALUE(x));
             }
         });
     }

data/ext/qml/util.cpp

@@ -1,11 +1,19 @@
 #include "util.h"
 #include "rubyvalue.h"
 #include <QString>
-#include <ruby/thread.h>
 #include <string>
 #include <memory>
 #include <cxxabi.h>
 
+#ifdef HAVE_RUBY_THREAD_H
+#include <ruby/thread.h>
+#else
+extern "C" {
+void *rb_thread_call_with_gvl(void *(*func)(void *), void *data1);
+void *rb_thread_call_without_gvl(void *(*func)(void *), void *data1, rb_unblock_function_t *ubf, void *data2);
+}
+#endif
+
 namespace RubyQml {
 
 void protect(const std::function<void ()> &doAction)
@@ -94,9 +102,9 @@ void changeGvl(const std::function<void ()> &doAction, bool gvl)
     };
     void *result;
     if (gvl) {
-        result = rb_thread_call_with_gvl(f, actionPtr );
+        result = rb_thread_call_with_gvl(f, actionPtr);
     } else {
-        result = rb_thread_call_without_gvl(f, actionPtr , RUBY_UBF_IO, nullptr);
+        result = rb_thread_call_without_gvl(f, actionPtr, RUBY_UBF_IO, nullptr);
     }
     std::unique_ptr<std::exception_ptr> exc(static_cast<std::exception_ptr *>(result));
     if (exc && *exc) {

data/lib/qml.rb

@@ -27,11 +27,13 @@ module QML
   end
 
   # Initializes ruby-qml.
-  # @param [Boolean] offscreen set this to true to run application offscreen (without GUI)
-  def init(offscreen: false)
+  # @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 offscreen
+    argv += %w{-platform offscreen} if opts[:offscreen]
     Kernel.init(argv)
     application.events_processed.each do
       Dispatcher.instance.run_tasks

data/lib/qml/access.rb

@@ -38,10 +38,15 @@ module QML
     module ClassMethods
 
       # Registers the class as a QML type.
-      # @param under [String|nil] the namespece which encapsulates the exported QML type. If not specified, automatically inferred from the module nesting of the class.
-      # @param version [String|nil] the version of the type. Defaults to VERSION constant of the encapsulating module / class of the class.
-      # @param name [String|nil] the name of the type. Defaults to the name of the class.
-      def register_to_qml(under: nil, version: nil, name: nil)
+      # @param opts [Hash]
+      # @option opts [String] :under the namespece which encapsulates the exported QML type. If not specified, automatically inferred from the module nesting of the class.
+      # @option opts [String] :version the version of the type. Defaults to VERSION constant of the encapsulating module / class of the class.
+      # @option opts [String] :name the name of the type. Defaults to the name of the class.
+      def register_to_qml(opts = {})
+        under = opts[:under]
+        version = opts[:version]
+        name = opts[:name]
+
         if !under || !version || !name
           path = self.name.split('::')
         end

data/lib/qml/application.rb

@@ -56,9 +56,12 @@ module QML
     end
 
     # Loads a QML file. The loaded component can be accessed by {#root_component}
+    # @param [Hash] opts
+    # @option opts [String] :data
+    # @option opts [String] :path
     # @see Component
-    def load(data: nil, path: nil)
-      @root_component = Component.new(data: data, path: path)
+    def load(opts)
+      @root_component = Component.new(data: opts[:data], path: opts[:path])
       @root = @root_component.create
     end
 

data/lib/qml/class_builder.rb

@@ -5,9 +5,7 @@ require 'qml/name_helper'
 
 module QML
 
-  class QtProperty
-    prepend Reactive::Bindable
-
+  class QtPropertyBase
     attr_reader :changed
 
     def initialize(metaobj, objptr, name)
@@ -27,9 +25,13 @@ module QML
     end
   end
 
+  class QtProperty < QtPropertyBase
+    include Reactive::Bindable
+  end
+
   class QtSignal < Reactive::Signal
     def initialize(metaobj, objptr, name)
-      super(variadic: true)
+      super([], variadic: true)
       @objptr = objptr
       @metaobj = metaobj
       @name = name
@@ -103,7 +105,7 @@ module QML
 
     def define_property(name)
       metaobj = @metaobj
-      @klass.__send__ :property, name, factory: proc { |obj|
+      @klass.__send__ :property, name, nil, factory: proc { |obj|
         QtProperty.new(@metaobj, obj.pointer, name)
       }
       underscore = NameHelper.to_underscore(name)

data/lib/qml/component.rb

@@ -15,11 +15,15 @@ module QML
     attr_reader :data, :path, :context
 
     # Creates an component. Either data or path must be specified.
-    # @param context [QML::Context|nil] The context that the created objects will depend on (default to the root context of the application engine)
-    # @param data [String] The QML file data
-    # @param path [#to_s] The QML file path
+    # @param opts [Hash]
+    # @option opts [QML::Context] :context the context that the created objects will depend on (default to the root context of the application engine).
+    # @option opts [String] :data the QML file data.
+    # @option opts [#to_s] :path the QML file path.
     # @return QML::Component
-    def self.new(context: nil, data: nil, path: nil)
+    def self.new(opts)
+      context = opts[:context]
+      data = opts[:data]
+      path = opts[:path]
       context ||= Engine.instance.context
       Plugins.core.createComponent(Engine.instance).instance_eval do
         @data = data

data/lib/qml/data/list_model.rb

@@ -73,7 +73,7 @@ module QML
       # @see #inserting
       # @see #removing
       def moving(range, destination)
-        return if range.size == 0
+        return if range.count == 0
 
         @qt_models.each do |qt_model|
           qt_model.begin_move(range.min, range.max, destination)
@@ -98,7 +98,7 @@ module QML
       # @see #removing
       # @see #moving
       def inserting(range, &block)
-        return if range.size == 0
+        return if range.count == 0
 
         @qt_models.each do |qt_model|
           qt_model.begin_insert(range.min, range.max)
@@ -119,7 +119,7 @@ module QML
       # @see #inserting
       # @see #moving
       def removing(range, &block)
-        return if range.size == 0
+        return if range.count == 0
 
         @qt_models.each do |qt_model|
           qt_model.begin_remove(range.min, range.max)

data/lib/qml/reactive/object.rb

@@ -125,6 +125,8 @@ module QML
         # The signal will be variadic if args == nil.
         # @param name [#to_sym] The signal name
         # @param params [Array<#to_sym>, nil] The signal parameter names
+        # @param opts [Hash]
+        # @option opts [Proc] :factory (nil)
         # @return [Symbol] The signal name
         # @example
         #   class Button
@@ -146,19 +148,21 @@ module QML
         #   color_button = ColorButton.new
         #   color_button.pressed.connect { |pos, color| "#{color} button pressed at #{pos}" }
         #   color_button.press([10, 20], 'red')
-        def signal(name, params, factory: nil)
+        def signal(name, params, opts = {})
           name.to_sym.tap do |name|
             params = params.map(&:to_sym)
-            add_signal(UnboundSignal.new(name, params, false, self, factory))
+            add_signal(UnboundSignal.new(name, params, false, self, opts[:factory]))
           end
         end
 
         # Defines a variadic signal.
         # Variadic signals do not restrict the number of arguments.
+        # @param opts [Hash]
+        # @option opts [Proc] :factory (nil)
         # @see #signal
-        def variadic_signal(name, factory: nil)
+        def variadic_signal(name, opts = {})
           name.to_sym.tap do |name|
-            add_signal(UnboundSignal.new(name, nil, true, self, factory))
+            add_signal(UnboundSignal.new(name, nil, true, self, opts[:factory]))
           end
         end
 
@@ -172,6 +176,8 @@ module QML
         # Defines a property for the class.
         # @param name [#to_sym] The name of the property
         # @param init_value The initial value (optional)
+        # @param opts [Hash]
+        # @option opts [Proc] :factory (nil)
         # @yield The initial property binding (optional)
         # @return [Symbol] The name
         # @example
@@ -190,9 +196,9 @@ module QML
         #     property(:name) { 'piyopiyo' }
         #   end
         #   Bar.new.name #=> 'piyopiyo'
-        def property(name, init_value = nil, factory: nil, &init_binding)
+        def property(name, init_value = nil, opts = {}, &init_binding)
           name = name.to_sym
-          add_property(UnboundProperty.new(name, init_value, init_binding, self, factory))
+          add_property(UnboundProperty.new(name, init_value, init_binding, self, opts[:factory]))
           name
         end
 
@@ -259,10 +265,10 @@ module QML
           add_signal(property.notifier_signal)
         end
 
-        def initial_connections_hash(include_super: true)
+        def initial_connections_hash(include_super = true)
           if include_super && superclass.include?(Object)
             superclass.send(:initial_connections_hash).dup.tap do |hash|
-              initial_connections_hash(include_super: false).each do |key, blocks|
+              initial_connections_hash(false).each do |key, blocks|
                 hash[key] ||= []
                 hash[key] += blocks
               end

data/lib/qml/reactive/signal.rb

@@ -20,9 +20,12 @@ module QML
       # Initializes the Signal.
       # The signal will be variadic if an empty array is given.
       # @param [Array<#to_sym>, Array<()>] params The parameter names.
-      def initialize(*params, variadic: false)
+      # @param [Hash] opts
+      # @option opts [Boolean] (false) :variadic
+      def initialize(params, opts = {})
+        opts = {variadic: false}.merge opts
         @listeners = []
-        if variadic
+        if opts[:variadic]
           @params = nil
           @arity = -1
         else

data/lib/qml/reactive/signals/map_signal.rb

@@ -5,7 +5,7 @@ module QML
     module Signals
       class MapSignal < ChainedSignal
         def initialize(source, func)
-          super(:mapped)
+          super([:mapped])
           @source = source
           @func = func
         end

data/lib/qml/reactive/signals/merge_signal.rb

@@ -6,7 +6,7 @@ module QML
       class MergeSignal < ChainedSignal
         def initialize(sources)
           param_count = sources.map(&:arity).max
-          super(*param_count.times.map { |i| :"arg#{i}" })
+          super(param_count.times.map { |i| :"arg#{i}" })
           @sources = sources
         end
 

data/lib/qml/reactive/signals/select_signal.rb

@@ -5,7 +5,7 @@ module QML
     module Signals
       class SelectSignal < ChainedSignal
         def initialize(source, pred)
-          super(*source.parameters.map(&:last))
+          super(source.parameters.map(&:last))
           @source = source
           @pred = pred
         end

data/lib/qml/reactive/simple_property.rb

@@ -10,7 +10,7 @@ module QML
       attr_reader :changed
 
       def initialize
-        @changed = Signal.new(:new_value)
+        @changed = Signal.new([:new_value])
       end
     end
   end

data/lib/qml/reactive/unbound_signal.rb

@@ -41,9 +41,9 @@ module QML
       def bind(obj)
         return @factory.call(obj, self) if @factory
         if @variadic
-          Signal.new(variadic: true)
+          Signal.new([], variadic: true)
         else
-          Signal.new(*@params)
+          Signal.new(@params)
         end
       end
     end

data/lib/qml/version.rb

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

data/qml.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.extensions = ["ext/qml/extconf.rb"]
 
-  spec.required_ruby_version = '~> 2.0'
+  spec.required_ruby_version = '>= 1.9.3'
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake", "~> 10.3"

data/spec/qml/conversion_spec.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 require 'spec_helper'
 
 def convert(value)

data/spec/qml/reactive/object_spec.rb

@@ -181,14 +181,14 @@ describe QML::Reactive::Object do
     context 'when include_super is false' do
       it 'returns all signal definitions of the class' do
         signals = ToggleButton.instance_signals(false)
-        expect(signals).to match_array %i{pressed toggled name_changed info_changed}
+        expect(signals).to match_array %w{pressed toggled name_changed info_changed}.map(&:to_sym)
       end
     end
 
     context 'when include_super is not specified' do
       it 'returns all signal definitions of the class and its superclasses' do
         signals = ToggleButton.instance_signals
-        expect(signals).to match_array %i{pressed message toggled name_changed id_changed info_changed name_double_changed clicked title_changed}
+        expect(signals).to match_array %w{pressed message toggled name_changed id_changed info_changed name_double_changed clicked title_changed}.map(&:to_sym)
       end
     end
   end
@@ -197,14 +197,14 @@ describe QML::Reactive::Object do
     context 'when include_super is false' do
       it 'returns all property definitions of the class' do
         properties = ToggleButton.instance_properties(false)
-        expect(properties).to match_array %i{name info}
+        expect(properties).to match_array %w{name info}.map(&:to_sym)
       end
     end
 
     context 'when include_super is not specified' do
       it 'returns all property definitions of the class and its superclasses' do
         properties = ToggleButton.instance_properties
-        expect(properties).to match_array %i{name id info name_double title}
+        expect(properties).to match_array %w{name id info name_double title}.map(&:to_sym)
       end
     end
   end
@@ -239,13 +239,13 @@ describe QML::Reactive::Object do
 
   describe '#signals' do
     it 'returns signal names for object' do
-      expect(toggle_button.signals).to match_array %i{pressed message toggled id_changed name_changed info_changed name_double_changed clicked title_changed}
+      expect(toggle_button.signals).to match_array %w{pressed message toggled id_changed name_changed info_changed name_double_changed clicked title_changed}.map(&:to_sym)
     end
   end
 
   describe '#properties' do
     it 'return property names for object' do
-      expect(toggle_button.properties).to match_array %i{name id info name_double title}
+      expect(toggle_button.properties).to match_array %w{name id info name_double title}.map(&:to_sym)
     end
   end
 

data/spec/qml/reactive/property_spec.rb

@@ -25,8 +25,8 @@ describe QML::Reactive::Property do
     describe '#value, #value=' do
       it 'sets and gets the contained value' do
         property = QML::Reactive::Property.new
-        property.value = '(´･_･`)'
-        expect(property.value).to eq('(´･_･`)')
+        property.value = 'hogehoge'
+        expect(property.value).to eq('hogehoge')
       end
     end
   end

data/spec/qml/reactive/signal_spec.rb

@@ -3,8 +3,8 @@ require 'spec_helper'
 describe QML::Reactive::Signal do
 
   before do
-    @signal = QML::Reactive::Signal.new(:foo, :bar)
-    @variadic_signal = QML::Reactive::Signal.new(variadic: true)
+    @signal = QML::Reactive::Signal.new([:foo, :bar])
+    @variadic_signal = QML::Reactive::Signal.new([], variadic: true)
   end
 
   describe 'connection' do
@@ -65,7 +65,7 @@ describe QML::Reactive::Signal do
       end
 
       it 'disconnects the whole chained connections if possible' do
-        signal = QML::Reactive::Signal.new :arg
+        signal = QML::Reactive::Signal.new [:arg]
         mapped = signal.map { |arg| arg * 2 }
 
         connection = mapped.connect {}
@@ -175,8 +175,8 @@ describe QML::Reactive::Signal do
       it 'merges multiple signals' do
         received = []
 
-        signal = QML::Reactive::Signal.new :foo
-        signal2 = QML::Reactive::Signal.new :foo
+        signal = QML::Reactive::Signal.new [:foo]
+        signal2 = QML::Reactive::Signal.new [:foo]
         signal.merge(signal2).connect { |foo| received << foo }
 
         signal.emit(:one)

data/spec/qml/reactive/signal_spy_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe QML::Reactive::SignalSpy do
 
   it 'records signal emittion' do
-    signal = QML::Reactive::Signal.new(:arg1, :arg2)
+    signal = QML::Reactive::Signal.new([:arg1, :arg2])
     spy = QML::Reactive::SignalSpy.new(signal)
     signal.emit(10, 20)
     signal.emit('foo', 'bar')
@@ -16,7 +16,7 @@ describe QML::Reactive::Signal do
 
   describe '#spy' do
     it 'returns a SignalSpy for the signal' do
-      signal = QML::Reactive::Signal.new(:arg1, :arg2)
+      signal = QML::Reactive::Signal.new([:arg1, :arg2])
       spy = signal.spy
       signal.emit(10, 20)
       signal.emit('foo', 'bar')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qml
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Ryohei Ikegami
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-21 00:00:00.000000000 Z
+date: 2014-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -319,9 +319,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="