rest-core 3.2.0 → 3.3.0

data/task/gemgem.rb

@@ -34,7 +34,7 @@ module Gemgem
       s.executables = bin_files
     end
     spec_create.call(spec)
-    spec.homepage = "https://github.com/godfat/#{spec.name}"
+    spec.homepage ||= "https://github.com/godfat/#{spec.name}"
     self.spec = spec
   end
 
@@ -227,10 +227,6 @@ end # of gem namespace
 desc 'Run tests'
 task :test do
   next if Gemgem.test_files.empty?
-
-  require 'bacon'
-  Bacon.extend(Bacon::TestUnitOutput)
-  Bacon.summary_on_exit
   Gemgem.test_files.each{ |file| require "#{Gemgem.dir}/#{file[0..-4]}" }
 end
 

data/test/test_auth_basic.rb

@@ -8,11 +8,11 @@ describe RC::AuthBasic do
 
   env = {RC::REQUEST_HEADERS => {}}
 
-  should 'do nothing' do
+  would 'do nothing' do
     @auth.call({}){ |res| res.should.eq({}) }
   end
 
-  should 'send Authorization header' do
+  would 'send Authorization header' do
     @auth.instance_eval{@username = 'Aladdin'}
     @auth.instance_eval{@password = 'open sesame'}
 
@@ -30,12 +30,12 @@ describe RC::AuthBasic do
     }
   end
 
-  should 'leave a log if username are not both provided' do
+  would 'leave a log if username are not both provided' do
     @auth.instance_eval{@username = 'Aladdin'}
     @auth.call(env){ |res| res[RC::LOG].size.should.eq 1 }
   end
 
-  should 'leave a log if password are not both provided' do
+  would 'leave a log if password are not both provided' do
     @auth.instance_eval{@password = 'open sesame'}
     @auth.call(env){ |res| res[RC::LOG].size.should.eq 1 }
   end

data/test/test_builder.rb

@@ -2,17 +2,33 @@
 require 'rest-core/test'
 
 describe RC::Builder do
-  should 'default app is a kind of RestCore::Dry' do
-    RC::Builder.client.new.app.should.kind_of RC::Engine
+  would 'default client app is a kind of RestCore::Engine' do
+    RC::Builder.client.new.app.should.kind_of? RC::Engine
   end
 
-  should 'switch default_engine to RestCore::Dry' do
+  would 'default        app is a kind of RestCore::Engine' do
+    RC::Builder.new.to_app.should.kind_of? RC::Engine
+  end
+
+  would 'switch default_engine to RestCore::RestClient' do
+    builder = Class.new(RC::Builder)
+    builder.default_engine = RC::RestClient
+    builder.new.to_app.class.should.eq RC::RestClient
+  end
+
+  would 'switch default_engine to RestCore::Dry' do
     builder = RC::Builder.dup
     builder.default_engine = RC::Dry
     builder.client.new.app.class.should.eq RC::Dry
   end
 
-  should 'not have duplicated fields' do
+  would 'accept middleware without a member' do
+    RC::Builder.client{
+      use Class.new.send(:include, RC::Middleware)
+    }.members.should.eq []
+  end
+
+  would 'not have duplicated fields' do
     middleware = Class.new do
       def self.members; [:value]; end
       include RC::Middleware

data/test/test_cache.rb

@@ -13,13 +13,12 @@ describe RC::Cache do
 
   def json_client
     RC::Builder.client do
-      use RC::Cache, {}, 3600 do
-        use RC::JsonResponse, true
-      end
+      use RC::JsonResponse, true
+      use RC::Cache, {}, 3600
     end.new
   end
 
-  should 'basic 0' do
+  would 'basic 0' do
     c = RC::Builder.client do
       use RC::Cache, {}, 3600
       run Class.new{
@@ -50,7 +49,7 @@ describe RC::Cache do
               RC::RESPONSE_KEY => RC::RESPONSE_STATUS).should.eq 200
   end
 
-  should 'basic 1' do
+  would 'basic 1' do
     path = 'http://a'
     stub_request(:get , path).to_return(:body => 'OK')
     stub_request(:post, path).to_return(:body => 'OK')
@@ -69,7 +68,7 @@ describe RC::Cache do
                                                             should.eq('OK')
   end
 
