qml 0.0.7 → 1.0.0

data/lib/qml/component.rb

@@ -1,57 +1,65 @@
 require 'qml/engine'
 
 module QML
-  # @!parse class Component < QtObjectBase; end
-
   # The Component class is used to instantiate objects like Window / ApplicationWindow objects from QML files.
   #
   # You usually do not need to use this class because Application#load, #load_path, #load_data do same
   # for the application top-level objects such as main windows.
   # @example
-  #   component = Component.new(path: path_to_qml_file)
+  #   component = Component.new(engine: engine, path: path_to_qml_file)
   #   root_object = component.create
   # @see http://qt-project.org/doc/qt-5/qqmlcomponent.html QQmlComponent (C++)
   class Component
-    attr_reader :data, :path, :context
+    attr_reader :data, :path
 
     # Creates an component. Either data or path must be specified.
-    # @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.
+    # @param [String] data the QML file data.
+    # @param [#to_s] path the QML file path.
     # @return QML::Component
-    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
-        @path = path
-        @context = context
-
-        if data
-          @extension.loadString(data, (path && path.to_s) || '')
-        elsif path
-          @extension.loadFile(path.to_s)
-        else
-          fail QMLError, 'neither data nor path specified'
-        end
-
-        self
+    def initialize(data: nil, path: nil)
+      fail TypeError, "neither data nor path privided" unless data || path
+
+      initialize_impl
+
+      case
+      when data
+        load_data(data)
+      when path
+        load_path(path)
+      end
+    end
+
+    def load_path(path)
+      path = path.to_s
+      check_error_string do
+        @path = Pathname.new(path)
+        load_path_impl(path)
       end
+      self
     end
 
-    def initialize
-      super()
-      Access.register_classes
-      @extension = Plugins.core.createComponentExtension(self)
+    def load_data(data)
+      check_error_string do
+        @data = data
+        load_data_impl(data, "<<STRING>>")
+      end
+      self
     end
 
     # Instantiates a object from the QML file.
-    # @return [QtObjectBase] The created Qt object
+    # @return [QML::JSObject] The created object
     def create
-      @extension.create(@context)
+      check_error_string do
+        create_impl
+      end
+    end
+
+    private
+
+    def check_error_string
+      yield.tap do
+        fail QMLError, error_string if error_string
+      end
     end
   end
 end

data/lib/qml/core_ext.rb

@@ -0,0 +1 @@
+require 'qml/core_ext/to_qml'

data/lib/qml/core_ext/to_qml.rb

@@ -0,0 +1,70 @@
+
+class Numeric
+  def to_qml
+    to_f
+  end
+end
+
+class String
+  def to_qml
+    self
+  end
+end
+
+class Symbol
+  def to_qml
+    to_s
+  end
+end
+
+class TrueClass
+  def to_qml
+    self
+  end
+end
+
+class FalseClass
+  def to_qml
+    self
+  end
+end
+
+class NilClass
+  def to_qml
+    self
+  end
+end
+
+class Array
+  def to_qml
+    QML.engine.new_array(self.size).tap do |jsarray|
+      self.each_with_index do |x, i|
+        jsarray[i] = x
+      end
+    end
+  end
+end
+
+class Hash
+  def to_qml
+    QML.engine.new_object.tap do |jsobj|
+      self.each do |key, value|
+        jsobj[key] = value
+      end
+    end
+  end
+end
+
+class Time
+  def to_qml
+    QML::JSUtil.classes['Date'].new(year, month, day, hour, min, sec, nsec / 1000000).tap do |date|
+      date.setTime((to_r * 1000).floor)
+    end
+  end
+end
+
+class Proc
+  def to_qml
+    QML::ProcAccess.wrap_proc(self)
+  end
+end

data/lib/qml/data.rb

@@ -1,3 +1,4 @@
+require 'qml/data/list_model_access'
 require 'qml/data/list_model'
 require 'qml/data/array_model'
 require 'qml/data/query_model'

data/lib/qml/data/array_model.rb

@@ -1,124 +1,122 @@
 module QML
-  module Data
-    # {ArrayModel} is one of ruby-qml's list models and it stores data in Array simply.
-    class ArrayModel < ListModel
+  # {ArrayModel} is one of ruby-qml's list models and it stores data in Array simply.
+  class ArrayModel < ListModel
 
-      # @param [Array<Symbol|String>] columns
-      def initialize(*columns)
-        super
-        @array = []
-      end
+    # @param [Array<Symbol|String>] columns
+    def initialize(*columns)
+      super
+      @array = []
+    end
 
