bubble-wrap 1.1.2 → 1.1.3

data/Gemfile.lock

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

data/README.md

@@ -65,6 +65,12 @@ If you wish to only include the `Location` wrapper:
 require 'bubble-wrap/location'
 ```
 
+If you wish to only include the `Media` wrapper:
+
+```ruby
+require 'bubble-wrap/media'
+```
+
 If you want to include everything (ie kitchen sink mode) you can save time and do:
 
 ```ruby
@@ -162,6 +168,7 @@ Other available methods:
 * `App.states`
 * `App.frame`
 * `App.delegate`
+* `App.shared`
 * `App.current_locale`
 
 
@@ -243,7 +250,7 @@ def viewWillAppear(animated)
   @foreground_observer = App.notification_center.observe UIApplicationWillEnterForegroundNotification do |notification|
     loadAndRefresh
   end
-  
+
   @reload_observer = App.notification_center.observe ReloadNotification do |notification|
     loadAndRefresh
   end
@@ -290,7 +297,7 @@ class ExampleViewController < UIViewController
 	@label = UILabel.alloc.initWithFrame [[20,20],[280,44]]
 	@label.text = ""
 	view.addSubview @label
-	
+
     observe(@label, :text) do |old_value, new_value|
       puts "Hello from viewDidLoad!"
     end
@@ -341,6 +348,22 @@ end
 
 Also available is `BW::Location.get_significant`, for monitoring significant location changes.
 
+## Media
+
+Added wrapper for playing remote and local media. Available are `modal` and custom presentation styles:
+
+```ruby
+# Plays in your custom frame
+local_file = NSURL.fileURLWithPath(File.join(NSBundle.mainBundle.resourcePath, 'test.mp3'))
+BW::Media.play(local_file) do |media_player|
+  media_player.view.frame = [[10, 100], [100, 100]]
+  self.view.addSubview media_player.view
+end
+
+# Plays in an independent modal controller
+BW::Media.play_modal("http://www.hrupin.com/wp-content/uploads/mp3/testsong_20_sec.mp3")
+```
+
 ## UI
 
 ### Gestures
@@ -498,7 +521,7 @@ feed_parser = BW::RSSParser.new(feed, true)
 **Since: > version 1.0.0**
 
 `BubbleWrap::Reactor` is a simplified, mostly complete implementation of
