rest-core 3.2.0 → 3.3.0

data/test/test_default_query.rb

@@ -9,11 +9,11 @@ describe RC::DefaultQuery do
   env = {RC::REQUEST_QUERY => {}}
 
   describe 'when given query' do
-    should 'do nothing' do
+    would 'do nothing' do
       @app.call(env){ |r| r[RC::REQUEST_QUERY].should.eq({}) }
     end
 
-    should 'merge query' do
+    would 'merge query' do
       @app.instance_eval{@query = {'q' => 'uery'}}
 
       @app.call(env){ |r| r.should.eq({RC::REQUEST_QUERY => {'q' => 'uery'}}) }
@@ -25,16 +25,24 @@ describe RC::DefaultQuery do
         r.should.eq({RC::REQUEST_QUERY => {'q' => 'uery'}.merge(format)}) }
     end
 
-    should 'string_keys in query' do
+    would 'string_keys in query' do
       e = {'query' => {:symbol => 'value'}}
       @app.call(env.merge(e)){ |r|
         r.should.eq({RC::REQUEST_QUERY => {'symbol' => 'value'}}.merge(e))
       }
     end
+
+    would 'also merge the very default query' do
+      @app.query = {'a' => 'b'}
+      @app.call('query' => {'b' => 'c'},
+               RC::REQUEST_QUERY => {'c' => 'd'}) do |r|
+        r[RC::REQUEST_QUERY].should.eq 'a' => 'b', 'b' => 'c', 'c' => 'd'
+      end
+    end
   end
 
   describe 'when not given query' do
-    should 'merge query with {}' do
+    would 'merge query with {}' do
       @app.call(env){ |r| r.should.eq(RC::REQUEST_QUERY => {}) }
     end
   end

data/test/test_error_detector.rb

@@ -2,7 +2,7 @@
 require 'rest-core/test'
 
 describe RC::ErrorDetector do
-  should 'lighten' do
+  would 'lighten' do
     client = RC::Builder.client do
       use RC::ErrorDetector
       run RC::Dry

data/test/test_error_detector_http.rb

@@ -2,7 +2,7 @@
 require 'rest-core/test'
 
 describe RC::ErrorDetectorHttp do
-  should 'lighten' do
+  would 'lighten' do
     client = RC::Builder.client do
       use RC::ErrorDetectorHttp
       run RC::Dry

data/test/test_error_handler.rb

@@ -10,13 +10,13 @@ describe RC::ErrorHandler do
   exp = Class.new(Exception)
 
   describe 'there is an exception' do
-    should 'raise an error with future' do
+    would 'raise an error with future' do
       lambda{
       client.new.get('/', {}, RC::FAIL => [exp.new('fail')])
       }.should.raise(exp)
     end
 
-    should 'give an error with callback' do
+    would 'give an error with callback' do
       client.new.get('/', {}, RC::FAIL => [exp.new('fail')]){ |res|
         res.should.kind_of?(exp)
       }
@@ -24,20 +24,20 @@ describe RC::ErrorHandler do
   end
 
   describe 'error_handler gives an exception' do
-    should 'raise an error with future' do
+    would 'raise an error with future' do
       lambda{
       client.new(:error_handler => lambda{ |res| exp.new }).
         get('/', {}, RC::FAIL => [true])
       }.should.raise(exp)
     end
 
-    should 'give an error with callback' do
+    would 'give an error with callback' do
       client.new(:error_handler => lambda{ |res| exp.new }).
         get('/', {}, RC::FAIL => [true]){ |res| res.should.kind_of?(exp) }
     end
   end
 
-  should 'no exception but errors' do
+  would 'no exception but errors' do
     client.new(:error_handler => lambda{ |res| 1 }).
       request(RC::FAIL => [0], RC::RESPONSE_KEY => RC::FAIL).should.eq [0, 1]
   end

data/test/test_event_source.rb

@@ -35,24 +35,24 @@ SSE
     [client.event_source(path, :a => 'b'), m, t]
   end
 
-  should 'work regularly' do
+  would 'work regularly' do
     es, m, t = server.call
     flag = 0
 
     es.onopen do |sock|
-      sock.should.kind_of IO
+      sock.should.kind_of? IO
       flag.should.eq 0
       flag += 1
     end.
     onmessage do |event, data, sock|
       {'event' => event, 'data' => data}.should.eq m.shift
