bubble-wrap 1.3.0 → 1.4.0

data/motion/core/ios/app.rb

@@ -63,9 +63,21 @@ module BubbleWrap
       UIApplication.sharedApplication
     end
 
+    def windows
+      UIApplication.sharedApplication.windows
+    end
+
     # the Application Window
     def window
-      UIApplication.sharedApplication.keyWindow || UIApplication.sharedApplication.windows[0]
+      normal_windows = App.windows.select { |w|
+        w.windowLevel == UIWindowLevelNormal
+      }
+
+      key_window = normal_windows.select {|w|
+        w == UIApplication.sharedApplication.keyWindow
+      }.first
+
+      key_window || normal_windows.first
     end
   end
 end

data/motion/core/ios/device.rb

@@ -55,5 +55,10 @@ module BubbleWrap
     def orientation
       screen.orientation
     end
+
+    # Delegates to BubbleWrap::Screen.interface_orientation
+    def interface_orientation
+      screen.interface_orientation
+    end
   end
 end

data/motion/core/json.rb

@@ -28,9 +28,7 @@ module BubbleWrap
     end
 
     def self.generate(obj)
-      # opts = NSJSONWritingPrettyPrinted
-      data = NSJSONSerialization.dataWithJSONObject(obj, options:0, error:nil)
-      data.to_str
+      NSJSONSerialization.dataWithJSONObject(obj, options:0, error:nil).to_str
     end
 
   end

data/motion/core/kvo.rb

@@ -64,9 +64,7 @@ module BubbleWrap
       return if @targets.nil? || target.nil? || key_path.nil?
 
       key_paths = @targets[target]
-      if !key_paths.nil? && key_paths.has_key?(key_path.to_s)
-        key_paths.delete(key_path.to_s)
-      end
+      key_paths.delete(key_path.to_s) if !key_paths.nil?
     end
 
     def remove_all_observer_blocks
@@ -75,19 +73,19 @@ module BubbleWrap
 
     # NSKeyValueObserving Protocol
 
-    def observeValueForKeyPath(key_path, ofObject:target, change:change, context:context)
+    def observeValueForKeyPath(key_path, ofObject: target, change: change, context: context)
       key_paths = @targets[target] || {}
-        blocks = key_paths[key_path] || []
-        blocks.each do |block|
-          args = [ change[NSKeyValueChangeOldKey], change[NSKeyValueChangeNewKey] ]
-          args << change[NSKeyValueChangeIndexesKey] if collection?(change)
-          block.call(*args)
-        end
+      blocks = key_paths[key_path] || []
+      blocks.each do |block|
+        args = [change[NSKeyValueChangeOldKey], change[NSKeyValueChangeNewKey]]
+        args << change[NSKeyValueChangeIndexesKey] if collection?(change)
+        block.call(*args)
       end
+    end
 
-      def collection?(change)
-        COLLECTION_OPERATIONS.include?(change[NSKeyValueChangeKindKey])
-      end
+    def collection?(change)
+      COLLECTION_OPERATIONS.include?(change[NSKeyValueChangeKindKey])
+    end
 
   end
 end

data/motion/core/persistence.rb

@@ -29,12 +29,19 @@ module BubbleWrap
       storage.synchronize
     end
 
+    def delete(key)
+      value = storage.objectForKey storage_key(key)
+      storage.removeObjectForKey(storage_key(key))
+      storage.synchronize
+      value
+    end
+
     def storage
       NSUserDefaults.standardUserDefaults
     end
 
     def storage_key(key)
-      app_key + '_' + key.to_s
+      "#{app_key}_#{key}"
     end
   end
 

data/motion/core/string.rb

@@ -55,9 +55,9 @@ module BubbleWrap
       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) }
+          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) }        
+          colors = hex_color.scan(%r<[0-9A-Fa-f]{2}>).map!{ |el| el.to_i(16) }
         else
           raise ArgumentError
       end 
@@ -71,4 +71,4 @@ module BubbleWrap
   end
 end
 
-String.send(:include, BubbleWrap::String)
+NSString.send(:include, BubbleWrap::String)

