bubble-wrap 0.4.0 → 1.0.0.pre

data/spec/core/app_spec.rb

@@ -13,13 +13,13 @@ describe BubbleWrap::App do
 
   describe '.notification_center' do
     it 'should be a NSNotificationCenter' do
-      BW::App.notification_center.class.should == NSNotificationCenter
+      BW::App.notification_center.should == NSNotificationCenter.defaultCenter
     end
   end
 
   describe '.user_cache' do
     it 'should be a NSUserDefaults' do
-      BW::App.user_cache.class.should == NSUserDefaults
+      BW::App.user_cache.should == NSUserDefaults.standardUserDefaults
     end
   end
 
@@ -55,6 +55,9 @@ describe BubbleWrap::App do
     it 'returns a hash' do
       BW::App.states.class.should == Hash
     end
+    it "returns the real instance variable" do
+      BW::App.states.should == BW::App.instance_variable_get(:@states)
+    end
   end
 
   describe '.name' do
@@ -70,14 +73,21 @@ describe BubbleWrap::App do
   end
 
   describe '.frame' do
-    it 'returns a CGRect' do
-      BW::App.frame.class.should == CGRect
+    it 'returns Application Frame' do
+      BW::App.frame.should == UIScreen.mainScreen.applicationFrame
     end
   end
 
+  describe '.bounds' do
+    it 'returns Main Screen bounds' do
+      BW::App.bounds.should == UIScreen.mainScreen.bounds
+    end
+  end
+
+
   describe '.delegate' do
     it 'returns a TestSuiteDelegate' do
-      BW::App.delegate.class.should == TestSuiteDelegate
+      BW::App.delegate.should == UIApplication.sharedApplication.delegate
     end
   end
 

data/spec/core/device/screen_spec.rb

@@ -111,42 +111,42 @@ describe BubbleWrap::Device::Screen do
     end
   end
 
-  describe '.widthForOrientation' do
+  describe '.width_for_orientation' do
     describe ':landscape_left' do
       it 'returns the current device screen height' do
-        BW::Device::Screen.widthForOrientation(:landscape_left).should == BW::Device::Screen.height
+        BW::Device::Screen.width_for_orientation(:landscape_left).should == BW::Device::Screen.height
       end
     end
 
     describe ':landscape_right' do
       it 'returns the current device screen height' do
-        BW::Device::Screen.widthForOrientation(:landscape_right).should == BW::Device::Screen.height
+        BW::Device::Screen.width_for_orientation(:landscape_right).should == BW::Device::Screen.height
       end
     end
 
     describe 'default' do
       it 'returns the current device screen width' do
-        BW::Device::Screen.widthForOrientation.should == BW::Device::Screen.width
+        BW::Device::Screen.width_for_orientation.should == BW::Device::Screen.width
       end
     end
   end
 
-  describe '.heightForOrientation' do
+  describe '.height_for_orientation' do
     describe ':landscape_left' do
       it 'returns the current device screen width' do
-        BW::Device::Screen.heightForOrientation(:landscape_left).should == BW::Device::Screen.width
+        BW::Device::Screen.height_for_orientation(:landscape_left).should == BW::Device::Screen.width
       end
     end
 
     describe ':landscape_right' do
       it 'returns the current device screen width' do
-        BW::Device::Screen.heightForOrientation(:landscape_right).should == BW::Device::Screen.width
+        BW::Device::Screen.height_for_orientation(:landscape_right).should == BW::Device::Screen.width
       end
     end
 
     describe 'default' do
       it 'returns the current device screen height' do
-        BW::Device::Screen.heightForOrientation.should == BW::Device::Screen.height
+        BW::Device::Screen.height_for_orientation.should == BW::Device::Screen.height
       end
     end
   end

data/spec/core/kvo_spec.rb

