bubble-wrap 1.4.0 → 1.5.0.rc1

data/motion/media/player.rb

@@ -88,7 +88,11 @@ module BubbleWrap
         if display_modal
           @presenting_controller = options[:controller]
           @presenting_controller ||= App.window.rootViewController
-          @presenting_controller.presentMoviePlayerViewControllerAnimated(@media_player)
+          if Device.ios_version < "7.0"
+            @presenting_controller.presentMoviePlayerViewControllerAnimated(@media_player)
+          else
+            @presenting_controller.presentViewController(@media_player, animated:true, completion:nil)
+          end
         else
           if block.nil?
             raise Error::NilPlayerCallback, "no block callback given in #play; you need\
@@ -105,7 +109,11 @@ module BubbleWrap
       # Stops playback for a Media::Player
       def stop
         if @media_player.is_a? MPMoviePlayerViewController
-          @presenting_controller.dismissMoviePlayerViewControllerAnimated
+          if Device.ios_version < "7.0"
+            @presenting_controller.dismissMoviePlayerViewControllerAnimated
+          else
+            @presenting_controller.dismissViewControllerAnimated(true, completion:nil)
+          end
           @presenting_controller = nil
         else
           @media_player.stop

data/motion/reactor.rb

@@ -86,6 +86,7 @@ module BubbleWrap
     # Schedule a block for execution on the reactor queue.
     def schedule(*args, &blk)
       @queue ||= ::Dispatch::Queue.concurrent("#{NSBundle.mainBundle.bundleIdentifier}.reactor")
+      blk.weak! if blk && BubbleWrap.use_weak_callbacks?
 
       cb = proc do
         blk.call(*args)
@@ -98,6 +99,7 @@ module BubbleWrap
     # This is useful as UI updates need to be executed from the main
     # thread.
     def schedule_on_main(*args, &blk)
+      blk.weak! if blk && BubbleWrap.use_weak_callbacks?
       cb = proc do
         blk.call(*args)
       end

data/motion/reactor/periodic_timer.rb

@@ -10,7 +10,8 @@ module BubbleWrap
       def initialize(interval, *args, &blk)
         callback = args.first.respond_to?(:call) ? args.first : blk
         raise ArgumentError, "No callback or block supplied to periodic timer" unless callback
-        
+        callback.weak! if callback && BubbleWrap.use_weak_callbacks?
+
         options = args.last.is_a?(Hash) ? args.last : {}
         if options[:common_modes]
           NSLog "[DEPRECATED - Option :common_modes] a Run Loop Mode is no longer needed."

data/motion/shortcut.rb

@@ -13,6 +13,14 @@ module BubbleWrap
     BubbleWrap::SETTINGS[:debug]
   end
 
+  def self.use_weak_callbacks=(val)
+    BubbleWrap::SETTINGS[:use_weak_callbacks] = val
+  end
+
+  def self.use_weak_callbacks?
+    BubbleWrap::SETTINGS[:use_weak_callbacks]
+  end
+
 end
 
 BW = BubbleWrap unless defined?(BW)

data/motion/sms/sms.rb

@@ -22,6 +22,8 @@ module BubbleWrap
     def compose(options={}, &callback)
       @delegate = options[:delegate] || App.window.rootViewController
       @callback = callback
+      @callback.weak! if @callback && BubbleWrap.use_weak_callbacks?
+
       @message_controller = create_message_controller(options)
       @message_is_animated = options[:animated] == false ? false : true
       @delegate.presentModalViewController(@message_controller, animated: @message_is_animated)

data/motion/ui/ui_alert_view.rb

@@ -28,6 +28,8 @@ module BW
         view.cancel_button_index = options[:cancel_button_index]
 
         view.instance_variable_set(:@handlers, {})
+        block.weak! if block && BubbleWrap.use_weak_callbacks?
+
         options[:on_click] ||= block
 
         callbacks.each do |callback|

data/motion/ui/ui_bar_button_item.rb

@@ -2,7 +2,12 @@ module BW
   class UIBarButtonItem < ::UIBarButtonItem
     class << self
       def styled(type, *objects, &block)
-        action = block ? :call : nil
+        if block.nil?
+          action = nil
+        else
+          block.weak! if BubbleWrap.use_weak_callbacks?
+          action = :call
+        end
         object = objects.size == 1 ? objects.first : objects
         style  = Constants.get("UIBarButtonItemStyle", type)
 
@@ -34,7 +39,12 @@ module BW
       end
 
       def system(type, &block)
-        action      = block ? :call : nil
+        if block.nil?
+          action = nil
+        else
+          block.weak! if BubbleWrap.use_weak_callbacks?
+          action = :call
+        end
         system_item = Constants.get("UIBarButtonSystemItem", type)
 
         item = alloc.initWithBarButtonSystemItem(system_item, target:block, action:action)

