teacup 2.1.4 → 2.1.5

data/.travis.yml

@@ -1,2 +1,3 @@
 language: objective-c
 before_install: rvm use ruby-1.9.3-p392
+before_script: sudo chown -R travis ~/Library/RubyMotion

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    teacup (2.1.4)
+    teacup (2.1.5)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -74,7 +74,9 @@ require 'teacup'
 
 #### 10 second primer, OS X
 
-Pretty much the same!
+Pretty much the same!  Note that on OS X, view coordinates are based on having
+the origin in the bottom-left corner, not the upper-left like it is *on every
+other GUI system ever*. :-|
 
 **You should use the `TeacupWindowController` parent class instead of `NSWindowController`**
 

data/app/controllers/memory_leak_controller.rb

@@ -0,0 +1,28 @@
+class MemoryLeakController < UIViewController
+  DidDeallocNotification = 'DidDeallocNotification'
+
+  stylesheet :memory_leak
+
+  layout do
+    puts("=============== memory_leak_controller.rb line #{__LINE__} ===============")
+    subview(UIView, :view) do
+      puts("=============== memory_leak_controller.rb line #{__LINE__} ===============")
+      subview(UIView)
+    end
+  end
+
+  def dealloc
+    NSNotificationCenter.defaultCenter.postNotificationName(DidDeallocNotification, object:self)
+    super
+  end
+
+end
+
+
+Teacup::Stylesheet.new :memory_leak do
+
+  style :view,
+    frame: [[10, 10], [100, 100]],
+    backgroundColor: UIColor.whiteColor
+
+end

data/lib/teacup.rb

@@ -22,4 +22,32 @@ Motion::Project::App.setup do |app|
   Dir.glob(File.join(teacup_lib, '**/*.rb')).reverse.each do |file|
     app.files.insert(insert_point, file)
   end
+
+  if platform == :ios
+    app.files_dependencies File.join(teacup_platform_lib, 'core_extensions/ui_view.rb') => [
+      File.join(teacup_lib, 'layout.rb'),
+      File.join(teacup_lib, 'teacup_view.rb'),
+    ]
+    app.files_dependencies File.join(teacup_platform_lib, 'core_extensions/ui_view_controller.rb') => [
+      File.join(teacup_lib, 'layout.rb'),
+      File.join(teacup_lib, 'teacup_controller.rb'),
+    ]
+  else
+    app.files_dependencies File.join(teacup_platform_lib, 'core_extensions/ns_view.rb') => [
+      File.join(teacup_lib, 'layout.rb'),
+      File.join(teacup_lib, 'teacup_view.rb'),
+    ]
+    app.files_dependencies File.join(teacup_platform_lib, 'core_extensions/ns_window.rb') => [
+      File.join(teacup_lib, 'layout.rb'),
+      File.join(teacup_lib, 'teacup_view.rb'),
+    ]
+    app.files_dependencies File.join(teacup_platform_lib, 'core_extensions/ns_view_controller.rb') => [
+      File.join(teacup_lib, 'layout.rb'),
+      File.join(teacup_lib, 'teacup_controller.rb'),
+    ]
+    app.files_dependencies File.join(teacup_platform_lib, 'core_extensions/ns_window_controller.rb') => [
+      File.join(teacup_lib, 'layout.rb'),
+      File.join(teacup_lib, 'teacup_controller.rb'),
+    ]
+  end
 end

data/lib/teacup/layout.rb

@@ -164,8 +164,8 @@ module Teacup
       # assign the 'teacup_next_responder', which is queried for a stylesheet if
       # one is not explicitly assigned to the view
       if view.is_a? Layout
-        puts("=============== layout.rb line #{__LINE__} ===============")
-        view.teacup_next_responder = self
+        view.teacup_next_responder = WeakRef.new(self)
+        # view.teacup_next_responder = self
       end
 
       if block_given?

data/lib/teacup/version.rb

@@ -1,5 +1,5 @@
 module Teacup
 
-  VERSION = '2.1.4'
+  VERSION = '2.1.5'
 
 end

data/spec/ios/memory_leak_spec.rb

@@ -0,0 +1,53 @@
+class LeakDetector
+
+  def initialize
+    @did_dealloc = false
+  end
+
+  def did_dealloc(notification)
+    @did_dealloc = true
+  end
+
+  def did_dealloc?
+    @did_dealloc
+  end
+
+end
+
+describe "Memory leaks" do
+  tests MemoryLeakController
+
+  def controller
+    unless @controller
+      puts("=============== memory_leak_spec.rb line #{__LINE__} ===============")
+      root = UIViewController.new
+      @controller = UINavigationController.alloc.initWithRootViewController(root)
+    end
+
+    @controller
+  end
+
+  it "should dealloc after being popped from UINavigationController" do
+    detector = LeakDetector.new
+
+    memory_leak = MemoryLeakController.new
+    p memory_leak.view
+
+    NSNotificationCenter.defaultCenter.addObserver(detector,
+            selector: :'did_dealloc:',
+            name: MemoryLeakController::DidDeallocNotification,
+            object: memory_leak)
+
+    self.controller.pushViewController(memory_leak, animated: false)
+    memory_leak = nil
+
+    wait 1 do
+      self.controller.popViewControllerAnimated(false)
+
+      wait 1 do
+        detector.did_dealloc?.should == true
+      end
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teacup
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -42,6 +42,7 @@ files:
 - app/controllers/gradient_controller.rb
 - app/controllers/landscape_only_controller.rb
 - app/controllers/main_controller.rb
+- app/controllers/memory_leak_controller.rb
 - app/controllers/motion_layout_controller.rb
 - app/controllers/present_modal_controller.rb
 - app/controllers/table_view_controller.rb
@@ -140,6 +141,7 @@ files:
 - spec/ios/layout_module_spec.rb
 - spec/ios/layout_spec.rb
 - spec/ios/main_spec.rb
+- spec/ios/memory_leak_spec.rb
 - spec/ios/motion_layout_spec.rb
 - spec/ios/present_modal_spec.rb
 - spec/ios/style_spec.rb
@@ -186,6 +188,7 @@ test_files:
 - spec/ios/layout_module_spec.rb
 - spec/ios/layout_spec.rb
 - spec/ios/main_spec.rb
+- spec/ios/memory_leak_spec.rb
 - spec/ios/motion_layout_spec.rb
 - spec/ios/present_modal_spec.rb
 - spec/ios/style_spec.rb