@@ -0,0 +1,191 @@
+describe "KVOHelper" do
+
+  class KvoExample
+    include BW::KVO
+
+    attr_accessor :label
+    attr_accessor :items
+
+    def initialize
+      @items = [ "Apple", "Banana", "Chickpeas" ]
+
+      @label = UILabel.alloc.initWithFrame [[0,0],[320, 30]]
+      @label.text = "Foo"
+    end
+
+    # Test helper
+
+    def observe_label(&block)
+      observe(@label, "text", &block)
+    end
+
+    def observe_collection(&block)
+      observe(self, "items", &block)
+    end
+
+    def unobserve_label
+      unobserve(@label, "text")
+    end
+
+    #  def unobserve_all
+    #unobserve(@label, "text")
+    #unobserve(self, "items")
+    #end
+
+  end
+
+
+  describe "Callbacks" do
+    before do
+      @example = KvoExample.new
+    end
+
+    after do
+      @example = nil
+    end
+
+    # add
+
+    it "should add an observer block" do
+      target = Object.new
+      block = lambda { |old_value, new_value| }
+      @example.send(:add_observer_block, target, "key_path", &block)
+      @example.send(:registered?, target, "key_path").should == true
+    end
+
+    it "should not add an observer block if the key path is not present" do
+      target = Object.new
+      block = lambda { |old_value, new_value| }
+      @example.send(:add_observer_block, target, nil, &block)
+      @example.send(:registered?, target, nil).should == false
+    end
+
+    it "should not add an observer block if the block is not present" do
+      target = Object.new
+      @example.send(:add_observer_block, target, "key_path")
+      @example.send(:registered?, target, "key_path").should == false
+    end
+
+    # remove
+
+    it "should remove an observer block" do
+      target = Object.new
+      block = lambda { |old_value, new_value| }
+      @example.send(:add_observer_block, target, "key_path", &block)
+      @example.send(:remove_observer_block, target, "key_path")
+      @example.send(:registered?, target, "key_path").should == false
+    end
+
+    it "should not remove an observer block if the target is not present" do
+      target = Object.new
+      block = lambda { |old_value, new_value| }
+      @example.send(:add_observer_block, target, "key_path", &block)
+      @example.send(:remove_observer_block, nil, "key_path")
+      @example.send(:registered?, target, "key_path").should == true
+    end
+  
+    it "should not remove an observer block if the key path is not present" do
+      target = Object.new
+      block = lambda { |old_value, new_value| }
+      @example.send(:add_observer_block, target, "key_path", &block)
+      @example.send(:remove_observer_block, target, nil)
+      @example.send(:registered?, target, "key_path").should == true
+    end
+  
+    it "should remove only one observer block" do
+      target = Object.new
+      block = lambda { |old_value, new_value| }
+      @example.send(:add_observer_block, target, "key_path1", &block)
+      @example.send(:add_observer_block, target, "key_path2", &block)
+      @example.send(:remove_observer_block, target, "key_path1")
+      @example.send(:registered?, target, "key_path1").should == false
+      @example.send(:registered?, target, "key_path2").should == true
+    end
+  
+    # remove all
+  
+    it "should remove all observer blocks" do
+      target = Object.new
+      block = lambda { |old_value, new_value| }
+      @example.send(:add_observer_block, target, "key_path1", &block)
+      @example.send(:add_observer_block, target, "key_path2", &block)
+      @example.send(:remove_all_observer_blocks)
+      @example.send(:registered?, target, "key_path1").should == false
+      @example.send(:registered?, target, "key_path2").should == false    
+    end
+    
+  end
+  
+  describe "API" do
+    before do
+      @example = KvoExample.new
+    end
+  
+    after do
+      @example.unobserve_all
+      @example = nil
+    end
+    
+    # observe
+
+    it "should observe a key path" do
+      observed = false
+      @example.observe_label do |old_value, new_value|
+        observed = true
+        old_value.should == "Foo"
+        new_value.should == "Bar"
+      end
+    
+      @example.label.text = "Bar"
+      observed.should == true
+    end
+  
+    it "should observe a key path with more than one block" do
+      observed_one = false
+      observed_two = false
+      observed_three = false
+      @example.observe_label do |old_value, new_value|
+        observed_one = true
+      end
+      @example.observe_label do |old_value, new_value|
+        observed_two = true
+      end
+      @example.observe_label do |old_value, new_value|
+        observed_three = true
+      end
+    
+      @example.label.text = "Bar"
+      observed_one.should == true
+      observed_two.should == true
+      observed_three.should == true
+    end
+    
+    # unobserve
+    
+    it "should unobserve a key path" do
+      observed = false
+      @example.observe_label do |old_value, new_value|
+        observed = true
+      end
+      @example.unobserve_label
+    
+      @example.label.text = "Bar"
+      observed.should == false
+    end
+  
+  end
+ 
+=begin
+  it "should be able to observe a collection" do
+    observed = false
+    @example.observe_collection do |old_value, new_value, indexes|
+      puts "#{collection} #{old_value} #{new_value} #{indexes}"
+      observed = true
+    end
+    
+    @example.items << "Dragonfruit"
+    observed.should == true  
+  end
+=end
+
+end

data/spec/core/ns_index_path_spec.rb

@@ -9,7 +9,6 @@ describe "NSIndexPathWrap" do
   end
 
   it "should support the each iterator" do
-    puts @index.inspect
     i = []
     @index.each do |idx|
       i << idx

data/spec/core/persistence_spec.rb

@@ -1,20 +1,42 @@
 describe BubbleWrap::Persistence do
 
   describe '.app_key' do
+    
+    it "caches the @app_key" do
+      BubbleWrap::Persistence.instance_variable_get(:@app_key).should.equal nil
+      BubbleWrap::Persistence.app_key
+      BubbleWrap::Persistence.instance_variable_get(:@app_key).should.not.equal nil
+    end
+
     it 'delegates to BubbleWrap::App.idenfitier' do
       BubbleWrap::Persistence.app_key.should == BubbleWrap::App.identifier
     end
+
   end
 
-  it 'can persist simple objects' do
-    lambda do
+
+  describe "storing objects" do
+    it 'can persist simple objects' do
+      lambda do
+        BubbleWrap::Persistence['arbitraryNumber'] = 42
+      end.
+        should.not.raise(Exception)
+    end 
+
+    it "must call synchronize" do
+      storage = NSUserDefaults.standardUserDefaults
+      def storage.synchronize; @sync_was_called = true; end
+
       BubbleWrap::Persistence['arbitraryNumber'] = 42
-    end.
-      should.not.raise(Exception)
+      storage.instance_variable_get(:@sync_was_called).should.equal true
+    end 
+
   end
 
-  it 'can retrieve persisted objects' do
-    BubbleWrap::Persistence['arbitraryNumber'].should == 42
+  describe "retrieving objects" do
+    it 'can retrieve persisted objects' do
+      BubbleWrap::Persistence['arbitraryNumber'].should == 42
+    end  
   end
 
 end

data/spec/core/time_spec.rb

@@ -1,5 +1,20 @@
 describe "Time" do
 