-      # Duplicates the internal array and returns it.
-      # @return [Array]
-      def to_a
-        @array.dup
-      end
+    # Duplicates the internal array and returns it.
+    # @return [Array]
+    def to_a
+      @array.dup
+    end
 
-      # @return [Integer] the number of the items.
-      def count
-        @array.count
-      end
+    # @return [Integer] the number of the items.
+    def count
+      @array.count
+    end
 
-      # Returns an item.
-      # @param [Integer] index the index of the item.
-      # @return the item.
-      def [](index)
-        @array[index]
-      end
+    # Returns an item.
+    # @param [Integer] index the index of the item.
+    # @return the item.
+    def [](index)
+      @array[index]
+    end
 
-      # Updates an item.
-      # @param [Integer] index
-      # @param item
-      # @return the item.
-      def []=(index, item)
-        @array[index] = item
-        update(index .. index)
-        item
-      end
+    # Updates an item.
+    # @param [Integer] index
+    # @param item
+    # @return the item.
+    def []=(index, item)
+      @array[index] = item
+      update(index .. index)
+      item
+    end
 
-      # Inserts items.
-      # @param [Integer] index
-      # @return [self]
-      def insert(index, *items)
-        inserting(index ... index + items.size) do
-          @array.insert(index, *items)
-        end
-        self
+    # Inserts items.
+    # @param [Integer] index
+    # @return [self]
+    def insert(index, *items)
+      inserting(index ... index + items.size) do
+        @array.insert(index, *items)
       end
+      self
+    end
 
-      # @overload delete_at(index)
-      #   Deletes an item.
-      #   @param [Integer] index
-      #   @return the deleted item.
-      # @overload delete_at(index, count)
-      #   Deletes items.
-      #   @param [Integer] index
-      #   @return [Array] the deleted items.
-      def delete_at(index, count = nil)
-        if count
-          removing(index ... index + count) do
-            count.times.map { @array.delete_at(index) }
-          end
-        else
-          removing(index .. index) do
-            @array.delete_at(index)
-          end
+    # @overload delete_at(index)
+    #   Deletes an item.
+    #   @param [Integer] index
+    #   @return the deleted item.
+    # @overload delete_at(index, count)
+    #   Deletes items.
+    #   @param [Integer] index
+    #   @return [Array] the deleted items.
+    def delete_at(index, count = nil)
+      if count
+        removing(index ... index + count) do
+          count.times.map { @array.delete_at(index) }
+        end
+      else
+        removing(index .. index) do
+          @array.delete_at(index)
         end
       end
+    end
 
-      # Prepend items.
-      # @return [self]
-      def unshift(*items)
-        insert(0, *items)
-      end
+    # Prepend items.
+    # @return [self]
+    def unshift(*items)
+      insert(0, *items)
+    end
 
-      # @overload shift
-      #   Deletes the first item.
-      #   @return the deleted item.
-      # @overload shift(count)
-      #   Deletes the first items.
-      #   @return [Array] the deleted items.
-      def shift(count = nil)
-        delete_at(0, count)
-      end
+    # @overload shift
+    #   Deletes the first item.
+    #   @return the deleted item.
+    # @overload shift(count)
+    #   Deletes the first items.
+    #   @return [Array] the deleted items.
+    def shift(count = nil)
+      delete_at(0, count)
+    end
 
-      # Append items.
-      # @return [self]
-      def push(*items)
-        insert(@array.size, *items)
-      end
+    # Append items.
+    # @return [self]
+    def push(*items)
+      insert(@array.size, *items)
+    end
 
-      alias_method :<<, :push
+    alias_method :<<, :push
 
-      # @overload pop
-      #   Deletes the last item.
-      #   @return the deleted item.
-      # @overload pop(count)
-      #   Deletes the last items.
-      #   @return [Array] the deleted items.
-      def pop(count = nil)
-        delete_at(@array.size - count, count)
-      end
+    # @overload pop
+    #   Deletes the last item.
+    #   @return the deleted item.
+    # @overload pop(count)
+    #   Deletes the last items.
+    #   @return [Array] the deleted items.
+    def pop(count = nil)
+      delete_at(@array.size - count, count)
+    end
 
-      # Deletes all items.
-      # @return [self]
-      def clear
-        removing(0 ... count) do
-          @array.clear
-        end
-        self
+    # Deletes all items.
+    # @return [self]
+    def clear
+      removing(0 ... count) do
+        @array.clear
       end
+      self
+    end
 
