motion-kit 0.10.9 → 0.10.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 348196a56892ff0ad347266474498ae0a19760d6
-  data.tar.gz: c66ff3d7c8d21a761f01229ffea31e2b41f352ad
+  metadata.gz: bc88d9d5ae26923a6a1537869a7decb22435fa71
+  data.tar.gz: 232df310d55a46eb997ddb1c343edf58aa8c193c
 SHA512:
-  metadata.gz: cc85df6f4dc0746984ef77eadecf14e4d3f56169824cc0f9da78b80f77e458f45cc311872eb6fe1875f8f5ca1578e156f6548ad39ed17b9a17710e33d2ce2898
-  data.tar.gz: 6e01ee6d4b90b0fd2c2652f131047c5f45d06409e8559fcc98c0bfad6faae1c344abdf72dd2be96e4f54fea8aa2f951348150714fe476e0cb7cb06eca2b354bd
+  metadata.gz: 9115565f3d88b37e5ea4f637bf1d67f5641133a12f42504072db87a3306373efbd6231abf018faae85e79889b1519314ef8a7799fa3715afd7d0fd5ed49bbecf
+  data.tar.gz: bde50f100e9705156cb5ec8897ac683466679a478b1f48202ac97e18a566d3960c64363e1663e95fd27b9eaabc342792f02f35b1c46b413995009f390997a6ab

data/README.md

@@ -1,5 +1,8 @@
 # MotionKit
 