+    describe "Caching the date formatter" do
+    
+      it "should reuse the created formatter" do
+        #this is a bad test, relies on implementation.
+        #I'll rewrite it when the better idea comes on my mind.. 
+        100.times do
+          Time.iso8601("2011-04-11T13:22:21Z")
+        end
+        Thread.current[:date_formatters].count.should.equal 1
+        Thread.current[:date_formatters]["yyyy-MM-dd'T'HH:mm:ss'Z'"].should.not.equal nil
+      end
+
+  end
+
+
   describe "parsing an iso8601 formatted time to a Time object" do
     before do
       @time = Time.iso8601("2012-05-31T19:41:33Z")

data/spec/http_spec.rb

@@ -1,385 +1,539 @@
 describe "HTTP" do
 
-
-
-describe "HTTP::Response" do
   before do
-    @response = BubbleWrap::HTTP::Response.new({ status_code: 200, url: 'http://localhost' })
+    @localhost_url = 'http://localhost'
   end
 
-  it 'should turn the initialization Hash to instance variables' do
-    @response.instance_variable_get(:@status_code).should == 200
-    @response.instance_variable_get(:@url).should == 'http://localhost'
-  end
+  describe "Core HTTP method calls" do
 
+    def test_http_method(method)
+      called = false
+      delegator = Proc.new { |r, q| @the_response = r; @the_query = q; called = true }
+      query = BubbleWrap::HTTP.send(method, @localhost_url, { name: 'bubble-wrap', action: delegator })
+      query.should.not.equal nil
+      query.method.should.equal method.to_s.upcase
+      query.options[:name].should.equal 'bubble-wrap'
+      query.instance_variable_get(:@delegator).should.equal delegator
 
-  it "says OK status code 20x" do
-    @response.ok?.should.equal true
-    (200..206).each do |code|
-      BubbleWrap::HTTP::Response.new({status_code: code}).ok?.should.be.true
-    end
-    [100..101, 300..307, 400..417, 500..505].inject([]){|codes, rg| codes += rg.to_a}.each do |code|
-      BubbleWrap::HTTP::Response.new({status_code: code}).ok?.should.be.false
+      query.connectionDidFinishLoading(query.connection)
+      query.should.be.same_as @the_query
+      query.response.should.be.same_as @the_response
+      called.should.equal true
     end
-  end
 
-  
-  it "has appropriate attributes" do
-    @response.should.respond_to :body
-    @response.should.respond_to :headers
-    @response.should.respond_to :url
-    @response.should.respond_to :status_code=
-    @response.should.respond_to :error_message=
-  end
+    it ".get .post .put .delete .head .patch should properly generate the HTTP::Query" do
+      [:get, :post, :put, :delete, :head, :patch].each do |method|  
+        test_http_method method
+      end
+    end
 
-end
+    it "uses the block instead of action passed in " do
+      [:get, :post, :put, :delete, :head, :patch].each do |method|  
+        called = false
+        expected_delegator = Proc.new {|response| called = true }
 
-describe "HTTP::Query" do
+        query = BubbleWrap::HTTP.send(method, @localhost_url, { action: 'not_valid' }, &expected_delegator)
+        query.instance_variable_get(:@delegator).should.equal expected_delegator
+        query.connectionDidFinishLoading(query.connection)
+        called.should.equal true
+      end 
+    end
 
-  before do
-    @credentials = { credit_card: 23423948234 }
-    @payload = { 
-      user: { name: 'marin', surname: 'usalj' }, 
-      twitter: '@mneorr',
-      website: 'mneorr.com',
-      values: [1, 2, 3],
-      credentials: @credentials
-    }
-    @action = lambda{|fa, ke|}
-    @cache_policy = 24234
-    @leftover_option = 'trololo'
-    @headers = { 'User-Agent' => "Mozilla/5.0 (X11; Linux x86_64; rv:12.0) \n Gecko/20100101 Firefox/12.0" }
-    @options = {  action: @action, 
-      payload: @payload, 
-      credentials: @credentials, 
-      headers: @headers, 
-      cache_policy: @cache_policy,
-      leftover_option: @leftover_option
-    }
-    @query = BubbleWrap::HTTP::Query.new( 'http://localhost' , :get, @options )
-  end
+    [:get, :post, :put, :delete, :head, :patch].each do |verb|
+      it "has access to the proper response scope for #{verb} request" do
+        class WatchedObj; attr_accessor :test_value end
+        @watched_object = WatchedObj.new
+        @name = 'Matt'
+        query = BubbleWrap::HTTP.send(verb, @localhost_url) do |response|
+          @watched_object.test_value = @name
+        end
+        wait_for_change(@watched_object, 'test_value') do
+          @watched_object.test_value.should == 'Matt'
+        end
+      end
+    end
 
-  it "has appropriate attributes" do
-    @query.should.respond_to :request=
-    @query.should.respond_to :connection=
-    @query.should.respond_to :credentials=
-    @query.should.respond_to :proxy_credential=
-    @query.should.respond_to :post_data=
-
-    @query.should.respond_to :method
-    @query.should.respond_to :response
-    @query.should.respond_to :status_code
-    @query.should.respond_to :response_headers
-    @query.should.respond_to :response_size
-    @query.should.respond_to :options
   end
 
-  describe "When initialized" do
 
-    it "should upcase the HTTP method" do
-      @query.method.should.equal "GET"
+  describe "HTTP::Response" do
+    before do
+      @response = BubbleWrap::HTTP::Response.new({ status_code: 200, url: 'http://localhost' })
     end
 
-    it "should set the deleted delegator from options" do
-      @query.instance_variable_get(:@delegator).should.equal @action
-      @options.should.not.has_key? :action
+    it 'should turn the initialization Hash to instance variables' do
+      @response.instance_variable_get(:@status_code).should == 200
+      @response.instance_variable_get(:@url).should == 'http://localhost'
     end
 
