bubble-wrap 1.4.0 → 1.5.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f49e903b8cbae3bf9a475a04c9fa209aa944ab60
-  data.tar.gz: aa486c325db87d7d54eb5647f8acce0e28ef6e48
+  metadata.gz: 6fe8341489f7d867922c2a8c271efa986f434521
+  data.tar.gz: eb3ed530d9b58a39525049fe03286e83f4add2cf
 SHA512:
-  metadata.gz: 83bf22da6648b81fbc4b7717445ea63154ad10fad278767958fb074ec41c2fce7d792022d87ff629925940e5d6f20cea2791e97614155963e071aa8580f82867
-  data.tar.gz: 1e5d77f5ec252c58a78fe372eddb3a0f7468d13b36344dd4cb12cf6162d3fdd70ba1db5d9911f709b4865d978ca698b040a9e0dba27a64e930aa99e054e84647
+  metadata.gz: fadcc0db6e1ca10ba457ff651cac9b66315834dce161d33e026ebadafc78748da0fd481f59c78007754bd9c7f0cb45463b784160ec49bb354d202b7cab7f8d0a
+  data.tar.gz: 3ff86b7387349720e3aec8b48dba3efca6e7d1a2c988023634cfa693569a158124a1e1f41d50abe90068211b86971c0467c98cb207120077d10455d72dffa858

data/.travis.yml

@@ -1,5 +1,6 @@
 language: objective-c
 before_install:
     - (ruby --version)
-before_script: sudo chown -R travis ~/Library/RubyMotion
+    - mkdir -p ~/Library/RubyMotion/build
+    - sudo motion update
 script: ./travis.sh

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bubble-wrap (1.4.0)
+    bubble-wrap (1.5.0.rc1)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -23,10 +23,10 @@ gem install bubble-wrap
 require 'bubble-wrap'
 ```
 
-If you are requiring bubble-wrap for RubyMotion 2.0 (iOS or OS X), use Bundler and specify version greater than 1.3.0:
+If you using Bundler:
 
 ```ruby
-gem "bubble-wrap", "~> 1.3.0"
+gem "bubble-wrap", "~> 1.4.0"
 ```
 
 BubbleWrap is split into multiple modules so that you can easily choose which parts
@@ -479,6 +479,12 @@ button.when(UIControlEventTouchUpInside) do
 end
 ```
 
+Set the use_weak_callbacks flag so the blocks do not retain a strong reference to self:
+
+```ruby
+BubbleWrap.use_weak_callbacks = true
+```
+
 ### UIBarButtonItem
 
 `BW::UIBarButtonItem` is a subclass of `UIBarButtonItem` with an natural Ruby syntax.