data/motion/core/time.rb

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

data/motion/http.rb

@@ -19,7 +19,7 @@ module BubbleWrap
     #   end
     #
 
-    [:get, :post, :put, :delete, :head, :patch].each do |http_verb|
+    [:get, :post, :put, :delete, :head, :options, :patch].each do |http_verb|
 
       define_singleton_method(http_verb) do |url, options = {}, &block|
         options[:action] = block if block

data/motion/http/query.rb

@@ -1,5 +1,5 @@
 # Class wrapping NSConnection and often used indirectly by the BubbleWrap::HTTP module methods.
-class BubbleWrap::HTTP::Query
+module BubbleWrap; module HTTP; class Query
   attr_accessor :request
   attr_accessor :connection
   attr_accessor :credentials # username & password has a hash
@@ -20,7 +20,7 @@ class BubbleWrap::HTTP::Query
   #
   # ==== Options
   # :payload<String>   - data to pass to a POST, PUT, DELETE query.
-  # :delegator         - Proc, class or object to call when the file is downloaded.
+  # :action            - Proc, class or object to call when the file is downloaded.
   # 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
@@ -31,6 +31,7 @@ class BubbleWrap::HTTP::Query
     @method = http_method.upcase.to_s
     @delegator = options.delete(:action) || self
     @payload = options.delete(:payload)
+    @encoding = options.delete(:encoding) || NSUTF8StringEncoding
     @files = options.delete(:files)
     @boundary = options.delete(:boundary) || BW.create_uuid
     @credentials = options.delete(:credentials) || {}
@@ -70,9 +71,7 @@ Cache policy: #{@cache_policy}, response: #{@response.inspect} >"
     if App.osx? && !response.is_a?(NSHTTPURLResponse)
       return
     end
-    @status_code = response.statusCode
-    @response_headers = response.allHeaderFields
-    @response_size = response.expectedContentLength.to_f
+    did_receive_response(response)
   end
 
   # This delegate method get called every time a chunk of data is being received
@@ -95,7 +94,11 @@ Cache policy: #{@cache_policy}, response: #{@response.inspect} >"
     log "##{@redirect_count} HTTP redirect_count: #{request.inspect} - #{self.description}"
 
     if @redirect_count >= 30
-      @response.error_message = "Too many redirections"
+      @response.error = NSError.errorWithDomain('BubbleWrap::HTTP', code:NSURLErrorHTTPTooManyRedirects, 
+                                                userInfo:NSDictionary.dictionaryWithObject("Too many redirections",
+                                                                                           forKey: NSLocalizedDescriptionKey))
+      @response.error_message = @response.error.localizedDescription
+      show_status_indicator false
       @request.done_loading!
       call_delegator_with_response
       nil
@@ -109,6 +112,7 @@ Cache policy: #{@cache_policy}, response: #{@response.inspect} >"
     log "HTTP Connection to #{@url.absoluteString} failed #{error.localizedDescription}"
     show_status_indicator false
     @request.done_loading!
+    @response.error = error
     @response.error_message = error.localizedDescription
     call_delegator_with_response
   end
@@ -139,15 +143,27 @@ Cache policy: #{@cache_policy}, response: #{@response.inspect} >"
         log "auth challenged, answered with credentials: #{credentials.inspect}"
       end
     else
+      did_receive_response(challenge.failureResponse)
+      @response.update(status_code: status_code, headers: response_headers, url: @url, original_url: @original_url)
       challenge.sender.cancelAuthenticationChallenge(challenge)
       log 'Auth Failed :('
     end
   end
 
+  def cancel
+    @connection.cancel
+    show_status_indicator false
+    @request.done_loading!
+  end
 
   private
 
-  private
+  def did_receive_response(response)
+    @status_code = response.statusCode
+    @response_headers = response.allHeaderFields
+    @response_size = response.expectedContentLength.to_f
+  end
+
   def show_status_indicator(show)
     if App.ios?
       UIApplication.sharedApplication.networkActivityIndicatorVisible = show
@@ -173,7 +189,7 @@ Cache policy: #{@cache_policy}, response: #{@response.inspect} >"
 
   def set_content_type
     return if headers_provided?
-    return if (@method == "GET" || @method == "HEAD")
+    return if (@method == "GET" || @method == "HEAD" || @method == "OPTIONS")
     @headers ||= {}
     @headers["Content-Type"] = case @format
     when :json
@@ -200,7 +216,7 @@ Cache policy: #{@cache_policy}, response: #{@response.inspect} >"
   end
 
   def create_request_body
-    return nil if (@method == "GET" || @method == "HEAD")
+    return nil if (@method == "GET" || @method == "HEAD" || @method == "OPTIONS")
     return nil unless (@payload || @files)
 
     body = NSMutableData.data
@@ -217,7 +233,10 @@ Cache policy: #{@cache_policy}, response: #{@response.inspect} >"
     if @payload.is_a?(NSData)
       body.appendData(@payload)
     elsif @payload.is_a?(String)
-      body.appendData(@payload.dataUsingEncoding NSUTF8StringEncoding)
+      body.appendData(@payload.to_encoded_data @encoding)
+    elsif @format == :json
+      json_string = BW::JSON.generate(@payload)
+      body.appendData(json_string.to_encoded_data @encoding)
     else
       append_form_params(body)
     end
@@ -231,7 +250,7 @@ Cache policy: #{@cache_policy}, response: #{@response.inspect} >"
       s += "Content-Disposition: form-data; name=\"#{key}\"\r\n\r\n"
       s += value.to_s
       s += "\r\n"
-      body.appendData(s.dataUsingEncoding NSUTF8StringEncoding)
+      body.appendData(s.to_encoded_data @encoding)
     end
     @payload_or_files_were_appended = true
     body
@@ -251,7 +270,7 @@ Cache policy: #{@cache_policy}, response: #{@response.inspect} >"
 
   def parse_file(key, value)
     if value.is_a?(Hash)
-      raise InvalidFileError if value[:data].nil?
+      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}
@@ -265,9 +284,9 @@ Cache policy: #{@cache_policy}, response: #{@response.inspect} >"
       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(s.to_encoded_data @encoding)
       file_data.appendData(file[:data])
-      file_data.appendData("\r\n".dataUsingEncoding NSUTF8StringEncoding)
+      file_data.appendData("\r\n".to_encoded_data @encoding)
       body.appendData(file_data)
     end
     @payload_or_files_were_appended = true
@@ -275,12 +294,12 @@ Cache policy: #{@cache_policy}, response: #{@response.inspect} >"
   end
 
   def append_body_boundary(body)
-    body.appendData("--#{@boundary}--\r\n".dataUsingEncoding NSUTF8StringEncoding)
+    body.appendData("--#{@boundary}--\r\n".to_encoded_data @encoding)
   end
 
   def create_url(url_string)
     url_string = url_string.stringByAddingPercentEscapesUsingEncoding NSUTF8StringEncoding
-    if (@method == "GET" || @method == "HEAD") && @payload
+    if (@method == "GET" || @method == "HEAD" || @method == "OPTIONS") && @payload
       unless @payload.empty?
         convert_payload_to_url if @payload.is_a?(Hash)
         url_string += "?#{@payload}"
@@ -299,8 +318,9 @@ Cache policy: #{@cache_policy}, response: #{@response.inspect} >"
   end
 
   def escape(string)
-    if string
-      CFURLCreateStringByAddingPercentEscapes nil, string.to_s, nil, "!*'();:@&=+$,/?%#[]", KCFStringEncodingUTF8
+    string_to_escape = string.to_s
+    if string_to_escape
+      CFURLCreateStringByAddingPercentEscapes nil, string_to_escape, nil, "!*'();:@&=+$,/?%#[]", KCFStringEncodingUTF8
     end
   end
 
@@ -364,4 +384,4 @@ Cache policy: #{@cache_policy}, response: #{@response.inspect} >"
     NSURLConnection.connectionWithRequest(request, delegate:delegate)
   end
 
-end
+end; end; end

data/motion/http/response.rb