-    it "should set self as the delegator if action not passed in" do
-      new_query = BubbleWrap::HTTP::Query.new( 'http://localhost', :get, {})
-      new_query.instance_variable_get(:@delegator).should.equal new_query
+    it "says OK status code 20x" do
+      @response.ok?.should.equal true
+      (200..209).each do |code|
+        BubbleWrap::HTTP::Response.new({status_code: code}).ok?.should.be.true
+      end
+      [100..101, 300..307, 400..417, 500..505].inject([]){|codes, rg| codes += rg.to_a}.each do |code|
+        BubbleWrap::HTTP::Response.new({status_code: code}).ok?.should.be.false
+      end
     end
 
-    it "should merge :username and :password in loaded credentials" do
-      @query.credentials.should.equal @credentials.merge({:username => '', :password => ''})
+    it "updates ivars when calling update" do
+      @response.update( { one: 'one', two: 'two' } )
+      @response.instance_variable_get(:@one).should.equal 'one'
+      @response.instance_variable_get(:@two).should.equal 'two'
 
-      new_credentials = {:username => 'user', :password => 'pass'}
-      options = { credentials: new_credentials }
-      new_query = BubbleWrap::HTTP::Query.new( 'http://localhost', :get,  options)
-      
-      new_query.credentials.should.equal new_credentials
-      options.should.be.empty
+      @response.update( { one: 'three', two: 'four' } )
+      @response.instance_variable_get(:@one).should.equal 'three'
+      @response.instance_variable_get(:@two).should.equal 'four'
     end
 
-    it "should set payload from options{} to @payload" do
-      payload = "user[name]=marin&user[surname]=usalj&twitter=@mneorr&website=mneorr.com&values=[1, 2, 3]&credentials[credit_card]=23423948234"
-      @query.instance_variable_get(:@payload).should.equal payload
-      @options.should.not.has_key? :payload
+    it "has appropriate attributes" do
+      @response.should.respond_to :body
+      @response.should.respond_to :headers
+      @response.should.respond_to :url
+      @response.should.respond_to :status_code=
+      @response.should.respond_to :error_message=
     end
 
-    it "should set default timeout to 30s or the one from hash" do
-      @query.instance_variable_get(:@timeout).should == 30
-
-      options = {timeout: 10}
-      new_query = BubbleWrap::HTTP::Query.new( 'http://localhost/', :get, options)
-      
-      new_query.instance_variable_get(:@timeout).should == 10
-      options.should.be.empty
-    end
+  end
 
-    it "should delete :headers from options and escape Line Feeds" do
-      gsubbed = @headers['User-Agent'].gsub("\n", '\\n')
-      @headers['User-Agent'] = gsubbed
-      @query.instance_variable_get(:@headers).should.equal @headers
-    end
+  describe "HTTP::Query" do
+
+    before do
+      @credentials = { username: 'mneorr', password: '123456xx!@crazy' }
+      @payload = { 
+        user: { name: 'marin', surname: 'usalj' }, 
+        twitter: '@mneorr',
+        website: 'mneorr.com',
+        values: ['apple', 'orange', 'peach'],
+        credentials: @credentials
+      }
+      @action = lambda{|fa, ke|}
+      @cache_policy = 24234
+      @leftover_option = 'trololo'
+      @headers = { 'User-Agent' => "Mozilla/5.0 (X11; Linux x86_64; rv:12.0) \n Gecko/20100101 Firefox/12.0" }
+      @options = {  action: @action, 
+        payload: @payload, 
+        credentials: @credentials, 
+        headers: @headers, 
+        cache_policy: @cache_policy,
+        leftover_option: @leftover_option
+      }
+      @query = BubbleWrap::HTTP::Query.new( @localhost_url , :get, @options )
+    end
+
+    it "has appropriate attributes" do
+      @query.should.respond_to :request=
+      @query.should.respond_to :connection=
+      @query.should.respond_to :credentials=
+      @query.should.respond_to :proxy_credential=
+      @query.should.respond_to :post_data=
+
+      @query.should.respond_to :method
+      @query.should.respond_to :response
+      @query.should.respond_to :status_code
+      @query.should.respond_to :response_headers
+      @query.should.respond_to :response_size
+      @query.should.respond_to :options
+    end
+
+    describe "When initialized" do
+
+      it "should upcase the HTTP method" do
+        @query.method.should.equal "GET"
+      end
+
+      it "should set the deleted delegator from options" do
+        @query.instance_variable_get(:@delegator).should.equal @action
+        @options.should.not.has_key? :action
+      end
+
+      it "should set self as the delegator if action was not passed in" do
+        new_query = BubbleWrap::HTTP::Query.new( 'http://localhost', :get, {})
+        new_query.instance_variable_get(:@delegator).should.equal new_query
+      end
+
+      it "should merge :username and :password in loaded credentials" do
+        @query.credentials.should.equal @credentials
+
+        options = { credentials: {} }
+        new_query = BubbleWrap::HTTP::Query.new( @localhost_url, :get,  options)
+
+        generated_credentials = {:username => '', :password => ''}
+        new_query.credentials.should.equal generated_credentials
+        options.should.be.empty
+      end
+
+      it "should set payload from options{} to @payload" do
+        payload = "user[name]=marin&user[surname]=usalj&twitter=@mneorr&website=mneorr.com&values[]=apple&values[]=orange&values[]=peach&credentials[username]=mneorr&credentials[password]=123456xx!@crazy"
+        @query.instance_variable_get(:@payload).should.equal payload
+        @options.should.not.has_key? :payload
+      end
+
+      it "should set default timeout to 30s or the one from hash" do
+        @query.instance_variable_get(:@timeout).should == 30
+
+        options = {timeout: 10}
+        new_query = BubbleWrap::HTTP::Query.new( @localhost_url, :get, options)
+
+        new_query.instance_variable_get(:@timeout).should == 10
+        options.should.be.empty
+      end
+
+      it "should delete :headers from options and escape Line Feeds" do
+        escaped_lf = {"User-Agent"=>"Mozilla/5.0 (X11; Linux x86_64; rv:12.0) \\n Gecko/20100101 Firefox/12.0"}
+        @query.instance_variable_get(:@headers).should.equal escaped_lf
+      end
+
+      it "should delete :cache_policy or set NSURLRequestUseProtocolCachePolicy" do
+        @query.instance_variable_get(:@cache_policy).should.equal @cache_policy
+        @options.should.not.has_key? :cache_policy
+
+        new_query = BubbleWrap::HTTP::Query.new( @localhost_url, :get, {})
+        new_query.instance_variable_get(:@cache_policy).should.equal NSURLRequestUseProtocolCachePolicy
+      end
+
+      it "should set the rest of options{} to ivar @options" do
+        @query.options.size.should.equal 1
+        @query.options.values[0].should.equal @leftover_option
+      end
+
+      it "should create a new response before instantiating a new request" do
+        @query.response.should.not.equal nil
+      end
+
+      it "should call initiate_request with the URL passed in" do
+        processed_url = "http://localhost?user%5Bname%5D=marin&user%5Bsurname%5D=usalj&twitter=@mneorr&website=mneorr.com&values%5B%5D=apple&values%5B%5D=orange&values%5B%5D=peach&credentials%5Busername%5D=mneorr&credentials%5Bpassword%5D=123456xx!@crazy"
+        @query.instance_variable_get(:@url).description.should.equal processed_url
+      end
+
+      it "should start the connection" do
+        @query.connection.was_started.should.equal true
+      end
+
+      it "should turn on the network indicator" do
+        UIApplication.sharedApplication.isNetworkActivityIndicatorVisible.should.equal true
+      end    
 
-    it "should delete :cache_policy or set NSURLRequestUseProtocolCachePolicy" do
-      @query.instance_variable_get(:@cachePolicy).should.equal @cache_policy
-      @options.should.not.has_key? :cache_policy
-      
-      new_query = BubbleWrap::HTTP::Query.new( 'http://fakehost.local/', :get, {})
-      new_query.instance_variable_get(:@cachePolicy).should.equal NSURLRequestUseProtocolCachePolicy
     end
 
-    it "should set the rest of options{} to ivar @options" do
-      @query.options.size.should.equal 1
-      @query.options.values[0].should.equal @leftover_option
-    end
+    describe "initiate request" do
 
-    it "should create a new response before instantiating a new request" do
-      @query.response.should.not.equal nil
-    end
+      before do
+        @url_string = 'http://initiated-request.dev/to convert'
+        @payload = { name: 'apple', model: 'macbook'}
+        @headers = { fake: 'headers' }
+        @get_query = BubbleWrap::HTTP::Query.new( @url_string , :get,  { headers: @headers, payload: @payload } )
+        @get_query.initiate_request @url_string
+      end
 
-    it "should call initiate_request with the URL passed in" do
-      processed_url = "http://localhost?user%5Bname%5D=marin&user%5Bsurname%5D=usalj&twitter=@mneorr&website=mneorr.com&values=%5B1,%202,%203%5D&credentials%5Bcredit_card%5D=23423948234"
-      @query.instance_variable_get(:@url).description.should.equal processed_url
-    end
+      it "should check if @payload is a hash before generating params" do
+        @get_query.instance_variable_get(:@payload).should.equal 'name=apple&model=macbook'
 
-    it "should start the connection" do
-      @query.connection.was_started.should.equal true
-    end
+        query_string_payload = BubbleWrap::HTTP::Query.new( 'nil' , :get,  { payload: "name=apple&model=macbook"} )
+        query_string_payload.instance_variable_get(:@payload).should.equal 'name=apple&model=macbook'
+      end
 
-    it "should turn on the network indicator" do
-      UIApplication.sharedApplication.isNetworkActivityIndicatorVisible.should.equal true
-    end    
+      it "should check if payload is nil" do
+        nil_payload = BubbleWrap::HTTP::Query.new( 'nil' , :post, {} )
+        lambda{ nil_payload.initiate_request('fake') }.should.not.raise NoMethodError        
+      end      
 
-  end
+      it "should set the payload in URL only for GET request" do
+        [:post, :put, :delete, :head, :patch].each do |method|
+          query = BubbleWrap::HTTP::Query.new( @localhost_url , method, { payload: @payload } )
+          query.instance_variable_get(:@url).description.should.equal @localhost_url
+        end  
+      end
 
-  describe "initiate request" do
+      it "sets the HTTPBody DATA to @request for all methods except GET" do
 
-    before do
-      @url_string = 'http://initiated-request.dev'
-      
-      @get_query = BubbleWrap::HTTP::Query.new( 'nil' , :get,  { payload: {name: 'apple', model: 'macbook'} } )
-      @get_query.initiate_request @url_string
-      
-      @post_query = BubbleWrap::HTTP::Query.new( 'nil' , :post,  { payload: {name: 'apple', model: 'macbook'}} )
-      @post_query.initiate_request @url_string
-    end
+        [:post, :put, :delete, :head, :patch].each do |method|
+          query = BubbleWrap::HTTP::Query.new( 'nil' , method, { payload: @payload } )
+          real_payload = NSString.alloc.initWithData(query.request.HTTPBody, encoding:NSUTF8StringEncoding)
 