-the [Event Machine](http://rubyeventmachine.com/) API.  In fact 
+the [Event Machine](http://rubyeventmachine.com/) API.  In fact
 `BubbleWrap::Reactor` is aliased to `EM` in the runtime environment.
 
 ### Deferables
@@ -588,11 +611,11 @@ Great scott!
 
 ### Scheduling operations
 
-You can use `EM.schedule` to schedule blocks to be executed 
+You can use `EM.schedule` to schedule blocks to be executed
 asynchronously.  BubbleWrap deviates from the EventMachine
 API here in that it also provides `EM.schedule_on_main` which
-makes sure that the task is run asynchronously, but on the 
-application's main thread - this is necessary if you are 
+makes sure that the task is run asynchronously, but on the
+application's main thread - this is necessary if you are
 updating the user interface.
 
 ```ruby
@@ -607,15 +630,15 @@ updating the user interface.
 ### Deferrable operations
 
 You can also use `EM.defer` in much the same way as `EM.schedule`
-with one important difference, you can pass in a second `proc` 
+with one important difference, you can pass in a second `proc`
 which will be called when the first has completed, and be passed
 it's result as an argument. Just like `EM.schedule`, `EM.defer`
 also has an `EM.defer_on_main` version.
 
 ```ruby
-> operation = proc { 99 }
+> operation = proc { 88 }
 => #<Proc:0x6d763c0>
-> callback = proc { |speed| puts speed >= 99 ? "Time travel!" : "Conventional travel!" }
+> callback = proc { |speed| puts speed >= 88 ? "Time travel!" : "Conventional travel!" }
 => #<Proc:0x8bd3910>
 > EM.defer(operation, callback)
 => nil

data/Rakefile

@@ -10,11 +10,7 @@ require 'bubble-wrap/test'
 Motion::Project::App.setup do |app|
   app.name = 'testSuite'
   app.identifier = 'io.bubblewrap.testSuite'
-  app.specs_dir = './spec/motion/'
-  # Hold your breath, we're going API spelunking!
-  spec_files = app.spec_files + Dir.glob(File.join(app.specs_dir, '**/*.rb'))
-  spec_files.uniq!
-  app.instance_variable_set(:@spec_files, spec_files)
+  app.specs_dir = './spec/motion'
 end
 
 namespace :spec do

data/lib/bubble-wrap/all.rb

@@ -1,4 +1,4 @@
 require File.expand_path('../loader', __FILE__)
-['core', 'http', 'reactor', 'rss_parser', 'ui', 'location'].each { |sub|
+['core', 'http', 'reactor', 'rss_parser', 'ui', 'location', 'media'].each { |sub|
 	require File.expand_path("../#{sub}", __FILE__)
 }

data/lib/bubble-wrap/http.rb

@@ -1,3 +1,4 @@
 require 'bubble-wrap/loader'
 BubbleWrap.require('motion/core/ns_url_request.rb')
+BubbleWrap.require('motion/core.rb')
 BubbleWrap.require('motion/http.rb')

data/lib/bubble-wrap/media.rb

@@ -0,0 +1,8 @@
+require 'bubble-wrap/loader'
+BubbleWrap.require('motion/core/string.rb')
+BubbleWrap.require('motion/core/ns_notification_center.rb')
+BubbleWrap.require('motion/media/**/*.rb') do
+  file('motion/media/media.rb').depends_on('motion/media/player.rb')
+  file('motion/media/player.rb').depends_on 'motion/core/string.rb'
+  file('motion/media/player.rb').uses_framework('MediaPlayer')
+end

data/lib/bubble-wrap/version.rb

@@ -1,3 +1,3 @@
 module BubbleWrap
-  VERSION = '1.1.2' unless defined?(BubbleWrap::VERSION)
+  VERSION = '1.1.3' unless defined?(BubbleWrap::VERSION)
 end

data/motion/core/app.rb

@@ -105,6 +105,11 @@ module BubbleWrap
       UIApplication.sharedApplication.delegate
     end
 
+    # the Application object.
+    def shared
+      UIApplication.sharedApplication
+    end
+
     # @return [NSLocale] locale of user settings
     def current_locale
       languages = NSLocale.preferredLanguages

data/motion/core/device.rb

@@ -23,7 +23,7 @@ module BubbleWrap
 
     # 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_camera?
+    def front_camera?(picker=UIImagePickerController)
       p "This method (front_camera?) is DEPRECATED. Transition to using Device.camera.front?"
       picker.isCameraDeviceAvailable(UIImagePickerControllerCameraDeviceFront)
     end

data/motion/core/json.rb

@@ -13,6 +13,7 @@ module BubbleWrap
     #
     # TODO: support options like the C Ruby module does
     def self.parse(str_data, &block)
+      return nil unless str_data
       data = str_data.respond_to?(:to_data) ? str_data.to_data : str_data
       opts = NSJSONReadingMutableContainers & NSJSONReadingMutableLeaves & NSJSONReadingAllowFragments
       error = Pointer.new(:id)

data/motion/core/ns_url_request.rb

@@ -3,8 +3,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} >"
+    "#<#{self.class}:#{self.object_id} - url: #{self.URL.description}, 
+    headers: #{self.allHTTPHeaderFields.inspect}, 
+    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

@@ -13,7 +13,13 @@ module BubbleWrap
     end
 
     def [](key)
-      storage.objectForKey storage_key(key)
+      value = storage.objectForKey storage_key(key)
+
+      # RubyMotion currently has a bug where the strings returned from
+      # standardUserDefaults are missing some methods (e.g. to_data).
+      # And because the returned object is slightly different than a normal
+      # String, we can't just use `value.is_a?(String)`
+      value.class.to_s == 'String' ? value.dup : value
     end
 
     def merge(values)

data/motion/core/string.rb

@@ -13,7 +13,7 @@ module BubbleWrap
         new_word = "/#{new_word}" if $1 == '/'
         new_word
       end
-      if uppercase_first_letter
+      if uppercase_first_letter && uppercase_first_letter != :lower
         string[0] = string[0].upcase
       else
         string[0] = string[0].downcase
@@ -35,7 +35,7 @@ module BubbleWrap
 
     def to_color
       # First check if it is a color keyword
-      keyword_selector = "#{self.camelize(false)}Color"
+      keyword_selector = "#{self.camelize(:lower)}Color"
       return UIColor.send(keyword_selector) if UIColor.respond_to? keyword_selector
 
       # Next attempt to convert from hex

data/motion/http.rb

@@ -19,38 +19,37 @@ module BubbleWrap
     #   end
     #
     def self.get(url, options={}, &block)
-      options[:action] = block if block_given?
-      HTTP::Query.new(url, :get, options)
+      create_query(url, :get, options, block)
     end
 
     # Make a POST request
     def self.post(url, options={}, &block)
-      options[:action] = block if block_given?
-      HTTP::Query.new(url, :post, options)
+      create_query(url, :post, options, block)
     end
 
     # Make a PUT request
     def self.put(url, options={}, &block)
-      options[:action] = block if block_given?
-      HTTP::Query.new(url, :put, options)
+      create_query(url, :put, options, block)
     end
 
     # Make a DELETE request
     def self.delete(url, options={}, &block)
-      options[:action] = block if block_given?
-      HTTP::Query.new(url, :delete, options)
+      create_query(url, :delete, options, block)
     end
 
     # Make a HEAD request
     def self.head(url, options={}, &block)
-      options[:action] = block if block_given?
-      HTTP::Query.new(url, :head, options)
+      create_query(url, :head, options, block)
     end
 
     # Make a PATCH request
     def self.patch(url, options={}, &block)
-      options[:action] = block if block_given?
-      HTTP::Query.new(url, :patch, options)
+      create_query(url, :patch, options, block)
+    end
+
+    def self.create_query(url, method, options, block)
+      options[:action] = block if block
+      HTTP::Query.new(url, method, options)
     end
 
     # Response class wrapping the results of a Query's response
@@ -95,7 +94,7 @@ module BubbleWrap
       attr_reader :response_headers
       attr_reader :response_size
       attr_reader :options
-
+      CLRF = "\r\n"
       # ==== Parameters
       # url<String>:: url of the resource to download
       # http_method<Symbol>:: Value representing the HTTP method to use
@@ -127,7 +126,7 @@ module BubbleWrap
         @url = create_url(url_string)
         @body = create_request_body
         @request = create_request
-        set_content_type
+
         @connection = create_connection(request, self)
         @connection.start
 
@@ -157,15 +156,18 @@ Cache policy: #{@cache_policy}, response: #{@response.inspect} >"
       end
 
       def connection(connection, willSendRequest:request, redirectResponse:redirect_response)
-        @redirection ||= 0
-        @redirection += 1
-        log "##{@redirection} HTTP redirection: #{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
-        @connection.cancel
-        @connection = create_connection(new_request, self)
-        new_request
+        @redirect_count ||= 0
+        @redirect_count += 1
+        log "##{@redirect_count} HTTP redirect_count: #{request.inspect} - #{self.description}"
+
+        if @redirect_count >= 30
+          @response.error_message = "Too many redirections"
+          @request.done_loading!
+          call_delegator_with_response
+          nil
+        else
+          request
+        end
       end
 
       def connection(connection, didFailWithError: error)
@@ -212,6 +214,7 @@ Cache policy: #{@cache_policy}, response: #{@response.inspect} >"
                                                       cachePolicy:@cache_policy,
                                                       timeoutInterval:@timeout)
         request.setHTTPMethod(@method)
+        set_content_type
         request.setAllHTTPHeaderFields(@headers)
         request.setHTTPBody(@body)
         patch_nsurl_request(request)
@@ -219,6 +222,30 @@ Cache policy: #{@cache_policy}, response: #{@response.inspect} >"
         request
       end
 
+      def set_content_type
+        return if headers_provided?
+        return if (@method == "GET" || @method == "HEAD")
+        @headers ||= {}
+        @headers["Content-Type"] = case @format
+        when :json
+          "application/json"
+        when :xml
+          "application/xml"
+        when :text
+          "text/plain"
+        else
+          if @format == :form_data || @payload_or_files_were_appended
+            "multipart/form-data; boundary=#{@boundary}"
+          else
+            "application/x-www-form-urlencoded"
+          end
+        end
+      end
+
+      def headers_provided?
+        @headers && @headers.keys.find {|k| k.downcase == 'content-type'}
+      end
+
       def create_request_body
         return nil if (@method == "GET" || @method == "HEAD")
         return nil unless (@payload || @files)
@@ -227,36 +254,17 @@ Cache policy: #{@cache_policy}, response: #{@response.inspect} >"
 
         append_payload(body) if @payload
         append_files(body) if @files
-        append_body_boundary(body) if @set_body_to_close_boundary
+        append_body_boundary(body) if @payload_or_files_were_appended
 
         log "Built HTTP body: \n #{body.to_str}"
         body
       end
 
-      def set_content_type
-        # if no headers provided, set content-type automatically
-        if @headers.nil? || !@headers.keys.find {|k| k.downcase == 'content-type'}
-          @headers ||= {}
-          @headers["Content-Type"] = case @format
-          when :json
-            "application/json"
-          when :xml
-            "application/xml"
-          when :text
-            "text/plain"
-          else
-            if @format == :form_data || @set_body_to_close_boundary
-              "multipart/form-data; boundary=#{@boundary}"
-            else
-             "application/x-www-form-urlencoded"
-            end
-          end
-        end
-      end
-
       def append_payload(body)
         if @payload.is_a?(NSData)
           body.appendData(@payload)
+        elsif @payload.is_a?(String)
+          body.appendData(@payload.dataUsingEncoding NSUTF8StringEncoding)
         else
           append_form_params(body)
         end
@@ -264,40 +272,37 @@ Cache policy: #{@cache_policy}, response: #{@response.inspect} >"
       end
 
       def append_form_params(body)
-        # puts "*** append_form #{@payload}"
-        if @payload.is_a?(String)
-          body.appendData(@payload.dataUsingEncoding NSUTF8StringEncoding)
-        else
-          list = process_payload_hash(@payload)
-          list.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
-          @set_body_to_close_boundary = true
+        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)
         end
