rm-extensions 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c40f86893d94e3fadea28f20067e25ca3931f26
-  data.tar.gz: b2758a852a8a0a9dd4e47763e6785e509f255bf3
+  metadata.gz: 7cbe483d3f68986bb4f011ecdd231cfc489a706c
+  data.tar.gz: 9900e1371f808b29a274faf967ab1f72310c407f
 SHA512:
-  metadata.gz: 0d24baa54ceb6ce6b24806f1c9a3723a068c5679420b4328df3f9e5a71b09890e249948965442eabefd02f86ed2ac9f48b1477115a5aeff306d9649e3a80a410
-  data.tar.gz: 68224e36927975027038177209c43e4d5eb555e103f05f448cedc34510718019db59dbc0b3574664d0295ff7ee94331201ffe5b41b12eeedff86ff470ff20865
+  metadata.gz: 7e81aba29549b3b3059bddb68a697c1946fce35aa4624a6fd5228f8450db7c0ebec6a2283f1ad34933368085027398be17e2d930db2912d4d9b519056f404e5c
+  data.tar.gz: c14c74e85f4f9c86903312ba1b29d5ba387f16123b330ba0319442eee1f6beadc221b73a091dd4ee7cd00a16259c4d9dfab5ce37b1b734f33defed2a565e50f6

data/lib/motion/events.rb

@@ -10,7 +10,7 @@ module RMExtensions
 
       # register a callback when an event is triggered on this object.
       def rmext_on(object, event, &block)
-        object.rmext_events_proxy.on(event, inContext:self, withBlock:block)
+        object.rmext_events_proxy.on(event, limit:-1, inContext:self, withBlock:block)
       end
 
       def rmext_now_and_on(object, event, &block)
@@ -19,7 +19,7 @@ module RMExtensions
 
       # register a callback when an event is triggered on this object and remove it after it fires once
       def rmext_once(object, event, &block)
-        object.rmext_events_proxy.once(event, inContext:self, withBlock:block)
+        object.rmext_events_proxy.on(event, limit:1, inContext:self, withBlock:block)
       end
 
       # remove a specific callback for an event on object
@@ -68,11 +68,10 @@ module RMExtensions
 
     def initialize(obj)
       @weak_object = WeakRef.new(obj)
-      @desc = obj.inspect
       @events = NSMapTable.weakToStrongObjectsMapTable
       @listenings = NSHashTable.weakObjectsHashTable
       if ::RMExtensions.debug?
-        p "created EventsProxy(#{@desc})"
+        p "CREATED EventsProxy: #{@weak_object.rmext_object_desc}"
       end
     end
 
@@ -80,7 +79,7 @@ module RMExtensions
       @did_dealloc = true
       cleanup
       if ::RMExtensions.debug?
-        p "dealloc EventsProxy(#{@desc})"
+        p "DEALLOC EventsProxy: #{@weak_object.rmext_object_desc}"
       end
       super
     end
@@ -91,7 +90,7 @@ module RMExtensions
       true
     end
 
-    def on(event, inContext:context, withBlock:block)
+    def on(event, limit:limit, inContext:context, withBlock:block)
       return if event.nil? || block.nil?
       event = event.to_s
       context ||= self.class
@@ -100,18 +99,19 @@ module RMExtensions
         @events.setObject(context_events, forKey:context)
       end
       unless context_event_blocks = context_events.objectForKey(event)
-        context_event_blocks = []
+        context_event_blocks = {}
         context_events.setObject(context_event_blocks, forKey:event)
       end
       block.weak!
-      context_event_blocks.addObject block
+      context_event_blocks[block] = limit
       # i.e.: controller/view listening_to model
       context.rmext_events_proxy.listening_to(@weak_object)
     end
 
+    # this is called in the reverse direction than normal
     def listening_to(object)
       if ::RMExtensions.debug?
-        p "listening_to object", object.class, "from context", @weak_object.class
+        p "CONTEXT:", @weak_object.rmext_object_desc, "LISTENING TO:", object.rmext_object_desc
       end
       @listenings.addObject(object)
     end
@@ -125,7 +125,7 @@ module RMExtensions
         res.event = event
         block.call(res)
       end
-      on(event, inContext:context, withBlock:block)
+      on(event, limit:-1, inContext:context, withBlock:block)
     end
 
     def off(event, inContext:context, withBlock:block)
@@ -134,19 +134,10 @@ module RMExtensions
       context ||= self.class
       return unless context_events = @events.objectForKey(context)
       return unless context_event_blocks = context_events.objectForKey(event)
-      context_event_blocks.removeObject block
+      context_event_blocks.delete block
       nil
     end
 
-    def once(event, inContext:context, withBlock:block)
-      block.weak!
-      once_block = lambda do |opts|
-        off(event, inContext:context, withBlock:once_block)
-        block.call(opts)
-      end
-      on(event, inContext:context, withBlock:once_block)
-    end
-
     def off_all
       @events.removeAllObjects
     end
