rm-extensions 0.1.10 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10b3c8d7d655d2182fc655af633cafccabdfe460
-  data.tar.gz: 064e5f501609992377c5579cb398dd2db2c26e37
+  metadata.gz: cbf506f0e146d719368d97d86a04b4fede0df97b
+  data.tar.gz: 6d8b171e1add24ee6c63d27ee4057c6051f944a4
 SHA512:
-  metadata.gz: ac1bc79b513e9b0adbafe309a3c6e795883c05b34eca599af6a730cf37cfdec82a2cda180b74137a41cb5a14e4a13098a3b5df49fb7fb2c80884c94a2d059ecf
-  data.tar.gz: 0ae909d56376adfd984be7dcbbbb4e36e26b5e39b093881040e4e261e71ffd8e7fb37d18286dda5d1e0f8025e7cce55cc6a3b36e01e96499f5a39a24b33a124d
+  metadata.gz: 3204fde1f0f0e9c903aa2fdda8a638f4c91544e2a81b404b728eb9bd100200ce8c81fa5d69cc6d2a57002a1182d968d331b8164e629fa30227b6f426e2ccdb18
+  data.tar.gz: 8fc6a988442c02b7ba501b7c360a1825d20ed40899b6707d3d4b179cb8e51c865f2552ab59357ea0a64368341a3345be2918aabdb7dc0f9f618c6ca11fcb825c

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.2.0
+
+[Commit history](https://github.com/joenoon/rm-extensions/compare/v0.1.10...v0.2.0)
+
+* Experimental changes.  Changelog to move to wiki soon.
+
 ## 0.1.10
 
 [Commit history](https://github.com/joenoon/rm-extensions/compare/v0.1.9...v0.1.10)

data/lib/motion/observation.rb

@@ -83,9 +83,6 @@ module RMExtensions
     DEFAULT_OPTIONS = NSKeyValueObservingOptionNew
 
     def initialize(obj)
-      obj.rmext_on_dealloc do |x|
-        cleanup
-      end
       @desc = obj.inspect
       @events = {}
       @targets = {}
@@ -96,6 +93,7 @@ module RMExtensions
 
     def dealloc
       @did_dealloc = true
+      cleanup
       if ::RMExtensions.debug?
         p "dealloc ObservationProxy for #{@desc}"
       end
@@ -127,7 +125,7 @@ module RMExtensions
 
       key_paths = @targets[target]
       if !key_paths.nil? && key_paths.has_key?(key_path.to_s)
-        key_paths.delete(key_path.to_s)
+        key_paths.removeObject(key_path.to_s)
       end
     end
 
@@ -142,7 +140,7 @@ module RMExtensions
           target.removeObserver(self, forKeyPath:key_path)
         end
       end
-      @targets.clear
+      @targets.removeAllObjects
     end
 
     def registered?(target, key_path)
@@ -152,8 +150,8 @@ module RMExtensions
     def add_observer_block(target, key_path, &block)
       return if target.nil? || key_path.nil? || block.nil?
       @targets[target] ||= {}
-      @targets[target][key_path.to_s] ||= []
-      @targets[target][key_path.to_s] << block
+      @targets[target][key_path.to_s] ||= NSHashTable.weakObjectsHashTable
+      @targets[target][key_path.to_s].addObject block
     end
 
     # NSKeyValueObserving Protocol
@@ -179,17 +177,17 @@ module RMExtensions
     def on(event, &block)
       return if event.nil? || block.nil?
       @events[event.to_s] ||= []
-      @events[event.to_s] << block
+      @events[event.to_s].addObject block
     end
 
     def off(event, &block)
       return if event.nil? || block.nil? || !@events.key?(event.to_s)
-      @events[event.to_s].delete_if { |b| b == block }
+      @events[event.to_s].removeObject block
       nil
     end
 
     def off_all
-      @events.clear
+      @events.removeAllObjects
     end
 
     def trigger(event, *args)

data/lib/motion/util.rb

@@ -31,6 +31,23 @@ module RMExtensions
         end
       end
 
+      def rmext_nil_instance_variables!
+        ivars = [] + instance_variables
+        while ivar = ivars.pop
+          instance_variable_set(ivar, nil)
+        end
+        true
+      end
+
+      def rmext_assign_debug_labels_to_ivars!
+        ivars = [] + instance_variables
+        while ivar = ivars.pop
+          val = instance_variable_get(ivar)
+          val.rmext_ivar(:debug_label, ivar)
+        end
+        true
+      end
+
     end
 
   end

data/lib/rm-extensions.rb

@@ -9,7 +9,6 @@ Motion::Project::App.setup do |app|
     layout
     util
     accessors
-    deallocation
     observation
     queues
   ).reverse.each do |x|

data/lib/rm-extensions/version.rb

@@ -1,3 +1,3 @@
 module RMExtensions
-  VERSION = "0.1.10"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rm-extensions
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.2.0
 platform: ruby
 authors:
 - Joe Noon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-15 00:00:00.000000000 Z
+date: 2013-11-26 00:00:00.000000000 Z
 dependencies: []
 description: Extensions and helpers for dealing with various areas of rubymotion
 email:
@@ -25,7 +25,6 @@ files:
 - Rakefile
 - app/app_delegate.rb
 - lib/motion/accessors.rb
-- lib/motion/deallocation.rb
 - lib/motion/layout.rb
 - lib/motion/observation.rb
 - lib/motion/queues.rb

data/lib/motion/deallocation.rb

@@ -1,56 +0,0 @@
-module RMExtensions
-
-  module ObjectExtensions
-
-    module Deallocation
-
-      # perform a block before +self+ will dealloc.
-      # the block given should have one argument, the object about to be deallocated.
-      def rmext_on_dealloc(&block)
-        internalObject = ::RMExtensions::OnDeallocInternalObject.create("#{self.class.name}:#{object_id}", self, block)
-        @rmext_on_dealloc_blocks ||= {}
-        @rmext_on_dealloc_blocks[internalObject] = internalObject
-        nil
-      end
-      
-      # removes a previously added block from the deallocation callback list
-      def rmext_cancel_on_dealloc(block)
-        @rmext_on_dealloc_blocks ||= {}
-        if internalObject = @rmext_on_dealloc_blocks[block]
-          internalObject.block = nil
-          @rmext_on_dealloc_blocks.delete(block)
-        end
-        nil
-      end
-
-    end
-
-  end
-
-  # Used internally by +rmext_on_dealloc+.  The idea is this object is added to the
-  # object we want to watch for deallocation.  When the object we want to watch
-  # is about to dealloc, this object will dealloc first, so we can execute the block.
-  # the object it follows is kept only as a weak reference to not create
-  # a retain cycle.
-  class OnDeallocInternalObject
-    attr_accessor :description, :block
-    rmext_weak_attr_accessor :obj
-    def self.create(description, obj, block)
-      x = new
-      x.description = description
-      x.obj = obj
-      x.block = block
-      x
-    end
-    def dealloc
-      # p "dealloc OnDeallocInternalObject #{description}"
-      if block
-        block.call(obj)
-        self.block = nil
-      end
-      super
-    end
-  end
-
-end
-Object.send(:include, ::RMExtensions::ObjectExtensions::Deallocation)