+        @payload_or_files_were_appended = true
         body
       end
 
       def append_files(body)
         @files.each do |key, value|
           file_data = NSMutableData.new
-          s = "\r\n--#{@boundary}\r\n"
+          s = "--#{@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)
+          file_data.appendData("\r\n".dataUsingEncoding NSUTF8StringEncoding)
           body.appendData(file_data)
         end
-        @set_body_to_close_boundary = true
+        @payload_or_files_were_appended = true
         body
       end
 
       def append_body_boundary(body)
-        body.appendData("\r\n--#{@boundary}--\r\n".dataUsingEncoding NSUTF8StringEncoding)
+        body.appendData("--#{@boundary}--\r\n".dataUsingEncoding NSUTF8StringEncoding)
       end
 
       def create_url(url_string)
@@ -305,7 +310,16 @@ Cache policy: #{@cache_policy}, response: #{@response.inspect} >"
           convert_payload_to_url if @payload.is_a?(Hash)
           url_string += "?#{@payload}"
         end
-        NSURL.URLWithString(url_string.stringByAddingPercentEscapesUsingEncoding NSUTF8StringEncoding)
+        url = NSURL.URLWithString(url_string.stringByAddingPercentEscapesUsingEncoding NSUTF8StringEncoding)
+
+        validate_url(url)
+        url
+      end
+
+      def validate_url(url)
+        if !NSURLConnection.canHandleRequest(NSURLRequest.requestWithURL(url))
+          raise InvalidURLError, "Invalid URL provided (Make sure you include a valid URL scheme, e.g. http:// or similar)."
+        end
       end
 
       def convert_payload_to_url
@@ -342,14 +356,14 @@ Cache policy: #{@cache_policy}, response: #{@response.inspect} >"
         return nil if hash.nil?
         escaped_hash = {}
 
-        hash.each{|k,v| escaped_hash[k] = v.gsub("\n", '\\n') }
+        hash.each{|k,v| escaped_hash[k] = v.gsub("\n", CLRF) }
         escaped_hash
       end
 
       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; end
         def request.done_loading!; @done_loading = true; end
       end
 
@@ -367,3 +381,5 @@ Cache policy: #{@cache_policy}, response: #{@response.inspect} >"
     end
   end
 end
+
+class InvalidURLError < StandardError; end