-    it "should check if @payload is a hash before generating params" do
-      @get_query.instance_variable_get(:@payload).should.equal 'name=apple&model=macbook'
+          real_payload.should.equal 'name=apple&model=macbook'
+        end
 
-      query_string_payload = BubbleWrap::HTTP::Query.new( 'nil' , :get,  { payload: "name=apple&model=macbook"} )
-      query_string_payload.instance_variable_get(:@payload).should.equal 'name=apple&model=macbook'
-    end
+      end
 
-  end
+      it "should add UTF8 escaping on the URL string" do
+        @get_query.instance_variable_get(:@url).description.should.equal 'http://initiated-request.dev/to%20convert?name=apple&model=macbook'
+      end
 
-  describe "Generating GET params" do
-
-    it "should create params with nested hashes with prefix[key]=value" do
-      expected_params = [
-        'user[name]=marin', 
-        'user[surname]=usalj', 
-        'twitter=@mneorr',
-        'website=mneorr.com',
-        'values=[1, 2, 3]',
-        'credentials[credit_card]=23423948234'
-      ]
-      @query.generate_get_params(@payload).should.equal expected_params
-    end
+      it "should create a new request with HTTP method & header fields" do
+        @query.request.HTTPMethod.should.equal @query.method
+        @get_query.request.allHTTPHeaderFields.should.equal @headers
+      end
 
-  end
+      it "creates a new NSURLConnection and sets itself as a delegate" do
+        @query.connection.delegate.should.equal @query
+      end
 
-  describe "when didReceiveResponse:" do
+      it "should pass the new request in the new connection" do
+        @query.connection.request.URL.description.should.equal @query.request.URL.description
+      end
 
-    it "should assign status_code, headers and response_size" do
-      headers = { foo: 'bar' }
-      status_code = 234
-      length = 123.53
+      it "should patch the NSURLRequest with done_loading and done_loading!" do
+        @query.request.done_loading.should.equal @query.request.instance_variable_get(:@done_loading)
+        
+        @query.request.instance_variable_set(:@done_loading, false)
+        @query.request.done_loading.should.equal false
+        @query.request.done_loading!
+        @query.request.done_loading.should.equal true
+      end
 
-      response = FakeURLResponse.new(status_code, headers, length)
-      @query.connection(nil, didReceiveResponse:response)
+      it "should pass the right arguments when creating new request" do
+        @query.request.cachePolicy.should.equal @query.instance_variable_get(:@cache_policy)
+        @query.request.timeoutInterval.should.equal @query.instance_variable_get(:@timeout)
+      end
 
-      @query.status_code.should.equal status_code
-      @query.response_headers.should.equal headers
-      @query.response_size.should.equal length
     end
 
-  end
+    describe "Generating GET params" do
 
-  describe "when didRecieveData:" do
+      it "should create params with nested hashes with prefix[key]=value" do
+        expected_params = [
+          'user[name]=marin', 
+          'user[surname]=usalj', 
+          'twitter=@mneorr',
+          'website=mneorr.com',
+          'values[]=apple',
+          'values[]=orange',
+          'values[]=peach',
+          "credentials[username]=mneorr", 
+          "credentials[password]=123456xx!@crazy"
+        ]
+        @query.generate_params(@payload).should.equal expected_params
+      end
 
-    def query_received_data
-      @query.instance_variable_get(:@received_data)
     end
 
-    it "should initialize @received_data and append the received data" do
-      query_received_data.should.equal nil
-      data = NSData.dataWithBytesNoCopy(Pointer.new(:char, 'abc'), length:24)
+    describe "when didReceiveResponse:" do
 
-      @query.connection(nil, didReceiveData:nil)
-      query_received_data.should.not.equal nil
+      it "should assign status_code, headers and response_size" do
+        headers = { foo: 'bar' }
+        status_code = 234
+        length = 123.53
 
-      @query.connection(nil, didReceiveData:data)
-      query_received_data.length.should.equal 24
+        response = FakeURLResponse.new(status_code, headers, length)
+        @query.connection(nil, didReceiveResponse:response)
 
-      @query.connection(nil, didReceiveData:data)
-      query_received_data.length.should.equal 48
-    end  
+        @query.status_code.should.equal status_code
+        @query.response_headers.should.equal headers
+        @query.response_size.should.equal length
+      end
 
-  end
+    end
 
+    describe "when didRecieveData:" do
 
+      def query_received_data
+        @query.instance_variable_get(:@received_data)
+      end
 
-  describe "when requestDidFailWithError:" do
-    before do
-      @fake_error = NSError.errorWithDomain('testing', code:7768, userInfo:nil)
-    end
+      it "should initialize @received_data and append the received data" do
+        query_received_data.should.equal nil
+        data = NSData.dataWithBytesNoCopy(Pointer.new(:char, 'abc'), length:24)
 
-    it "should turn off network indicator" do
-      UIApplication.sharedApplication.isNetworkActivityIndicatorVisible.should == true
+        @query.connection(nil, didReceiveData:nil)
+        query_received_data.should.not.equal nil
 
-      @query.connection(nil, didFailWithError:@fake_error)
-      UIApplication.sharedApplication.isNetworkActivityIndicatorVisible.should == false    
-    end
+        @query.connection(nil, didReceiveData:data)
+        query_received_data.length.should.equal 24
 
