motion-wiretap 0.2.1 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 446d7bb23634641466df4e37ffa85daaac5fdc8c
+  data.tar.gz: f7b9033df4a62d4f235b47f4d5f39e1efa0bac11
+SHA512:
+  metadata.gz: 17981158a67d7424e538351070ac732a7591e364c515882e176f83156f6ad850d5922bbf0754cdc1a704e089f15a15fbc676c9b58b02c381d48dc76cf8f8ed34
+  data.tar.gz: 196a340c6afe69833db31d76f51751ede875d75d38e6e9b294fde372031a5c2de60dc17b689174dd7aea6fe07ca8d53186b9dbf192bde535b99d36fb4893fa1d

data/README.md

@@ -1,17 +1,25 @@
-Wiretap
--------
+MotionWiretap
+-------------
 
-An iOS / OS X wrapper heavily inspired by ReactiveCocoa.
+An iOS / OS X library heavily inspired by ReactiveCocoa.
 
     gem install motion-wiretap
 
+Run the iOS specs using `rake spec`
 Run the OSX specs using `rake spec platform=osx`
 
 First things first
 ------------------
 
-You **MUST** call `cancel!` on any wiretaps you create, otherwise they will live
-in memory forever.  The upside is that you can create 
+You **MUST** retain any wiretaps you create, otherwise they will be garbage
+collected immediately.  I don't yet have a clever way to avoid this unfortunate
+state of affairs, other than keeping some global list of wiretaps.  UG to that.
+
+How does ReactiveCocoa do it, anyone know?  I'd love to mimic that.
+
+This isn't a terrible thing, though, since most wiretaps require that you call
+the `cancel!` method. Again, I'm not sure how ReactiveCocoa accomplishes the
+"auto shutdown" of signals that rely on notifications and key-value observation.
 
 Showdown
 --------
@@ -24,7 +32,61 @@ Open these side by side to see the comparison:
 Usage
 -----
 
-These are taken from the specs.
+Creating a wiretap is done using the factory method `Motion.wiretap()`.
+
+```ruby
+@wiretap = Motion.wiretap(obj, :property)
+```
+
+If you want to use a more literate style, you can include the
+`motion-wiretap-polluting` to have a `wiretap` method added to your objects. *I*
+like this style, but the default is to have a non-polluting system.
+
+```ruby
+@wiretap = obj.wiretap(:property)
+```
+
+Wiretaps can be composed all sorts of ways: you can filter them, map them,
+combine multiple wiretaps into a single value, use them to respond to
+notifications or control events.
+
+### Let's start with something practical!
+
+This first example will use `motion-wiretap-polluting` methods, because that's
+my preferred aesthetic style, but the rest of this document will focus on the
+non-polluting version.
+
+```ruby
+# assign the label to the text view; changes to the text view will be reflected
+# on the label.
+@label.wiretap(:text).bind_to(@text_view.wiretap(:text))
+
+# assign the attributedText of the label to the text view, doing some
+# highlighting in-between
+@label.wiretap(:attributedText).bind_to(@text_view.wiretap(:text).map do |text|
+  NSAttributedString.alloc.initWithString(text, attributes: { NSForegroundColorAttributeName => UIColor.blueColor })
+end)
+
+# bind the `enabled` property to check on whether `username_field.text` and
+# `password_field.text` are blank
+@login_button.wiretap(:enabled).bind_to(
+  [
+    @username_field.wiretap(:text),
+    @password_field.wiretap(:text),
+  ].wiretap.combine do |username, password|
+    username && username.length > 0 && password && password.length > 0
+  end
+  )
+```
+
+### Types of wiretaps
+
+- Key-Value Observation / KVO
+- Arrays (map/reduce)
+- Jobs (event stream, completion)
+- NSNotificationCenter
+- UIView Gestures
+- UIControl events
 
 ### Key-Value Observation
 
@@ -37,16 +99,26 @@ end
 
 # listen for changes
 person = Person.new
-person.wiretap(:name) do |name|
+# you need to store the wiretap object in memory; when the object is
+# deallocated, it will no longer receive updates.
+wiretap = Motion.wiretap(person, :name)
+# react to change events
+wiretap.listen do |name|
   puts "name is now #{name}"
 end
 person.name = 'Joe'
 # puts => "name is now Joe"
 
+# Since listening is very common, you can easily shorthand this to:
+wiretap = Motion.wiretap(person, :name) do |name|
+  puts "name is now #{name}"
+end
+
 # bind the property of one object to the value of another
 person_1 = Person.new
 person_2 = Person.new
-wiretap = person_1.wiretap(:name).bind_to(person_2.wiretap(:name))
+wiretap = Motion.wiretap(person_1, :name)
+wiretap.bind_to(person_2, :name)  # creates a new Wiretap object for person_2; changes to person_2.name will affect person_1
 person_2.name = 'Bob'
 person_1.name # => "Bob"
 
@@ -57,20 +129,20 @@ person_1.name
 # => "BOB"
 
 # bind the property of one object to the value of another, but change it using `map`
-wiretap = person_1.wiretap(:name).bind_to(person_2.wiretap(:name).map { |value| value.upcase })
+wiretap = Motion.wiretap(person_1, :name).bind_to(person_2.wiretap(:name).map { |value| value.upcase })
 person_2.name = 'Bob'
 person_1.name # => "BOB"
 ```
 
 ### Working with arrays
 
-```
+```ruby
 # combine the values `name` and `email`
 person = Person.new
-[
-  person.wiretap(:name),
-  person.wiretap(:email),
-].wiretap.combine do |name, email|
+taps = Motion.wiretap([
+  Motion.wiretap(person, :name),
+  Motion.wiretap(person, :email),
+]).combine do |name, email|
   puts "#{name} <#{email}>"
 end
 
@@ -82,22 +154,25 @@ person.email = 'kaz@example.com'
 # reduce/inject
 person_1 = Person.new
 person_2 = Person.new
-[
-  person_1.wiretap(:name),
-  person_2.wiretap(:name),
-].wiretap.reduce do |memo, name|
+taps = Motion.wiretap([
+  Motion.wiretap(person_1, :name),
+  Motion.wiretap(person_2, :name),
+]).reduce do |memo, name|
   memo ||= []
   memo + [name]
 end
+wiretap.listen do |names|
+  puts names.inspect
+end
 person_1.name = 'Mr. White'
 person_1.name = 'Mr. Blue'
-# => ['Mr. White', 'Mr. Blue']
+# => ["Mr. White", "Mr. Blue"]
 
 # you can provide an initial 'memo' (default: nil)
-[
-  person_1.wiretap(:name),
-  person_2.wiretap(:name),
-].wiretap.reduce([]) do |memo, name|
+Motion.wiretap([
+  Motion.wiretap(person_1, :name),
+  Motion.wiretap(person_2, :name),
+]).reduce([]) do |memo, name|
   memo + [name]  # you should not change memo in place, the same one will be used on every change event
 end
 ```
@@ -105,23 +180,29 @@ end
 ### Monitoring jobs
 
 ```ruby
-# monitor for background job completion
--> {
+# Monitor for background job completion:
+Motion.wiretap(-> do
   this_will_take_forever!
-}.wiretap(Dispatch::Queue.concurrent) do
+end).and_then do
   puts "done!"
-end
+end.start
 
-# Note: this is convenient shorthand for calling `queue`, `and_then`, and `start`
--> {}.wiretap.queue(...).and_then do ... end.start
+# Same, but specifying the thread to run on. The completion block will be called
+# on this thread, too. The queue conveniently accepts a completion handler
+# (delegates to the `Wiretap#and_then` method).
+Motion.wiretap(-> do
+  this_will_take_forever!
+end).queue(Dispatch::Queue.concurrent).and_then do
+  puts "done!"
+end.start
 
-# send a stream of values.  a lambda is passed in that will forward change
-# events to the `listen` block
--> (on_change) do
+# Send a stream of values from a block. A lambda is passed in that will forward
+# change events to the `listen` block
+Motion.wiretap(-> (on_change) do
   5.times do |count|
     on_change.call count
   end
-end.wiretap.queue(Dispatch::Queue.concurrent).listen do |index|
+end).listen do |index|
   puts "...#{index}"
 end.and_then do
   puts "done!"
@@ -129,28 +210,17 @@ end.start
 # => puts "...0", "...1", "...2", "...3", "...4", "done!"
 ```
 
-### Let's do something practical!
+### Notifications
 
 ```ruby