-      sock.should.kind_of IO
+      sock.should.kind_of? IO
       sock.should.not.closed?
       flag += 1
     end.
     onerror do |error, sock|
-      error.should.kind_of EOFError
-      m.should.empty
+      error.should.kind_of? EOFError
+      m.should.empty?
       sock.should.closed?
       flag.should.eq 3
       flag += 1
@@ -62,7 +62,7 @@ SSE
     t.join
   end
 
-  should 'close' do
+  would 'close' do
     es, _, t = server.call(false)
     flag = 0
     es.onmessage do
@@ -74,7 +74,7 @@ SSE
     t.join
   end
 
-  should 'reconnect' do
+  would 'reconnect' do
     stub_request(:get, 'https://a?b=c').to_return(:body => <<-SSE)
 event: put
 data: 0
@@ -95,19 +95,19 @@ SSE
       data.should.eq m.shift
 
     end.onerror do |error|
-      error.should.kind_of EOFError
+      error.should.kind_of? EOFError
       es.query = {:c => 'd'}
 
     end.onreconnect do |error, sock|
-      error.should.kind_of EOFError
-      sock.should.respond_to :read
+      error.should.kind_of? EOFError
+      sock.should.respond_to? :read
       !m.empty? # not empty to reconnect
 
     end.start.wait
-    m.should.empty
+    m.should.empty?
   end
 
-  should 'not cache' do
+  would 'not cache' do
     stub_request(:get, 'https://a?b=c').to_return(:body => <<-SSE)
 event: put
 data: 0
@@ -121,14 +121,14 @@ SSE
       data.should.eq m.shift
 
     end.onerror do |error|
-      error.should.kind_of EOFError
+      error.should.kind_of? EOFError
 
     end.onreconnect do |error, sock|
-      error.should.kind_of EOFError
-      sock.should.respond_to :read
+      error.should.kind_of? EOFError
+      sock.should.respond_to? :read
       !m.empty? # not empty to reconnect
 
     end.start.wait
-    m.should.empty
+    m.should.empty?
   end
 end

data/test/test_follow_redirect.rb

@@ -16,30 +16,30 @@ describe RC::FollowRedirect do
   end
 
   [301, 302, 303, 307].each do |status|
-    should "not follow redirect if reached max_redirects: #{status}" do
+    would "not follow redirect if reached max_redirects: #{status}" do
       dry.status = status
       app.call(RC::REQUEST_METHOD => :get, 'max_redirects' => 0) do |res|
         res[RC::RESPONSE_HEADERS]['LOCATION'].should.eq 'location'
       end
     end
 
-    should "follow once: #{status}" do
+    would "follow once: #{status}" do
       dry.status = status
       app.call(RC::REQUEST_METHOD => :get) do |res|
         res[RC::RESPONSE_HEADERS]['LOCATION'].should.eq 'location'
       end
     end
 
-    should "not carry query string: #{status}" do
+    would "not carry query string: #{status}" do
       dry.status = status
       app.call(RC::REQUEST_METHOD => :get,
                RC::REQUEST_QUERY => {:a => 'a'}) do |res|
         res[RC::REQUEST_PATH] .should.eq 'location'
-        res[RC::REQUEST_QUERY].should.empty
+        res[RC::REQUEST_QUERY].should.empty?
       end
     end
 
-    should "carry payload for #{status}" do
+    would "carry payload for #{status}" do
       dry.status = status
       app.call(RC::REQUEST_METHOD => :put,
                RC::REQUEST_PAYLOAD => {:a => 'a'}) do |res|
@@ -49,7 +49,7 @@ describe RC::FollowRedirect do
   end
 
   [200, 201, 404, 500].each do |status|
-    should "not follow redirect if it's not a redirect status: #{status}" do
+    would "not follow redirect if it's not a redirect status: #{status}" do
       dry.status = status
       app.call(RC::REQUEST_METHOD => :get, 'max_redirects' => 9) do |res|
         res[RC::RESPONSE_HEADERS]['LOCATION'].should.eq 'location'

data/test/test_future.rb

@@ -3,14 +3,14 @@ require 'stringio'
 require 'rest-core/test'
 
 describe RC::Promise::Future do
-  should 'fulfill the future' do
+  would 'fulfill the future' do
     promise = RC::Promise.new(RC::FAIL => [])
     promise.fulfill('body', 200, {'A' => 'B'}, StringIO.new)
 
     promise.future_body    .should.eq 'body'
     promise.future_status  .should.eq 200
     promise.future_headers .should.eq('A' => 'B')
