qml 0.0.5 → 0.0.6

data/lib/qml/reactive/object.rb

@@ -12,31 +12,30 @@ module QML
 
       # When {Object} is included by a class, the class extends {ClassMethods} to add the common class methods.
       def self.included(derived)
-        fail Error, "SignalDef must be included in a class" unless derived.is_a? ::Class
+        fail Error, "#{Object} must be included in a class" unless derived.is_a? ::Class
         derived.extend(ClassMethods)
       end
 
       def initialize(*args, &block)
-        super
+        # prepare properties
         properties = self.class.instance_property_hash
           .values
           .map { |property| self.class.instance_property(property.original) }
           .uniq
-        notifier_signals = properties.map(&:notifier_signal)
+        properties.each do |property|
+          instance_variable_set("@_property_#{property.name}", property.bind(self))
+        end
+
+        # prepare signals
         signals = self.class.instance_signal_hash
           .values
           .map { |signal| self.class.instance_signal(signal.original) }
-          .uniq - notifier_signals
-
-        properties.each do |property|
-          p = property.bind(self)
-          instance_variable_set(:"@_property_#{property.name}", p)
-          instance_variable_set(:"@_signal_#{property.notifier_signal.name}", p.changed)
-        end
+          .uniq
         signals.each do |signal|
-          instance_variable_set(:"@_signal_#{signal.name}", signal.bind(self))
+          instance_variable_set("@_signal_#{signal.name}", signal.bind(self))
         end
 
+        # prepare signal connections
         self.class.send(:initial_connections_hash).each do |name, blocks|
           blocks.each do |block|
             signal(name).connect do |*args|
@@ -44,6 +43,8 @@ module QML
             end
           end
         end
+
+        super
       end
 
       # @!method signal(name)
@@ -126,7 +127,7 @@ module QML
         # @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)
+        # @option opts [Proc] :signal (nil)
         # @return [Symbol] The signal name
         # @example
         #   class Button
@@ -151,33 +152,37 @@ module QML
         def signal(name, params, opts = {})
           name.to_sym.tap do |name|
             params = params.map(&:to_sym)
-            add_signal(UnboundSignal.new(name, params, false, self, opts[:factory]))
+            add_signal(UnboundSignal.new(name, params, false, self, opts[:signal]))
           end
         end
 
         # Defines a variadic signal.
         # Variadic signals do not restrict the number of arguments.
         # @param opts [Hash]
-        # @option opts [Proc] :factory (nil)
+        # @option opts [Proc] :signal (nil)
         # @see #signal
         def variadic_signal(name, opts = {})
           name.to_sym.tap do |name|
-            add_signal(UnboundSignal.new(name, nil, true, self, opts[:factory]))
+            add_signal(UnboundSignal.new(name, nil, true, self, opts[:signal]))
           end
         end
 
         # Aliases a signal.
+        # @param name [#to_sym]
+        # @param original_name [#to_sym]
         # @return [Symbol] The new name
         def alias_signal(name, original_name)
-          add_signal(instance_signal(original_name).alias(name))
-          name
+          name.to_sym.tap do |name|
+            original_name = original_name.to_sym
+            add_signal(instance_signal(original_name).alias(name))
+          end
         end
 
         # 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)
+        # @option opts [Proc] :property (nil)
         # @yield The initial property binding (optional)
         # @return [Symbol] The name
         # @example
@@ -197,16 +202,22 @@ module QML
         #   end
         #   Bar.new.name #=> 'piyopiyo'
         def property(name, init_value = nil, opts = {}, &init_binding)
-          name = name.to_sym
-          add_property(UnboundProperty.new(name, init_value, init_binding, self, opts[:factory]))
-          name
+          name.to_sym.tap do |name|
+            add_property(UnboundProperty.new(name, init_value, init_binding, self, opts[:property]))
+            signal("#{name}_changed", [:new_value], signal: -> { property(name).changed })
+          end
         end
 
         # Aliases a property.
+        # @param name [#to_sym]
+        # @param original_name [#to_sym]
         # @return [Symbol] The new name
         def alias_property(name, original_name)
-          add_property(instance_property(original_name).alias(name))
-          name
+          name.to_sym.tap do |name|
+            original_name = original_name.to_sym
+            add_property(instance_property(original_name).alias(name))
+            alias_signal("#{name}_changed", "#{original_name}_changed")
+          end
         end
 
         # Adds a signal handler.