data/motion/ui/ui_control_wrapper.rb

@@ -10,6 +10,7 @@ module BubbleWrap
       end
 
       @callback[events] << block
+      block.weak! if BubbleWrap.use_weak_callbacks?
       addTarget(@callback[events].last, action:'call', forControlEvents: events)
     end
   end

data/motion/ui/ui_view_wrapper.rb

@@ -20,6 +20,10 @@ module BubbleWrap
       add_gesture_recognizer_helper(UIPanGestureRecognizer.alloc.initWithTarget(self, action:'handle_gesture:'), enableInteraction, proc)
     end
 
+    def when_screen_edge_panned(enableInteraction=true, &proc)
+      add_gesture_recognizer_helper(UIScreenEdgePanGestureRecognizer.alloc.initWithTarget(self, action:'handle_gesture:'), enableInteraction, proc)
+    end
+
     def when_pressed(enableInteraction=true, &proc)
       add_gesture_recognizer_helper(UILongPressGestureRecognizer.alloc.initWithTarget(self, action:'handle_gesture:'), enableInteraction, proc)
     end
@@ -47,6 +51,7 @@ module BubbleWrap
       self.addGestureRecognizer(recognizer)
 
       @recognizers = {} unless @recognizers
+      proc.weak! if !proc.nil? && BubbleWrap.use_weak_callbacks?
       @recognizers[recognizer] = proc
 
       recognizer

data/samples/osx/Gemfile.lock

@@ -1,10 +1,14 @@
+PATH
+  remote: ../../
+  specs:
+    bubble-wrap (1.4.0)
+
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    bubble-wrap (1.3.0.osx)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bubble-wrap (~> 1.3.0.osx)
+  bubble-wrap!

data/spec/motion/core/device/ios/camera_spec.rb

@@ -93,6 +93,12 @@ describe BubbleWrap::Device::Camera do
         camera.imagePickerController(camera.instance_variable_get("@picker"), didFinishPickingMediaWithInfo: info)
         image_view.nil?.should == false
       end
+      
+      it 'should set popover' do
+        uiview = UIView.alloc
+        camera = BW::Device.camera.photo_library.popover_from(uiview)
+        camera.instance_variable_get("@popover_in_view").should == uiview
+      end
     end
   end
 

data/spec/motion/core/device/ios/camera_wrapper_spec.rb

@@ -1,16 +1,19 @@
 describe BubbleWrap::Device::CameraWrapper do
-  
+
   before do
     BW::Device.camera.instance_variable_set(:@front, nil)
     BW::Device.camera.instance_variable_set(:@rear, nil)
   end
-  
+
   describe 'on device with only front facing camera' do
     before do
       UIImagePickerController.instance_eval do
         def isCameraDeviceAvailable(c)
           c == UIImagePickerControllerCameraDeviceFront
         end
+        def isSourceTypeAvailable(c)
+          c == UIImagePickerControllerSourceTypeCamera
+        end
       end
     end
 
@@ -25,6 +28,12 @@ describe BubbleWrap::Device::CameraWrapper do
         BW::Device.camera.rear?.should == false
       end
     end
+
+    describe '.available?' do
+      it 'returns true' do
+        BW::Device.camera.available?.should == true
+      end
+    end
   end
 
   describe 'on device with only rear facing camera' do
@@ -33,6 +42,9 @@ describe BubbleWrap::Device::CameraWrapper do
         def isCameraDeviceAvailable(c)
           c == UIImagePickerControllerCameraDeviceRear
         end
+        def isSourceTypeAvailable(c)
+          c == UIImagePickerControllerSourceTypeCamera
+        end
       end
     end
 
@@ -47,5 +59,42 @@ describe BubbleWrap::Device::CameraWrapper do
         BW::Device.camera.rear?.should == true
       end
     end
+
+    describe '.available?' do
+      it 'returns true' do
+        BW::Device.camera.available?.should == true
+      end
+    end
+  end
+
+  describe 'on device with no physical camera' do
+    before do
+      UIImagePickerController.instance_eval do
+        def isCameraDeviceAvailable(c)
+          false
+        end
+        def isSourceTypeAvailable(c)
+          false
+        end
+      end
+    end
+
+    describe '.front?' do
+      it 'returns false' do
+        BW::Device.camera.front?.should == false
+      end
+    end
+
+    describe '.rear?' do
+      it 'returns false' do
+        BW::Device.camera.rear?.should == false
+      end
+    end
+
+    describe '.available?' do
+      it 'returns true' do
+        BW::Device.camera.available?.should == false
+      end
+    end
   end
 end

data/spec/motion/core/kvo_spec.rb