-# bind the `enabled` property to the Wiretap object to a check on whether
-# `username_field.text` and `password_field.text` are blank
-@login_button.wiretap(:enabled).bind_to(
-  [
-    @username_field.wiretap(:text),
-    @password_field.wiretap(:text),
-  ].wiretap.combine do |username, password|
-    username && username.length > 0 && password && password.length > 0
-  end
-  )
+notification = Motion.wiretap('NotificationName') do
+  puts 'notification received!'
+end
+# the notification observer will be removed when the Wiretap is dealloc'd
 ```
 
-### Notifications
+### Gestures
 
 ```ruby
-notification = "NotificationName".wiretap do
-  puts "notification received!"
-end
 
-# rememder: it's *important* to cancel all wiretaps!
-notification.cancel!
 ```

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

@@ -1,20 +1,28 @@
-module Wiretap
+module MotionWiretap
 
   # a Wiretap::Signal is much like a Promise in functional programming.  A
   # Signal is triggered with a new value, or it is completed, or canceled with
   # an error event.
-  class Signal
+  class Signal < Wiretap
+    attr :value
 
-    def initialize
+    def initialize(value=nil)
+      super()
+      @value = value
+      trigger_changed(@value)
     end
 
     def next(value)
+      @value = value
+      trigger_changed(@value)
     end
 
     def complete
+      trigger_completed
     end
 
-    def error
+    def error(error)
+      trigger_error(error)
     end
 
   end

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

@@ -1,11 +1,8 @@
-
 module MotionWiretap
 
   class Wiretap
 
     def initialize(&block)
-      # MotionWiretap.wiretaps << self  # signal will be removed when it is completed
-
       @is_torn_down = false
       @is_completed = false
       @is_error = false
@@ -18,6 +15,11 @@ module MotionWiretap
       listen &block if block
     end
 
+    def dealloc
+      self.cancel!
+      super
+    end
+
     # this is the preferred way to turn off a wiretap; child classes override
     # `teardown`, which is only ever called once.
     def cancel!
@@ -26,7 +28,8 @@ module MotionWiretap
       teardown
     end
 
-    # for internal use
+    # Overridden by subclasses to turn off observation, unregister
+    # notifications, etc.
     def teardown
     end
 
@@ -53,7 +56,7 @@ module MotionWiretap
     def listen(wiretap=nil, &block)
       raise "Block or Wiretap is expected in #{self.class.name}##{__method__}" unless block || wiretap
       raise "Only Block *or* Wiretap is expected in #{self.class.name}##{__method__}" if block && wiretap
-      @listener_handlers << (block || wiretap)
+      @listener_handlers << (block ? block.weak! : wiretap)
       self
     end
 
@@ -81,11 +84,11 @@ module MotionWiretap
     def and_then(wiretap=nil, &block)
       raise "Block or Wiretap is expected in #{self.class.name}##{__method__}" unless block || wiretap
       raise "Only Block *or* Wiretap is expected in #{self.class.name}##{__method__}" if block && wiretap
-      @completion_handlers << (block || wiretap)
+      @completion_handlers << (block ? block.weak! : wiretap)
       if @is_completed
         trigger_completed_on(block || wiretap)
       end
-      self
+      return self
     end
 
     def trigger_completed
@@ -114,11 +117,11 @@ module MotionWiretap
     def on_error(wiretap=nil, &block)
       raise "Block or Wiretap is expected in #{self.class.name}##{__method__}" unless block || wiretap
       raise "Only Block *or* Wiretap is expected in #{self.class.name}##{__method__}" if block && wiretap
-      @error_handlers << (block || wiretap)
+      @error_handlers << (block ? block.weak! : wiretap)
       if @is_error
         trigger_error_on(block || wiretap, @is_error)
       end
-      self
+      return self
     end
 
     def trigger_error(error)
@@ -156,6 +159,10 @@ module MotionWiretap
 
     # Returns a Wiretap that combines all the values into one value (the values
     # are all passed in at the same time)
+    # @example
+    #     wiretap.combine do |one, two|
+    #       one ? two : nil
+    #     end
     def combine(&block)
       return WiretapCombiner.new(self, block)
     end
@@ -163,15 +170,19 @@ module MotionWiretap
     # Returns a Wiretap that passes each value through the block, and also the
     # previous return value (memo).
     # @example
+    #     # returns the total of all the prices
     #     wiretap.reduce(0) do |memo, item|
     #       memo + item.price
     #     end
-    #     # returns the total of all the prices
     def reduce(memo=nil, &block)
       return WiretapReducer.new(self, memo, block)
     end
 
     # Returns a Wiretap that passes each value through the provided block
+    # @example
+    #     wiretap.map do |item|
+    #       item.to_s
+    #     end
     def map(&block)
       return WiretapMapper.new(self, block)
     end
@@ -186,11 +197,6 @@ module MotionWiretap
       super(&block)
     end
 
-    def teardown
-      @target = nil
-      super
-    end
-
   end
 
   class WiretapKvo < WiretapTarget
@@ -201,6 +207,7 @@ module MotionWiretap
       @property = property
       @value = nil
       @initial_is_set = false
+      @bound_to = []
       super(target, &block)
 
       @target.addObserver(self,
@@ -214,8 +221,7 @@ module MotionWiretap
       @target.removeObserver(self,
         forKeyPath: @property.to_s
         )
-      @property = nil
-      @value = nil
+      @bound_to.each &:cancel!
       super
     end
 
@@ -224,10 +230,13 @@ module MotionWiretap
     end
 
     def bind_to(wiretap)
+      @bound_to << wiretap
       wiretap.listen do |value|
-        @target.send("#{@property}=", value)
+        @target.send("#{@property}=".to_sym, value)
       end
       wiretap.trigger_changed
+
+      return self
     end
 
     def observeValueForKeyPath(path, ofObject: target, change: change, context: context)
@@ -256,26 +265,26 @@ module MotionWiretap
 
       # gets assigned to the wiretap value if it's a Wiretap, or the object
       # itself if it is anything else.
-      @value = []
+      @values = []
       @initial_is_set = true
       # maps the wiretap object (which is unique)
       @wiretaps = {}
 
-      targets.each_with_index do |wiretap,index|
+      targets.each_with_index do |wiretap, index|
         unless wiretap.is_a? Wiretap
-          @value << wiretap
+          @values << wiretap
           # not a wiretap, so doesn't need to be "completed"
           @uncompleted -= 1
         else
           raise "You cannot store a Wiretap twice in the same sequence (for now - do you really need this?)" if @wiretaps.key?(wiretap)
           @wiretaps[wiretap] = index
 
-          @value << wiretap.value
+          @values << wiretap.value
 
           wiretap.listen do |value|
             indx = @wiretaps[wiretap]
-            @value[index] = wiretap.value
-            trigger_changed(*@value)
+            @values[index] = wiretap.value
+            trigger_changed(*@values)
           end
 
           wiretap.on_error do |error|
@@ -292,36 +301,41 @@ module MotionWiretap
       end
     end
 
-    def cancel!
-      @wiretaps.each do |wiretap,index|
-        wiretap.cancel!
-      end
-      super
-    end
-
     def teardown
-      @wiretaps = nil
+      cancel = (->(wiretap){ wiretap.cancel! }).weak!
+      @wiretaps.keys.each &cancel
       super
     end
 
     def trigger_changed(*values)
-      values = @value if values.length == 0
+      values = @values if values.length == 0
       super(*values)
     end
 
   end
 
-  class WiretapFilter < Wiretap
+  class WiretapChild < Wiretap
 
-    def initialize(parent, filter)
+    def initialize(parent)
       @parent = parent
-      @filter = filter
-
       @parent.listen(self)
-
       super()
     end
 
+    def teardown
+      @parent.cancel!
+      super
+    end
+
+  end
+
+  class WiretapFilter < WiretapChild
+
+    def initialize(parent, filter)
+      @filter = filter
+      super(parent)
+    end
+
     # passes the values through the filter before passing up to the parent
     # implementation
     def trigger_changed(*values)
@@ -330,22 +344,14 @@ module MotionWiretap
       end
     end
 
-    def teardown
-      @parent = nil
-      super
-    end
-
   end
 
-  class WiretapCombiner < Wiretap
+  class WiretapCombiner < WiretapChild
 
     def initialize(parent, combiner)
-      @parent = parent
       @combiner = combiner
 
-      @parent.listen(self)
-
-      super()
+      super(parent)
     end
 
     # passes the values through the combiner before passing up to the parent
@@ -354,23 +360,15 @@ module MotionWiretap
       super(@combiner.call(*values))
     end
 
-    def teardown
-      @parent = nil
-      super
-    end
-
   end
 
-  class WiretapReducer < Wiretap
+  class WiretapReducer < WiretapChild
 
     def initialize(parent, memo, reducer)
-      @parent = parent
       @reducer = reducer
       @memo = memo
 
-      @parent.listen(self)
-
-      super()
+      super(parent)
     end
 
     # passes each value through the @reducer, passing in the return value of the
@@ -379,22 +377,14 @@ module MotionWiretap
       super(values.inject(@memo, &@reducer))
     end
 
-    def teardown
-      @parent = nil
-      super
-    end
-
   end
 
-  class WiretapMapper < Wiretap
+  class WiretapMapper < WiretapChild
 
     def initialize(parent, mapper)
-      @parent = parent
       @mapper = mapper
 
-      @parent.listen(self)
-
-      super()
+      super(parent)
     end
 
     # passes the values through the mapper before passing up to the parent
@@ -403,22 +393,17 @@ module MotionWiretap
       super(*values.map { |value| @mapper.call(value) })
     end
 
-    def teardown
-      @parent = nil
-      super
-    end
-
   end
 
   class WiretapProc < WiretapTarget
 
-    def initialize(target, queue, block)
+    def initialize(target, queue, and_then)
       @started = false
       super(target)
-      and_then(&block) if block
+      and_then(&and_then) if and_then
       queue(queue) if queue
 
-      start if block
+      start if and_then
     end
 
     def start
@@ -448,7 +433,7 @@ module MotionWiretap
       @notification = notification
       @object = object
 
-      NSNotificationCenter.defaultCenter.addObserver(self, selector: 'notify:', name:@notification, object:@object)
+      NSNotificationCenter.defaultCenter.addObserver(self, selector: 'notify:', name: @notification, object: @object)
       listen(&block) if block
     end
 
@@ -457,16 +442,10 @@ module MotionWiretap
     end
 
     def teardown
-      NSNotificationCenter.defaultCenter.removeObserver(self, name:@notification, object:@object)
+      NSNotificationCenter.defaultCenter.removeObserver(self, name: @notification, object: @object)
       super
     end
 
   end
 
-  module_function
-
-  def wiretaps
-    @wiretaps ||= []
-  end
-
 end

data/lib/motion-wiretap/ios/wiretap_factory.rb

@@ -0,0 +1,30 @@
+module Motion
+
+  module_function
+
+  def wiretap(target, property=nil, &block)
+    case target
+    when NSString
+      MotionWiretap::WiretapNotification.new(target, property, block)
+    when Proc
+      MotionWiretap::WiretapProc.new(target, property, block)
+    when NSArray
+      MotionWiretap::WiretapArray.new(target, &block)
+    when UIControl
+      if property.nil?
+        MotionWiretap::WiretapControl.new(target, &block)
+      else
+        MotionWiretap::WiretapKvo.new(target, property, &block)
+      end
+    when UIView
+      if property.nil?
+        MotionWiretap::WiretapView.new(target, &block)
+      else
+        MotionWiretap::WiretapKvo.new(target, property, &block)
+      end
+    else
+      MotionWiretap::WiretapKvo.new(target, property, &block)
+    end
+  end
+
+end

data/lib/motion-wiretap/ios/wiretap_gestures.rb

@@ -23,7 +23,7 @@ module MotionWiretap
         end
       end
 
-      recognizer = UITapGestureRecognizer.alloc.initWithTarget(target, action:'handle_gesture:')
+      recognizer = UITapGestureRecognizer.alloc.initWithTarget(target, action: :handle_gesture)
       recognizer.numberOfTapsRequired = taps if taps
       recognizer.numberOfTouchesRequired = fingers if fingers
       return recognizer
@@ -31,13 +31,13 @@ module MotionWiretap
 
     # @yield [recognizer] Handles the gesture event, and passes the recognizer instance to the block.
     def pinch(target)
-      recognizer = UIPinchGestureRecognizer.alloc.initWithTarget(target, action:'handle_gesture:')
+      recognizer = UIPinchGestureRecognizer.alloc.initWithTarget(target, action: :handle_gesture)
       return recognizer
     end
 
     # @yield [recognizer] Handles the gesture event, and passes the recognizer instance to the block.
     def rotate(target)
-      recognizer = UIRotationGestureRecognizer.alloc.initWithTarget(target, action:'handle_gesture:')
+      recognizer = UIRotationGestureRecognizer.alloc.initWithTarget(target, action: :handle_gesture)
       return recognizer
     end
 
@@ -71,7 +71,7 @@ module MotionWiretap
         direction = UISwipeGestureRecognizerDirectionDown
       end
 
-      recognizer = UISwipeGestureRecognizer.alloc.initWithTarget(target, action:'handle_gesture:')
+      recognizer = UISwipeGestureRecognizer.alloc.initWithTarget(target, action: :handle_gesture)
       recognizer.direction = direction if direction
       recognizer.numberOfTouchesRequired = fingers if fingers
       return recognizer
@@ -103,7 +103,7 @@ module MotionWiretap
       min_fingers ||= fingers
       max_fingers ||= fingers
 
-      recognizer = UIPanGestureRecognizer.alloc.initWithTarget(target, action:'handle_gesture:')
+      recognizer = UIPanGestureRecognizer.alloc.initWithTarget(target, action: :handle_gesture)
       recognizer.maximumNumberOfTouches = min_fingers if min_fingers
       recognizer.minimumNumberOfTouches = max_fingers if max_fingers
       return recognizer
@@ -131,7 +131,7 @@ module MotionWiretap
         end
       end
 
-      recognizer = UILongPressGestureRecognizer.alloc.initWithTarget(target, action:'handle_gesture:')
+      recognizer = UILongPressGestureRecognizer.alloc.initWithTarget(target, action: :handle_gesture)
       recognizer.minimumPressDuration = duration if duration
       recognizer.numberOfTapsRequired = taps if taps
       recognizer.numberOfTouchesRequired = fingers if fingers

data/lib/motion-wiretap/ios/wiretap_ios.rb

@@ -2,7 +2,11 @@ module MotionWiretap
   class GestureNotFound < Exception
   end
 
-  class WiretapView < Wiretap
+  class WiretapView < WiretapTarget
+
+    def dummy
+      UIButton.new.enabled = true
+    end
 
     def on(recognizer, options=nil, &block)
       if recognizer
@@ -26,12 +30,12 @@ module MotionWiretap
         self.target.addGestureRecognizer(recognizer)
       end
 
-      super(&block)
+      listen(&block)
 
       return self
     end
 
-    def handle_gesture(recognizer)
+    def handle_gesture
       trigger_changed
     end
 
@@ -46,7 +50,7 @@ module MotionWiretap
     def on(control_event, options={}, &block)
       begin
         control_event = ControlEvents.convert(control_event)
-        self.target.addTarget(self, action:'handle_event:', forControlEvents:control_event)
+        self.target.addTarget(self, action: :handle_event, forControlEvents: control_event)
       rescue ControlEventNotFound
         super(control_event, options, &block)
       else
@@ -56,7 +60,7 @@ module MotionWiretap
       return self
     end
 
-    def handle_event(event)
+    def handle_event
       trigger_changed
     end
 

data/lib/motion-wiretap/osx/wiretap_factory.rb

@@ -0,0 +1,24 @@
+module Motion
+
+  module_function
+
+  def wiretap(target, property=nil, &block)
+    case target
+    when NSString
+      MotionWiretap::WiretapNotification.new(target, property, block)
+    when Proc
+      MotionWiretap::WiretapProc.new(target, property, block)
+    when NSArray
+      MotionWiretap::WiretapArray.new(target, &block)
+    when NSView
+      if property.nil?
+        MotionWiretap::WiretapView.new(target, &block)
+      else
+        MotionWiretap::WiretapKvo.new(target, property, &block)
+      end
+    when NSObject
+      MotionWiretap::WiretapKvo.new(target, property, &block)
+    end
+  end
+
+end

data/lib/motion-wiretap/version.rb

@@ -1,3 +1,3 @@
 module MotionWiretap
-  Version = '0.2.1'
+  VERSION = '1.0.0'
 end

data/lib/{motion-wiretap/all/wiretap_exts.rb → motion-wiretap-polluting/all/polluting_all.rb}

@@ -28,7 +28,7 @@ end
 class NSString
 
   def wiretap(object=nil, &block)
-    MotionWiretap::WiretapNotification(self, object, block)
+    MotionWiretap::WiretapNotification.new(self, object, block)
   end
 
 end

data/lib/motion-wiretap-polluting.rb

@@ -0,0 +1,17 @@
+unless defined?(Motion::Project::Config)
+  raise "The motion-wiretap gem must be required within a RubyMotion project Rakefile."
+end
+
+
+require 'motion-wiretap'
+
+
+Motion::Project::App.setup do |app|
+  # scans app.files until it finds app/ (the default)
+  # if found, it inserts just before those files, otherwise it will insert to
+  # the end of the list
+  insert_point = app.files.find_index { |file| file =~ /^(?:\.\/)?app\// } || 0
+
+  app.files.insert(insert_point, *Dir.glob(File.join(File.dirname(__FILE__), "motion-wiretap-polluting/#{app.template.to_s}/*.rb")))
+  app.files.insert(insert_point, *Dir.glob(File.join(File.dirname(__FILE__), "motion-wiretap-polluting/all/*.rb")))
+end

data/motion-wiretap.gemspec

@@ -3,7 +3,8 @@ require File.expand_path('../lib/motion-wiretap/version.rb', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name          = 'motion-wiretap'
-  gem.version       = MotionWiretap::Version
+  gem.version       = MotionWiretap::VERSION
+  gem.licenses      = ['BSD']
 
   gem.authors = ['Colin T.A. Gray']
   gem.email   = ['colinta@gmail.com']

metadata

@@ -1,36 +1,26 @@
 --- !ruby/object:Gem::Specification
 name: motion-wiretap
 version: !ruby/object:Gem::Version
-  version: 0.2.1
-  prerelease: 
+  version: 1.0.0
 platform: ruby
 authors:
 - Colin T.A. Gray
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-24 00:00:00.000000000 Z
+date: 2014-02-28 00:00:00.000000000 Z
 dependencies: []
-description: ! 'ReactiveCocoa is an amazing system, and RubyMotion could benefit from
-  the
-
+description: |
+  ReactiveCocoa is an amazing system, and RubyMotion could benefit from the
   lessons learned there!
 
-
   Motion-Wiretap is, essentially, a wrapper for Key-Value coding and observation.
-
   It exposes a +Wiretap+ class that you can use as a signal, or add listeners to
-
   it.
 
-
   Extensions are provided to listen to an +Array+ of +Wiretap+ objects, and the
-
   `UIKit`/`AppKit` classes are augmented to provide actions as events (gestures,
-
   mouse events, value changes).
-
-'
 email:
 - colinta@gmail.com
 executables: []
@@ -39,39 +29,42 @@ extra_rdoc_files: []
 files:
 - lib/motion-wiretap/all/signal.rb
 - lib/motion-wiretap/all/wiretap.rb
-- lib/motion-wiretap/all/wiretap_exts.rb
 - lib/motion-wiretap/ios/wiretap_control_events.rb
-- lib/motion-wiretap/ios/wiretap_exts_ios.rb
+- lib/motion-wiretap/ios/wiretap_factory.rb
 - lib/motion-wiretap/ios/wiretap_gestures.rb
 - lib/motion-wiretap/ios/wiretap_ios.rb
-- lib/motion-wiretap/osx/wiretap_exts_osx.rb
+- lib/motion-wiretap/osx/wiretap_factory.rb
 - lib/motion-wiretap/osx/wiretap_osx.rb
 - lib/motion-wiretap/version.rb
+- lib/motion-wiretap-polluting/all/polluting_all.rb
+- lib/motion-wiretap-polluting/ios/polluting_ios.rb
+- lib/motion-wiretap-polluting/osx/polluting_osx.rb
+- lib/motion-wiretap-polluting.rb
 - lib/motion-wiretap.rb
 - README.md
 - motion-wiretap.gemspec
 homepage: https://github.com/colinta/motion-wiretap
-licenses: []
+licenses:
+- BSD
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: It's like ReactiveCocoa, but in RubyMotion
 test_files: []