@@ -261,8 +272,6 @@ module QML
               @_property_#{property.original}.value = new_value
             end
           EOS
-
-          add_signal(property.notifier_signal)
         end
 
         def initial_connections_hash(include_super = true)

data/lib/qml/reactive/signal.rb

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

data/lib/qml/reactive/unbound_property.rb

@@ -31,7 +31,7 @@ module QML
       end
 
       def bind(obj)
-        return @factory.call(obj, self) if @factory
+        return obj.instance_exec(&@factory) if @factory
         Property.new.tap do |p|
           p.value = @initial_value if @initial_value
           p.bind { obj.instance_eval &@initial_binding } if @initial_binding

data/lib/qml/reactive/unbound_signal.rb

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

data/lib/qml/version.rb

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

data/spec/qml/reactive/object_spec.rb

@@ -2,36 +2,7 @@ require 'spec_helper'
 
 describe QML::Reactive::Object do
 
-  class Button
-    include QML::Reactive::Object
-    signal :pressed, [:pos]
-    variadic_signal :message
-    property :name, 'button'
-    property :id, 0
-    property :name_double do
-      name + name
-    end
-    on :pressed do |pos|
-      self.name = pos
-    end
-    on_changed :id do
-      self.name = "ID: #{id}"
-    end
-    on_changed :id do
-    end
-    alias_property :title, :name
-    alias_signal :clicked, :pressed
-  end
-
-  class ToggleButton < Button
-    signal :pressed, [:x, :y]
-    signal :toggled, [:on]
-    property(:name) { 'toggle button' }
-    property(:info) { 'some info' }
-  end
-
-  let(:button) { Button.new }
-  let(:toggle_button) { ToggleButton.new }
+  include_context 'Reactive test objects'
 
   describe '.property' do
 
@@ -175,19 +146,24 @@ describe QML::Reactive::Object do
       button.id = 2
       expect(button.name).to eq "ID: 2"
     end
+    it 'calls all connections including superclass' do
+      toggle_button.id = 3
+      expect(toggle_button.name).to eq "ID: 3"
+      expect(toggle_button.info).to eq "ID changed"
+    end
   end
 
   describe '.instance_signals' do
     context 'when include_super is false' do
       it 'returns all signal definitions of the class' do
-        signals = ToggleButton.instance_signals(false)
+        signals = toggle_button_class.instance_signals(false)
         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
+        signals = toggle_button_class.instance_signals
         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
@@ -196,14 +172,14 @@ describe QML::Reactive::Object do
   describe '.instance_properties' do
     context 'when include_super is false' do
       it 'returns all property definitions of the class' do
-        properties = ToggleButton.instance_properties(false)
+        properties = toggle_button_class.instance_properties(false)
         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
+        properties = toggle_button_class.instance_properties
         expect(properties).to match_array %w{name id info name_double title}.map(&:to_sym)
       end
     end
@@ -211,28 +187,28 @@ describe QML::Reactive::Object do
 
   describe '.instance_signal' do
     it 'returns the UnboundSignal for name' do
-      s = ToggleButton.instance_signal(:pressed)
+      s = toggle_button_class.instance_signal(:pressed)
       expect(s).to be_a QML::Reactive::UnboundSignal
       expect(s.name).to eq :pressed
       expect(s.arity).to eq 2
     end
     context 'when signal does not exist' do
       it 'fails with NameError' do
-        expect { ToggleButton.instance_signal(:non_existent) }.to raise_error(NameError)
+        expect { toggle_button_class.instance_signal(:non_existent) }.to raise_error(NameError)
       end
     end
   end
 
   describe '.instance_property' do
     it 'returns the UnboundProperty for name' do
-      p = ToggleButton.instance_property(:name)
+      p = toggle_button_class.instance_property(:name)
       expect(p).to be_a QML::Reactive::UnboundProperty
       expect(p.name).to eq :name
       expect(p.initial_binding.call).to eq 'toggle button'
     end
     context 'when property does not exist' do
       it 'fails with NameError' do
-        expect { ToggleButton.instance_property(:non_existent) }.to raise_error(NameError)
+        expect { toggle_button_class.instance_property(:non_existent) }.to raise_error(NameError)
       end
     end
   end

data/spec/qml/reactive/signal_spec.rb

@@ -4,7 +4,7 @@ describe QML::Reactive::Signal do
 
   before do
     @signal = QML::Reactive::Signal.new([:foo, :bar])
