bubble-wrap 1.1.5 → 1.2.0.pre

data/motion/http.rb

@@ -34,6 +34,7 @@ module BubbleWrap
       attr_reader :headers
       attr_accessor :status_code, :status_description, :error_message
       attr_reader :url
+      attr_reader :original_url
 
       def initialize(values={})
         self.update(values)
@@ -86,6 +87,7 @@ module BubbleWrap
       # a proc will receive a Response object while the passed object
       # will receive the handle_query_response method
       # :headers<Hash>     - headers send with the request
+      # :cookies<Boolean>  - Set whether cookies should be sent with request or not (Default: true)
       # Anything else will be available via the options attribute reader.
       #
       def initialize(url_string, http_method = :get, options={})
@@ -101,17 +103,20 @@ module BubbleWrap
         @format = options.delete(:format)
         @cache_policy = options.delete(:cache_policy) || NSURLRequestUseProtocolCachePolicy
         @credential_persistence = options.delete(:credential_persistence) || NSURLCredentialPersistenceForSession
+        @cookies = options.key?(:cookies) ? options.delete(:cookies) : true      
         @options = options
         @response = HTTP::Response.new
+        @follow_urls = options[:follow_urls] || true
 
         @url = create_url(url_string)
         @body = create_request_body
         @request = create_request
+        @original_url = @url.copy
 
         @connection = create_connection(request, self)
         @connection.start
 
-        UIApplication.sharedApplication.networkActivityIndicatorVisible = true
+        UIApplication.sharedApplication.networkActivityIndicatorVisible = true if defined?(UIApplication)
       end
 
       def to_s
@@ -137,6 +142,10 @@ Cache policy: #{@cache_policy}, response: #{@response.inspect} >"
       end
 
       def connection(connection, willSendRequest:request, redirectResponse:redirect_response)
+        # abort early if the user has explicitly disabled redirects
+        if @options[:no_redirect] and redirect_response then
+          return nil
+        end
         @redirect_count ||= 0
         @redirect_count += 1
         log "##{@redirect_count} HTTP redirect_count: #{request.inspect} - #{self.description}"
@@ -147,13 +156,14 @@ Cache policy: #{@cache_policy}, response: #{@response.inspect} >"
           call_delegator_with_response
           nil
         else
+          @url = request.URL if @follow_urls
           request
         end
       end
 
       def connection(connection, didFailWithError: error)
-        log "HTTP Connection failed #{error.localizedDescription}"
-        UIApplication.sharedApplication.networkActivityIndicatorVisible = false
+        log "HTTP Connection to #{@url.absoluteString} failed #{error.localizedDescription}"
+        UIApplication.sharedApplication.networkActivityIndicatorVisible = false if defined?(UIApplication)
         @request.done_loading!
         @response.error_message = error.localizedDescription
         call_delegator_with_response
@@ -166,10 +176,10 @@ Cache policy: #{@cache_policy}, response: #{@response.inspect} >"
       end
 
       def connectionDidFinishLoading(connection)
-        UIApplication.sharedApplication.networkActivityIndicatorVisible = false
+        UIApplication.sharedApplication.networkActivityIndicatorVisible = false if defined?(UIApplication)
         @request.done_loading!
         response_body = NSData.dataWithData(@received_data) if @received_data
-        @response.update(status_code: status_code, body: response_body, headers: response_headers, url: @url)
+        @response.update(status_code: status_code, body: response_body, headers: response_headers, url: @url, original_url: @original_url)
 
         call_delegator_with_response
       end
@@ -203,6 +213,7 @@ Cache policy: #{@cache_policy}, response: #{@response.inspect} >"
         set_content_type
         request.setAllHTTPHeaderFields(@headers)
         request.setHTTPBody(@body)
+        request.setHTTPShouldHandleCookies(@cookies)
         patch_nsurl_request(request)
 
         request
@@ -260,26 +271,34 @@ Cache policy: #{@cache_policy}, response: #{@response.inspect} >"
       def append_form_params(body)
         list = process_payload_hash(@payload)
         list.each do |key, value|
-          form_data = NSMutableData.new
           s = "--#{@boundary}\r\n"
           s += "Content-Disposition: form-data; name=\"#{key}\"\r\n\r\n"
           s += value.to_s
           s += "\r\n"
-          form_data.appendData(s.dataUsingEncoding NSUTF8StringEncoding)
-          body.appendData(form_data)
+          body.appendData(s.dataUsingEncoding NSUTF8StringEncoding)
         end
         @payload_or_files_were_appended = true
         body
       end
 