-      # Replaces entire array with given array.
-      # @param [Array] ary
-      # @return [self]
-      def replace(ary)
-        resetting do
-          @array = ary.dup
-        end
-        self
+    # Replaces entire array with given array.
+    # @param [Array] ary
+    # @return [self]
+    def replace(ary)
+      resetting do
+        @array = ary.dup
       end
+      self
     end
   end
 end

data/lib/qml/data/list_model.rb

@@ -1,146 +1,122 @@
-require 'qml/data/error'
-require 'qml/wrappable'
-require 'qml/dispatchable'
-
 module QML
-  module Data
-    # {ListModel} is the base class of list models which provides data to QML list views.
-    # @see http://qt-project.org/doc/qt-5/qabstractitemmodel.html QAbstractItemModel (C++)
-    # @see http://qt-project.org/doc/qt-5/qabstractlistmodel.html QAbstractListModel (C++)
-    class ListModel
-      include ::Enumerable
-      include Wrappable
-      include Dispatchable
-
-      # @api private
-      # @return [Array<QtObjectBase>]
-      attr_reader :qt_models
-
-      # @return [Array<Symbol|String>]
-      attr_reader :columns
-
-      # @param [Array<Symbol|String>] columns the column names of the model.
-      def initialize(*columns)
-        @columns = columns
-        @qt_models = []
-      end
-
-      # Iterates each item.
-      # @overload each
-      #   @return [Enumerator]
-      # @overload each
-      #   @yield [item]
-      #   @return [self]
-      def each
-        return to_enum unless block_given?
-        count.times do |i|
-          yield self[i]
-        end
-        self
-      end
-
-      # @abstract
-      # @return [Integer] the number of the items.
-      def count
-        fail ::NotImplementedError
-      end
+  # {ListModel} is the base class of list models which provides data to QML list views.
+  # @see http://qt-project.org/doc/qt-5/qabstractitemmodel.html QAbstractItemModel (C++)
+  # @see http://qt-project.org/doc/qt-5/qabstractlistmodel.html QAbstractListModel (C++)
+  class ListModel
+    include Enumerable
+
+    # @return [Array<Symbol|String>]
+    attr_reader :columns
+
+    # @param [Array<Symbol|String>] columns the column names of the model.
+    def initialize(*columns)
+      @columns = columns
+      @access = ListModelAccess.create(self)
+      @qml_model = QML::Plugins.rubyqml.createListModel(@access)
+    end
 
-      # Returns an item.
-      # @abstract
-      # @param [Integer] index the index of the item.
-      # @return the item.
-      def [](index)
-        fail ::NotImplementedError
+    # Iterates each item.
+    # @overload each
+    #   @return [Enumerator]
+    # @overload each
+    #   @yield [item]
+    #   @return [self]
+    def each
+      return to_enum unless block_given?
+      count.times do |i|
+        yield self[i]
       end
+      self
+    end
 
-      protected
+    # @abstract
+    # @return [Integer] the number of the items.
+    def count
+      fail ::NotImplementedError
+    end
 
-      # Notifies the list views that the data of the items was changed.
-      # @param [Range<Integer>] range the index range of changed items.
-      def update(range)
-        @qt_models.each do |qt_model|
-          qt_model.update(range.min, range.max)
-        end
-      end
+    # Returns an item.
+    # @abstract
+    # @param [Integer] index the index of the item.
+    # @return the item.
+    def [](index)
+      fail ::NotImplementedError
+    end
 
-      # Notifies the list views that items are about to be and were moved.
-      # @param [Range<Integer>] range the index range of the item being moved.
-      # @param [Integer] destination the first index of the items after moved.
-      # @yield the block that actually do moving operation of the items.
-      # @return the result of given block.
-      # @see http://qt-project.org/doc/qt-5/qabstractitemmodel.html#beginMoveRows QAbstractItemModel::beginMoveRows
-      # @see http://qt-project.org/doc/qt-5/qabstractitemmodel.html#endMoveRows QAbstractItemModel::endMoveRows
-      # @see #inserting
-      # @see #removing
-      def moving(range, destination)
-        return if range.count == 0
+    # @return [QML::JSObject]
+    def to_qml
+      @qml_model
+    end
 
-        @qt_models.each do |qt_model|
-          qt_model.begin_move(range.min, range.max, destination)
-        end
-        ret = yield
-        @qt_models.each do |qt_model|
-          qt_model.end_move
-        end
-        ret
-      end
+    protected
 