-    @variadic_signal = QML::Reactive::Signal.new([], variadic: true)
+    @variadic_signal = QML::Reactive::Signal.new(nil)
   end
 
   describe 'connection' do

data/spec/qml/reactive/unbound_property_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe QML::Reactive::UnboundProperty do
+  include_context 'Reactive test objects'
+  let(:property) { button_class.instance_property(:name) }
+  let(:alias_property) { button_class.instance_property(:title) }
+
+  describe '#name' do
+    it 'returns the name' do
+      expect(property.name).to eq(:name)
+      expect(alias_property.name).to eq(:title)
+    end
+  end
+
+  describe '#owner' do
+    it 'returns the owner class' do
+      expect(property.owner).to be(button_class)
+      expect(alias_property.owner).to be(button_class)
+    end
+  end
+
+  describe '#original' do
+    it 'returns the original name of the alias property' do
+      expect(alias_property.original).to eq(:name)
+    end
+  end
+
+  describe '#alias?' do
+    context 'for non-alias properties' do
+      it 'returns false' do
+        expect(property).not_to be_alias
+      end
+    end
+    context 'for alias properties' do
+      it 'returns true' do
+        expect(alias_property).to be_alias
+      end
+    end
+  end
+end

data/spec/qml/reactive/unbound_signal_spec.rb

@@ -0,0 +1,70 @@
+require 'spec_helper'
+
+describe QML::Reactive::UnboundSignal do
+  include_context 'Reactive test objects'
+  let(:signal) { button_class.instance_signal(:pressed) }
+  let(:alias_signal) { button_class.instance_signal(:clicked) }
+  let(:variadic_signal) { button_class.instance_signal(:message) }
+
+  describe '#name' do
+    it 'returns the name' do
+      expect(signal.name).to eq(:pressed)
+      expect(alias_signal.name).to eq(:clicked)
+    end
+  end
+
+  describe '#owner' do
+    it 'returns the owner class' do
+      expect(signal.owner).to be(button_class)
+      expect(alias_signal.owner).to be(button_class)
+    end
+  end
+
+  describe '#original' do
+    it 'returns the original name of the alias signal' do
+      expect(alias_signal.original).to eq(:pressed)
+    end
+  end
+
+  describe '#variadic?' do
+    context 'for non-variadic signals' do
+      it 'returns false' do
+        expect(signal).not_to be_variadic
+      end
+    end
+    context 'for variadic signals' do
+      it 'returns true' do
+        expect(variadic_signal).to be_variadic
+      end
+    end
+  end
+
+  describe '#alias?' do
+    context 'for non-alias signals' do
+      it 'returns false' do
+        expect(signal).not_to be_alias
+      end
+    end
+    context 'for alias signals' do
+      it 'returns true' do
+        expect(alias_signal).to be_alias
+      end
+    end
+  end
+
+  describe '#arity' do
+    it 'returns the number of arguments' do
+      expect(signal.arity).to eq(1)
+      expect(variadic_signal.arity).to eq(-1)
+      expect(alias_signal.arity).to eq(1)
+    end
+  end
+
+  describe '#parameters' do
+    it 'returns parameter names' do
+      expect(signal.parameters).to eq([[:req, :pos]])
+      expect(alias_signal.parameters).to eq([[:req, :pos]])
+      expect(variadic_signal.parameters).to eq([[:rest, :args]])
+    end
+  end
+end

data/spec/shared/qml/reactive/object.rb

@@ -0,0 +1,39 @@
+shared_context 'Reactive test objects' do
+  let(:button_class) do
+    Class.new do
+      include QML::Reactive::Object
+      signal :pressed, [:pos]
+      variadic_signal :message
+      property :name, 'button'
+      property :id, 0
+      property :name_double do
+        name + name
+      end
+      on :pressed do |pos|
+        self.name = pos
+      end
+      on_changed :id do
+        self.name = "ID: #{id}"
+      end
+      on_changed :id do
+      end
+      alias_property :title, :name
+      alias_signal :clicked, :pressed
+    end
+  end
+
+  let(:toggle_button_class) do
+    Class.new(button_class) do
+      signal :pressed, [:x, :y]
+      signal :toggled, [:on]
+      property(:name) { 'toggle button' }
+      property(:info) { 'some info' }
+      on_changed :id do
+        self.info = 'ID changed'
+      end
+    end
+  end
+
+  let(:button) { button_class.new }
+  let(:toggle_button) { toggle_button_class.new }
+end