@@ -158,7 +149,7 @@ module RMExtensions
     def off_all_context
       while object = @listenings.anyObject
         if ::RMExtensions.debug?
-          p "remove object", object.class, "from context", @weak_object.class
+          p "CONTEXT:", @weak_object.rmext_object_desc, "UNLISTENING TO:", object.rmext_object_desc
         end
         @listenings.removeObject(object)
         object.rmext_events_proxy.off_context(@weak_object)
@@ -166,11 +157,6 @@ module RMExtensions
     end
 
     def trigger(event, value)
-      # m_desc = nil
-      # if ::RMExtensions.debug?
-      #   m_desc = "~~> EventsProxy(#{@desc})#trigger(#{event}, #{value.inspect.split(" ").first }>)"
-      #   p "called", m_desc
-      # end
       rmext_inline_or_on_main_q do
         next if @did_dealloc
         next if event.nil?
@@ -183,17 +169,27 @@ module RMExtensions
         while context = contexts.pop
           if context_events = @events.objectForKey(context)
             if event_blocks = context_events[event]
-              blocks = [] + event_blocks
-              # if ::RMExtensions.debug?
-              #   p "blocks.size", blocks.size, m_desc
-              # end
-              while blk = blocks.pop
+              blocks = event_blocks.keys
+              if ::RMExtensions.debug?
+                p "TRIGGER:", event, "OBJECT:", @weak_object.rmext_object_desc, "CONTEXT:", context.rmext_object_desc, "BLOCKS SIZE:", blocks.size
+              end
+              while block = blocks.pop
+                limit = event_blocks[block]
                 res = EventResponse.new
                 res.context = context
                 res.value = value
                 res.target = @weak_object
                 res.event = event
-                blk.call(res)
+                block.call(res)
+                if limit == 1
+                  # off
+                  if ::RMExtensions.debug?
+                    p "LIMIT REACHED:", event, "OBJECT:", @weak_object.rmext_object_desc, "CONTEXT:", context.rmext_object_desc
+                  end
+                  off(event, inContext:context, withBlock:block)
+                elsif limit > 1
+                  context_events[block] -= 1
+                end
               end
             end
           end

data/lib/motion/util.rb

@@ -25,35 +25,57 @@ module RMExtensions
   class LongTask
     attr_accessor :bgTask, :desc
 
+    def self.time_remaining
+      UIApplication.sharedApplication.backgroundTimeRemaining
+    end
+
     # RMExtensions::BackgroundTask.new("my long task") { |task| task.end! }
-    def initialize(desc=nil, &block)
-      @desc = desc
-      @bgTask = UIApplication.sharedApplication.beginBackgroundTaskWithExpirationHandler(lambda do
-        if ::RMExtensions.debug?
-          p "ERROR: #{self.inspect} #{@desc} didn't call #end! in time!"
-        end
-        UIApplication.sharedApplication.endBackgroundTask(@bgTask)
-      end.weak!)
-      block.call(self)
+    def self.create(desc=nil, &block)
+      x = new(desc)
+      block.weak!.call(x)
+      x
+    end
+
+    def initialize(desc=nil)
+      @desc = "#{rmext_object_desc} #{desc}"
+      @bgTask = UIApplication.sharedApplication.beginBackgroundTaskWithName(@desc, expirationHandler:lambda do
+        p "ERROR: #{@desc} didn't call #end! in time!"
+        __end!
+      end)
       self
     end
 
     def end!
       if ::RMExtensions.debug?
-        p "SUCCESS: #{self.inspect} #{@desc} ended successfully."
+        p "SUCCESS: #{@desc} ended successfully."
       end
-      if @bgTask != UIBackgroundTaskInvalid
+      __end!
+    end
+
+    def __end!
+      if @bgTask && @bgTask != UIBackgroundTaskInvalid
         UIApplication.sharedApplication.endBackgroundTask(@bgTask)
         @bgTask = UIBackgroundTaskInvalid
       end
     end
 
+    def dealloc
+      if ::RMExtensions.debug?
+        p "DEALLOC: #{@desc}"
+      end
+      super
+    end
+
   end
 
   module ObjectExtensions
 
     module Util
 
+      def rmext_object_desc
+        "#{self.className}:#{'%x' % (self.object_id)}"
+      end
+
       # Raises an exception when called from a thread other than the main thread.
       # Good for development and experimenting.
       def rmext_assert_main_thread!

data/lib/rm-extensions/version.rb

@@ -1,3 +1,3 @@
 module RMExtensions
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rm-extensions
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Joe Noon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-19 00:00:00.000000000 Z
+date: 2014-01-21 00:00:00.000000000 Z
 dependencies: []
 description: Extensions and helpers for dealing with various areas of rubymotion
 email: