bubble-wrap 1.0.0 → 1.1.0

data/motion/core/device/camera_wrapper.rb

@@ -0,0 +1,45 @@
+module BubbleWrap
+  module Device
+    module CameraWrapper
+
+      module_function
+
+      # The front-facing camera used to capture media
+      # @return [Device::Camera, NilClass] a Camera will be returned if there is a front camera, nil otherwise
+      def front
+        BubbleWrap::Device::Camera.front
+      end
+
+      # Verifies that the device running has a front facing camera.
+      # @return [TrueClass, FalseClass] true will be returned if the device has a front facing camera, false otherwise.
+      def front?
+        !!front
+      end
+
+      # The rear-facing camera used to capture media
+      # @return [Device::Camera, NilClass] a Camera will be returned if there is a rear camera, nil otherwise
+      def rear
+        BubbleWrap::Device::Camera.rear
+      end
+
+      # Verifies that the device running has a rear facing camera.
+      # @return [TrueClass, FalseClass] true will be returned if the device has a rear facing camera, false otherwise.
+      def rear?
+        !!rear
+      end
+
+      # A Device::Camera used to capture media; by default it will use the :photo_library source type
+      # See Device::Camera docs for more source type options.
+      # @return [Device::Camera] a Camera will always be returned.
+      def any
+        BubbleWrap::Device::Camera.any
+      end
+
+      # Should always return true, since picking images from *some* source is always possible
+      # @return [TrueClass]
+      def any?
+        !!any
+      end
+    end
+  end
+end

data/motion/core/ns_url_request.rb

@@ -0,0 +1,10 @@
+class NSURLRequest
+
+  # Provides a to_s method so we can use inspect in instances and get
+  # valuable information.
+  def to_s
+    "#<#{self.class}:#{self.object_id} - url: #{self.URL.description}, cache policy: #{self.cachePolicy}, Pipelining: #{self.HTTPShouldUsePipelining}, main doc url: #{mainDocumentURL},\
+ timeout: #{self.timeoutInterval}, network service type: #{self.networkServiceType} >"
+  end
+
+end

data/motion/core/persistence.rb

@@ -16,6 +16,13 @@ module BubbleWrap
       storage.objectForKey storage_key(key.to_s)
     end
 
+    def merge(values)
+      values.each do |key, value|
+        storage.setObject(value, forKey: storage_key(key.to_s))
+      end
+      storage.synchronize
+    end
+
     def storage
       NSUserDefaults.standardUserDefaults
     end

data/motion/core/pollute.rb

@@ -1,6 +1,5 @@
 [
-  [NSIndexPath, NSIndexPathWrap],
-  [UIControl, UIControlWrap]
+  [NSIndexPath, NSIndexPathWrap]
 ].each do |base, wrapper|
     base.send(:include, wrapper)
 end

data/motion/core/string.rb

@@ -32,6 +32,29 @@ module BubbleWrap
       word.downcase!
       word
     end
+
+    def to_color
+      # First check if it is a color keyword
+      keyword_selector = "#{self.camelize(false)}Color"
+      return UIColor.send(keyword_selector) if UIColor.respond_to? keyword_selector
+
+      # Next attempt to convert from hex
+      hex_color = self.gsub("#", "")   
+      case hex_color.size 
+        when 3
+          colors = hex_color.scan(%r{[0-9A-Fa-f]}).map{ |el| (el * 2).to_i(16) }
+        when 6
+          colors = hex_color.scan(%r<[0-9A-Fa-f]{2}>).map{ |el| el.to_i(16) }        
+        else
+          raise ArgumentError
+      end 
+      if colors.size == 3
+        UIColor.colorWithRed((colors[0]/255.0), green:(colors[1]/255.0), blue:(colors[2]/255.0), alpha:1)
+      else
+        raise ArgumentError
+      end 
+    end  
+
   end
 end
 

data/motion/http.rb

@@ -1,7 +1,5 @@
 module BubbleWrap
 
-  SETTINGS = {}
-
   # The HTTP module provides a simple interface to make HTTP requests.
   #
   # TODO: preflight support, easier/better cookie support, better error handling
@@ -21,38 +19,38 @@ module BubbleWrap
     #   end
     #
     def self.get(url, options={}, &block)