-    promise.future_socket  .should.kind_of(StringIO)
+    promise.future_socket  .should.kind_of?(StringIO)
     promise.future_failures.should.eq []
   end
 end

data/test/test_json_request.rb

@@ -10,7 +10,7 @@ describe RC::JsonRequest do
     'nested' => {'k' => 'v', 'a' => [4, 5, 6]}
   }
 
-  should 'encode payload as json' do
+  would 'encode payload as json' do
     e = env.merge(RC::REQUEST_METHOD  => :post,
                   RC::REQUEST_PAYLOAD => request_params)
 
@@ -21,8 +21,13 @@ describe RC::JsonRequest do
         RC::REQUEST_PAYLOAD => RC::Json.encode(request_params))}
   end
 
-  should 'do nothing if json_request is false' do
-    app = RC::JsonRequest.new(RC::Dry.new, false)
-    app.call(env){ |res| res.should.eq res }
+  would 'do nothing if payload is empty' do
+    e = env.merge(RC::REQUEST_PAYLOAD => {})
+    app.call(e){ |res| res.should.eq e }
+  end
+
+  would 'do nothing if json_request is false' do
+    a = RC::JsonRequest.new(RC::Dry.new, false)
+    a.call(env){ |res| res.should.eq env }
   end
 end

data/test/test_json_response.rb

@@ -6,13 +6,13 @@ describe RC::JsonResponse do
     app = RC::JsonResponse.new(RC::Dry.new, true)
     bad = 'bad json'
 
-    should 'do nothing' do
+    would 'do nothing' do
       expected = {RC::RESPONSE_BODY => nil,
                   RC::REQUEST_HEADERS => {'Accept' => 'application/json'}}
       app.call({}){ |response| response.should.eq(expected) }
     end
 
-    should 'decode' do
+    would 'decode' do
       expected = {RC::RESPONSE_BODY => {},
                   RC::REQUEST_HEADERS => {'Accept' => 'application/json'}}
       app.call(RC::RESPONSE_BODY => '{}') do |response|
@@ -20,18 +20,18 @@ describe RC::JsonResponse do
       end
     end
 
-    should 'give proper parse error' do
+    would 'give proper parse error' do
       app.call(RC::RESPONSE_BODY => bad) do |response|
         err = response[RC::FAIL].first
-        err.should.kind_of(RC::Json.const_get(:ParseError))
-        err.should.kind_of(RC::JsonResponse::ParseError)
+        err.should.kind_of?(RC::Json.const_get(:ParseError))
+        err.should.kind_of?(RC::JsonResponse::ParseError)
       end
     end
 
-    should 'give me original text' do
+    would 'give me original text' do
       app.call(RC::RESPONSE_BODY => bad) do |response|
         err = response[RC::FAIL].first
-        err.message    .should.include(bad)
+        err.message    .should.include?(bad)
         err.body       .should.eq(bad)
         err.cause.class.should.eq(RC::Json.const_get(:ParseError))
       end
@@ -48,14 +48,14 @@ describe RC::JsonResponse do
       }
     end
 
-    should 'do nothing' do
+    would 'do nothing' do
       expected = '{}'
       client.new(:json_response => false).get(''){ |response|
         response.should.eq(expected)
       }.get('').should.eq(expected)
     end
 
-    should 'decode' do
+    would 'decode' do
       expected = {}
       client.new.get(''){ |response|
         response.should.eq(expected)

data/test/test_oauth1_header.rb

@@ -24,7 +24,7 @@ describe RC::Oauth1Header do
     'GDdmIQH6jhtmLUypg82g',
     'MCD8BKwGdgPHvAuvgvz4EQpqDAtx89grbuNMRd7Eh98')
 
-  should 'have correct signature' do
+  would 'have correct signature' do
     auth.signature(env, oauth_params).should.eq(
       '8wUi7m5HFQy76nowoCThusfgB+Q=')
   end
@@ -43,36 +43,36 @@ describe RC::Oauth1Header do
       auth.base_string(e, oauth_params).should.eq b
     end
 
-    should 'have correct base_string' do
+    would 'have correct base_string' do
       check[env, base_string]
     end
 
-    should 'not use payload in multipart request for base_string' do
+    would 'not use payload in multipart request for base_string' do
       File.open(__FILE__) do |f|
         check[env.merge(RC::REQUEST_PAYLOAD => {'file' => f}), base_string]
       end
     end
 