-    it "should set request_done to true" do
-      @query.request.done_loading.should == false
+        @query.connection(nil, didReceiveData:data)
+        query_received_data.length.should.equal 48
+      end  
 
-      @query.connection(nil, didFailWithError:@fake_error)
-      @query.request.done_loading.should == true
     end
 
-    it "should set the error message to response object" do
-      @query.response.error_message.should.equal nil
 
-      @query.connection(nil, didFailWithError:@fake_error)
-      @query.response.error_message.should.equal @fake_error.localizedDescription
-    end
 
-    it "should check if there's a callback block and pass the response in" do
-      expected_response = BubbleWrap::HTTP::Response.new
-      real_response = nil
-      block = lambda{ |response, query| real_response = response }
+    describe "when requestDidFailWithError:" do
+      before do
+        @fake_error = NSError.errorWithDomain('testing', code:7768, userInfo:nil)
+      end
 
-      query = BubbleWrap::HTTP::Query.new( 'http://localhost', :get, { :action => block })
-      query.instance_variable_set(:@response, expected_response)
+      it "should turn off network indicator" do
+        UIApplication.sharedApplication.isNetworkActivityIndicatorVisible.should == true
+        @query.connection(nil, didFailWithError:@fake_error)
+        UIApplication.sharedApplication.isNetworkActivityIndicatorVisible.should == false    
+      end
 
-      query.connection(nil, didFailWithError:@fake_error)
-      real_response.should.equal expected_response
-    end
+      it "should set request_done to true" do
+        @query.request.done_loading.should == false
+        @query.connection(nil, didFailWithError:@fake_error)
+        @query.request.done_loading.should == true
+      end
 
-  end
+      it "should set the error message to response object" do
+        @query.response.error_message.should.equal nil
+        @query.connection(nil, didFailWithError:@fake_error)
+        @query.response.error_message.should.equal @fake_error.localizedDescription
+      end
 
-  describe "when connectionDidFinishLoading:" do
+      it "should check if there's a callback block and pass the response in" do
+        expected_response = BubbleWrap::HTTP::Response.new
+        real_response = nil
+        block = lambda{ |response, query| real_response = response }
 
-    it "should turn off the network indicator" do
-      UIApplication.sharedApplication.isNetworkActivityIndicatorVisible.should == true
+        query = BubbleWrap::HTTP::Query.new(@localhost_url, :get, { :action => block })
+        query.instance_variable_set(:@response, expected_response)
+
+        query.connection(nil, didFailWithError:@fake_error)
+        real_response.should.equal expected_response
+      end
 
-      @query.connectionDidFinishLoading(nil)
-      UIApplication.sharedApplication.isNetworkActivityIndicatorVisible.should == false
     end
 
-    it "should set request_done to true" do
-      @query.request.done_loading.should == false
+    describe "when connectionDidFinishLoading:" do
 
-      @query.connectionDidFinishLoading(nil)
-      @query.request.done_loading.should == true
-    end
+      it "should turn off the network indicator" do
+        UIApplication.sharedApplication.isNetworkActivityIndicatorVisible.should == true
 
-    it "should set response_body to @received data if not nil" do
-      data = NSData.dataWithBytesNoCopy(Pointer.new(:char, 'abc'), length:24)
-      headers = { foo: 'bar' }
-      status_code = 234
-      response = FakeURLResponse.new(status_code, headers, 65456)
+        @query.connectionDidFinishLoading(nil)
+        UIApplication.sharedApplication.isNetworkActivityIndicatorVisible.should == false
+      end
 
-      @query.connection(nil, didReceiveResponse:response)
-      @query.connection(nil, didReceiveData:data)
-      @query.connectionDidFinishLoading(nil)
+      it "should set request_done to true" do
+        @query.request.done_loading.should == false
 
-      @query.response.body.should.equal data
-      @query.response.status_code.should.equal status_code
-      @query.response.headers.should.equal headers
-      @query.response.url.should.equal @query.instance_variable_get(:@url)
-    end
+        @query.connectionDidFinishLoading(nil)
+        @query.request.done_loading.should == true
+      end
 
-    it "should check if there's a callback block and pass the response in" do
-      expected_response = BubbleWrap::HTTP::Response.new
-      real_response = nil
-      block = lambda{ |response, query| real_response = response }
+      it "should set response_body to @received data if not nil" do
+        data = NSData.dataWithBytesNoCopy(Pointer.new(:char, 'abc'), length:24)
+        headers = { foo: 'bar' }
+        status_code = 234
+        response = FakeURLResponse.new(status_code, headers, 65456)
 
-      query = BubbleWrap::HTTP::Query.new( 'http://localhost', :get, { :action => block })
-      query.instance_variable_set(:@response, expected_response)
+        @query.connection(nil, didReceiveResponse:response)
+        @query.connection(nil, didReceiveData:data)
+        @query.connectionDidFinishLoading(nil)
 
-      query.connectionDidFinishLoading(nil)
-      real_response.should.equal expected_response
-    end
+        @query.response.body.should.equal data
+        @query.response.status_code.should.equal status_code
+        @query.response.headers.should.equal headers
+        @query.response.url.should.equal @query.instance_variable_get(:@url)
+      end
 
-  end
+      it "should check if there's a callback block and pass the response in" do
+        expected_response = BubbleWrap::HTTP::Response.new
+        real_response = nil
+        block = lambda{ |response, query| real_response = response }
+        query = BubbleWrap::HTTP::Query.new(@localhost_url, :get, { :action => block })
+        query.instance_variable_set(:@response, expected_response)
+
+        query.connectionDidFinishLoading(nil)
+        real_response.should.equal expected_response
+      end
 