-      create_query url, :get, options, block
+      options[:action] = block if block_given?
+      HTTP::Query.new(url, :get, options)
     end
     
     # Make a POST request
     def self.post(url, options={}, &block)
-      create_query url, :post, options, block
+      options[:action] = block if block_given?
+      HTTP::Query.new(url, :post, options)
     end
     
     # Make a PUT request
     def self.put(url, options={}, &block)
-      create_query url, :put, options, block
+      options[:action] = block if block_given?
+      HTTP::Query.new(url, :put, options)
     end
     
     # Make a DELETE request
     def self.delete(url, options={}, &block)
-      create_query url, :delete, options, block
+      options[:action] = block if block_given?
+      HTTP::Query.new(url, :delete, options)
     end
 
     # Make a HEAD request
     def self.head(url, options={}, &block)
-      create_query url, :head, options, block
+      options[:action] = block if block_given?
+      HTTP::Query.new(url, :head, options)
     end
 
     # Make a PATCH request
     def self.patch(url, options={}, &block)
-      create_query url, :patch, options, block
-    end
-
-    private
-    def self.create_query(url, method, options, passed_block)
-      options[:action] = passed_block if passed_block
-      HTTP::Query.new( url, method, options )
+      options[:action] = block if block_given?
+      HTTP::Query.new(url, :patch, options)
     end
 
     # Response class wrapping the results of a Query's response
@@ -76,6 +74,11 @@ module BubbleWrap
         status_code.to_s =~ /20\d/ ? true : false
       end
 
+      def to_s
+        "#<#{self.class}:#{self.object_id} - url: #{self.url}, body: #{self.body}, headers: #{self.headers}, status code: #{self.status_code}, error message: #{self.error_message} >"
+      end
+      alias description to_s
+
     end
 
     # Class wrapping NSConnection and often used indirectly by the BubbleWrap::HTTP module methods.
@@ -106,10 +109,12 @@ module BubbleWrap
       # :headers<Hash>     - headers send with the request
       # Anything else will be available via the options attribute reader.
       #
-      def initialize(url, http_method = :get, options={})
+      def initialize(url_string, http_method = :get, options={})
         @method = http_method.upcase.to_s
         @delegator = options.delete(:action) || self
         @payload = options.delete(:payload)
+        @files = options.delete(:files)
+        @boundary = options.delete(:boundary) || BW.create_uuid
         @credentials = options.delete(:credentials) || {}
         @credentials = {:username => '', :password => ''}.merge(@credentials)
         @timeout = options.delete(:timeout) || 30.0
@@ -117,62 +122,21 @@ module BubbleWrap
         @cache_policy = options.delete(:cache_policy) || NSURLRequestUseProtocolCachePolicy
         @options = options
         @response = HTTP::Response.new
-        initiate_request(url)
-        connection.start
-        UIApplication.sharedApplication.networkActivityIndicatorVisible = true
-        connection
-      end
 
-      def generate_params(payload, prefix=nil)
-        list = []
-        payload.each do |k,v|
-          if v.is_a?(Hash)
-            new_prefix = prefix ? "#{prefix}[#{k.to_s}]" : k.to_s
-            param = generate_params(v, new_prefix)
-            list << param
-          elsif v.is_a?(Array)
-            v.each do |val|
-              param = prefix ? "#{prefix}[#{k}][]=#{val}" : "#{k}[]=#{val}"
-              list << param
-            end
-          else
-            param = prefix ? "#{prefix}[#{k}]=#{v}" : "#{k}=#{v}"
-            list << param
-          end
-        end
-        return list.flatten
-      end
-
-      def initiate_request(url_string)
-        # http://developer.apple.com/documentation/Cocoa/Reference/Foundation/Classes/nsrunloop_Class/Reference/Reference.html#//apple_ref/doc/constant_group/Run_Loop_Modes
-        # NSConnectionReplyMode
-        
-        unless @payload.nil?
-          if @payload.is_a?(Hash)
-            params   = generate_params(@payload)
-            @payload = params.join("&")
-          end
-          url_string = "#{url_string}?#{@payload}" if @method == "GET"
-        end
-        #this method needs a refactor when the specs are done. (especially this utf8 escaping part)
-        log "BubbleWrap::HTTP building a NSRequest for #{url_string}"
-        @url = NSURL.URLWithString(url_string.stringByAddingPercentEscapesUsingEncoding NSUTF8StringEncoding)
-        @request = NSMutableURLRequest.requestWithURL(@url,
-                                                      cachePolicy:@cache_policy,
-                                                      timeoutInterval:@timeout)
-        @request.setHTTPMethod @method
-        @request.setAllHTTPHeaderFields(@headers) if @headers
+        @url = create_url(url_string)
+        @body = create_request_body
+        @request = create_request
+        @connection = create_connection(request, self)
+        @connection.start
 