+      def parse_file(key, value)
+        if value.is_a?(Hash)
+          raise InvalidFileError if value[:data].nil?
+          {data: value[:data], filename: value[:filename] || key}
+        else
+          {data: value, filename: key}
+        end
+      end
+
       def append_files(body)
         @files.each do |key, value|
-          file_data = NSMutableData.new
+          file = parse_file(key, value)
           s = "--#{@boundary}\r\n"
-          s += "Content-Disposition: form-data; name=\"#{key}\"; filename=\"#{key}\"\r\n"
+          s += "Content-Disposition: form-data; name=\"#{key}\"; filename=\"#{file[:filename]}\"\r\n"
           s += "Content-Type: application/octet-stream\r\n\r\n"
+          file_data = NSMutableData.new
           file_data.appendData(s.dataUsingEncoding NSUTF8StringEncoding)
-          file_data.appendData(value)
+          file_data.appendData(file[:data])
           file_data.appendData("\r\n".dataUsingEncoding NSUTF8StringEncoding)
           body.appendData(file_data)
         end
@@ -311,7 +330,7 @@ Cache policy: #{@cache_policy}, response: #{@response.inspect} >"
 
       def escape(string)
         if string
-          CFURLCreateStringByAddingPercentEscapes nil, string.to_s, "[]", ";=&,", KCFStringEncodingUTF8
+          CFURLCreateStringByAddingPercentEscapes nil, string.to_s, nil, "!*'();:@&=+$,/?%#[]", KCFStringEncodingUTF8
         end
       end
 
@@ -376,3 +395,4 @@ Cache policy: #{@cache_policy}, response: #{@response.inspect} >"
 end
 
 class InvalidURLError < StandardError; end
+class InvalidFileError < StandardError; end

data/motion/location/location.rb

@@ -21,6 +21,10 @@ module BubbleWrap
       LOCATION_UNKNOWN=3
     end
 
+    Constants.register KCLLocationAccuracyBestForNavigation, KCLLocationAccuracyBest,
+        KCLLocationAccuracyNearestTenMeters, KCLLocationAccuracyHundredMeters,
+        KCLLocationAccuracyKilometer, KCLLocationAccuracyThreeKilometers
+
     module_function
     # Start getting locations
     # @param [Hash] options = {
@@ -28,7 +32,7 @@ module BubbleWrap
     #     all location changes (see Apple docs for info); default == false
     #   distance_filter:  minimum change in distance to be updated about, in meters;
     #     default == uses KCLDistanceFilterNone,
-    #   desired_accuracy: minimum accuracy for updates to arrive; 
+    #   desired_accuracy: minimum accuracy for updates to arrive;
     #     any of :best_for_navigation, :best, :nearest_ten_meters,
     #     :hundred_meters, :kilometer, or :three_kilometers; default == :best
     #   purpose: string to display when the system asks user for location,
@@ -37,7 +41,7 @@ module BubbleWrap
     # @block for callback. takes one argument, `result`.
     #   - On error or cancelled, is called with a hash {error: BW::Location::Error::<Type>}
     #   - On success, is called with a hash {to: #<CLLocation>, from: #<CLLocation>}
-    # 
+    #
     # Example
     # BW::Location.get(distance_filter: 10, desired_accuracy: :nearest_ten_meters) do |result|
     #   result[:to].class == CLLocation
@@ -52,6 +56,7 @@ module BubbleWrap
       @options[:distance_filter] ||= KCLDistanceFilterNone
       @options[:desired_accuracy] ||= KCLLocationAccuracyBest
       @options[:retries] ||= 5
+      @options[:once] ||= false
       @retries = 0
 
       if not enabled?
@@ -59,7 +64,7 @@ module BubbleWrap
       end
 
       self.location_manager.distanceFilter = @options[:distance_filter]
-      self.location_manager.desiredAccuracy = const_int_get("KCLLocationAccuracy", @options[:desired_accuracy])
+      self.location_manager.desiredAccuracy = Constants.get("KCLLocationAccuracy", @options[:desired_accuracy])
       self.location_manager.purpose = @options[:purpose] if @options[:purpose]
 
       if @options[:significant]
@@ -73,6 +78,10 @@ module BubbleWrap
       get(options.merge(significant: true), &block)
     end
 
+    def get_once(options = {}, &block)
+      get(options.merge(once: true), &block)
+    end
+
     # Stop getting locations
     def stop
       if @options[:significant]
@@ -102,7 +111,13 @@ module BubbleWrap
     ##########
     # CLLocationManagerDelegate Methods
     def locationManager(manager, didUpdateToLocation:newLocation, fromLocation:oldLocation)