-    should 'not use payload if it contains binary' do
+    would 'not use payload if it contains binary' do
       File.open(__FILE__) do |f|
         check[env.merge(RC::REQUEST_PAYLOAD => f), base_string]
       end
     end
 
-    should 'not use payload if it contains [binary]' do
+    would 'not use payload if it contains [binary]' do
       File.open(__FILE__) do |f|
         check[env.merge(RC::REQUEST_PAYLOAD => [f]), base_string]
       end
     end
 
-    should 'not use payload if Content-Type is not x-www-form-urlencoded' do
+    would 'not use payload if Content-Type is not x-www-form-urlencoded' do
       check[
         env.merge(RC::REQUEST_PAYLOAD => {'pay' => 'load'},
                   RC::REQUEST_HEADERS => {'Content-Type' => 'text/plain'}),
         base_string]
     end
 
-    should 'use payload if Content-Type is x-www-form-urlencoded' do
+    would 'use payload if Content-Type is x-www-form-urlencoded' do
       check[env.merge(
               RC::REQUEST_PAYLOAD => {'pay' => 'load'},
               RC::REQUEST_HEADERS =>
@@ -80,12 +80,12 @@ describe RC::Oauth1Header do
             base_string + '%26pay%3Dload']
     end
 
-    should 'use payload if there is no binary data' do
+    would 'use payload if there is no binary data' do
       check[env.merge(RC::REQUEST_PAYLOAD => {'pay' => 'load'}),
             base_string + '%26pay%3Dload']
     end
 
-    should 'not escape ~' do
+    would 'not escape ~' do
       check[env.merge(RC::REQUEST_PAYLOAD => {'tilde' => '~'}),
             base_string + '%26tilde%3D~']
     end

data/test/test_oauth2_header.rb

@@ -5,18 +5,18 @@ describe RC::Oauth2Header do
   env  = {RC::REQUEST_HEADERS => {}}
   auth = RC::Oauth2Header.new(RC::Dry.new)
 
-  should 'do nothing if no access token' do
+  would 'do nothing if no access token' do
     auth.call(env){ |res| res.should.eq(env) }
   end
 
-  should 'Bearer token' do
+  would 'Bearer token' do
     auth.call(env.merge('access_token_type' => 'Bearer',
                         'access_token'      => 'token')){ |res|
       res[RC::REQUEST_HEADERS].should.eq 'Authorization' => 'Bearer token'
     }
   end
 
-  should 'MAC token' do # http://tools.ietf.org/html/rfc6749#section-7.1
+  would 'MAC token' do # http://tools.ietf.org/html/rfc6749#section-7.1
     auth.call(env.merge('access_token_type' => 'MAC',
                         'access_token'      =>
                           {'id'  => 'h480djs93hd8',

data/test/test_parse_link.rb

@@ -3,7 +3,7 @@ require 'rest-core/test'
 
 describe RC::ParseLink do
   describe 'http://tools.ietf.org/html/rfc5988' do
-    should '5.5 a' do
+    would '5.5 a' do
       link = '<http://example.com/TheBook/chapter2>; rel="previous"; title="previous chapter"'
       RC::ParseLink.parse_link(link).should.eq(
         'previous' => {'uri' => 'http://example.com/TheBook/chapter2',
@@ -11,14 +11,14 @@ describe RC::ParseLink do
                        'title' => 'previous chapter'})
     end
 
-    should '5.5 b' do
+    would '5.5 b' do
       link = '</>; rel="http://example.net/foo"'
       RC::ParseLink.parse_link(link).should.eq(
         'http://example.net/foo' => {'uri' => '/',
                                      'rel' => 'http://example.net/foo'})
     end
 
-    should '5.5 c (we did not implement * and unescape for now)' do
+    would '5.5 c (we did not implement * and unescape for now)' do
       link = <<-LINK
 </TheBook/chapter2>; rel="previous"; title*=UTF-8'de'letztes%20Kapitel, </TheBook/chapter4>; rel="next"; title*=UTF-8'de'n%c3%a4chstes%20Kapitel
       LINK
@@ -31,7 +31,7 @@ describe RC::ParseLink do
                        'title*' => "UTF-8'de'n%c3%a4chstes%20Kapitel"})
     end
 
-    should '5.5 d' do
+    would '5.5 d' do
       link = '<http://example.org/>; rel="start http://example.net/relation/other"'
 
       RC::ParseLink.parse_link(link).should.eq(