-      # Notifies the list views that items are about to be and were inserted.
-      # @param [Range<Integer>] range the index range of the items after inserted.
-      # @yield the block that actually do insertion of the items.
-      # @return the result of give block.
-      # @example
-      #   inserting(index ... index + items.size) do
-      #     @array.insert(index, *items)
-      #   end
-      # @see http://qt-project.org/doc/qt-5/qabstractitemmodel.html#beginInsertRows QAbstractItemModel::beginInsertRows
-      # @see http://qt-project.org/doc/qt-5/qabstractitemmodel.html#endInsertRows QAbstractItemModel::endInsertRows
-      # @see #removing
-      # @see #moving
-      def inserting(range, &block)
-        return if range.count == 0
+    # Notifies the list views that the data of the items was changed.
+    # @param [Range<Integer>] range the index range of changed items.
+    def update(range)
+      @access.update(range.min, range.max)
+    end
 
-        @qt_models.each do |qt_model|
-          qt_model.begin_insert(range.min, range.max)
-        end
-        ret = yield
-        @qt_models.each do |qt_model|
-          qt_model.end_insert
-        end
-        ret
-      end
+    # Notifies the list views that items are about to be and were moved.
+    # @param [Range<Integer>] range the index range of the item being moved.
+    # @param [Integer] destination the first index of the items after moved.
+    # @yield the block that actually do moving operation of the items.
+    # @return the result of given block.
+    # @see http://qt-project.org/doc/qt-5/qabstractitemmodel.html#beginMoveRows QAbstractItemModel::beginMoveRows
+    # @see http://qt-project.org/doc/qt-5/qabstractitemmodel.html#endMoveRows QAbstractItemModel::endMoveRows
+    # @see #inserting
+    # @see #removing
+    def moving(range, destination)
+      return if range.count == 0
+
+      @access.begin_move(range.min, range.max, destination)
+      ret = yield
+      @access.end_move
+      ret
+    end
 
-      # Notifies the list views that items are about to be and were removed.
-      # @param [Range<Integer>] range the index range of the items before removed.
-      # @yield the block that actually do removal of the items.
-      # @return the result of give block.
-      # @see http://qt-project.org/doc/qt-5/qabstractitemmodel.html#beginRemoveRows QAbstractItemModel::beginRemoveRows
-      # @see http://qt-project.org/doc/qt-5/qabstractitemmodel.html#endRemoveRows QAbstractItemModel::endRemoveRows
-      # @see #inserting
-      # @see #moving
-      def removing(range, &block)
-        return if range.count == 0
+    # Notifies the list views that items are about to be and were inserted.
+    # @param [Range<Integer>] range the index range of the items after inserted.
+    # @yield the block that actually do insertion of the items.
+    # @return the result of give block.
+    # @example
+    #   inserting(index ... index + items.size) do
+    #     @array.insert(index, *items)
+    #   end
+    # @see http://qt-project.org/doc/qt-5/qabstractitemmodel.html#beginInsertRows QAbstractItemModel::beginInsertRows
+    # @see http://qt-project.org/doc/qt-5/qabstractitemmodel.html#endInsertRows QAbstractItemModel::endInsertRows
+    # @see #removing
+    # @see #moving
+    def inserting(range, &block)
+      return if range.count == 0
+
+      @access.begin_insert(range.min, range.max)
+      ret = yield
+      @access.end_insert
+      ret
+    end
 
-        @qt_models.each do |qt_model|
-          qt_model.begin_remove(range.min, range.max)
-        end
-        ret = yield
-        @qt_models.each do |qt_model|
-          qt_model.end_remove
-        end
-        ret
-      end
+    # Notifies the list views that items are about to be and were removed.
+    # @param [Range<Integer>] range the index range of the items before removed.
+    # @yield the block that actually do removal of the items.
+    # @return the result of give block.
+    # @see http://qt-project.org/doc/qt-5/qabstractitemmodel.html#beginRemoveRows QAbstractItemModel::beginRemoveRows
+    # @see http://qt-project.org/doc/qt-5/qabstractitemmodel.html#endRemoveRows QAbstractItemModel::endRemoveRows
+    # @see #inserting
+    # @see #moving
+    def removing(range, &block)
+      return if range.count == 0
+
+      @access.begin_remove(range.min, range.max)
+      ret = yield
+      @access.end_remove
+      ret
+    end
 
-      def resetting(&block)
-        @qt_models.each do |qt_model|
-          qt_model.begin_reset
-        end
-        ret = yield
-        @qt_models.each do |qt_model|
-          qt_model.end_reset
-        end
-        ret
-      end
+    def resetting(&block)
+      @access.begin_reset
+      ret = yield
+      @access.end_reset
+      ret
     end
   end
 end