-      @callback.call({to: newLocation, from: oldLocation})
+      if @options[:once]
+        @callback.call(newLocation)
+        @callback = proc { |result| }
+        stop
+      else
+        @callback.call({to: newLocation, from: oldLocation})
+      end
     end
 
     def locationManager(manager, didFailWithError:error)
@@ -134,19 +149,6 @@ module BubbleWrap
         error(Error::PERMISSION_DENIED)
       end
     end
-
-    def const_int_get(base, value)
-      return value if value.is_a? Numeric
-      value = value.to_s.camelize
-      Kernel.const_get("#{base}#{value}")
-    end
-
-    def load_constants_hack
-      [KCLLocationAccuracyBestForNavigation, KCLLocationAccuracyBest,
-        KCLLocationAccuracyNearestTenMeters, KCLLocationAccuracyHundredMeters,
-        KCLLocationAccuracyKilometer, KCLLocationAccuracyThreeKilometers,
-      ]
-    end
   end
 end
 ::Location = BubbleWrap::Location unless defined?(::Location)

data/motion/reactor.rb

@@ -37,9 +37,14 @@ module BubbleWrap
     # Call `callback` or the passed block every `interval` seconds.
     # Returns a timer signature that can be passed into
     # `cancel_timer`
-    def add_periodic_timer(interval, callback=nil, &blk)
+    # Optionally supply a callback as a second argument instead of a block
+    # (as per EventMachine API)
+    # Optionally supply :common_modes => true in args to schedule the timer
+    # for the runloop "common modes" (NSRunLoopCommonModes) instead of
+    # the default runloop mode.
+    def add_periodic_timer(interval, *args, &blk)
       @timers ||= {}
-      timer = PeriodicTimer.new(interval,callback,&blk)
+      timer = PeriodicTimer.new(interval,*args,&blk)
       timer.on(:cancelled) do
         @timers.delete(timer)
       end

data/motion/reactor/eventable.rb

@@ -7,18 +7,28 @@ module BubbleWrap
       # and be passed the arguments that are passed to
       # `trigger`.
       def on(event, &blk)
-        @events ||= Hash.new { |h,k| h[k] = [] }
-        @events[event].push blk
+        events[event].push blk
+      end
+
+      # When `event` is triggered, do not call the given
+      # block any more
+      def off(event, &blk)
+        events[event].delete_if { |b| b == blk }
+        blk
       end
 
       # Trigger an event
       def trigger(event, *args)
-        @events ||= Hash.new { |h,k| h[k] = [] }
-        @events[event].map do |event|
+        events[event].map do |event|
           event.call(*args)
         end
       end
 
+      private
+
+      def events
+        @events ||= Hash.new { |h,k| h[k] = [] }
+      end
     end
   end
 end

data/motion/reactor/periodic_timer.rb

@@ -7,13 +7,19 @@ module BubbleWrap
       attr_accessor :interval
 
       # Create a new timer that fires after a given number of seconds
-      def initialize(interval, callback=nil, &blk)
+      def initialize(interval, *args, &blk)
+        options = args.last.is_a?(Hash) ? args.last : {}
+        callback = args.first.respond_to?(:call) ? args.first : blk
+        raise ArgumentError, "No callback or block supplied to periodic timer" unless callback
+
         self.interval = interval
         fire = proc {
-          (callback || blk).call
+          callback.call
           trigger(:fired)
         }
-        @timer = NSTimer.scheduledTimerWithTimeInterval(interval,target: fire, selector: 'call:', userInfo: nil, repeats: true)
+        @timer = NSTimer.timerWithTimeInterval(interval, target: fire, selector: 'call:', userInfo: nil, repeats: true)
+        runloop_mode = options[:common_modes] ? NSRunLoopCommonModes : NSDefaultRunLoopMode 
+        NSRunLoop.currentRunLoop.addTimer(@timer, forMode: runloop_mode)
       end
 
       # Cancel the timer

data/motion/ui/ui_bar_button_item.rb

