motion-wiretap 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99db3db8e4cf9422189294a89b8291de93af7548
-  data.tar.gz: f8565d3e0cde697b9ca8c02bdf1f932f0ce635bc
+  metadata.gz: c00742f3bdb9d4cd330e42f101a484650651a0ee
+  data.tar.gz: e2e14fb9ec9bf951cc51d2b3cae3722ebea63d31
 SHA512:
-  metadata.gz: 1e217902b0a8c869efcf462ad728046dffcd492a613781e8284d2db7449caa4e2780bdeebc0390eda3a453fdc7a6c4282c89314d767f61e0e757ddde2955ec6a
-  data.tar.gz: 64755e1482c0fb48241805ff5d30a41832833a3fb77d9878ef25e01fbf2612575844eff88aa8a71621f8321ec61fd1856f392ce6c435c8599bfecf6e76b95f8a
+  metadata.gz: 9f04ca6c2feb0c9f8c6d95ac969294d4c1b371907775451392c85e2c0fdecc63b1d755c0ea565027456e09226e4a4c1183a9d863f23202401df9ff72756f3891
+  data.tar.gz: 2cc1e685b0732dd594da91d3aeac89e25614bc78e7f4fbafaffca2255744c382cd69b019122e2873c4f44cface5e9ddb460a0e72a2dc3090694352cc845a1a81

data/lib/motion-wiretap/all/signal.rb

@@ -8,8 +8,8 @@ module MotionWiretap
     # The SINGLETON value does not trigger a 'change' event. It is for internal
     # use only.
     def initialize(value=SINGLETON, &block)
-      @value = value
       super(&block)
+      @value = value
     end
 
     def value

data/lib/motion-wiretap/all/wiretap.rb

@@ -9,12 +9,15 @@ module MotionWiretap
   SINGLETON = Class.new.new
 
   class Wiretap
+    # wiretaps have an intrinsic "current value"
+    attr :value
 
     def initialize(&block)
       @is_torn_down = false
       @is_completed = false
       @is_error = false
       @queue = nil
+      @value = nil
 
       @listener_handlers = []
       @completion_handlers = []
@@ -70,6 +73,11 @@ module MotionWiretap
 
     def trigger_changed(*values)
       return if @is_torn_down || @is_completed || @is_error
+      if values.length == 1
+        @value = values.first
+      else
+        @value = values
+      end
 
       @listener_handlers.each do |block_or_wiretap|
         trigger_changed_on(block_or_wiretap, values)
@@ -215,11 +223,9 @@ module MotionWiretap
 
   class WiretapKvo < WiretapTarget
     attr :property
-    attr :value
 
     def initialize(target, property, &block)
       @property = property
-      @value = nil
       @initial_is_set = false
       @bound_to = []
       super(target, &block)
@@ -239,25 +245,22 @@ module MotionWiretap
       super
     end
 
-    def trigger_changed(*values)
-      super(@value)
-    end
-
     def bind_to(wiretap)
       @bound_to << wiretap
       wiretap.listen do |value|
         @target.send("#{@property}=".to_sym, value)
       end
-      wiretap.trigger_changed
+      wiretap.trigger_changed(wiretap.value)
 
       return self
     end
 
     def observeValueForKeyPath(path, ofObject: target, change: change, context: context)
-      @value = change[NSKeyValueChangeNewKey]
+      value = change[NSKeyValueChangeNewKey]
       if @initial_is_set
-        trigger_changed(@value)
+        trigger_changed(value)
       else
+        @value = value
         @initial_is_set = true
       end
     end
@@ -333,6 +336,7 @@ module MotionWiretap
     def initialize(parent)
       @parent = parent
       @parent.listen(self)
+      @value = @parent.value
       super()
     end
 
@@ -353,7 +357,7 @@ module MotionWiretap
     # passes the values through the filter before passing up to the parent
     # implementation
     def trigger_changed(*values)
-      if ( @filter.call(*values) )
+      if @filter.call(*values)
         super(*values)
       end
     end
@@ -364,7 +368,6 @@ module MotionWiretap
 
     def initialize(parent, combiner)
       @combiner = combiner
-
       super(parent)
     end
 
@@ -381,7 +384,6 @@ module MotionWiretap
     def initialize(parent, memo, reducer)
       @reducer = reducer
       @memo = memo
-
       super(parent)
     end
 
@@ -397,7 +399,6 @@ module MotionWiretap
 
     def initialize(parent, mapper)
       @mapper = mapper
-
       super(parent)
     end
 

data/lib/motion-wiretap/version.rb

@@ -1,3 +1,3 @@
 module MotionWiretap
-  VERSION = '1.1.3'
+  VERSION = '1.1.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-wiretap
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Colin T.A. Gray