@@ -3,11 +3,13 @@ describe BubbleWrap::KVO do
   class KvoExample
     include BubbleWrap::KVO
 
+    attr_accessor :age
     attr_accessor :label
     attr_accessor :items
 
     def initialize
       @items = [ "Apple", "Banana", "Chickpeas" ]
+      @age = 1
 
       if App.osx?
         @label = NSTextField.alloc.initWithFrame [[0,0],[320, 30]]
@@ -187,6 +189,31 @@ describe BubbleWrap::KVO do
       @example.set_text "Bar"
       observed.should == false
     end
+
+    # without target
+
+    it "should observe a key path without a target" do
+      observed = false
+      @example.observe :age do |old_value, new_value|
+        observed = true
+        old_value.should == 1
+        new_value.should == 2
+      end
+    
+      @example.age = 2
+      observed.should == true
+    end
+
+    it "should unobserve a key path without a target" do
+      observed = false
+      @example.observe :age do |old_value, new_value|
+        observed = true
+      end
+      @example.unobserve :age
+    
+      @example.age = 2
+      observed.should == false
+    end
   
   end
  

data/spec/motion/core/ns_notification_center_spec.rb

@@ -14,9 +14,9 @@ describe "NSNotificationCenter" do
   end
 
   it "add observer" do
-    notified = false
+    @notified = false
     @observer = BW::App.notification_center.observe(SampleNotification) do |note|
-      notified = true
+      @notified = true
       note.should.is_a NSNotification
       note.object.class.should == Time
       note.userInfo.should.not.be.nil
@@ -25,7 +25,7 @@ describe "NSNotificationCenter" do
 
     lambda { 
       BW::App.notification_center.post SampleNotification, Time.now, {:status => "ok"}
-    }.should.change { notified }
+    }.should.change { @notified }
   end
 
   it "remove observer" do

data/spec/motion/core/time_spec.rb

@@ -16,13 +16,15 @@ describe "Time" do
 
   describe "parsing an iso8601 formatted time to a Time object" do
     before do
-      @time = Time.iso8601("2012-05-31T19:41:33Z")
+      @time = Time.iso8601("2012-#{Time.now.month}-#{Time.now.day}T19:41:32Z")
       @time_with_timezone = Time.iso8601_with_timezone("1987-08-10T06:00:00+02:00")
+      @time_with_fractional_seconds = Time.iso8601_with_fractional_seconds("2012-#{Time.now.month}-#{Time.now.day}T19:41:32.123Z")
     end
 
     it "should be a time" do
       @time.instance_of?(Time).should == true
       @time_with_timezone.instance_of?(Time).should == true
+      @time_with_fractional_seconds.instance_of?(Time).should == true
     end
 
     # Crashes Buggy RubyMotion 1.18
@@ -30,36 +32,43 @@ describe "Time" do
       local_zone = Time.now.zone
       @time.zone.should == local_zone
       @time_with_timezone.zone == local_zone
+      @time_with_fractional_seconds.zone.should == local_zone
     end
 
     it "should have a valid year" do
       @time.utc.year.should == 2012
       @time_with_timezone.utc.year.should == 1987
+      @time_with_fractional_seconds.utc.year.should == 2012
     end
 
     it "should have a valid month" do
-      @time.utc.month.should == 5
+      @time.utc.month.should == Time.now.month
       @time_with_timezone.utc.month.should == 8
+      @time_with_fractional_seconds.utc.month.should == Time.now.month
     end
 
     it "should have a valid day" do
-      @time.utc.day.should == 31
+      @time.utc.day.should == Time.now.day
       @time_with_timezone.utc.day.should == 10
+      @time_with_fractional_seconds.utc.day.should == Time.now.day
     end
 
     it "should have a valid hour" do
       @time.utc.hour.should == 19
       @time_with_timezone.utc.hour.should == 4
+      @time_with_fractional_seconds.utc.hour.should == 19
     end
 
     it "should have a valid minute" do
       @time.utc.min.should == 41
       @time_with_timezone.utc.min.should == 0
+      @time_with_fractional_seconds.utc.min.should == 41
     end
 
     it "should have a valid second" do
-      @time.utc.sec.should == 33
+      @time.utc.sec.should == 32
       @time_with_timezone.utc.sec.should == 0
+      @time_with_fractional_seconds.utc.sec.should == 32
     end
   end
 

data/spec/motion/core_spec.rb

@@ -28,7 +28,6 @@ describe 'BubbleWrap' do
     end
 
     it "creates color with rgb devided by 255 with alpha=1" do
-      color = nil
       r,g,b,a = [(@red/255.0), (@green/255.0), (@blue/255.0), 1]
       if App.osx?
         color = NSColor.colorWithDeviceRed(r, green:g, blue:b, alpha: a)