-  describe "when connection:willSendRequest:redirectResponse:" do
-    before do
-      @request = NSURLRequest.requestWithURL NSURL.URLWithString('http://fakehost.local/')
     end
 
-    it "should make a mutableCopy of passed in request and set headers from @headers" do
-      expected_headers = { new_header: 'should_be_here' }
-      @query.instance_variable_set(:@headers, expected_headers)
+    describe "when connection:willSendRequest:redirectResponse:" do
+      before do
+        @request = NSURLRequest.requestWithURL NSURL.URLWithString('http://fakehost.local/')
+      end
 
-      new_request = @query.connection(nil, willSendRequest:@request, redirectResponse:nil)
+      it "should make a mutableCopy of passed in request and set headers from @headers" do
+        expected_headers = { new_header: 'should_be_here' }
+        @query.instance_variable_set(:@headers, expected_headers)
 
-      @query.request.should.not.be.equal @request
-      new_request.URL.description.should.equal @request.URL.description
-      new_request.allHTTPHeaderFields.should.equal expected_headers
-    end
+        new_request = @query.connection(nil, willSendRequest:@request, redirectResponse:nil)
 
-    it "should create a new Connection with the request passed in" do
-      old_connection = @query.connection
-      @query.connection(nil, willSendRequest:@request, redirectResponse:nil)
+        @query.request.should.not.be.equal @request
+        new_request.URL.description.should.equal @request.URL.description
+        new_request.allHTTPHeaderFields.should.equal expected_headers
+      end
 
-      old_connection.should.not.equal @query.connection
-    end
+      it "should create a new Connection with the request passed in" do
+        old_connection = @query.connection
+        @query.connection(nil, willSendRequest:@request, redirectResponse:nil)
+        old_connection.should.not.equal @query.connection
+      end
 
-    it "should set itself as a delegate of new NSURLConnection" do
-      @query.connection(nil, willSendRequest:@request, redirectResponse:nil)
-      @query.connection.delegate.should.equal @query
+      it "should set itself as a delegate of new NSURLConnection" do
+        @query.connection(nil, willSendRequest:@request, redirectResponse:nil)
+        @query.connection.delegate.should.equal @query
+      end
+
+      it "should pass the new request in the new connection" do
+        @query.connection(nil, willSendRequest:@request, redirectResponse:nil)
+        @query.connection.request.URL.description.should.equal @request.URL.description
+      end
     end
 
-    it "should pass the new request in the new connection" do
-      @query.connection(nil, willSendRequest:@request, redirectResponse:nil)
-      @query.connection.request.URL.description.should.equal @request.URL.description
+    describe "didReceiveAuthenticationChallenge" do
+      before do
+        @challenge = FakeChallenge.new
+        @challenge.previousFailureCount = 0
+        @query.connection(nil, didReceiveAuthenticationChallenge:@challenge)
+      end
+
+      it "should cancel the authentication if the failure count was not 0" do
+        @challenge.previousFailureCount = 1
+        @query.connection(nil, didReceiveAuthenticationChallenge:@challenge)
+        @challenge.sender.was_cancelled.should.equal true
+      end
+
+      it "should pass in Credentials and the challenge itself to the sender" do
+        @challenge.sender.challenge.should.equal @challenge
+        @challenge.sender.credential.user.should.equal @credentials[:username]
+        @challenge.sender.credential.password.should.equal @credentials[:password]
+      end
+
+      it "always uses NSURLCredentialPersistenceForSession" do
+        @challenge.sender.credential.persistence.should.equal NSURLCredentialPersistenceForSession
+      end
+
     end
 
-  end
+    class FakeSender
+      attr_reader :challenge, :credential, :was_cancelled
+      def cancelAuthenticationChallenge(challenge)
+        @was_cancelled = true
+      end
+      def useCredential(credential, forAuthenticationChallenge:challenge)
+        @challenge = challenge
+        @credential = credential
+      end
+    end
 
-  class BubbleWrap::HTTP::Query
-    def create_connection(request, delegate); FakeURLConnection.new(request, delegate); end      
-  end
+    class FakeChallenge
+      attr_accessor :previousFailureCount
+
+      def sender
+        @fake_sender ||= FakeSender.new
+      end
+    end
 
-  class FakeURLConnection < NSURLConnection
-    attr_reader :delegate, :request, :was_started
-    def initialize(request, delegate)
-      @request = request
-      @delegate = delegate
-      self.class.connectionWithRequest(request, delegate:delegate)
+    class BubbleWrap::HTTP::Query
+      def create_connection(request, delegate); FakeURLConnection.new(request, delegate); end      
     end
-    def start
-      @was_started = true
-      super
+
+    class FakeURLConnection < NSURLConnection
+      attr_reader :delegate, :request, :was_started
+      def initialize(request, delegate)
+        @request = request
+        @delegate = delegate
+        self.class.connectionWithRequest(request, delegate:delegate)
+      end
+      def start
+        @was_started = true
+        super
+      end
     end
-  end
 
-  class FakeURLResponse
-    attr_reader :statusCode, :allHeaderFields, :expectedContentLength
-    def initialize(status_code, headers, length)
-      @statusCode = status_code
-      @allHeaderFields = headers
-      @expectedContentLength = length
+    class FakeURLResponse
+      attr_reader :statusCode, :allHeaderFields, :expectedContentLength
+      def initialize(status_code, headers, length)
+        @statusCode = status_code
+        @allHeaderFields = headers
+        @expectedContentLength = length
+      end
     end
+
   end
 
 end
-
-end