@@ -626,6 +632,20 @@ BW::HTTP.post("http://foo.bar.com/", {payload: data}) do |response|
 end
 ```
 
+To upload files to a server, provide a `files:` hash:
+
+```ruby
+data = {token: "some-api-token"}
+avatar_data = UIImagePNGRepresentation(UIImage.imageNamed("some-image"))
+avatar = { data: avatar_data, filename: "some-image.png", content_type: "image/png" }
+
+BW::HTTP.post("http://foo.bar.com/", {payload: data}, files: { avatar: avatar }) do |response|
+  if response.ok?
+    # files are uploaded
+  end
+end
+```
+
 A `:download_progress` option can also be passed. The expected object
 would be a Proc that takes two arguments: a float representing the
 amount of data currently received and another float representing the

data/bubble-wrap.gemspec

@@ -2,16 +2,16 @@
 require File.expand_path('../lib/bubble-wrap/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Matt Aimonetti", "Francis Chong", "James Harton", "Clay Allsopp", "Dylan Markow", "Jan Weinkauff", "Marin Usalj"]
-  gem.email         = ["mattaimonetti@gmail.com", "francis@ignition.hk", "james@sociable.co.nz", "clay.allsopp@gmail.com", "dylan@dylanmarkow.com", "jan@dreimannzelt.de", "mneorr@gmail.com"]
-  gem.description   = "RubyMotion wrappers and helpers (Ruby for iOS) - Making Cocoa APIs more Ruby like, one API at a time. Fork away and send your pull request."
-  gem.summary       = "RubyMotion wrappers and helpers (Ruby for iOS) - Making Cocoa APIs more Ruby like, one API at a time. Fork away and send your pull request."
-  gem.homepage      = "http://bubblewrap.io/"
+  gem.authors       = ['Matt Aimonetti', 'Francis Chong', 'James Harton', 'Clay Allsopp', 'Dylan Markow', 'Jan Weinkauff', 'Marin Usalj']
+  gem.email         = ['mattaimonetti@gmail.com', 'francis@ignition.hk', 'james@sociable.co.nz', 'clay.allsopp@gmail.com', 'dylan@dylanmarkow.com', 'jan@dreimannzelt.de', 'mneorr@gmail.com']
+  gem.description   = 'RubyMotion wrappers and helpers (Ruby for iOS) - Making Cocoa APIs more Ruby like, one API at a time. Fork away and send your pull request.'
+  gem.summary       = 'RubyMotion wrappers and helpers (Ruby for iOS) - Making Cocoa APIs more Ruby like, one API at a time. Fork away and send your pull request.'
+  gem.homepage      = 'http://bubblewrap.io/'
 
   gem.files         = `git ls-files`.split($\)
   gem.test_files    = gem.files.grep(%r{^(test|spec|lib_spec|features)/})
-  gem.name          = "bubble-wrap"
-  gem.require_paths = ["lib"]
+  gem.name          = 'bubble-wrap'
+  gem.require_paths = ['lib']
   gem.version       = BubbleWrap::VERSION
 
   gem.extra_rdoc_files = gem.files.grep(%r{motion})

data/lib/bubble-wrap.rb

@@ -1,3 +1,3 @@
-require "bubble-wrap/version" unless defined?(BubbleWrap::VERSION)
+require 'bubble-wrap/version' unless defined?(BubbleWrap::VERSION)
 require File.expand_path('../bubble-wrap/core', __FILE__)
 require File.expand_path('../bubble-wrap/http', __FILE__)

data/lib/bubble-wrap/core.rb

@@ -9,12 +9,12 @@ BubbleWrap.require('motion/core/device/*.rb')
 BubbleWrap.require_ios do
   BubbleWrap.require('motion/core/ios/**/*.rb')
   BubbleWrap.require('motion/core/device/ios/**/*.rb')
+  
+  require 'bubble-wrap/camera'
+  require 'bubble-wrap/ui'
 end
 
 BubbleWrap.require_osx do
   BubbleWrap.require('motion/core/osx/**/*.rb')
   BubbleWrap.require('motion/core/device/osx/**/*.rb')
 end
-
-require 'bubble-wrap/camera'
-require 'bubble-wrap/ui'

data/lib/bubble-wrap/ext.rb

@@ -1,2 +1 @@
-require 'bubble-wrap/ext/motion_project_config'
 require 'bubble-wrap/ext/motion_project_app'

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

@@ -4,14 +4,15 @@ module BubbleWrap
 
       def self.extended(base)
         base.instance_eval do
-          def setup_with_bubblewrap(&block)
+          def setup_with_bubblewrap(*args, &block)
             bw_config = proc do |app|
               app.files = ::BubbleWrap::Requirement.files(app.files)
               app.files_dependencies ::BubbleWrap::Requirement.files_dependencies
               app.frameworks = ::BubbleWrap::Requirement.frameworks(app.frameworks)
               block.call(app) unless block.nil?
             end
-            config.setup_blocks << bw_config
+
+            setup_without_bubblewrap *args, &bw_config
           end
           alias :setup_without_bubblewrap :setup
           alias :setup :setup_with_bubblewrap
@@ -30,4 +31,4 @@ end
 
 Motion::Project::App.extend(BubbleWrap::Ext::BuildTask)
 
-Motion::Project::App.extend(BubbleWrap::Ext::Platforms)
+Motion::Project::App.extend(BubbleWrap::Ext::Platforms)

data/lib/bubble-wrap/loader.rb

@@ -1,5 +1,5 @@
 unless defined?(Motion::Project::Config)
-  raise "This file must be required within a RubyMotion project Rakefile."
+  raise 'This file must be required within a RubyMotion project Rakefile.'
 end
 
 unless defined?(BubbleWrap::LOADER_PRESENT)
@@ -13,7 +13,7 @@ unless defined?(BubbleWrap::LOADER_PRESENT)
 
   module BubbleWrap
 
-    LOADER_PRESENT=true
+    LOADER_PRESENT = true
     module_function
 
     def root
@@ -44,5 +44,5 @@ unless defined?(BubbleWrap::LOADER_PRESENT)
   BW = BubbleWrap unless defined?(BW)
 
   BW.require 'motion/shortcut.rb'
-  
+
 end

data/lib/bubble-wrap/media.rb

@@ -2,6 +2,8 @@ require 'bubble-wrap/loader'
 
 BubbleWrap.require_ios("media") do
   BubbleWrap.require('motion/core/app.rb')
+  BubbleWrap.require('motion/core/ios/app.rb')
+  BubbleWrap.require('motion/core/ios/device.rb')
   BubbleWrap.require('motion/core/string.rb')
   BubbleWrap.require('motion/core/ns_notification_center.rb')
   BubbleWrap.require('motion/media/**/*.rb') do

data/lib/bubble-wrap/requirement.rb

@@ -85,7 +85,7 @@ module BubbleWrap
       end
 
       def frameworks(app_frameworks=nil)
-        frameworks = ['UIKit', 'Foundation', 'CoreGraphics'] +
+        frameworks = ['Foundation', 'CoreGraphics'] +
           paths.values.map(&:frameworks)
         frameworks += app_frameworks if app_frameworks
         frameworks.flatten.compact.sort.uniq

data/lib/bubble-wrap/version.rb

@@ -1,4 +1,4 @@
 module BubbleWrap
-  VERSION = '1.4.0' unless defined?(BubbleWrap::VERSION)
-  MIN_MOTION_VERSION = '2.0'
+  VERSION = '1.5.0.rc1' unless defined?(BubbleWrap::VERSION)
+  MIN_MOTION_VERSION = '2.17'
 end

data/motion/core/device/ios/camera.rb

@@ -34,9 +34,21 @@ module BubbleWrap
         @rear ||= Camera.new(:rear)
       end
 
+      def self.available?
+        UIImagePickerController.isSourceTypeAvailable(UIImagePickerControllerSourceTypeCamera)
+      end
+
       # For uploading photos from the library.
-      def self.any
-        @any ||= Camera.new
+      class << self
+        def any
+          @any ||= Camera.new
+        end
+        alias_method "photo_library", "any"
+      end
+      
+      def popover_from(view)
+        @popover_in_view = view
+        self
       end
 
       def initialize(location = :none)
@@ -78,6 +90,7 @@ module BubbleWrap
       # end
       def picture(options = {}, presenting_controller = nil, &block)
         @callback = block
+        @callback.weak! if @callback && BubbleWrap.use_weak_callbacks?
 
         @options = options
         @options[:allows_editing] = false if not @options.has_key? :allows_editing
@@ -124,7 +137,19 @@ module BubbleWrap
 
         presenting_controller ||= App.window.rootViewController.presentedViewController # May be nil, but handles use case of container views
         presenting_controller ||= App.window.rootViewController
-        presenting_controller.presentViewController(self.picker, animated:@options[:animated], completion: lambda {})
+        
+        # use popover for iPad (ignore on iPhone)
+        if Device.ipad? and source_type==UIImagePickerControllerSourceTypePhotoLibrary and @popover_in_view
+          @popover = UIPopoverController.alloc.initWithContentViewController(picker)
+          @popover.presentPopoverFromRect(@popover_in_view.bounds, inView:@popover_in_view, permittedArrowDirections:UIPopoverArrowDirectionAny, animated:@options[:animated])
+        else
+          presenting_controller.presentViewController(self.picker, animated:@options[:animated], completion: lambda {})
+        end
+      end
+      
+      # iPad popover is dismissed
+      def popoverControllerDidDismissPopover(popoverController)
+        @popover = nil
       end
 
       ##########
@@ -154,6 +179,11 @@ module BubbleWrap
 
         @callback.call(callback_info)
         dismiss
+        # iPad popover? close it
+        if @popover
+          @popover.dismissPopoverAnimated(@options[:animated])
+          @popover = nil
+        end
       end
 
       ##########

data/motion/core/device/ios/camera_wrapper.rb

@@ -34,12 +34,22 @@ module BubbleWrap
       def any
         @any ||= BubbleWrap::Device::Camera.any
       end
+      # alias for any
+      def photo_library
+        any
+      end
 
       # Should always return true, since picking images from *some* source is always possible
       # @return [TrueClass]
       def any?
         !!any
       end
+
+      # Verifies that the device running has a physical camera.
+      # @return [TrueClass, FalseClass] true will be returned if the device has a physical camera, false otherwise.
+      def available?
+        BubbleWrap::Device::Camera.available?
+      end
     end
   end
 end

data/motion/core/kvo.rb

@@ -21,12 +21,26 @@ module BubbleWrap
     COLLECTION_OPERATIONS = [ NSKeyValueChangeInsertion, NSKeyValueChangeRemoval, NSKeyValueChangeReplacement ]
     DEFAULT_OPTIONS = NSKeyValueObservingOptionNew | NSKeyValueObservingOptionOld
 
-    def observe(target, key_path, &block)
+    def observe(*arguments, &block)
+      unless [1,2].include?(arguments.length)
+        raise ArgumentError, "wrong number of arguments (#{arguments.length} for 1 or 2)"
+      end
+
+      key_path = arguments.pop
+      target   = arguments.pop || self
+
       target.addObserver(self, forKeyPath:key_path, options:DEFAULT_OPTIONS, context:nil) unless registered?(target, key_path)
       add_observer_block(target, key_path, &block)
     end
 
-    def unobserve(target, key_path)
+    def unobserve(*arguments)
+      unless [1,2].include?(arguments.length)
+        raise ArgumentError, "wrong number of arguments (#{arguments.length} for 1 or 2)"
+      end
+
+      key_path = arguments.pop
+      target   = arguments.pop || self
+
       return unless registered?(target, key_path)
 
       target.removeObserver(self, forKeyPath:key_path)
@@ -54,6 +68,8 @@ module BubbleWrap
     def add_observer_block(target, key_path, &block)
       return if target.nil? || key_path.nil? || block.nil?
 
+      block.weak! if BubbleWrap.use_weak_callbacks?
+
       @targets ||= {}
       @targets[target] ||= {}
       @targets[target][key_path.to_s] ||= []

data/motion/core/ns_notification_center.rb

@@ -4,6 +4,7 @@ class NSNotificationCenter
   end
 
   def observe(name, object=nil, &proc)
+    proc.weak! if proc && BubbleWrap.use_weak_callbacks?
     observer = self.addObserverForName(name, object:object, queue:NSOperationQueue.mainQueue, usingBlock:proc)
     observers << observer
     observer

data/motion/core/time.rb

@@ -9,6 +9,11 @@ class Time
     cached_date_formatter("yyyy-MM-dd'T'HH:mm:ssZZZZZ").
       dateFromString(time)
   end
+  
+  def self.iso8601_with_fractional_seconds(time)
+    cached_date_formatter("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'").
+      dateFromString(time)
+  end
 
   private
 

data/motion/http/query.rb

@@ -30,6 +30,10 @@ module BubbleWrap; module HTTP; class Query
   def initialize(url_string, http_method = :get, options={})
     @method = http_method.upcase.to_s
     @delegator = options.delete(:action) || self
+    if @delegator.respond_to?("weak!")
+      @delegator.weak! if BubbleWrap.use_weak_callbacks?
+    end
+
     @payload = options.delete(:payload)
     @encoding = options.delete(:encoding) || NSUTF8StringEncoding
     @files = options.delete(:files)
@@ -53,6 +57,7 @@ module BubbleWrap; module HTTP; class Query
     @original_url = @url.copy
 
     @connection = create_connection(request, self)
+    @connection.scheduleInRunLoop(NSRunLoop.currentRunLoop, forMode:NSRunLoopCommonModes)
     @connection.start
 
     show_status_indicator true
@@ -269,20 +274,21 @@ Cache policy: #{@cache_policy}, response: #{@response.inspect} >"
   end
 
   def parse_file(key, value)
-    if value.is_a?(Hash)
-      raise(InvalidFileError, "You need to supply a `:data` entry in #{value} for file '#{key}' in your HTTP `:files`") if value[:data].nil?
-      {data: value[:data], filename: value[:filename] || key}
-    else
-      {data: value, filename: key}
-    end
+    value = {data: value} unless value.is_a?(Hash)
+    raise(InvalidFileError, "You need to supply a `:data` entry in #{value} for file '#{key}' in your HTTP `:files`") if value[:data].nil?
+    { 
+      data: value[:data], 
+      filename: value.fetch(:filename, key),
+      content_type: value.fetch(:content_type, "application/octet-stream")
+    }
   end
 
   def append_files(body)
     @files.each do |key, value|
       file = parse_file(key, value)
       s = "--#{@boundary}\r\n"
-      s += "Content-Disposition: form-data; name=\"#{key}\"; filename=\"#{file[:filename]}\"\r\n"
-      s += "Content-Type: application/octet-stream\r\n\r\n"
+      s += "Content-Disposition: attachment; name=\"#{key}\"; filename=\"#{file[:filename]}\"\r\n"
+      s += "Content-Type: #{file[:content_type]}\r\n\r\n"
       file_data = NSMutableData.new
       file_data.appendData(s.to_encoded_data @encoding)
       file_data.appendData(file[:data])
@@ -381,7 +387,7 @@ Cache policy: #{@cache_policy}, response: #{@response.inspect} >"
 
   # This is a temporary method used for mocking.
   def create_connection(request, delegate)
-    NSURLConnection.connectionWithRequest(request, delegate:delegate)
+    NSURLConnection.alloc.initWithRequest(request, delegate:delegate, startImmediately:false)
   end
 
 end; end; end

data/motion/location/location.rb

@@ -50,6 +50,7 @@ module BubbleWrap
     # end
     def get(options = {}, &block)
       @callback = block
+      @callback.weak! if @callback && BubbleWrap.use_weak_callbacks?
       @options = options
 
       @options[:significant] = false if @options[:significant].nil?
@@ -112,11 +113,11 @@ module BubbleWrap
     # CLLocationManagerDelegate Methods
     def locationManager(manager, didUpdateToLocation:newLocation, fromLocation:oldLocation)
       if @options[:once]
-        @callback.call(newLocation)
+        @callback && @callback.call(newLocation)
         @callback = proc { |result| }
         stop
       else
-        @callback.call({to: newLocation, from: oldLocation})
+        @callback && @callback.call({to: newLocation, from: oldLocation})
       end
     end
 

data/motion/mail/mail.rb

@@ -26,11 +26,12 @@ module BubbleWrap
       @delegate = options[:delegate] || App.window.rootViewController
 
       @callback = callback
+      @callback.weak! if @callback && BubbleWrap.use_weak_callbacks?
       
       @mail_controller = create_mail_controller(options)
       
       @mailer_is_animated = options[:animated] == false ? false : true
-      @delegate.presentModalViewController(@mail_controller, animated: @mailer_is_animated)
+      @delegate.presentViewController(@mail_controller, animated: @mailer_is_animated, completion: options[:completion])
     end
     
     def create_mail_controller(options={})