bubble-wrap 1.1.3 → 1.1.4

data/CHANGELOG.md

@@ -1,6 +1,22 @@
+## Unreleased
+
+[Commit history](https://github.com/rubymotion/BubbleWrap/compare/v1.1.4...master)
+
+## 1.1.4 (Unreleased)
+
+[Commit history](https://github.com/rubymotion/BubbleWrap/compare/v1.1.3...v1.1.4)
+
+* Support RubyMotion 1.24 or above (https://github.com/rubymotion/BubbleWrap/pull/143)
+* Fixed a problem with `when` events not properly handling multiple targets per event. Now defaults to one target per event with an option to append multiple targets.
+
+## 1.1.3
+
+[Commit history](https://github.com/rubymotion/BubbleWrap/compare/v1.1.2...v1.1.3)
+
+
 ## 1.1.2
 
-[Commit history](https://github.com/rubymotion/BubbleWrap/compare/v1.1.0...v1.1.1)
+[Commit history](https://github.com/rubymotion/BubbleWrap/compare/v1.1.1...v1.1.2)
 
 * Fixed a problem with the load path.
 * Added `format:` to the HTTP wrapper with [5 supported formats supported](https://github.com/rubymotion/BubbleWrap/pull/109) that sets the content type accordingly.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bubble-wrap (1.1.3)
+    bubble-wrap (1.1.4)
 
 GEM
   remote: https://rubygems.org/
@@ -10,7 +10,7 @@ GEM
     metaclass (0.0.1)
     mocha (0.11.4)
       metaclass (~> 0.0.1)
-    mocha-on-bacon (0.2.0)
+    mocha-on-bacon (0.2.1)
       mocha (>= 0.9.8)
     rake (0.9.2.2)
 

data/README.md

@@ -169,6 +169,7 @@ Other available methods:
 * `App.frame`
 * `App.delegate`
 * `App.shared`
+* `App.window`
 * `App.current_locale`
 
 
@@ -226,7 +227,7 @@ end
 
 ### JSON
 
-`BubbleWrap::JSON` wraps `NSJSONSerialization` available in iOS5 and offers the same API as Ruby's JSON std lib.
+`BW::JSON` wraps `NSJSONSerialization` available in iOS5 and offers the same API as Ruby's JSON std lib.
 
 ```ruby
 BW::JSON.generate({'foo => 1, 'bar' => [1,2,3], 'baz => 'awesome'})
@@ -399,7 +400,7 @@ end
 
 ## HTTP
 
-`BubbleWrap::HTTP` wraps `NSURLRequest`, `NSURLConnection` and friends to provide Ruby developers with a more familiar and easier to use API.
+`BW::HTTP` wraps `NSURLRequest`, `NSURLConnection` and friends to provide Ruby developers with a more familiar and easier to use API.
 The API uses async calls and blocks to stay as simple as possible.
 
 To enable it add the following require line to your `Rakefile`:
@@ -410,22 +411,22 @@ require 'bubble-wrap/http'
 Usage example:
 
 ```ruby
-BubbleWrap::HTTP.get("https://api.github.com/users/mattetti") do |response|
+BW::HTTP.get("https://api.github.com/users/mattetti") do |response|
   p response.body.to_str
 end
 ```
 
 ```ruby
-BubbleWrap::HTTP.get("https://api.github.com/users/mattetti", {credentials: {username: 'matt', password: 'aimonetti'}}) do |response|
+BW::HTTP.get("https://api.github.com/users/mattetti", {credentials: {username: 'matt', password: 'aimonetti'}}) do |response|
   p response.body.to_str # prints the response's body
 end
 ```
 
 ```ruby
 data = {first_name: 'Matt', last_name: 'Aimonetti'}
-BubbleWrap::HTTP.post("http://foo.bar.com/", {payload: data}) do |response|
+BW::HTTP.post("http://foo.bar.com/", {payload: data}) do |response|
   if response.ok?
-    json = BubbleWrap::JSON.parse(response.body.to_str)
+    json = BW::JSON.parse(response.body.to_str)
     p json['id']
   elsif response.status_code.to_s =~ /40\d/
     App.alert("Login failed")
@@ -520,9 +521,9 @@ feed_parser = BW::RSSParser.new(feed, true)
 ## Reactor
 **Since: > version 1.0.0**
 
-`BubbleWrap::Reactor` is a simplified, mostly complete implementation of
+`BW::Reactor` is a simplified, mostly complete implementation of
 the [Event Machine](http://rubyeventmachine.com/) API.  In fact
-`BubbleWrap::Reactor` is aliased to `EM` in the runtime environment.
+`BW::Reactor` is aliased to `EM` in the runtime environment.
 
 ### Deferables
 
@@ -539,7 +540,7 @@ changes to either successful or failure state.
 
 ```ruby
 > d = EM::DefaultDeferrable.new
-=> #<BubbleWrap::Reactor::DefaultDeferrable:0x6d859a0>
+=> #<BW::Reactor::DefaultDeferrable:0x6d859a0>
 > d.callback { |what| puts "Great #{what}!" }
 => [#<Proc:0x6d8a1e0>]
 > d.succeed "justice"
@@ -551,7 +552,7 @@ Great justice!
 
 ```ruby
 > d = EM::DefaultDeferrable.new
-=> #<BubbleWrap::Reactor::DefaultDeferrable:0x8bf3ee0>
+=> #<BW::Reactor::DefaultDeferrable:0x8bf3ee0>
 > d.errback { |what| puts "Great #{what}!" }
 => [#<Proc:0x8bf3ef0>]
 > d.fail "sadness"
@@ -563,11 +564,11 @@ Great sadness!
 
 ```ruby
 > d = EM::DefaultDeferrable.new
-=> #<BubbleWrap::Reactor::DefaultDeferrable:0x8bf5910>
+=> #<BW::Reactor::DefaultDeferrable:0x8bf5910>
 > d.errback { puts "Great scott!" }
 => [#<Proc:0x8bf6350>]
 > d.timeout 2
-=> #<BubbleWrap::Reactor::Timer:0x6d920a0 @timer=#<__NSCFTimer:0x6d91990>>
+=> #<BW::Reactor::Timer:0x6d920a0 @timer=#<__NSCFTimer:0x6d91990>>
 # wait...
 > Great scott!
 ```
@@ -649,7 +650,7 @@ Time travel!
 
 Although not part of the EventMachine API, BubbleWrap provides
 an `Eventable` mixin for use instrumenting objects with simple
-event triggering behaviour. `BubbleWrap::Reactor` uses this
+event triggering behaviour. `BW::Reactor` uses this
 behind the scenes in several places, and as it's a very handy
 idiom it is available as a public API.
 

data/Rakefile

@@ -11,6 +11,7 @@ Motion::Project::App.setup do |app|
   app.name = 'testSuite'
   app.identifier = 'io.bubblewrap.testSuite'
   app.specs_dir = './spec/motion'
+  app.version = '1.2.3'
 end
 
 namespace :spec do

data/bubble-wrap.gemspec

@@ -2,8 +2,8 @@
 require File.expand_path('../lib/bubble-wrap/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Matt Aimonetti", "Francis Chong", "James Harton"]
-  gem.email         = ["mattaimonetti@gmail.com", "francis@ignition.hk", "james@sociable.co.nz"]
+  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/"

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

@@ -11,8 +11,7 @@ module BubbleWrap
               app.frameworks = ::BubbleWrap::Requirement.frameworks(app.frameworks)
               block.call(app) unless block.nil?
             end
-            configs.each_value &bw_config
-            config.validate
+            config.setup_blocks << bw_config
           end
           alias :setup_without_bubblewrap :setup
           alias :setup :setup_with_bubblewrap

data/lib/bubble-wrap/loader.rb

@@ -3,8 +3,11 @@ unless defined?(Motion::Project::Config)
 end
 
 unless defined?(BubbleWrap::LOADER_PRESENT)
-
   require 'bubble-wrap/version' unless defined?(VERSION)
+  if BubbleWrap::minor_version(Motion::Version) < BubbleWrap::minor_version(BubbleWrap::MIN_MOTION_VERSION)
+    raise "BubbleWrap #{BubbleWrap::VERSION} requires at least rubymotion #{BubbleWrap::MIN_MOTION_VERSION}"
+  end
+
   require 'bubble-wrap/ext'
   require 'bubble-wrap/requirement'
 

data/lib/bubble-wrap/rss_parser.rb

@@ -1,2 +1,3 @@
 require 'bubble-wrap/loader'
 BubbleWrap.require('motion/rss_parser.rb')
+BubbleWrap.require('motion/http.rb')

data/lib/bubble-wrap/version.rb

@@ -1,3 +1,9 @@
 module BubbleWrap
-  VERSION = '1.1.3' unless defined?(BubbleWrap::VERSION)
+  VERSION = '1.1.4' unless defined?(BubbleWrap::VERSION)
+  MIN_MOTION_VERSION = '1.24'
+
+  module_function
+  def minor_version(version_str)
+    version_str.split(".")[1].to_i
+  end
 end

data/motion/core/app.rb

@@ -90,6 +90,10 @@ module BubbleWrap
       NSBundle.mainBundle.bundleIdentifier
     end
 
+    def version
+      NSBundle.mainBundle.infoDictionary['CFBundleVersion']
+    end
+
     # Return application frame
     def frame
       UIScreen.mainScreen.applicationFrame
@@ -110,6 +114,11 @@ module BubbleWrap
       UIApplication.sharedApplication
     end
 
+    # the Application Window
+    def window
+      UIApplication.sharedApplication.keyWindow || UIApplication.sharedApplication.windows[0]
+    end
+
     # @return [NSLocale] locale of user settings
     def current_locale
       languages = NSLocale.preferredLanguages
@@ -122,4 +131,4 @@ module BubbleWrap
 
   end
 end
-::App = BubbleWrap::App
+::App = BubbleWrap::App unless defined?(::App)

data/motion/core/device.rb

@@ -56,4 +56,4 @@ module BubbleWrap
 
   end
 end
-::Device = BubbleWrap::Device
+::Device = BubbleWrap::Device unless defined?(::Device)

data/motion/core/device/camera.rb

@@ -87,6 +87,7 @@ module BubbleWrap
           @options[:source_type] = :camera
         end
 
+        source_type_readable = options[:source_type]
         source_type = const_int_get("UIImagePickerControllerSourceType", @options[:source_type])
         if not Camera.source_type_available?(source_type)
           error(Error::SOURCE_TYPE_NOT_AVAILABLE) and return
@@ -108,15 +109,15 @@ module BubbleWrap
         self.picker.mediaTypes = media_types
         self.picker.allowsEditing = @options[:allows_editing]
 
-        if source_type == :camera && ![:front, :rear].member?(self.location)
+        if source_type_readable == :camera && ![:front, :rear].member?(self.location)
           raise Error::INVALID_CAMERA_LOCATION, "Can't use camera location #{self.location} with source type :camera"
         end
 
-        if source_type == :camera
+        if source_type_readable == :camera
           self.picker.cameraDevice = camera_device
         end
 
-        presenting_controller ||= UIApplication.sharedApplication.keyWindow.rootViewController
+        presenting_controller ||= App.window.rootViewController
         presenting_controller.presentViewController(self.picker, animated:@options[:animated], completion: lambda {})
       end
 
@@ -216,4 +217,4 @@ module BubbleWrap
     end
   end
 end
-::Camera = BubbleWrap::Device::Camera
+::Camera = BubbleWrap::Device::Camera unless defined?(::Camera)

data/motion/core/persistence.rb

@@ -39,4 +39,4 @@ module BubbleWrap
   end
 
 end
-::Persistence = BubbleWrap::Persistence
+::Persistence = BubbleWrap::Persistence unless defined?(::Persistence)

data/motion/core/string.rb

@@ -33,6 +33,18 @@ module BubbleWrap
       word
     end
 
+    def to_url_encoded(encoding = NSUTF8StringEncoding)
+      stringByAddingPercentEscapesUsingEncoding encoding
+    end
+
+    def to_url_decoded(encoding = NSUTF8StringEncoding)
+      stringByReplacingPercentEscapesUsingEncoding encoding
+    end
+
+    def to_encoded_data(encoding = NSUTF8StringEncoding)
+      dataUsingEncoding encoding
+    end
+
     def to_color
       # First check if it is a color keyword
       keyword_selector = "#{self.camelize(:lower)}Color"

data/motion/http.rb

@@ -18,45 +18,21 @@ module BubbleWrap
     #     p response.body.to_str # prints the response's body
     #   end
     #
-    def self.get(url, options={}, &block)
-      create_query(url, :get, options, block)
-    end
-
-    # Make a POST request
-    def self.post(url, options={}, &block)
-      create_query(url, :post, options, block)
-    end
 
-    # Make a PUT request
-    def self.put(url, options={}, &block)
-      create_query(url, :put, options, block)
-    end
-
-    # Make a DELETE request
-    def self.delete(url, options={}, &block)
-      create_query(url, :delete, options, block)
-    end
+    [:get, :post, :put, :delete, :head, :patch].each do |http_verb|
 
-    # Make a HEAD request
-    def self.head(url, options={}, &block)
-      create_query(url, :head, options, block)
-    end
-
-    # Make a PATCH request
-    def self.patch(url, options={}, &block)
-      create_query(url, :patch, options, block)
-    end
+      define_singleton_method(http_verb) do |url, options = {}, &block|
+        options[:action] = block if block
+        HTTP::Query.new(url, http_verb, options)
+      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
     class Response
       attr_reader :body
       attr_reader :headers
-      attr_accessor :status_code, :error_message
+      attr_accessor :status_code, :status_description, :error_message
       attr_reader :url
 
       def initialize(values={})
@@ -67,6 +43,7 @@ module BubbleWrap
         values.each do |k,v|
           self.instance_variable_set("@#{k}", v)
         end
+        update_status_description
       end
 
       def ok?
@@ -78,6 +55,9 @@ module BubbleWrap
       end
       alias description to_s
 
+      def update_status_description
+        @status_description = status_code.nil? ? nil : NSHTTPURLResponse.localizedStringForStatusCode(status_code)
+      end
     end
 
     # Class wrapping NSConnection and often used indirectly by the BubbleWrap::HTTP module methods.
@@ -356,7 +336,7 @@ Cache policy: #{@cache_policy}, response: #{@response.inspect} >"
         return nil if hash.nil?
         escaped_hash = {}
 
-        hash.each{|k,v| escaped_hash[k] = v.gsub("\n", CLRF) }
+        hash.each{|k,v| escaped_hash[k] = v.gsub("\n", CLRF) if v }
         escaped_hash
       end
 

data/motion/location/location.rb

@@ -149,4 +149,4 @@ module BubbleWrap
     end
   end
 end
-::Location = BubbleWrap::Location
+::Location = BubbleWrap::Location unless defined?(::Location)

data/motion/media/media.rb

@@ -12,4 +12,4 @@ module BubbleWrap
   end
 end
 
-::Media = BubbleWrap::Media
+::Media = BubbleWrap::Media unless defined?(::Media)

data/motion/media/player.rb

@@ -87,7 +87,7 @@ module BubbleWrap
 
         if display_modal
           @presenting_controller = options[:controller]
-          @presenting_controller ||= UIApplication.sharedApplication.keyWindow.rootViewController
+          @presenting_controller ||= App.window.rootViewController
           @presenting_controller.presentMoviePlayerViewControllerAnimated(@media_player)
         else
           if block.nil?

data/motion/reactor.rb

@@ -102,4 +102,4 @@ module BubbleWrap
   end
 end
 
-::EM = ::BubbleWrap::Reactor # Yes I dare!
+::EM = ::BubbleWrap::Reactor unless defined?(::EM) # Yes I dare!

data/motion/rss_parser.rb

@@ -50,19 +50,16 @@ module BubbleWrap
       if data
         data_to_parse = input.respond_to?(:to_data) ? input.to_data : input
         @source = data_to_parse
-        @parser = NSXMLParser.alloc.initWithData(@source)
       else
         url = input.is_a?(NSURL) ? input : NSURL.alloc.initWithString(input)
         @source = url
-        # Delay the initialization of the underlying NSXMLParser so it
-        # doesn't load the content of the url until it's triggered.
-        @parser = Proc.new{ NSXMLParser.alloc.initWithContentsOfURL(url) }
       end
       self.state = :initializes
       self
     end
 
     def state=(new_state)
+      @state = new_state
       callback_meth = "when_parser_#{new_state}"
       if self.delegate && self.delegate.respond_to?(callback_meth)
         self.delegate.send(callback_meth)
@@ -77,10 +74,13 @@ module BubbleWrap
     #   end
     def parse(&block)
       @block = block
-      @parser = @parser.call if @parser.respond_to?(:call)
-      @parser.shouldProcessNamespaces = true
-      @parser.delegate ||= self
-      @parser.parse
+
+      fetch_source_data do |data|
+        @parser = NSXMLParser.alloc.initWithData(data)
+        @parser.shouldProcessNamespaces = true
+        @parser.delegate ||= self
+        @parser.parse
+      end
     end
 
     # Delegate getting called when parsing starts
@@ -120,7 +120,7 @@ module BubbleWrap
     # error can be retrieved with parserError
     def parser(parser, parseErrorOccurred:parse_error)
       puts "parseErrorOccurred" if debug
-      @parse_error = parse_error
+      @parser_error = parse_error
 
       self.state = :errors
     end
@@ -140,5 +140,20 @@ module BubbleWrap
     # parser:validationErrorOccurred:
     # parser:foundCDATA:
 
+    protected
+
+    def fetch_source_data(&blk)
+      if @source.is_a?(NSURL)
+        HTTP.get(@source.absoluteString) do |response|
+          if response.ok?
+            blk.call(response.body)
+          else
+            parser(parser, parseErrorOccurred:"HTTP request failed (#{response})")
+          end
+        end
+      else
+        yield @source
+      end
+    end
   end
 end

data/motion/ui/gestures.rb

@@ -2,38 +2,71 @@
 
 class UIView
 
+  def when_tapped(enableInteraction=true, &proc)
+    add_gesture_recognizer_helper(UITapGestureRecognizer.alloc.initWithTarget(self, action:'handle_gesture:'), enableInteraction, proc)
+  end
+
+  def when_pinched(enableInteraction=true, &proc)
+    add_gesture_recognizer_helper(UIPinchGestureRecognizer.alloc.initWithTarget(self, action:'handle_gesture:'), enableInteraction, proc)
+  end
+
+  def when_rotated(enableInteraction=true, &proc)
+    add_gesture_recognizer_helper(UIRotationGestureRecognizer.alloc.initWithTarget(self, action:'handle_gesture:'), enableInteraction, proc)
+  end
+
+  def when_swiped(enableInteraction=true, &proc)
+    add_gesture_recognizer_helper(UISwipeGestureRecognizer.alloc.initWithTarget(self, action:'handle_gesture:'), enableInteraction, proc)
+  end
+
+  def when_panned(enableInteraction=true, &proc)
+    add_gesture_recognizer_helper(UIPanGestureRecognizer.alloc.initWithTarget(self, action:'handle_gesture:'), enableInteraction, proc)
+  end
+
+  def when_pressed(enableInteraction=true, &proc)
+    add_gesture_recognizer_helper(UILongPressGestureRecognizer.alloc.initWithTarget(self, action:'handle_gesture:'), enableInteraction, proc)
+  end
+
+
   def whenTapped(enableInteraction=true, &proc)
-    addGestureRecognizerHelper(proc, enableInteraction, UITapGestureRecognizer.alloc.initWithTarget(self, action:'motionHandleGesture:'))
+    NSLog "[DEPRECATED - whenTapped] please use when_tapped instead."
+    when_tapped(enableInteraction, &proc)
   end
 
   def whenPinched(enableInteraction=true, &proc)
-    addGestureRecognizerHelper(proc, enableInteraction, UIPinchGestureRecognizer.alloc.initWithTarget(self, action:'motionHandleGesture:'))
+    NSLog "[DEPRECATED - whenPinched] please use when_pinched instead."
+    when_pinched(enableInteraction, &proc)
   end
 
   def whenRotated(enableInteraction=true, &proc)
-    addGestureRecognizerHelper(proc, enableInteraction, UIRotationGestureRecognizer.alloc.initWithTarget(self, action:'motionHandleGesture:'))
+    NSLog "[DEPRECATED - whenRotated] please use when_rotated instead."
+    when_rotated(enableInteraction, &proc)
   end
 
   def whenSwiped(enableInteraction=true, &proc)
-    addGestureRecognizerHelper(proc, enableInteraction, UISwipeGestureRecognizer.alloc.initWithTarget(self, action:'motionHandleGesture:'))
+    NSLog "[DEPRECATED - whenSwiped] please use when_swiped instead."
+    when_swiped(enableInteraction, &proc)
   end
 
   def whenPanned(enableInteraction=true, &proc)
-    addGestureRecognizerHelper(proc, enableInteraction, UIPanGestureRecognizer.alloc.initWithTarget(self, action:'motionHandleGesture:'))
+    NSLog "[DEPRECATED - whenPanned] please use when_panned instead."
+    when_panned(enableInteraction, &proc)
   end
 
   def whenPressed(enableInteraction=true, &proc)
-    addGestureRecognizerHelper(proc, enableInteraction, UILongPressGestureRecognizer.alloc.initWithTarget(self, action:'motionHandleGesture:'))
+    NSLog "[DEPRECATED - whenPressed] please use when_pressed instead."
+    when_pressed(enableInteraction, &proc)
   end
 
+
+
   private
 
-  def motionHandleGesture(recognizer)
+  def handle_gesture(recognizer)
     @recognizers[recognizer].call(recognizer)
   end
 
   # Adds the recognizer and keeps a strong reference to the Proc object.
-  def addGestureRecognizerHelper(proc, enableInteraction, recognizer)
+  def add_gesture_recognizer_helper(recognizer, enableInteraction, proc)
     setUserInteractionEnabled true if enableInteraction && !isUserInteractionEnabled
     self.addGestureRecognizer(recognizer)
 

data/motion/ui/ui_control.rb

@@ -1,7 +1,14 @@
 module UIControlWrap
-  def when(events, &block)
+  def when(events, options={}, &block)
     @callback ||= {}
-    @callback[events] = block
-    addTarget(@callback[events], action:'call', forControlEvents: events)
+    @callback[events] ||= []
+    
+    unless options[:append]
+      @callback[events] = []
+      removeTarget(nil, action: nil, forControlEvents: events)
+    end
+
+    @callback[events] << block
+    addTarget(@callback[events].last, action:'call', forControlEvents: events)
   end
 end

data/spec/lib/motion_stub.rb

@@ -11,4 +11,5 @@ module Motion
       end
     end
   end
+  Version = "1.24"
 end

data/spec/motion/core/app_spec.rb

@@ -1,25 +1,25 @@
 describe BubbleWrap::App do
   describe '.documents_path' do
     it 'should end in "/Documents"' do
-      BW::App.documents_path[-10..-1].should == '/Documents'
+      App.documents_path[-10..-1].should == '/Documents'
     end
   end
 
   describe '.resources_path' do
     it 'should end in "/testSuite.app"' do
-      BW::App.resources_path.should =~ /\/testSuite(_spec)?.app$/
+      App.resources_path.should =~ /\/testSuite(_spec)?.app$/
     end
   end
 
   describe '.notification_center' do
     it 'should be a NSNotificationCenter' do
-      BW::App.notification_center.should == NSNotificationCenter.defaultCenter
+      App.notification_center.should == NSNotificationCenter.defaultCenter
     end
   end
 
   describe '.user_cache' do
     it 'should be a NSUserDefaults' do
-      BW::App.user_cache.should == NSUserDefaults.standardUserDefaults
+      App.user_cache.should == NSUserDefaults.standardUserDefaults
     end
   end
 
@@ -30,7 +30,7 @@ describe BubbleWrap::App do
 
     describe "with only one string argument" do
       before do
-        @alert = BW::App.alert('1.21 Gigawatts!')
+        @alert = App.alert('1.21 Gigawatts!')
       end
 
       it 'returns an alert' do
@@ -54,7 +54,7 @@ describe BubbleWrap::App do
 
     describe "with only two string arguments" do
       before do
-        @alert = BW::App.alert('1.21 Gigawatts!', 'Great Scott!')
+        @alert = App.alert('1.21 Gigawatts!', 'Great Scott!')
       end
 
       it 'returns an alert' do
@@ -78,7 +78,7 @@ describe BubbleWrap::App do
 
     describe "with variable args" do
       before do
-        @alert = BW::App.alert('1.21 Gigawatts!', cancel_button_title: 'Great Scott!',
+        @alert = App.alert('1.21 Gigawatts!', cancel_button_title: 'Great Scott!',
                                                   message: 'Some random message')
       end
 
@@ -107,7 +107,7 @@ describe BubbleWrap::App do
 
     describe "with a block" do
       before do
-        @alert = BW::App.alert('1.21 Gigawatts!') do |alert|
+        @alert = App.alert('1.21 Gigawatts!') do |alert|
           alert.message = 'My message!!'
         end
       end
@@ -138,47 +138,53 @@ describe BubbleWrap::App do
 
   describe '.states' do
     it 'returns a hash' do
-      BW::App.states.class.should == Hash
+      App.states.class.should == Hash
     end
     it "returns the real instance variable" do
-      BW::App.states.should == BW::App.instance_variable_get(:@states)
+      App.states.should == App.instance_variable_get(:@states)
     end
   end
 
   describe '.name' do
     it 'returns the application name' do
-      BW::App.name.should == 'testSuite'
+      App.name.should == 'testSuite'
     end
   end
 
   describe '.identifier' do
     it 'returns the application identifier' do
-      BW::App.identifier.should == 'io.bubblewrap.testSuite'
+      App.identifier.should == 'io.bubblewrap.testSuite_spec'
+    end
+  end
+
+  describe '.version' do
+    it 'returns the application version' do
+      App.version.should == '1.2.3'
     end
   end
 
   describe '.frame' do
     it 'returns Application Frame' do
-      BW::App.frame.should == UIScreen.mainScreen.applicationFrame
+      App.frame.should == UIScreen.mainScreen.applicationFrame
     end
   end
 
   describe '.bounds' do
     it 'returns Main Screen bounds' do
-      BW::App.bounds.should == UIScreen.mainScreen.bounds
+      App.bounds.should == UIScreen.mainScreen.bounds
     end
   end
 
 
   describe '.delegate' do
     it 'returns a TestSuiteDelegate' do
-      BW::App.delegate.should == UIApplication.sharedApplication.delegate
+      App.delegate.should == UIApplication.sharedApplication.delegate
     end
   end
 
   describe '.app' do
     it 'returns UIApplication.sharedApplication' do
-      BW::App.shared.should == UIApplication.sharedApplication
+      App.shared.should == UIApplication.sharedApplication
     end
   end
 

data/spec/motion/core/gestures_spec.rb

@@ -29,27 +29,33 @@ describe UIView do
     # it 'responds to interaction'
   end
 
-  describe '#whenTapped' do
+  describe '#when_tapped' do
+    testMethod.call :when_tapped
     testMethod.call :whenTapped
   end
 
-  describe '#whenPinched' do
+  describe '#when_pinched' do
+    testMethod.call :when_pinched
     testMethod.call :whenPinched
   end
 
-  describe '#whenRotated' do
+  describe '#when_rotated' do
+    testMethod.call :when_rotated
     testMethod.call :whenRotated
   end
   
-  describe '#whenSwiped' do
+  describe '#when_swiped' do
+    testMethod.call :when_swiped
     testMethod.call :whenSwiped
   end
 
-  describe '#whenPanned' do
+  describe '#when_panned' do
+    testMethod.call :when_panned
     testMethod.call :whenPanned
   end
 
-  describe '#whenPressed' do
+  describe '#when_pressed' do
+    testMethod.call :when_pressed
     testMethod.call :whenPressed
   end
 

data/spec/motion/core/string_spec.rb

@@ -143,4 +143,46 @@ describe BubbleWrap::String do
     end
     
   end 
+
+  describe "encoding" do
+
+    before do
+      @raw_string = "hey ho let's {go}"
+    end
+
+    it "to_url_encoded" do
+      real_encoded = @raw_string.stringByAddingPercentEscapesUsingEncoding NSUTF8StringEncoding
+      @raw_string.to_url_encoded.should.equal real_encoded
+    end
+
+    it "handles other encodings" do
+      utf16 = @raw_string.stringByAddingPercentEscapesUsingEncoding NSUTF16StringEncoding
+      @raw_string.to_url_encoded(NSUTF16StringEncoding).should.equal utf16
+    end
+
+    it "to_url_decoded" do
+      encoded_string = "hey%20ho%20let's%20%7Bgo%7D"
+      real_decoded = encoded_string.stringByReplacingPercentEscapesUsingEncoding NSUTF8StringEncoding
+      
+      encoded_string.to_url_decoded.should.equal real_decoded
+    end
+
+
+    describe "dataUsingEncoding" do
+
+      it "#to_url_encoded_data - utf8" do
+        utf8 = @raw_string.dataUsingEncoding NSUTF8StringEncoding
+        @raw_string.to_encoded_data.should.equal utf8
+      end
+      
+      it "handles multiple encodings" do
+        utf16 = @raw_string.dataUsingEncoding NSUTF16StringEncoding
+        @raw_string.to_encoded_data(NSUTF16StringEncoding).should.equal utf16
+      end
+
+    end
+
+
+  end
+
 end

data/spec/motion/core/ui_control_spec.rb

@@ -1,16 +1,36 @@
 describe "UIControlWrap" do
+  describe 'UIButton' do
+    before do
+      @button = UIButton.buttonWithType(UIButtonTypeRoundedRect) 
+      @touched = []
+      @button.when(UIControlEventTouchUpInside) do
+        @touched << 'for the very first time'
+      end
+    end
+
+    it "supports the 'when' event handler for UIButton" do
+      @button.sendActionsForControlEvents(UIControlEventTouchUpInside)
+      @touched.should == ['for the very first time']
+    end
+
+    it "replaces the target for a given control event by default" do
+      @button.when(UIControlEventTouchUpInside) do
+        @touched << 'touched'
+      end
+      @button.sendActionsForControlEvents(UIControlEventTouchUpInside)
+      @touched.should == ['touched']
+    end
 
-  it "should support the 'when' event handler" do
-    button = UIButton.buttonWithType(UIButtonTypeRoundedRect)
-    touched = nil
-    button.when(UIControlEventTouchUpInside) do
-      touched = 'for the very first time'
+    it "allows multiple targets for a given control event if specified" do
+      @button.when(UIControlEventTouchUpInside, append: true) do
+        @touched << 'touched'
+      end
+      @button.sendActionsForControlEvents(UIControlEventTouchUpInside)
+      @touched.should == ['for the very first time', 'touched']
     end
-    button.sendActionsForControlEvents(UIControlEventTouchUpInside)
-    touched.should == 'for the very first time'
   end
 
-  it "should support the 'when' event handler for UISlider" do
+  it "supports the 'when' event handler for UISlider" do
     button = UISlider.alloc.init
     changed = nil
     button.when(UIControlEventValueChanged) do

data/spec/motion/http_spec.rb

@@ -75,6 +75,10 @@ describe "HTTP" do
       end
     end
 
+    it "updates the status description" do
+      @response.status_description.should.equal 'no error'
+    end
+
     it "updates ivars when calling update" do
       @response.update(one: 'one', two: 'two')
       @response.instance_variable_get(:@one).should.equal 'one'
@@ -143,6 +147,15 @@ describe "HTTP" do
       @query.should.respond_to :options
     end
 
+    it "should accept nil header value" do
+      @headers = { 'Authorization' => nil, 'User-Agent' => "Mozilla/5.0 (X11; Linux x86_64; rv:12.0) \n Gecko/20100101 Firefox/12.0" }
+      @options = {
+        headers: @headers,
+      }
+      @query = BubbleWrap::HTTP::Query.new( @localhost_url , :get, @options )
+      @query.should.not.be.nil
+    end
+
     describe "When initialized" do
 
       it "should upcase the HTTP method" do

data/spec/motion/media/player_spec.rb

@@ -36,7 +36,7 @@ describe BubbleWrap::Media::Player do
     end
 
     it "should present a modalViewController on root if no controller given" do
-      @controller = UIApplication.sharedApplication.keyWindow.rootViewController
+      @controller = App.window.rootViewController
 
       @player.play_modal(@local_file)
 
@@ -58,7 +58,7 @@ describe BubbleWrap::Media::Player do
       # .presentMoviePlayerViewControllerAnimated detects whether or not
       # @controller.view is part of a hierarchy, I guess. if you remove this
       # then the test fails.
-      UIApplication.sharedApplication.keyWindow.rootViewController.view.addSubview(@controller.view)
+      App.window.rootViewController.view.addSubview(@controller.view)
 
       @player.play_modal(@local_file, controller: @controller)
 

data/spec/motion/reactor_spec.rb

@@ -45,9 +45,9 @@ describe BubbleWrap::Reactor do
   describe '.add_periodic_timer' do
     it 'runs callbacks repeatedly' do
       @proxy.proof = 0
-      timer = @subject.add_periodic_timer 0.5 do
+      @timer = @subject.add_periodic_timer 0.5 do
         @proxy.proof = @proxy.proof + 1
-        @subject.cancel_timer(timer) if @proxy.proof > 2
+        @subject.cancel_timer(@timer) if @proxy.proof > 2
       end
       wait 1.1 do
         @proxy.proof.should >= 2

data/spec/motion/rss_parser_spec.rb

@@ -19,18 +19,51 @@ describe "RSSParser" do
       parser.source.class.should.equal NSURL
       parser.source.absoluteString.should.equal @feed_url
     end
-
-    # it "works with some data" do
-      # feed_data_string = File.read(@local_feed)
-      # parser = BW::RSSParser.new(feed_data_string, true)
-      # parser.source.class.should.equal NSData
-      # parser.source.to_str.should.equal @feed_data_string
-      # parser = BW::RSSParser.new(@feed_data_string.to_data, true)
-      # parser.source.class.should.equal NSURL
-      # parser.source.class.should.equal NSData
-      # parser.source.to_str.should.equal @feed_data_string
-    # end
   end
 
+  describe "parsing" do
+
+    it "parses local file data" do
+      parser = BW::RSSParser.new(File.read(@local_feed).to_data, true)
+      episodes = []
+      parser.parse { |episode| episodes << episode }
+      episodes.length.should.equal 108
+      episodes.last.title.should.equal 'Episode 001: Summer of Rails'
+    end
+
+    it "parses url data" do
+      parser = BW::RSSParser.new(@feed_url)
+      episodes = []
+      parser.parse { |episode| episodes << episode }
+      episodes.length.should.equal 108
+      episodes.last.title.should.equal 'Episode 001: Summer of Rails'
+    end
+
+    it "handles errors" do
+      parser = BW::RSSParser.new("http://doesnotexist.com")
+      parser.parse
+      parser.state.should.equal :errors
+    end
+
+    module BW
+      module HTTP
+        class << self
+          # To avoid interfering the http_spec's mocking, we only want to override HTTP.get if it's
+          # for the RSSParser spec.
+          alias_method :original_get, :get
+          def get(url, options={}, &block)
+            if url == 'https://raw.github.com/gist/2952427/9f1522cbe5d77a72c7c96c4fdb4b77bd58d7681e/atom.xml'
+              string = File.read(File.join(App.resources_path, 'atom.xml'))
+              yield BW::HTTP::Response.new(body: string.to_data, status_code: 200)
+            elsif url == 'http://doesnotexist.com'
+              yield BW::HTTP::Response.new(status_code: nil)
+            else
+              original_get(url, options, &block)
+            end
+          end
+        end
+      end
+    end
+  end
 end
 

metadata

@@ -1,17 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: bubble-wrap
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
   prerelease: 
 platform: ruby
 authors:
 - Matt Aimonetti
 - Francis Chong
 - James Harton
+- Clay Allsopp
+- Dylan Markow
+- Jan Weinkauff
+- Marin Usalj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-28 00:00:00.000000000 Z
+date: 2012-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
@@ -83,6 +87,10 @@ email:
 - mattaimonetti@gmail.com
 - francis@ignition.hk
 - james@sociable.co.nz
+- clay.allsopp@gmail.com
+- dylan@dylanmarkow.com
+- jan@dreimannzelt.de
+- mneorr@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -283,7 +291,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4493023769486268840
+      hash: -27678325849561073
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -292,7 +300,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4493023769486268840
+      hash: -27678325849561073
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24