+[![Build Status](https://travis-ci.org/motion-kit/motion-kit.svg?branch=master)](https://travis-ci.org/motion-kit/motion-kit)
+[![Version](https://badge.fury.io/rb/motion-kit.svg)](https://rubygems.org/gems/motion-kit)
+
 *The RubyMotion layout and styling gem.*
 
 1. Crossplatform compatibility: iOS, OSX, and planned support for Android

data/lib/motion-kit/layouts/base_layout.rb

@@ -18,7 +18,7 @@ module MotionKit
 
     def initialize(args={})
       # @layout is the object we look in for style methods
-      @layout = self
+      @layout = nil
       # the Layout object that implements custom style methods. Leave this as nil
       # in the initializer.
       @layout_delegate = nil
@@ -27,22 +27,30 @@ module MotionKit
       # Explicit roots will not have a strong reference from
       # MotionKit, so retain one yourself from your controller
       # or other view to prevent deallocation.
-      @preset_root = WeakRef.new(args[:root])
+      @preset_root = args[:root]
     end
 
     def set_layout(layout)
       @layout = WeakRef.new(layout)
     end
 
+    def parent_layout
+      @layout || self
+    end
+
+    def is_parent_layout?
+      @layout.nil? || @layout == self
+    end
+
     def target
-      if @layout.nil? || @layout == self
+      if is_parent_layout?
         # only the "root layout" instance is allowed to change the context.
         # if there isn't a context set, try and create a root instance; this
         # will fail if we're not in a state that allows the root to be created
         @context ||= create_default_root_context
       else
         # child layouts get the context from the root layout
-        @layout.target
+        parent_layout.target
       end
     end
     def v ; target ; end
@@ -76,7 +84,7 @@ module MotionKit
       return target unless block
       # this little line is incredibly important; the context is only set on
       # the top-level Layout object.
-      return @layout.context(target, &block) if @layout != self
+      return parent_layout.context(target, &block) unless is_parent_layout?
 
       if target.is_a?(Symbol)
         target = self.get(target)
@@ -92,7 +100,7 @@ module MotionKit
       end
       @parent = MK::Parent.new(context_was)
       @context = target
-      @context.motion_kit_meta[:delegate] ||= Layout.layout_for(@layout, @context.class)
+      @context.motion_kit_meta[:delegate] ||= Layout.layout_for(parent_layout, @context.class)
       @layout_delegate = @context.motion_kit_meta[:delegate]
       yield
       @layout_delegate, @context, @parent = delegate_was, context_was, parent_was
@@ -108,7 +116,7 @@ module MotionKit
     # after a call to Layout#layout.
     def deferred(context=nil, &block)
       context ||= @context
-      return @layout.add_deferred_block(context, &block)
+      return parent_layout.add_deferred_block(context, &block)
     end
 
     # Only intended for private use
@@ -201,7 +209,7 @@ module MotionKit
       objc_method_name, objc_method_args = objc_version(method_name, args)
       ruby_method_name = ruby_version(method_name)
 
-      @layout_delegate ||= Layout.layout_for(@layout, target.class)
+      @layout_delegate ||= Layout.layout_for(parent_layout, target.class)
       if objc_method_name && @layout_delegate.respond_to?(objc_method_name)
         return @layout_delegate.send(objc_method_name, *objc_method_args, &block)
       elsif @layout_delegate.respond_to?(ruby_method_name)
@@ -269,8 +277,6 @@ module MotionKit
       end
     end
 
-  public
-
     class << self
 
       # Prevents infinite loops when methods that are defined on Object/Kernel
@@ -295,6 +301,13 @@ module MotionKit
 
     end
 
+  protected
+
+    def preset_root
+      # Set in the initializer
+      # TreeLayout.new(root: some_view)
+      @preset_root
+    end
 
   end
 

data/lib/motion-kit/layouts/tree_layout.rb

@@ -50,8 +50,8 @@ module MotionKit
 
     # The main view.  This method builds the layout and returns the root view.
     def view
-      if @layout != self
-        return @layout.view
+      unless is_parent_layout?
+        return parent_layout.view
       end
       @view ||= build_view
     end
@@ -142,9 +142,9 @@ module MotionKit
 
     def call_style_method(element, element_id)
       style_method = "#{element_id}_style"
-      if @layout.respond_to?(style_method)
-        @layout.context(element) do
-          @layout.send(style_method)
+      if parent_layout.respond_to?(style_method)
+        parent_layout.context(element) do
+          parent_layout.send(style_method)
         end
       end
       return element
@@ -214,8 +214,8 @@ module MotionKit
     # with this element_id in the tree, where *first* means the view closest to
     # the root view. Aliased to `first` to distinguish it from `last`.
     def get(element_id)
-      if @layout != self
-        return @layout.get(element_id)
+      unless is_parent_layout?
+        return parent_layout.get(element_id)
       end
       self.get(element_id, in: self._root)
     end
@@ -231,8 +231,8 @@ module MotionKit
     # with this element_id, where last means the view deepest and furthest from
     # the root view.
     def last(element_id)
-      if @layout != self
-        return @layout.last(element_id)
+      unless is_parent_layout?
+        return parent_layout.last(element_id)
       end
       self.last(element_id, in: self._root)
     end
@@ -244,8 +244,8 @@ module MotionKit
 
     # Returns all the elements with a given element_id in the view tree.
     def all(element_id)
-      if @layout != self
-        return @layout.all(element_id)
+      unless is_parent_layout?
+        return parent_layout.all(element_id)
       end
       self.all(element_id, in: self._root)
     end
@@ -268,8 +268,8 @@ module MotionKit
     # Removes a view (or several with the same name) from the hierarchy
     # and forgets it entirely.  Returns the views that were removed.
     def remove(element_id)
-      if @layout != self
-        return @layout.remove(element_id)
+      unless is_parent_layout?
+        return parent_layout.remove(element_id)
       end
       self.remove(element_id, from: self._root)
     end
@@ -297,12 +297,6 @@ module MotionKit
 
   protected
 
-    def preset_root
-      # Set in the initializer
-      # TreeLayout.new(root: some_view)
-      @preset_root
-    end
-
     # This method builds the layout and returns the root view.
     def build_view
       # Only in the 'layout' method will we allow default container to be
@@ -314,6 +308,7 @@ module MotionKit
       unless @view
         if @assign_root
           create_default_root_context
+          @view = @context
         else
           NSLog('Warning! No root view was set in TreeLayout#layout. Did you mean to call `root`?')
         end
@@ -326,6 +321,11 @@ module MotionKit
       # it's previous value
       @context = nil
 
+      if @preset_root
+        @view = WeakRef.new(@view)
+        @preset_root = nil
+      end
+
       @view
     end
 
@@ -350,7 +350,7 @@ module MotionKit
     # `ViewLayout`, which returns the root view.
     def initialize_element(elem)
       if elem.is_a?(Class) && elem < TreeLayout
-        elem = elem.new_child(@layout).view
+        elem = elem.new_child(parent_layout).view
       elsif elem.is_a?(Class)
         elem = elem.new
       elsif elem.is_a?(TreeLayout)

data/lib/motion-kit/version.rb

@@ -1,3 +1,3 @@
 module MotionKit
-  VERSION = '0.10.9'
+  VERSION = '0.10.10'
 end

data/spec/ios/memory_leak_spec.rb

@@ -0,0 +1,74 @@
+describe 'MemoryLeaks' do
+
+  before do
+    window = UIWindow.alloc.initWithFrame(UIScreen.mainScreen.bounds)
+    @controller = UINavigationController.new
+    @controller.viewControllers = [UIViewController.new, TestMemoryLeakController.new]
+    window.rootViewController = @controller
+    window.makeKeyAndVisible
+
+    @did_dealloc_controller = false
+    @did_dealloc_layout = false
+    @did_dealloc_cell = false
+    @did_dealloc_cell_layout = false
+
+    @observe_controller = NSNotificationCenter.defaultCenter.addObserverForName('TestMemoryLeakController dealloc', object: nil, queue: nil, usingBlock: -> notification do
+      @did_dealloc_controller = true
+    end)
+    @observe_layout = NSNotificationCenter.defaultCenter.addObserverForName('TestMemoryLeakLayout dealloc', object: nil, queue: nil, usingBlock: -> notification do
+      @did_dealloc_layout = true
+    end)
+    @observe_cell = NSNotificationCenter.defaultCenter.addObserverForName('TestMemoryLeakCell dealloc', object: nil, queue: nil, usingBlock: -> notification do
+      @did_dealloc_cell = true
+    end)
+    @observe_cell_layout = NSNotificationCenter.defaultCenter.addObserverForName('TestMemoryLeakCellLayout dealloc', object: nil, queue: nil, usingBlock: -> notification do
+      @did_dealloc_cell_layout = true
+    end)
+  end
+
+  after do
+    NSNotificationCenter.defaultCenter.removeObserver(@observe_controller)
+    NSNotificationCenter.defaultCenter.removeObserver(@observe_layout)
+    NSNotificationCenter.defaultCenter.removeObserver(@observe_cell)
+    NSNotificationCenter.defaultCenter.removeObserver(@observe_cell_layout)
+  end
+
+  describe 'When popping a controller' do
+
+    before do
+      wait 0.1 do
+        @controller.popViewControllerAnimated(false)
+
+        # window = UIWindow.alloc.initWithFrame(UIScreen.mainScreen.bounds)
+        # window.rootViewController = @controller
+        # window.makeKeyAndVisible
+      end
+    end
+
+    it 'should release the TestMemoryLeakController' do
+      wait 0.1 do
+        @did_dealloc_controller.should == true
+      end
+    end
+
+    it 'should release the TestMemoryLeakLayout' do
+      wait 0.1 do
+        @did_dealloc_layout.should == true
+      end
+    end
+
+    it 'should release the TestMemoryLeakCell' do
+      wait 0.1 do
+        @did_dealloc_cell.should == true
+      end
+    end
+
+    it 'should release the TestMemoryLeakCellLayout' do
+      wait 0.1 do
+        @did_dealloc_cell_layout.should == true
+      end
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-kit
 version: !ruby/object:Gem::Version
-  version: 0.10.9
+  version: 0.10.10
 platform: ruby
 authors:
 - Colin T.A. Gray
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-07 00:00:00.000000000 Z
+date: 2014-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dbt
@@ -109,6 +109,7 @@ files:
 - spec/ios/layout_extensions_spec.rb
 - spec/ios/layout_spec.rb
 - spec/ios/layout_state_spec.rb
+- spec/ios/memory_leak_spec.rb
 - spec/ios/motionkit_util_spec.rb
 - spec/ios/objc_selectors_spec.rb
 - spec/ios/orientation_helper_specs.rb
@@ -187,6 +188,7 @@ test_files:
 - spec/ios/layout_extensions_spec.rb
 - spec/ios/layout_spec.rb
 - spec/ios/layout_state_spec.rb
+- spec/ios/memory_leak_spec.rb
 - spec/ios/motionkit_util_spec.rb
 - spec/ios/objc_selectors_spec.rb
 - spec/ios/orientation_helper_specs.rb