@@ -0,0 +1,99 @@
+module BW
+  module UIBarButtonItem
+    module_function
+
+    def styled(type, *objects, &block)
+      action = block ? :call : nil
+      object = objects.size == 1 ? objects.first : objects
+      style  = Constants.get("UIBarButtonItemStyle", type)
+
+      item = if object.is_a?(String)
+        ::UIBarButtonItem.alloc.initWithTitle(object,
+          style:style,
+          target:block,
+          action:action
+        )
+      elsif object.is_a?(UIImage)
+        ::UIBarButtonItem.alloc.initWithImage(object,
+          style:style,
+          target:block,
+          action:action
+        )
+      elsif object.is_a?(Array) && object.size == 2 && object.all? { |o| o.is_a?(UIImage) }
+        ::UIBarButtonItem.alloc.initWithImage(object[0],
+          landscapeImagePhone:object[1],
+          style:style,
+          target:block,
+          action:action
+        )
+      else
+        raise ArgumentError, "invalid object - #{object.inspect}"
+      end
+
+      item.instance_variable_set(:@target, block)
+      item
+    end
+
+    def system(type, &block)
+      action      = block ? :call : nil
+      system_item = Constants.get("UIBarButtonSystemItem", type)
+
+      item = ::UIBarButtonItem.alloc.initWithBarButtonSystemItem(system_item,
+        target:block,
+        action:action
+      )
+      item.instance_variable_set(:@target, block)
+      item
+    end
+
+    def custom(view, &block)
+      view.when_tapped(true, &block) if block
+      ::UIBarButtonItem.alloc.initWithCustomView(view)
+    end
+
+    def build(options = {}, &block)
+      if options[:styled]
+        args = options.values_at(:title, :image, :landscape).compact
+        return styled(options[:styled], *args, &block)
+      end
+
+      return system(options[:system], &block) if options[:system]
+
+      return custom(options[:custom], &block) if options[:custom]
+      return custom(options[:view],   &block) if options[:view]
+
+      raise ArgumentError, "invalid options - #{options.inspect}"
+    end
+  end
+
+  Constants.register(
+    UIBarButtonItemStylePlain,
+    UIBarButtonItemStyleBordered,
+    UIBarButtonItemStyleDone,
+
+    UIBarButtonSystemItemDone,
+    UIBarButtonSystemItemCancel,
+    UIBarButtonSystemItemEdit,
+    UIBarButtonSystemItemSave,
+    UIBarButtonSystemItemAdd,
+    UIBarButtonSystemItemFlexibleSpace,
+    UIBarButtonSystemItemFixedSpace,
+    UIBarButtonSystemItemCompose,
+    UIBarButtonSystemItemReply,
+    UIBarButtonSystemItemAction,
+    UIBarButtonSystemItemOrganize,
+    UIBarButtonSystemItemBookmarks,
+    UIBarButtonSystemItemSearch,
+    UIBarButtonSystemItemRefresh,
+    UIBarButtonSystemItemStop,
+    UIBarButtonSystemItemCamera,
+    UIBarButtonSystemItemTrash,
+    UIBarButtonSystemItemPlay,
+    UIBarButtonSystemItemPause,
+    UIBarButtonSystemItemRewind,
+    UIBarButtonSystemItemFastForward,
+    UIBarButtonSystemItemUndo,
+    UIBarButtonSystemItemRedo,
+    UIBarButtonSystemItemPageCurl,
+  )
+end

data/motion/util/constants.rb

@@ -0,0 +1,38 @@
+# Stupid hack because the RubyMotion dependency detection has a bug.
+module Kernel.const_get("BubbleWrap")::Constants
+  module_function
+
+  # Looks like RubyMotiononly  adds UIKit constants
+  # at compile time. If you don't use these
+  # directly in your code, they don't get added
+  # to Kernel and Constants.get crashes.
+  # Examples
+  # Constants.register UIReturnKeyDone, UIReturnKeyNext
+  def register(*ui_constants)
+    # do nothing, just get the constants in the code
+  end
+
+  # @param [String] base of the constant 
+  # @param [Integer, NSArray, String, Symbol] the suffix of the constant
+  #   when NSArray, will return the bitmask of all suffixes in the array
+  # @return [Integer] the constant for this base and suffix
+  # Examples
+  # get("UIReturnKey", :done) => UIReturnKeyDone == 9
+  # get("UIReturnKey", "done") => UIReturnKeyDone == 9
+  # get("UIReturnKey", 9) => 9
+  # get("UIImagePickerControllerSourceType", ["photo_library", "camera", "saved_photos_album"]) => 3
+  def get(base, *values)
+    value = values.size == 1 ? values.first : values.flatten
+    case value
+    when Numeric
+      value.to_i
+    when NSArray
+      value.reduce { |i, j|
+        get(base, i) | get(base, j)
+      }
+    else
+      value = value.to_s.camelize
+      Kernel.const_get("#{base}#{value}")
+    end
+  end
+end

data/samples/camera/Gemfile

@@ -1,3 +1,3 @@
-source :rubygems
+source "https://rubygems.org"
 
 gem 'bubble-wrap', '~> 1.1.0'