-  should 'not raise error if headers is nil' do
+  would 'not raise error if headers is nil' do
     path = 'http://a'
     stub_request(:get , path).to_return(:body => 'OK', :headers => nil)
     c = simple_client
@@ -77,7 +76,7 @@ describe RC::Cache do
     c.get(path).should.eq 'OK'
   end
 
-  should 'head then get' do
+  would 'head then get' do
     c = simple_client
     path = 'http://example.com'
     stub_request(:head, path).to_return(:headers => {'A' => 'B'})
@@ -86,7 +85,7 @@ describe RC::Cache do
     c.get(path).should.eq('body')
   end
 
-  should 'only [] and []= should be implemented' do
+  would 'only [] and []= should be implemented' do
     cache = Class.new do
       def initialize    ; @h = {}                      ; end
       def []  key       ; @h[key]                      ; end
@@ -105,14 +104,14 @@ describe RC::Cache do
     c.get('4').should.eq '5'
   end
 
-  should 'cache the original response' do
+  would 'cache the original response' do
     c = json_client
     stub_request(:get, 'http://me').to_return(:body => body = '{"a":"b"}')
     c.get('http://me').should.eq 'a' => 'b'
     c.cache.values.first.should.eq "200\n\n\n#{body}"
   end
 
-  should 'cache multiple headers' do
+  would 'cache multiple headers' do
     c = simple_client
     stub_request(:get, 'http://me').to_return(:headers =>
       {'Apple' => 'Orange', 'Orange' => 'Apple'})
@@ -121,7 +120,7 @@ describe RC::Cache do
     2.times{ c.get(*args).should.eq expected }
   end
 
-  should 'preserve promise and REQUEST_URI' do
+  would 'preserve promise and REQUEST_URI' do
     c = simple_client
     uri = 'http://me?a=b'
     stub_request(:get, uri)
@@ -129,7 +128,7 @@ describe RC::Cache do
     2.times{ c.get(*args).yield[RC::REQUEST_URI].should.eq uri }
   end
 
-  should 'preserve promise and preserve wrapped call' do
+  would 'preserve promise and preserve wrapped call' do
     c = json_client
     stub_request(:get, 'http://me').to_return(:body => body = '{"a":"b"}')
     args = ['http://me', {}, {RC::RESPONSE_KEY => RC::PROMISE}]
@@ -138,7 +137,7 @@ describe RC::Cache do
     end
   end
 
-  should 'multiline response' do
+  would 'multiline response' do
     c = simple_client
     stub_request(:get, 'http://html').to_return(:body => body = "a\n\nb")
     c.get('http://html').should.eq body
@@ -146,7 +145,7 @@ describe RC::Cache do
     c.get('http://html').should.eq body
   end
 
-  should "follow redirect with cache.update correctly" do
+  would "follow redirect with cache.update correctly" do
     c = RC::Builder.client do
       use RC::FollowRedirect, 10
       use RC::Cache, {}, nil
@@ -160,7 +159,7 @@ describe RC::Cache do
     c.get(x, {}, 'cache.update' => true).should.eq 'OK'
   end
 
-  should 'not cache post/put/delete' do
+  would 'not cache post/put/delete' do
     [:put, :post, :delete].each{ |meth|
       url, body = "https://cache", 'ok'
       stub_request(meth, url).to_return(:body => body).times(3)
@@ -178,13 +177,13 @@ describe RC::Cache do
     }
   end
 
-  should 'not cache dry run' do
+  would 'not cache dry run' do
     c = simple_client
     c.url('test')
     c.cache.should.eq({})
   end
 
-  should 'not cache hijacking' do
+  would 'not cache hijacking' do
     stub_request(:get, 'http://a').to_return(:body => 'ok')
     c = simple_client
     2.times do
@@ -195,7 +194,7 @@ describe RC::Cache do
     c.cache.should.eq({})
   end
 
-  should 'update cache if there is cache option set to false' do
+  would 'update cache if there is cache option set to false' do
     url, body = "https://cache", 'ok'
     stub_request(:get, url).to_return(:body => body)
     c = simple_client
@@ -219,12 +218,12 @@ describe RC::Cache do
       @cache
     end
 
