bubble-wrap 1.4.0 → 1.5.0.rc1

data/spec/motion/http_spec.rb

@@ -44,7 +44,7 @@ describe "HTTP" do
     it "works with classic blocks as well" do
       [:get, :post, :put, :delete, :head, :patch].each do |method|
         called = false
-        query = BubbleWrap::HTTP.send(method, @localhost_url, { action: 'not_valid' } ) do |response|
+        query = BubbleWrap::HTTP.send(method, @localhost_url, { action: 'not_valid' } ) do
           called = true
         end
         query.connectionDidFinishLoading(query.connection)

data/spec/motion/location/location_spec.rb

@@ -51,7 +51,7 @@ describe BubbleWrap::Location do
     end
 
     it "should set purpose using hash" do
-      BW::Location.get(purpose: "test") do |result|
+      BW::Location.get(purpose: "test") do
       end
 
       location_manager.purpose.should == "test"
@@ -82,7 +82,7 @@ describe BubbleWrap::Location do
     end
 
     it "should use normal update functions" do
-      BW::Location.get do |result|
+      BW::Location.get do
       end
 
       location_manager.instance_variable_get("@startUpdatingLocation").should == true

data/spec/motion/mail/mail_spec.rb

@@ -2,7 +2,7 @@
 class MailViewController < UIViewController
   attr_accessor :expectation
   
-  def presentModalViewController(modal, animated: animated)
+  def presentViewController(modal, animated: animated, completion: completion)
     expectation.call modal, animated
   end
 end

data/spec/motion/media/player_spec.rb

@@ -29,6 +29,7 @@ describe BubbleWrap::Media::Player do
     end
   end
 
+=begin
   describe ".play_modal" do
     before do
       @player = BW::Media::Player.new
@@ -40,11 +41,18 @@ describe BubbleWrap::Media::Player do
 
       @player.play_modal(@local_file)
 
-      wait 1 do
+
+      EM.add_timer 2.0 do
+        resume
+      end
+      wait_max 5 do
         @controller.modalViewController.should.not == nil
+        EM.add_timer 4.0 do
+          resume
+        end
 
         @player.stop
-        wait 1 do
+        wait_max 5 do
           @controller.modalViewController.should == nil
           @controller = nil
           @player = nil
@@ -53,25 +61,39 @@ describe BubbleWrap::Media::Player do
     end
 
     it "should present a modalViewController if controller given" do
-      @controller = UIViewController.alloc.initWithNibName(nil, bundle:nil)
-
-      # .presentMoviePlayerViewControllerAnimated detects whether or not
-      # @controller.view is part of a hierarchy, I guess. if you remove this
-      # then the test fails.
-      App.window.rootViewController.view.addSubview(@controller.view)
+      parent = App.window.rootViewController
+      @controller = UINavigationController.alloc.init
+      parent.addChildViewController @controller
+      @controller.viewWillAppear(false)
+      parent.view.addSubview(@controller.view)
+      @controller.viewDidAppear(false)
 
-      @player.play_modal(@local_file, controller: @controller)
+      @controller.didMoveToParentViewController(parent)
 
-      wait 1 do
+      EM.add_timer 3.0 do
+        resume
+      end
+      wait_max 5 do
+        @player.play_modal(@local_file, controller: @controller)
         @controller.modalViewController.should.not == nil
+        EM.add_timer 2.0 do
+          @player.stop
+        end
+        EM.add_timer 4.0 do
+          resume
+        end
 
-        @player.stop
-        wait 1 do
+        wait_max 5 do
           @controller.modalViewController.should == nil
+          @controller.willMoveToParentViewController(nil)
+          @controller.viewWillDisappear(false)
+          @controller.removeFromParentViewController
+          @controller.viewDidDisappear(false)
           @controller = nil
           @player = nil
         end
       end
     end
   end
+=end
 end

data/spec/motion/ui/ui_bar_button_item_spec.rb

@@ -1,4 +1,30 @@
 describe BW::UIBarButtonItem do
