rm-extensions 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d64ca280c2914d4e0e8ebda0af7b8900c4a71d0
-  data.tar.gz: 422760a452010841d394d296a59090c5967b43cd
+  metadata.gz: def362607872dfcd691017faa171e66967d0630c
+  data.tar.gz: bbeb76a150653503536aa8e2cf02565d48d0bca9
 SHA512:
-  metadata.gz: 613afb58ed64e974e51cdfc117e8627ecc381084c2d1cf6e571b2d0df6a95ba071fab76efeda59cf9eb0e6a203a3d9cce1908a5e3cdf05be8b9179e8c947c4dd
-  data.tar.gz: 41375da6369ebe8921c5f47d2576ea774cc353b8701774e092ffaf7df6948e6b65b87bf203f10c2a055603e324c93b8ee4689205f76f5597ee267ee38a45f86d
+  metadata.gz: 3fc8a7624f1ecfe03c8af4bcea0f7c31092c3403091bc99754071efde2d98b2927531c361ca809c817b4a70753357ca0395e9e2c5563c3c8506856e20cda9de6
+  data.tar.gz: 608c671f2a9d9656961005e4e86d2e21a0d14e050dfbea5eb5bc759404ac992bc1d486507936bc149d9a0c4147e0a4937152d3b4ddebe90c027e66dc46c4f852

data/lib/motion/deallocation.rb

@@ -0,0 +1,56 @@
+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)

data/lib/motion/layout.rb

@@ -46,24 +46,27 @@ module RMExtensions
       end
     end
 
-    def view(view=nil)
-      if view
-        @view = view
-      end
-      @view
+    def view(view)
+      @view = view
     end
 
-    def subviews(subviews=nil)
-      if subviews
-        @subviews = subviews
-        @subviews.values.each do |subview|
-          subview.translatesAutoresizingMaskIntoConstraints = false
-          @view.addSubview(subview)
-        end
+    def view=(v)
+      view(v)
+    end
+
+    def subviews(subviews)
+      @subviews = subviews
+      @subviews.values.each do |subview|
+        subview.translatesAutoresizingMaskIntoConstraints = false
+        @view.addSubview(subview)
       end
       @subviews
     end
 
+    def subviews=(views)
+      subviews(views)
+    end
+
     def eqs(str)
       str.split("\n").map(&:strip).select { |x| !x.empty? }.map do |line|
         eq(line)
@@ -143,16 +146,8 @@ module RMExtensions
 
       # normalize
 
-      res_item = item == "view" ? @view : @subviews[item]
-      res_item_attribute = ATTRIBUTE_LOOKUP[item_attribute]
-      res_related_by = RELATED_BY_LOOKUP[related_by]
-      res_to_item = if to_item
-        to_item == "view" ? @view : @subviews[to_item]
-      end
-      res_to_item_attribute = ATTRIBUTE_LOOKUP[to_item_attribute]
-      res_multiplier = multiplier ? Float(multiplier) : 1.0
+      res_item = view_for_item(item)
       res_constant = constant ? Float(PRIORITY_LOOKUP[constant] || constant) : 0.0
-      res_priority = priority ? Integer(PRIORITY_LOOKUP[priority] || priority) : nil
 
       if res_item
         case item_attribute
@@ -167,6 +162,13 @@ module RMExtensions
         end
       end
 
+      res_item_attribute = ATTRIBUTE_LOOKUP[item_attribute]
+      res_related_by = RELATED_BY_LOOKUP[related_by]
+      res_to_item = to_item ? view_for_item(to_item) : nil
+      res_to_item_attribute = ATTRIBUTE_LOOKUP[to_item_attribute]
+      res_multiplier = multiplier ? Float(multiplier) : 1.0
+      res_priority = priority ? Integer(PRIORITY_LOOKUP[priority] || priority) : nil
+
       errors = []
       errors.push("Invalid view1: #{item}") unless res_item
       errors.push("Invalid attr1: #{item_attribute}") unless res_item_attribute
@@ -226,5 +228,15 @@ module RMExtensions
       "#{item}.#{item_attribute} #{related_by} #{to_item}.#{to_item_attribute} * #{multiplier} + #{constant} @ #{priority}"
     end
 
+    private
+
+    def view_for_item(item)
+      if item == "view"
+        @view
+      elsif v = (@subviews && @subviews[item])
+        v
+      end
+    end
+
   end
 end

data/lib/motion/observation.rb

@@ -5,7 +5,7 @@ module RMExtensions
     module Observation
 
       def rmext_observation_proxy
-        @rmext_observation_proxy ||= ObservationProxy.new(self.inspect)
+        @rmext_observation_proxy ||= ObservationProxy.new(self)
       end
 
       # observe an object.key. takes a block that will be called with the
@@ -82,21 +82,30 @@ module RMExtensions
     COLLECTION_OPERATIONS = [ NSKeyValueChangeInsertion, NSKeyValueChangeRemoval, NSKeyValueChangeReplacement ]
     DEFAULT_OPTIONS = NSKeyValueObservingOptionNew
 
-    def initialize(desc)
-      @desc = desc
+    def initialize(obj)
+      obj.rmext_on_dealloc do |x|
+        cleanup
+      end
+      @desc = obj.inspect
       @events = {}
       @targets = {}
-      # p "created #{self.inspect} for #{@desc}"
+      if ::RMExtensions.debug?
+        p "created ObservationProxy for #{@desc}"
+      end
     end
 
-    # clean up on dellocation
     def dealloc
-      # p "dealloc #{self.inspect} for #{@desc}"
-      cleanup
+      @did_dealloc = true
+      if ::RMExtensions.debug?
+        p "dealloc ObservationProxy for #{@desc}"
+      end
       super
     end
 
     def cleanup
+      if ::RMExtensions.debug?
+        p "cleanup #{@desc}"
+      end
       unobserve_all
       off_all
       true
@@ -150,13 +159,16 @@ module RMExtensions
     # NSKeyValueObserving Protocol
 
     def observeValueForKeyPath(key_path, ofObject:target, change:change, context:context)
-      return if target.nil?
-      key_paths = @targets[target] || {}
-      blocks = key_paths[key_path] || []
-      blocks.each do |block|
-        args = [ change[NSKeyValueChangeNewKey] ]
-        args << change[NSKeyValueChangeIndexesKey] if collection?(change)
-        rmext_on_main_q { block.call(*args) }
+      rmext_on_main_q do
+        next if @did_dealloc
+        next if target.nil?
+        key_paths = @targets[target] || {}
+        blocks = key_paths[key_path] || []
+        blocks.each do |block|
+          args = [ change[NSKeyValueChangeNewKey] ]
+          args << change[NSKeyValueChangeIndexesKey] if collection?(change)
+          block.call(*args)
+        end
       end
     end
 

data/lib/motion/util.rb

@@ -1,5 +1,13 @@
 module RMExtensions
 
+  def self.debug?
+    !!@debug
+  end
+
+  def self.debug!(bool=true)
+    @debug = bool
+  end
+
   module ObjectExtensions
 
     module Util

data/lib/rm-extensions/version.rb

@@ -1,3 +1,3 @@
 module RMExtensions
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/lib/rm-extensions.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rm-extensions
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Joe Noon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-19 00:00:00.000000000 Z
+date: 2013-08-22 00:00:00.000000000 Z
 dependencies: []
 description: Extensions and helpers for dealing with various areas of rubymotion
 email:
@@ -24,6 +24,7 @@ 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