-    should 'respect in options' do
+    would 'respect in options' do
       c = RC::Builder.client{use RC::Cache, nil, nil}.new
       c.get(@url, {}, :cache => @cache, :expires_in => 3).should.eq @body
     end
 
-    should 'respect in middleware' do
+    would 'respect in middleware' do
       c = RC::Builder.client{use RC::Cache, nil,   3}.new(:cache => @cache)
       c.get(@url).should.eq @body
     end

data/test/test_clash.rb

@@ -2,7 +2,7 @@
 require 'rest-core/test'
 
 describe RC::Clash do
-  should 'never give nil for non-existing values' do
+  would 'never give nil for non-existing values' do
     h = {0 => 1, 2 => {3 => 4, 5 => [6, {7 => 8}]}, 9 => false, 10 => nil}
     c = RC::Clash.new(h)
     c[0]            .should.eq(1)

data/test/test_clash_response.rb

@@ -5,19 +5,19 @@ describe RC::ClashResponse do
   describe 'app' do
     app = RC::ClashResponse.new(RC::Dry.new, true)
 
-    should 'do nothing' do
+    would 'do nothing' do
       env = {RC::RESPONSE_BODY => []}
       app.call(env) do |res|
         res.should.eq(env)
-        res[RC::RESPONSE_BODY].should.kind_of(Array)
+        res[RC::RESPONSE_BODY].should.kind_of?(Array)
       end
     end
 
-    should 'clash' do
+    would 'clash' do
       app.call(RC::RESPONSE_BODY => {}) do |res|
         body = res[RC::RESPONSE_BODY]
-        body.should.kind_of(RC::Clash)
-        body.should.empty
+        body.should.kind_of?(RC::Clash)
+        body.should.empty?
         body[0].should.eq({})
         body[0][0].should.eq({})
       end
@@ -34,22 +34,22 @@ describe RC::ClashResponse do
         }
       end
 
-      should 'do nothing' do
+      would 'do nothing' do
         b = client.new(:clash_response => false).get(''){ |res|
           res.should.eq(body)
-          res.should.kind_of(Hash)
+          res.should.kind_of?(Hash)
         }.get('')
         b.should.eq(body)
-        b.should.kind_of(Hash)
+        b.should.kind_of?(Hash)
       end
 
-      should 'clash' do
+      would 'clash' do
         b = client.new.get(''){ |res|
           res.should.eq(body)
-          res.should.kind_of(RC::Clash)
+          res.should.kind_of?(RC::Clash)
         }.get('')
         b.should.eq(body)
-        b.should.kind_of(RC::Clash)
+        b.should.kind_of?(RC::Clash)
       end
     end
   end

data/test/test_client.rb

@@ -9,7 +9,7 @@ describe RC::Simple do
 
   url = 'http://localhost/'
 
-  should 'do simple request' do
+  would 'do simple request' do
     c = RC::Simple.new
     [:get, :post, :delete, :put, :patch].each do |method|
       stub_request(method, url).to_return(:body => '[]')
@@ -23,7 +23,7 @@ describe RC::Simple do
     c.options(url).should.eq('A' => 'B')
   end
 