data/spec/motion/http/query_spec.rb

@@ -183,7 +183,7 @@ describe BubbleWrap::HTTP::Query do
         query = BubbleWrap::HTTP::Query.new(@fake_url, :post, {files: files})
         uuid = query.instance_variable_get(:@boundary)
         real_payload = NSString.alloc.initWithData(query.request.HTTPBody, encoding:NSUTF8StringEncoding)
-        real_payload.should.equal "--#{uuid}\r\nContent-Disposition: form-data; name=\"upload\"; filename=\"test.txt\"\r\nContent-Type: application/octet-stream\r\n\r\ntwitter:@mneorr\r\n--#{uuid}--\r\n"
+        real_payload.should.equal "--#{uuid}\r\nContent-Disposition: attachment; name=\"upload\"; filename=\"test.txt\"\r\nContent-Type: application/octet-stream\r\n\r\ntwitter:@mneorr\r\n--#{uuid}--\r\n"
       end
 
       it "processes filenames from file hashes, using the name when the filename is missing" do
@@ -193,7 +193,7 @@ describe BubbleWrap::HTTP::Query do
         query = BubbleWrap::HTTP::Query.new(@fake_url, :post, {files: files})
         uuid = query.instance_variable_get(:@boundary)
         real_payload = NSString.alloc.initWithData(query.request.HTTPBody, encoding:NSUTF8StringEncoding)
-        real_payload.should.equal "--#{uuid}\r\nContent-Disposition: form-data; name=\"upload\"; filename=\"upload\"\r\nContent-Type: application/octet-stream\r\n\r\ntwitter:@mneorr\r\n--#{uuid}--\r\n"
+        real_payload.should.equal "--#{uuid}\r\nContent-Disposition: attachment; name=\"upload\"; filename=\"upload\"\r\nContent-Type: application/octet-stream\r\n\r\ntwitter:@mneorr\r\n--#{uuid}--\r\n"
       end
 
       it "throws an error for invalid file parameters" do
@@ -214,7 +214,7 @@ describe BubbleWrap::HTTP::Query do
           query = BubbleWrap::HTTP::Query.new( @fake_url , method, { payload: payload, files: files } )
           uuid = query.instance_variable_get(:@boundary)
           real_payload = NSString.alloc.initWithData(query.request.HTTPBody, encoding:NSUTF8StringEncoding)
-          real_payload.should.equal "--#{uuid}\r\nContent-Disposition: form-data; name=\"name\"\r\n\r\napple\r\n--#{uuid}\r\nContent-Disposition: form-data; name=\"model\"\r\n\r\nmacbook\r\n--#{uuid}\r\nContent-Disposition: form-data; name=\"twitter\"; filename=\"twitter\"\r\nContent-Type: application/octet-stream\r\n\r\ntwitter:@mneorr\r\n--#{uuid}\r\nContent-Disposition: form-data; name=\"site\"; filename=\"site\"\r\nContent-Type: application/octet-stream\r\n\r\nmneorr.com\r\n--#{uuid}--\r\n"
+          real_payload.should.equal "--#{uuid}\r\nContent-Disposition: form-data; name=\"name\"\r\n\r\napple\r\n--#{uuid}\r\nContent-Disposition: form-data; name=\"model\"\r\n\r\nmacbook\r\n--#{uuid}\r\nContent-Disposition: attachment; name=\"twitter\"; filename=\"twitter\"\r\nContent-Type: application/octet-stream\r\n\r\ntwitter:@mneorr\r\n--#{uuid}\r\nContent-Disposition: attachment; name=\"site\"; filename=\"site\"\r\nContent-Type: application/octet-stream\r\n\r\nmneorr.com\r\n--#{uuid}--\r\n"
         end
 
         [:get, :head, :options].each do |method|
@@ -475,7 +475,7 @@ describe BubbleWrap::HTTP::Query do
 
     it "should initialize @received_data and append the received data" do
       query_received_data.should.equal nil
-      data = NSData.dataWithBytesNoCopy(Pointer.new(:char, 'abc'), length:24, freeWhenDone: false)
+      data = NSData.dataWithBytes(Pointer.new(:char, 'abc'), length:24)
 
       @query.connection(nil, didReceiveData:nil)
       query_received_data.should.not.equal nil
@@ -555,7 +555,7 @@ describe BubbleWrap::HTTP::Query do
     end
 
     it "should set response_body to @received data if not nil" do
-      data = NSData.dataWithBytesNoCopy(Pointer.new(:char, 'abc'), length:24, freeWhenDone: false)
+      data = NSData.dataWithBytes(Pointer.new(:char, 'abc'), length:24)
       headers = { foo: 'bar' }
       status_code = 234
       response = FakeURLResponse.new(status_code, headers, 65456)