-        # @payload needs to be converted to data
-        unless @method == "GET" || @payload.nil?
-          @payload = @payload.to_s.dataUsingEncoding(NSUTF8StringEncoding)
-          @request.setHTTPBody @payload
-        end
+        UIApplication.sharedApplication.networkActivityIndicatorVisible = true
+      end
 
-        # NSHTTPCookieStorage.sharedHTTPCookieStorage
-        @connection = create_connection(request, self)
-        patch_nsurl_request
+      def to_s
+        "#<#{self.class}:#{self.object_id} - Method: #{@method}, url: #{@url.description}, body: #{@body.description}, Payload: #{@payload}, Headers: #{@headers} Credentials: #{@credentials}, Timeout: #{@timeout}, \
+Cache policy: #{@cache_policy}, response: #{@response.inspect} >"
       end
+      alias description to_s
 
       def connection(connection, didReceiveResponse:response)
         @status_code = response.statusCode
@@ -184,10 +148,14 @@ module BubbleWrap
       def connection(connection, didReceiveData:received_data)
         @received_data ||= NSMutableData.new
         @received_data.appendData(received_data)
+
+        if download_progress = options[:download_progress]
+          download_progress.call(@received_data.length.to_f, response_size)
+        end
       end
 
       def connection(connection, willSendRequest:request, redirectResponse:redirect_response)
-        log "HTTP redirected #{request.description}"
+        log "HTTP redirected info: #{request} - #{self.description}"
         new_request = request.mutableCopy
         # new_request.setValue(@credentials.inspect, forHTTPHeaderField:'Authorization') # disabled while we figure this one out
         new_request.setAllHTTPHeaderFields(@headers) if @headers
@@ -197,19 +165,22 @@ module BubbleWrap
       end
 
       def connection(connection, didFailWithError: error)
+        log "HTTP Connection failed #{error.localizedDescription}"
         UIApplication.sharedApplication.networkActivityIndicatorVisible = false
         @request.done_loading!
-        log "HTTP Connection failed #{error.localizedDescription}"
         @response.error_message = error.localizedDescription
         call_delegator_with_response
       end
 
+      def connection(connection, didSendBodyData:sending, totalBytesWritten:written, totalBytesExpectedToWrite:expected)
+        if upload_progress = options[:upload_progress]
+          upload_progress.call(sending, written, expected)
+        end
+      end
 
-      # The transfer is done and everything went well
       def connectionDidFinishLoading(connection)
         UIApplication.sharedApplication.networkActivityIndicatorVisible = false
         @request.done_loading!
-        # copy the data in a local var that we will attach to the response object
         response_body = NSData.dataWithData(@received_data) if @received_data
         @response.update(status_code: status_code, body: response_body, headers: response_headers, url: @url)
 
@@ -217,16 +188,10 @@ module BubbleWrap
       end
 
       def connection(connection, didReceiveAuthenticationChallenge:challenge)
-
         if (challenge.previousFailureCount == 0)
-          # by default we are keeping the credential for the entire session
-          # Eventually, it would be good to let the user pick one of the 3 possible credential persistence options:
-          # NSURLCredentialPersistenceNone,
-          # NSURLCredentialPersistenceForSession,
-          # NSURLCredentialPersistencePermanent
-          log "auth challenged, answered with credentials: #{credentials.inspect}"
           new_credential = NSURLCredential.credentialWithUser(credentials[:username], password:credentials[:password], persistence:NSURLCredentialPersistenceForSession)
           challenge.sender.useCredential(new_credential, forAuthenticationChallenge:challenge)
+          log "auth challenged, answered with credentials: #{credentials.inspect}"
         else
           challenge.sender.cancelAuthenticationChallenge(challenge)
           log 'Auth Failed :('