+  class NavigationItemContainingBarButtonItem < UINavigationItem
+    def init_with_styled
+      initWithTitle('dummy')
+      subject = BW::UIBarButtonItem.styled(:plain, 'dummy') do
+        #Can be empty, but we need a block/proc here to potentially create a retain cycle
+      end
+      self.leftBarButtonItem = subject
+      self
+    end
+
+
+    def init_with_system
+      initWithTitle('dummy')
+      subject = BW::UIBarButtonItem.system(:save) do
+        #Can be empty, but we need a block/proc here to potentially create a retain cycle
+      end
+      self.leftBarButtonItem = subject
+      self
+    end
+
+    def dealloc
+      App.notification_center.post('NavigationItemContainingBarButtonItem dealloc', nil, {'tag'=>tag})
+      super
+    end
+  end
+
   describe ".styled" do
     describe "given an unknown style" do
       it "raises an exception" do
@@ -153,6 +179,31 @@ describe BW::UIBarButtonItem do
         @subject.action.should.equal(:call)
       end
     end
+
+    ###############################################################################################
+
+    describe "with BubbleWrap.use_weak_callbacks=true" do
+      it "removes cyclic references" do
+        observer = App.notification_center.observe('NavigationItemContainingBarButtonItem dealloc') do |obj|
+          if obj.userInfo['tag'] == 1
+            @weak_deallocated = true
+          elsif obj.userInfo['tag'] == 2
+            @strong_deallocated = true
+          end
+        end
+        autorelease_pool {
+          BubbleWrap.use_weak_callbacks = true
+          v1 = NavigationItemContainingBarButtonItem.alloc.init_with_styled
+          v1.tag = 1
+          BubbleWrap.use_weak_callbacks = false
+          v2 = NavigationItemContainingBarButtonItem.alloc.init_with_styled
+          v2.tag = 2
+        }
+        App.notification_center.unobserve(observer)
+        @weak_deallocated.should.equal true
+        @strong_deallocated.should.equal nil
+      end
+    end
   end
 
   #################################################################################################
@@ -222,6 +273,31 @@ describe BW::UIBarButtonItem do
         @subject.action.should.equal(nil)
       end
     end
+
+    ###############################################################################################
+
+    describe "with BubbleWrap.use_weak_callbacks=true" do
+      it "removes cyclic references" do
+        observer = App.notification_center.observe('NavigationItemContainingBarButtonItem dealloc') do |obj|
+          if obj.userInfo['tag'] == 1
+            @weak_deallocated = true
+          elsif obj.userInfo['tag'] == 2
+            @strong_deallocated = true
+          end
+        end
+        autorelease_pool {
+          BubbleWrap.use_weak_callbacks = true
+          v1 = NavigationItemContainingBarButtonItem.alloc.init_with_system
+          v1.tag = 1
+          BubbleWrap.use_weak_callbacks = false
+          v2 = NavigationItemContainingBarButtonItem.alloc.init_with_system
+          v2.tag = 2
+        }
+        App.notification_center.unobserve(observer)
+        @weak_deallocated.should.equal true
+        @strong_deallocated.should.equal nil
+      end
+    end
   end
 
   #################################################################################################

data/spec/motion/ui/ui_control_wrapper_spec.rb

@@ -23,6 +23,44 @@ describe BW::UIControlWrapper do
       @touched.should.equal ['touched']
     end
 
+    it "BubbleWrap.use_weak_callbacks=true removes cyclic references" do
+      class ControlSuperView < UIView
+        def initWithFrame(frame)
+          super
+          subject = UIControl.alloc.init
+          subject.when(UIControlEventTouchUpInside) do
+            #Can be empty, but we need a block/proc here to potentially create a retain cycle
+          end
+          addSubview(subject)
+          self
+        end
+
+        def dealloc
+          App.notification_center.post('ControlSuperView dealloc', nil, {'tag'=>tag})
+          super
+        end
+      end
+
+      observer = App.notification_center.observe('ControlSuperView dealloc') do |obj|
+        if obj.userInfo['tag'] == 1
+          @weak_deallocated = true
+        elsif obj.userInfo['tag'] == 2
+          @strong_deallocated = true
+        end
+      end
+      autorelease_pool {
+        BubbleWrap.use_weak_callbacks = true
+        v1 = ControlSuperView.new
+        v1.tag = 1
+        BubbleWrap.use_weak_callbacks = false
+        v2 = ControlSuperView.new
+        v2.tag = 2
+      }
+      App.notification_center.unobserve(observer)
+      @weak_deallocated.should.equal true
+      @strong_deallocated.should.equal nil
+    end
+
     it "allows multiple targets for a given control event if specified" do
       @subject.when(UIControlEventTouchUpInside, append: true) do
         @touched << 'touched'