-  should 'call the callback' do
+  would 'call the callback' do
     [:get, :post, :delete, :put, :patch].each do |method|
       stub_request(method, url).to_return(:body => '123')
       (client = RC::Simple.new).send(method, url){ |res|
@@ -44,7 +44,7 @@ describe RC::Simple do
     client.wait
   end
 
-  should 'wait for all the requests' do
+  would 'wait for all the requests' do
     t, i, m = 5, 0, Mutex.new
     stub_request(:get, url).to_return do
       m.synchronize{ i += 1 }
@@ -54,11 +54,11 @@ describe RC::Simple do
     client = RC::Builder.client
     t.times{ client.new.get(url) }
     client.wait
-    client.promises.should.empty
+    client.promises.should.empty?
     i.should.eq t
   end
 
-  should 'cleanup promises' do
+  would 'cleanup promises' do
     stub_request(:get, url)
     client = RC::Builder.client
     5.times{ client.new.get(url) }
@@ -66,17 +66,17 @@ describe RC::Simple do
     GC.start # can only force GC run on MRI, so we mock for jruby and rubinius
     stub(any_instance_of(WeakRef)).weakref_alive?{false}
     client.new.get(url)
-    client.promises.size.should < 6
+    client.promises.size.should.lt 6
     client.shutdown
-    client.promises.should.empty
+    client.promises.should.empty?
   end
 
-  should 'have correct to_i' do
+  would 'have correct to_i' do
     stub_request(:get, url).to_return(:body => '123')
     RC::Simple.new.get(url).to_i.should.eq 123
   end
 
-  should 'use defaults' do
+  would 'use defaults' do
     client = RC::Builder.client do
       use RC::Timeout, 4
     end
@@ -107,7 +107,7 @@ describe RC::Simple do
     c.timeout.should.eq false # false would disable default
   end
 
-  should 'work for inheritance' do
+  would 'work for inheritance' do
     stub_request(:get, url).to_return(:body => '123')
     Class.new(RC::Simple).new.get(url).should.eq '123'
   end

data/test/test_client_oauth1.rb

@@ -13,7 +13,7 @@ describe RC::ClientOauth1 do
 
   client.send(:include, RC::ClientOauth1)
 
-  should 'restore data with correct sig' do
+  would 'restore data with correct sig' do
     data = {'a' => 'b', 'c' => 'd'}
     sig = Digest::MD5.hexdigest('e&a=b&c=d')
     data_sig = data.merge('sig' => sig)
@@ -36,7 +36,7 @@ describe RC::ClientOauth1 do
     c.data.should.eq({})
   end
 
-  should 'have correct default data' do
+  would 'have correct default data' do
     c = client.new
     c.data.should.eq({})
     c.data = nil
@@ -44,7 +44,7 @@ describe RC::ClientOauth1 do
     c.data['a'].should.eq 'b'
   end
 
-  should 'authorize' do
+  would 'authorize' do
     stub_request(:post, 'http://localhost').
       to_return(:body => 'oauth_token=abc')
 

data/test/test_config.rb

@@ -17,7 +17,7 @@ describe RC::Config do
     @klass.default_lang         .should.eq 'zh-tw'
   end
 
-  should 'honor config' do
+  would 'honor config' do
     RC::Config.load(
       @klass,
       "#{File.dirname(__FILE__)}/config/rest-core.yaml",

data/test/test_default_headers.rb

@@ -0,0 +1,13 @@
+
+require 'rest-core/test'
+
+describe RC::DefaultHeaders do
+  app = RC::DefaultHeaders.new(RC::Dry.new, 'a' => 'b')
+
+  would 'also merge the very default headers' do
+    app.call('headers' => {'b' => 'c'},
+             RC::REQUEST_HEADERS => {'c' => 'd'}) do |r|
+      r[RC::REQUEST_HEADERS].should.eq 'a' => 'b', 'b' => 'c', 'c' => 'd'
+    end
+  end
+end

data/test/test_default_payload.rb

@@ -5,11 +5,11 @@ describe RC::DefaultPayload do
   app = RC::DefaultPayload.new(RC::Dry.new, {})
   env = {RC::REQUEST_PAYLOAD => {}}
 
-  should 'do nothing' do
+  would 'do nothing' do
     app.call(env){ |r| r[RC::REQUEST_PAYLOAD].should.eq({}) }
   end
 
-  should 'merge payload' do
+  would 'merge payload' do
     app.instance_eval{@payload = {'pay' => 'load'}}
 
     app.call(env){ |r| r.should.eq({RC::REQUEST_PAYLOAD =>
@@ -22,7 +22,15 @@ describe RC::DefaultPayload do
       {'pay' => 'load'}.merge(format)})}
   end
 
-  should 'accept non-hash payload' do
+  would 'also merge the very default payload' do
+    a = RC::DefaultPayload.new(RC::Dry.new, 'a' => 'b')
+    a.call('payload' => {'b' => 'c'},
+           RC::REQUEST_PAYLOAD => {'c' => 'd'}) do |r|
+      r[RC::REQUEST_PAYLOAD].should.eq 'a' => 'b', 'b' => 'c', 'c' => 'd'
+    end
+  end
+
+  would 'accept non-hash payload' do
     u = RC::Universal.new(:log_method => false)
     env = {RC::REQUEST_PAYLOAD => 'payload'}
     u.request_full(env, u.dry)[RC::REQUEST_PAYLOAD].should.eq('payload')