@@ -236,8 +201,101 @@ module BubbleWrap
 
       private
 
+      def create_request
+        log "BubbleWrap::HTTP building a NSRequest for #{@url.description}"
+
+        request = NSMutableURLRequest.requestWithURL(@url,
+                                                      cachePolicy:@cache_policy,
+                                                      timeoutInterval:@timeout)
+        request.setHTTPMethod(@method)
+        request.setAllHTTPHeaderFields(@headers)
+        request.setHTTPBody(@body)
+        patch_nsurl_request(request)
+
+        request
+      end
+
+      def create_request_body
+        return nil if (@method == "GET" || @method == "HEAD")
+        return nil unless (@payload || @files)
+        @headers = {"Content-Type" => "multipart/form-data; boundary=#{@boundary}"} if @headers.nil?
+
+        body = NSMutableData.data
+
+        append_payload(body) if @payload
+        append_files(body) if @files
+        body.appendData("\r\n--#{@boundary}--\r\n".dataUsingEncoding NSUTF8StringEncoding)
+        
+        log "Built HTTP body: \n #{body.to_str}"
+        body
+      end
+
+      def append_payload(body)
+        if @payload.is_a?(NSData)
+          body.appendData(@payload)
+        else
+          append_form_params(body)
+        end
+      end
+
+      def append_form_params(body)
+        @payload.each do |key, value|
+          form_data = NSMutableData.new
+          s = "\r\n--#{@boundary}\r\n"
+          s += "Content-Disposition: form-data; name=\"#{key}\"\r\n\r\n"
+          s += value.to_s
+          form_data.appendData(s.dataUsingEncoding NSUTF8StringEncoding)
+          body.appendData(form_data)
+        end
+      end
+
+      def append_files(body)
+        @files.each do |key, value|
+          file_data = NSMutableData.new
+          s = "\r\n--#{@boundary}\r\n"
+          s += "Content-Disposition: form-data; name=\"#{key}\"; filename=\"#{key}\"\r\n"
+          s += "Content-Type: application/octet-stream\r\n\r\n"
+          file_data.appendData(s.dataUsingEncoding NSUTF8StringEncoding)
+          file_data.appendData(value)
+          body.appendData(file_data)
+        end
+      end
+
+      def create_url(url_string)
+        if (@method == "GET" || @method == "HEAD") && @payload
+          convert_payload_to_url if @payload.is_a?(Hash)
+          url_string += "?#{@payload}"
+        end
+        NSURL.URLWithString(url_string.stringByAddingPercentEscapesUsingEncoding NSUTF8StringEncoding)
+      end
+
+      def convert_payload_to_url
+        params_array = generate_get_params(@payload)
+        @payload = params_array.join("&")
+      end
+
+      def generate_get_params(payload, prefix=nil)
+        list = []
+        payload.each do |k,v|
+          if v.is_a?(Hash)
+            new_prefix = prefix ? "#{prefix}[#{k.to_s}]" : k.to_s
+            param = generate_get_params(v, new_prefix)
+            list << param
+          elsif v.is_a?(Array)
+            v.each do |val|
+              param = prefix ? "#{prefix}[#{k}][]=#{val}" : "#{k}[]=#{val}"
+              list << param
+            end
+          else
+            param = prefix ? "#{prefix}[#{k}]=#{v}" : "#{k}=#{v}"
+            list << param
+          end
+        end
+        return list.flatten
+      end
+
       def log(message)
-        NSLog message if SETTINGS[:debug]
+        NSLog message if BubbleWrap.debug?
       end
 
       def escape_line_feeds(hash)
@@ -248,11 +306,11 @@ module BubbleWrap
         escaped_hash
       end
 
-      def patch_nsurl_request
-        @request.instance_variable_set("@done_loading", false)
+      def patch_nsurl_request(request)
+        request.instance_variable_set("@done_loading", false)
         
-        def @request.done_loading; @done_loading; end
-        def @request.done_loading!; @done_loading = true; end
+        def request.done_loading; @done_loading; end
+        def request.done_loading!; @done_loading = true; end
       end
 
       def call_delegator_with_response
@@ -265,6 +323,7 @@ module BubbleWrap
       def create_connection(request, delegate)
         NSURLConnection.connectionWithRequest(request, delegate:delegate)
       end
+
     end
   end
 end