data/spec/motion/ui/ui_view_wrapper_spec.rb

@@ -54,9 +54,51 @@ describe BW::UIViewWrapper do
       testMethod.call :whenPanned
     end
 
+    describe '#when_screen_edge_panned' do
+      testMethod.call :when_screen_edge_panned
+    end
+
     describe '#when_pressed' do
       testMethod.call :when_pressed
       testMethod.call :whenPressed
     end
+
+    it "BubbleWrap.use_weak_callbacks=true removes cyclic references" do
+      class ViewSuperView < UIView
+        def initWithFrame(frame)
+          super
+          subject = UIView.alloc.init
+          subject.when_tapped do
+            #Can be empty, but we need a block/proc here to potentially create a retain cycle
+          end
+          addSubview(subject)
+          self
+        end
+
+        def dealloc
+          App.notification_center.post('ViewSuperView dealloc', nil, {'tag'=>tag})
+          super
+        end
+      end
+
+      observer = App.notification_center.observe('ViewSuperView dealloc') do |obj|
+        if obj.userInfo['tag'] == 1
+          @weak_deallocated = true
+        elsif obj.userInfo['tag'] == 2
+          @strong_deallocated = true
+        end
+      end
+      autorelease_pool {
+        BubbleWrap.use_weak_callbacks = true
+        v1 = ViewSuperView.new
+        v1.tag = 1
+        BubbleWrap.use_weak_callbacks = false
+        v2 = ViewSuperView.new
+        v2.tag = 2
+      }
+      App.notification_center.unobserve(observer)
+      @weak_deallocated.should.equal true
+      @strong_deallocated.should.equal nil
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bubble-wrap
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0.rc1
 platform: ruby
 authors:
 - Matt Aimonetti
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-06 00:00:00.000000000 Z
+date: 2014-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
@@ -86,7 +86,6 @@ executables: []
 extensions: []
 extra_rdoc_files:
 - lib/bubble-wrap/ext/motion_project_app.rb
-- lib/bubble-wrap/ext/motion_project_config.rb
 - motion/core.rb
 - motion/core/app.rb
 - motion/core/device.rb
@@ -199,7 +198,6 @@ files:
 - lib/bubble-wrap/core.rb
 - lib/bubble-wrap/ext.rb
 - lib/bubble-wrap/ext/motion_project_app.rb
-- lib/bubble-wrap/ext/motion_project_config.rb
 - lib/bubble-wrap/font.rb
 - lib/bubble-wrap/http.rb
 - lib/bubble-wrap/loader.rb
@@ -373,9 +371,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3

data/lib/bubble-wrap/ext/motion_project_config.rb

@@ -1,34 +0,0 @@
-module BubbleWrap
-  module Ext
-    module ConfigTask
-
-      def self.included(base) 
-        base.class_eval do
-          alias_method :files_dependencies_without_bubblewrap, :files_dependencies
-          alias_method :files_dependencies, :files_dependencies_with_bubblewrap
-        end
-      end
-
-      def path_matching_expression
-        /^\.?\//
-      end
-
-      def files_dependencies_with_bubblewrap(deps_hash)
-        res_path = lambda do |x|
-          path = path_matching_expression.match(x) ? x : File.join('.', x)
-          unless @files.include?(path)
-            Motion::Project::App.send(:fail, "Can't resolve dependency `#{x}' because #{path} is not in #{@files.inspect}")
-          end
-          path
-        end
-        deps_hash.each do |path, deps|
-          deps = [deps] unless deps.is_a?(Array)
-          @dependencies[res_path.call(path)] = deps.map(&res_path)
-        end
-      end
-
-    end
-  end
-end
-
-Motion::Project::Config.send(:include, BubbleWrap::Ext::ConfigTask)