@@ -1,8 +1,8 @@
 # Response class wrapping the results of a Query's response
-class BubbleWrap::HTTP::Response
+module BubbleWrap; module HTTP; class Response
   attr_reader :body
   attr_reader :headers
-  attr_accessor :status_code, :status_description, :error_message
+  attr_accessor :status_code, :status_description, :error_message, :error
   attr_reader :url
   attr_reader :original_url
 
@@ -18,7 +18,7 @@ class BubbleWrap::HTTP::Response
   end
 
   def ok?
-    status_code.to_s =~ /20\d/ ? true : false
+    status_code.to_s =~ /2\d\d/ ? true : false
   end
 
   def to_s
@@ -29,4 +29,4 @@ class BubbleWrap::HTTP::Response
   def update_status_description
     @status_description = status_code.nil? ? nil : NSHTTPURLResponse.localizedStringForStatusCode(status_code)
   end
-end
+end; end; end

data/motion/mail/mail.rb

@@ -0,0 +1,59 @@
+module BubbleWrap
+  module Mail
+
+    module_function
+
+    # Base method to create your in-app mail
+    # ---------------------------------------
+    # EX
+    #   BW::Mail.compose {
+    #     delegate: self, # optional, will use root view controller by default
+    #     to: [ "tom@example.com" ],
+    #     cc: [ "itchy@example.com", "scratchy@example.com" ],
+    #     bcc: [ "jerry@example.com" ],
+    #     html: false,
+    #     subject: "My Subject",
+    #     message: "This is my message. It isn't very long.",
+    #     animated: false
+    #   } do |result, error|
+    #     result.sent?      # => boolean
+    #     result.canceled?  # => boolean
+    #     result.saved?     # => boolean
+    #     result.failed?    # => boolean
+    #     error             # => NSError
+    #   end
+    def compose(options={}, &callback)
+      @delegate = options[:delegate] || App.window.rootViewController
+
+      @callback = callback
+      
+      @mail_controller = create_mail_controller(options)
+      
+      @mailer_is_animated = options[:animated] == false ? false : true
+      @delegate.presentModalViewController(@mail_controller, animated: @mailer_is_animated)
+    end
+    
+    def create_mail_controller(options={})
+      mail_controller = MFMailComposeViewController.alloc.init
+      
+      mail_controller.mailComposeDelegate = self
+      mail_controller.setToRecipients(Array(options[:to]))
+      mail_controller.setCcRecipients(Array(options[:cc]))
+      mail_controller.setBccRecipients(Array(options[:bcc]))
+      mail_controller.setSubject(options[:subject] || "Contact")
+      is_html = !!options[:html]
+      mail_controller.setMessageBody(options[:message], isHTML: is_html)
+      
+      mail_controller
+    end
+
+    # Event when the MFMailComposeViewController is closed
+    # -------------------------------------------------------------
+    # the callback is fired if it was present in the constructor
+
+    def mailComposeController(controller, didFinishWithResult: result, error: error)
+      @delegate.dismissModalViewControllerAnimated(@mailer_is_animated)
+      @callback.call Result.new(result, error) if @callback
+    end
+  end
+end

data/motion/mail/result.rb

@@ -0,0 +1,29 @@
+module BubbleWrap
+  module Mail
+    class Result
+      attr_accessor :result, :error
+
+      def initialize(result, error)
+        self.result = result
+        self.error = error
+      end
+
+      def sent?
+        self.result == MFMailComposeResultSent
+      end
+
+      def canceled?
+        self.result == MFMailComposeResultCancelled
+      end
+
+      def saved?
+        self.result == MFMailComposeResultSaved
+      end
+
+      def failed?
+        self.result == MFMailComposeResultFailed || self.error
+      end
+      
+    end
+  end
+end

data/motion/reactor/eventable.rb

@@ -19,8 +19,9 @@ module BubbleWrap
 
       # Trigger an event
       def trigger(event, *args)
-        __events__[event].map do |event|
-          event.call(*args)
+        blks = __events__[event].clone
+        blks.map do |blk|
+          blk.call(*args)
         end
       end