rest-more 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5444cce199f7ad6519edbcbfa1db1a2ee7d1b143
-  data.tar.gz: 2e7c6a0750501114f7bdd7f631827f5acacf08ea
+  metadata.gz: 8b39d49bb082449d7cc14d9c296b5b11b464eefe
+  data.tar.gz: c329a58ec85fea8020a2e72b0461da6df5d48651
 SHA512:
-  metadata.gz: 73043581c21ef0dad61cba002fff199a754c96b6290ee49d44da0a78f43a3d8ea79534d239ed695b12e6c66ad1a8ad5bf91b349c0ffabb4cd86d439c87d03ca3
-  data.tar.gz: 9f2a1b3582b0006f88ad2b1b2619fa7c7a13a539fcf827d71f94758cf4bdc01488e89f3768a4e23e5ce0aa8a02c61be64e82ddf9be11fe8438d90186a5a40876
+  metadata.gz: 6f390c57bc49b63ba559056cc1b51d2ca32484a1d5100354084ef89d740b53138029260311b9a8bbb70c644eec70ea53d3fdc3b82e96b75d8852d1376b0e01ad
+  data.tar.gz: 94171dcccda4f3e7821da7b009e0ab776b97f115dc0d294656e93fc6b83b1bc7a1557eeb8fb1f61b243d6b7729ab7b73adf848b2ad5faafc43c2c38711a5c723

data/CHANGES.md

@@ -1,5 +1,9 @@
 # CHANGES
 
+## rest-more 3.3.0 -- 2014-08-25
+
+* Adopted rest-core 3.3.0
+
 ## rest-more 3.2.0 -- 2014-06-27
 
 * Removed RC::Firebase because it's extracted into [rest-firebase][]

data/Gemfile

@@ -8,7 +8,7 @@ gem 'rest-core', :path => 'rest-core' if
   File.exist?("#{File.dirname(File.expand_path(__FILE__))}/rest-core/Gemfile")
 
 gem 'rake'
-gem 'bacon'
+gem 'pork'
 gem 'muack'
 gem 'webmock'
 

data/Rakefile

@@ -14,7 +14,7 @@ Gemgem.init(dir) do |s|
   s.version  = RestMore::VERSION
   s.homepage = 'https://github.com/godfat/rest-more'
 
-  %w[rest-core].each{ |g| s.add_runtime_dependency(g, '>=3.2.0') }
+  %w[rest-core].each{ |g| s.add_runtime_dependency(g, '>=3.3.0') }
 
   # exclude rest-core
   s.files.reject!{ |f| f.start_with?('rest-core/') }

data/lib/rest-core/client/dropbox.rb

@@ -15,11 +15,10 @@ module RestCore
       'https://www.dropbox.com/1/oauth/authorize'
 
     use CommonLogger  , nil
-    use Cache         , nil, 600 do
-      use ErrorHandler, lambda{ |env| Dropbox::Error.call(env) }
-      use ErrorDetectorHttp
-      use JsonResponse, true
-    end
+    use ErrorHandler  , lambda{ |env| Dropbox::Error.call(env) }
+    use ErrorDetectorHttp
+    use JsonResponse  , true
+    use Cache         , nil, 600
   end
 end
 

data/lib/rest-core/client/facebook.rb

@@ -14,14 +14,13 @@ module RestCore
     use Oauth2Query   , nil
 
     use CommonLogger  , nil
-    use Cache         , nil, 600 do
-      use ErrorHandler,  lambda{ |env| Facebook::Error.call(env) }
-      use ErrorDetector, lambda{ |env|
-        env[RESPONSE_BODY].kind_of?(Hash) &&
-        (env[RESPONSE_BODY]['error'] || env[RESPONSE_BODY]['error_code'])}
+    use ErrorHandler  , lambda{ |env| Facebook::Error.call(env) }
+    use ErrorDetector , lambda{ |env|
+      env[RESPONSE_BODY].kind_of?(Hash) &&
+      (env[RESPONSE_BODY]['error'] || env[RESPONSE_BODY]['error_code'])}
 
-      use JsonResponse, true
-    end
+    use JsonResponse  , true
+    use Cache         , nil, 600
 
     use Defaults      , :old_site => 'https://api.facebook.com/'
   end

data/lib/rest-core/client/github.rb

@@ -11,12 +11,11 @@ module RestCore
     use Oauth2Query   , nil
 
     use CommonLogger  , nil
-    use Cache         , nil, 600 do
-      use ErrorHandler, lambda{ |env|
-        RuntimeError.new(env[RESPONSE_BODY]['message'])}
-      use ErrorDetectorHttp
-      use JsonResponse, true
-    end
+    use ErrorHandler  , lambda{ |env|
+      RuntimeError.new(env[RESPONSE_BODY]['message'])}
+    use ErrorDetectorHttp
+    use JsonResponse  , true
+    use Cache         , nil, 600
   end
 end
 

data/lib/rest-core/client/instagram.rb

@@ -12,11 +12,10 @@ module RestCore
     use Oauth2Query   , nil
 
     use CommonLogger  , nil
-    use Cache         , nil, 600 do
-      use ErrorHandler, lambda{ |env| RuntimeError.new(env[RESPONSE_BODY])}
-      use ErrorDetectorHttp
-      use JsonResponse, true
-    end
+    use ErrorHandler  , lambda{ |env| RuntimeError.new(env[RESPONSE_BODY])}
+    use ErrorDetectorHttp
+    use JsonResponse  , true
+    use Cache         , nil, 600
   end
 end
 

data/lib/rest-core/client/linkedin.rb

@@ -15,12 +15,11 @@ module RestCore
       'https://www.linkedin.com/uas/oauth/authorize'
 
     use CommonLogger  , nil
-    use Cache         , nil, 600 do
-      use ErrorHandler, lambda{ |env|
-        RuntimeError.new(env[RESPONSE_BODY]['message'])}
-      use ErrorDetectorHttp
-      use JsonResponse, true
-    end
+    use ErrorHandler  , lambda{ |env|
+      RuntimeError.new(env[RESPONSE_BODY]['message'])}
+    use ErrorDetectorHttp
+    use JsonResponse  , true
+    use Cache         , nil, 600
   end
 end
 

data/lib/rest-core/client/stackexchange.rb

@@ -12,12 +12,11 @@ module RestCore
     use Oauth2Query   , nil
 
     use CommonLogger  , nil
-    use Cache         , nil, 600 do
-      use ErrorHandler, lambda{ |env|
-        RuntimeError.new(env[RESPONSE_BODY]['error_message'])}
-      use ErrorDetectorHttp
-      use JsonResponse, true
-    end
+    use ErrorHandler  , lambda{ |env|
+      RuntimeError.new(env[RESPONSE_BODY]['error_message'])}
+    use ErrorDetectorHttp
+    use JsonResponse  , true
+    use Cache         , nil, 600
   end
 end
 

data/lib/rest-core/client/twitter.rb

@@ -13,11 +13,10 @@ module RestCore
       'oauth/request_token', 'oauth/access_token', 'oauth/authorize'
 
     use CommonLogger  , nil
-    use Cache         , nil, 600 do
-      use ErrorHandler, lambda{ |env| Twitter::Error.call(env) }
-      use ErrorDetectorHttp
-      use JsonResponse, true
-    end
+    use ErrorHandler  , lambda{ |env| Twitter::Error.call(env) }
+    use ErrorDetectorHttp
+    use JsonResponse  , true
+    use Cache         , nil, 600
   end
 end
 

data/lib/rest-more/version.rb

@@ -1,4 +1,4 @@
 
 module RestMore
-  VERSION = '3.2.0'
+  VERSION = '3.3.0'
 end

data/rest-more.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: rest-more 3.2.0 ruby lib
+# stub: rest-more 3.3.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "rest-more"
-  s.version = "3.2.0"
+  s.version = "3.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Lin Jen-Shin (godfat)"]
-  s.date = "2014-06-27"
+  s.date = "2014-08-25"
   s.description = "Various REST clients such as Facebook and Twitter built with [rest-core][].\n\n[rest-core]: https://github.com/godfat/rest-core"
   s.email = ["godfat (XD) godfat.org"]
   s.executables = ["rib-rest-core"]
@@ -83,7 +83,7 @@ Gem::Specification.new do |s|
   "test/twitter/test_twitter.rb"]
   s.homepage = "https://github.com/godfat/rest-more"
   s.licenses = ["Apache License 2.0"]
-  s.rubygems_version = "2.2.2"
+  s.rubygems_version = "2.4.1"
   s.summary = "Various REST clients such as Facebook and Twitter built with [rest-core][]."
   s.test_files = [
   "test/dropbox/test_dropbox.rb",
@@ -107,11 +107,11 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rest-core>, [">= 3.2.0"])
+      s.add_runtime_dependency(%q<rest-core>, [">= 3.3.0"])
     else
-      s.add_dependency(%q<rest-core>, [">= 3.2.0"])
+      s.add_dependency(%q<rest-core>, [">= 3.3.0"])
     end
   else
-    s.add_dependency(%q<rest-core>, [">= 3.2.0"])
+    s.add_dependency(%q<rest-core>, [">= 3.3.0"])
   end
 end

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/dropbox/test_dropbox.rb

@@ -6,7 +6,7 @@ describe RC::Dropbox do
     WebMock.reset!
   end
 
-  should 'get right' do
+  would 'get right' do
     stub_request(:get, 'https://api.dropbox.com/1/account/info').
       to_return(:body => '{"status": "OK"}')
 
@@ -24,7 +24,7 @@ describe RC::Dropbox do
     WebMock.reset!
   end
 
-  should 'raise exception when encountering error' do
+  would 'raise exception when encountering error' do
     [401, 402, 403].each{ |status| check(status, RC::Dropbox::Error) }
     [500, 502, 503].each{ |status| check(status, RC::Dropbox::Error::
                                                  ServerError)        }

data/test/facebook/test_api.rb

@@ -6,13 +6,13 @@ describe RC::Facebook do
     WebMock.reset!
   end
 
-  should 'generate correct url' do
+  would 'generate correct url' do
     RC::Facebook.new(:access_token => 'awesome').
       url('path', :query => 'str').should.eq \
       'https://graph.facebook.com/path?access_token=awesome&query=str'
   end
 
-  should 'request to correct server' do
+  would 'request to correct server' do
     stub_request(:get, 'http://nothing.godfat.org/me').with(
       :headers => {'Accept'          => 'text/plain',
                    'Accept-Language' => 'zh-tw',
@@ -26,7 +26,7 @@ describe RC::Facebook do
                      get('me').should.eq({'data' => []})
   end
 
-  should 'pass custom headers' do
+  would 'pass custom headers' do
     stub_request(:get, 'http://example.com/').with(
       :headers => {'Accept'          => 'application/json',
                    'Accept-Language' => 'en-us',
@@ -40,7 +40,7 @@ describe RC::Facebook do
       should.eq({'data' => []})
   end
 
-  should 'post right' do
+  would 'post right' do
     stub_request(:post, 'https://graph.facebook.com/feed/me').
       with(:body => 'message=hi%20there').to_return(:body => 'ok')
 
@@ -48,7 +48,7 @@ describe RC::Facebook do
       post('feed/me', :message => 'hi there').should == 'ok'
   end
 
-  should 'use secret_access_token' do
+  would 'use secret_access_token' do
     stub_request(:get,
       'https://graph.facebook.com/me?access_token=1|2').
       to_return(:body => 'ok')
@@ -63,7 +63,7 @@ describe RC::Facebook do
       '/me?access_token=1%7C2'
   end
 
-  should 'suppress auto-decode in an api call' do
+  would 'suppress auto-decode in an api call' do
     stub_request(:get, 'https://graph.facebook.com/woot').
       to_return(:body => 'bad json')
 
@@ -72,7 +72,7 @@ describe RC::Facebook do
     rg.json_response.should == true
   end
 
-  should 'not raise exception when encountering error' do
+  would 'not raise exception when encountering error' do
     [500, 401, 402, 403].each{ |status|
       stub_request(:delete, 'https://graph.facebook.com/123').to_return(
         :body => '[]', :status => status)
@@ -81,7 +81,7 @@ describe RC::Facebook do
     }
   end
 
-  should 'convert query to string' do
+  would 'convert query to string' do
     o = Object.new
     def o.to_s; 'i am mock'; end
     stub_request(:get, "https://graph.facebook.com/search?q=i%20am%20mock").

data/test/facebook/test_default.rb

@@ -2,7 +2,7 @@
 require 'rest-more/test'
 
 describe RC::Facebook do
-  should 'honor default attributes' do
+  would 'honor default attributes' do
     RC::Facebook.members.reject{ |name|
       name.to_s =~ /method$|handler$|detector$/ }.each{ |name|
         RC::Facebook.new.send(name).should ==
@@ -10,7 +10,7 @@ describe RC::Facebook do
     }
   end
 
-  should 'use module to override default attributes' do
+  would 'use module to override default attributes' do
     klass = RC::Facebook.dup
     klass.send(:include, Module.new do
       def default_app_id

data/test/facebook/test_error.rb

@@ -6,7 +6,7 @@ describe RC::Facebook::Error do
     WebMock.reset!
   end
 
-  should 'have the right ancestors' do
+  would 'have the right ancestors' do
     RC::Facebook::Error::AccessToken.should.lt RC::Facebook::Error
 
     RC::Facebook::Error::InvalidAccessToken.should.lt \
@@ -22,7 +22,7 @@ describe RC::Facebook::Error do
      RC::REQUEST_QUERY => {}}
   end
 
-  should 'parse right' do
+  would 'parse right' do
     %w[OAuthInvalidTokenException OAuthException].each{ |type|
       RC::Facebook::Error.call(error2env('error' => {'type' => type})).
         should.kind_of?(RC::Facebook::Error::InvalidAccessToken)
@@ -52,7 +52,7 @@ describe RC::Facebook::Error do
     error.should    .kind_of?(RC::Facebook::Error)
   end
 
-  should 'nuke cache upon errors' do
+  would 'nuke cache upon errors' do
     stub_request(:get, 'https://graph.facebook.com/me').
       to_return(:body => '{"error":"wrong"}').times(2)
 

data/test/facebook/test_handler.rb

@@ -7,7 +7,7 @@ describe RC::Facebook do
   end
 
   describe 'log method' do
-    should 'log whenever doing network request' do
+    would 'log whenever doing network request' do
       stub_request(:get, 'https://graph.facebook.com/me').
         to_return(:body => '{}')
 
@@ -29,12 +29,12 @@ describe RC::Facebook do
         to_return(:body => @error)
     end
 
-    should 'call error_handler if error occurred' do
+    would 'call error_handler if error occurred' do
       RC::Facebook.new(:error_handler => @id).get('me').
         should.eq @error_hash
     end
 
-    should 'raise ::RC::Facebook::Error in default error_handler' do
+    would 'raise ::RC::Facebook::Error in default error_handler' do
       begin
         RC::Facebook.new.get('me').tap{}
       rescue ::RC::Facebook::Error => e
@@ -65,12 +65,12 @@ describe RC::Facebook do
       stub_request(:get, bad_fql_request).to_return(:body => @fql_error)
     end
 
-    should 'call error_handler if error occurred' do
+    would 'call error_handler if error occurred' do
       RC::Facebook.new(:error_handler => @id).fql(@bad_fql_query).
         should.eq @fql_error_hash
     end
 
-    should 'raise ::RC::Facebook::Error in default error_handler' do
+    would 'raise ::RC::Facebook::Error in default error_handler' do
       begin
         RC::Facebook.new.fql(@bad_fql_query).tap{}
       rescue ::RC::Facebook::Error => e

data/test/facebook/test_misc.rb

@@ -6,12 +6,12 @@ describe RC::Facebook do
     WebMock.reset!
   end
 
-  should 'return true in authorized? if there is an access_token' do
+  would 'return true in authorized? if there is an access_token' do
     RC::Facebook.new(:access_token => '1').authorized?.should.eq true
     RC::Facebook.new(:access_token => nil).authorized?.should.eq false
   end
 
-  should 'treat oauth_token as access_token as well' do
+  would 'treat oauth_token as access_token as well' do
     rg = RC::Facebook.new
     hate_facebook = 'why the hell two different name?'
     rg.data['oauth_token'] = hate_facebook
@@ -19,7 +19,7 @@ describe RC::Facebook do
     rg.access_token.should.eq hate_facebook
   end
 
-  should 'build correct headers' do
+  would 'build correct headers' do
     rg = RC::Facebook.new(:accept => 'text/html',
                           :lang   => 'zh-tw')
 
@@ -30,14 +30,14 @@ describe RC::Facebook do
     }
   end
 
-  should 'create access_token in query string' do
+  would 'create access_token in query string' do
     rg = RC::Facebook.new(:access_token => 'token')
     rg.dry.call(rg.send(:build_env)){ |res|
       res[RC::REQUEST_QUERY].should.eq({'access_token' => 'token'})
     }
   end
 
-  should 'build correct query string' do
+  would 'build correct query string' do
     rg = RC::Facebook.new(:access_token => 'token')
     rg.url('', :message => 'hi!!').
       should.eq "#{rg.site}?access_token=token&message=hi%21%21"
@@ -47,19 +47,19 @@ describe RC::Facebook do
       should.eq "#{rg.site}?message=hi%21%21&subject=%28%26oh%26%29"
   end
 
-  should 'auto decode json' do
+  would 'auto decode json' do
     rg = RC::Facebook.new(:json_response => true)
     stub_request(:get, rg.site).to_return(:body => '[]')
     rg.get('').should.eq []
   end
 
-  should 'not auto decode json' do
+  would 'not auto decode json' do
     rg = RC::Facebook.new(:json_response => false)
     stub_request(:get, rg.site).to_return(:body => '[]')
     rg.get('').should.eq '[]'
   end
 
-  should 'give attributes' do
+  would 'give attributes' do
     RC::Facebook.new(:json_response => false).attributes.
       keys.map(&:to_s).sort.should.eq \
       RC::Facebook.members.map(&:to_s).sort

data/test/facebook/test_oauth.rb

@@ -11,13 +11,13 @@ describe RC::Facebook do
     WebMock.reset!
   end
 
-  should 'return correct oauth url' do
+  would 'return correct oauth url' do
     @rg.authorize_url(:redirect_uri => @uri).
     should.eq 'https://www.facebook.com/dialog/oauth?' \
               'client_id=29&redirect_uri=http%3A%2F%2Fzzz.tw'
   end
 
-  should 'do authorizing and parse result and save it in data' do
+  would 'do authorizing and parse result and save it in data' do
     stub_request(:post, 'https://graph.facebook.com/oauth/access_token'). \
       with(:body => {'client_id'     => '29' ,
                      'client_secret' => '18' ,
@@ -32,7 +32,7 @@ describe RC::Facebook do
     @rg.data.should.eq result
   end
 
-  should 'not append access_token in authorize_url even presented' do
+  would 'not append access_token in authorize_url even presented' do
     RC::Facebook.new(:access_token => 'do not use me').authorize_url.
       should.eq 'https://www.facebook.com/dialog/oauth'
   end

data/test/facebook/test_old.rb

@@ -6,7 +6,7 @@ describe RC::Facebook do
     WebMock.reset!
   end
 
-  should 'do fql query with/without access_token' do
+  would 'do fql query with/without access_token' do
     fql = 'SELECT name FROM likes where id="123"'
     query = "format=json&query=#{RC::Middleware.escape(fql)}"
     stub_request(:get, "https://api.facebook.com/method/fql.query?#{query}").
@@ -22,7 +22,7 @@ describe RC::Facebook do
     RC::Facebook.new(:access_token => token).fql(fql).should.eq []
   end
 
-  should 'do fql.mutilquery correctly' do
+  would 'do fql.mutilquery correctly' do
     f0 = 'SELECT display_name FROM application WHERE app_id="233082465238"'
     f1 = 'SELECT display_name FROM application WHERE app_id="110225210740"'
     f0q, f1q = "\"#{f0.gsub('"', '\\"')}\"", "\"#{f1.gsub('"', '\\"')}\""
@@ -45,7 +45,7 @@ describe RC::Facebook do
     RC::Facebook.new.fql_multi(:f0 => f0, :f1 => f1).should.eq []
   end
 
-  should 'do facebook old rest api' do
+  would 'do facebook old rest api' do
     body = 'hate facebook inconsistent'
     stub_request(:get,
       'https://api.facebook.com/method/notes.create?format=json').
@@ -55,7 +55,7 @@ describe RC::Facebook do
       old_rest('notes.create', {}, :json_response => false).should.eq body
   end
 
-  should 'exchange sessions for access token' do
+  would 'exchange sessions for access token' do
     stub_request(:post,
       'https://graph.facebook.com/oauth/exchange_sessions?'     \
               'type=client_cred&client_id=id&client_secret=di&' \
@@ -67,7 +67,7 @@ describe RC::Facebook do
       first['access_token'].should.eq 'bogus'
   end
 
-  should 'use an secret access_token' do
+  would 'use an secret access_token' do
     stub_request(:get,
       'https://api.facebook.com/method/admin.getAppProperties?' \
       'access_token=123%7Cs&format=json&properties=app_id'

data/test/facebook/test_page.rb

@@ -6,7 +6,7 @@ describe RC::Facebook do
     WebMock.reset!
   end
 
-  should 'get the next/prev page' do
+  would 'get the next/prev page' do
     f = RC::Facebook.new(:site => '', :cache => false)
     %w[next previous].each{ |type|
       kind = "#{type}_page"
@@ -19,7 +19,7 @@ describe RC::Facebook do
     }
   end
 
-  should 'merge all pages into one' do
+  would 'merge all pages into one' do
     f = RC::Facebook.new(:site => '', :cache => false)
     %w[next previous].each{ |type|
       kind = "#{type}_page"
@@ -47,7 +47,7 @@ describe RC::Facebook do
     }
   end
 
-  should 'for_pages with callback' do
+  would 'for_pages with callback' do
     f = RC::Facebook.new(:site => '', :cache => false)
     %w[next previous].each{ |type|
       kind = "#{type}_page"

data/test/facebook/test_parse.rb

@@ -2,14 +2,13 @@
 require 'rest-more/test'
 
 describe RC::Facebook do
-
-  should 'return nil if parse error, but not when call data directly' do
+  would 'return nil if parse error, but not when call data directly' do
     rg = RC::Facebook.new
     rg.parse_cookies!({}).should.eq nil
     rg.data              .should.eq({})
   end
 
-  should 'parse if fbs contains json as well' do
+  would 'parse if fbs contains json as well' do
     algorithm = 'HMAC-SHA256'
     user      = '{"country"=>"us", "age"=>{"min"=>21}}'
     data      = {'algorithm' => algorithm, 'user' => user}
@@ -18,7 +17,7 @@ describe RC::Facebook do
     rg.parse_fbs!("\"#{rg.fbs}\"").should.eq data.merge('sig' => sig)
   end
 
-  should 'extract correct access_token or fail checking sig' do
+  would 'extract correct access_token or fail checking sig' do
     access_token = '1|2-5|f.'
     app_id       = '1829'
     secret       = app_id.reverse
@@ -54,13 +53,13 @@ describe RC::Facebook do
     check.call(nil, "\"#{fbs}\"")
   end
 
-  should 'not pass if there is no secret, prevent from forgery' do
+  would 'not pass if there is no secret, prevent from forgery' do
     rg = RC::Facebook.new
     rg.parse_fbs!('"feed=me&sig=bddd192cf27f22c05f61c8bea24fa4b7"').
       should.eq nil
   end
 
-  should 'parse json correctly' do
+  would 'parse json correctly' do
     rg = RC::Facebook.new
 
     rg.parse_json!('bad json')    .should.eq nil
@@ -87,11 +86,11 @@ describe RC::Facebook do
       "#{encode(sig)}.#{json_encoded}"
     end
 
-    should 'parse invalid' do
+    would 'parse invalid' do
       RC::Facebook.new.parse_signed_request!('bad').should.eq nil
     end
 
-    should 'parse' do
+    would 'parse' do
       secret = 'aloha'
       rg = RC::Facebook.new(:secret => secret)
       rg.parse_signed_request!(setup_sr(secret, {'ooh' => 'dir',
@@ -105,7 +104,7 @@ describe RC::Facebook do
       rg.data                                 .should.eq({})
     end
 
-    should 'fbsr and cookies with fbsr' do
+    would 'fbsr and cookies with fbsr' do
       secret       = 'lulala'
       code         = 'lalalu'
       access_token = 'lololo'
@@ -136,13 +135,13 @@ describe RC::Facebook do
     end
   end
 
-  should 'generate correct fbs with correct sig' do
+  would 'generate correct fbs with correct sig' do
     RC::Facebook.new(:access_token => 'fake', :secret => 's').fbs.
       should.eq \
       "access_token=fake&sig=#{Digest::MD5.hexdigest('access_token=fakes')}"
   end
 
-  should 'parse fbs from facebook response which lacks sig...' do
+  would 'parse fbs from facebook response which lacks sig...' do
     rg = RC::Facebook.new(:access_token => 'a', :secret => 'z')
     rg.parse_fbs!(rg.fbs)                           .should.kind_of?(Hash)
     rg.data.empty?.should.eq false
@@ -150,7 +149,7 @@ describe RC::Facebook do
     rg.data.empty?.should.eq true
   end
 
-  should 'generate correct fbs with additional parameters' do
+  would 'generate correct fbs with additional parameters' do
     rg = RC::Facebook.new(:access_token => 'a', :secret => 'z')
     rg.data['expires'] = '1234'
     rg.parse_fbs!(rg.fbs).should.kind_of?(Hash)

data/test/facebook/test_serialize.rb

@@ -2,7 +2,7 @@
 require 'rest-more/test'
 
 describe RC::Facebook do
-  should 'be serialized with lighten' do
+  would 'be serialized with lighten' do
     require 'yaml'
     [YAML, Marshal].each{ |engine|
       test = lambda{ |obj| engine.load(engine.dump(obj)) }
@@ -15,7 +15,7 @@ describe RC::Facebook do
     }
   end
 
-  should 'lighten takes options to change attributes' do
+  would 'lighten takes options to change attributes' do
     RC::Facebook.new.lighten(:timeout => 100    ).timeout.should.eq 100
     RC::Facebook.new.lighten(:lang    => 'zh-TW').lang.should.eq 'zh-TW'
   end

data/test/facebook/test_timeout.rb

@@ -7,7 +7,7 @@ describe RC::Facebook do
     Muack.verify
   end
 
-  should 'respect timeout' do
+  would 'respect timeout' do
     stub_request(:get, 'https://graph.facebook.com/me').
       to_return(:body => '{}')
     any_instance_of(RC::Timeout::Timer){ |timer|
@@ -16,7 +16,7 @@ describe RC::Facebook do
     RC::Facebook.new.get('me').should.eq({})
   end
 
-  should 'override timeout' do
+  would 'override timeout' do
     stub_request(:get, 'https://graph.facebook.com/me').
       to_return(:body => 'true')
     mock(RC::Timeout::Timer).new(99, is_a(Timeout::Error))

data/test/github/test_github.rb

@@ -6,7 +6,7 @@ describe RC::Github do
     WebMock.reset!
   end
 
-  should 'get all' do
+  would 'get all' do
     link = '</users/godfat/repos?type=o&per_page=100&page=3>; rel="last"'
     headers = {'Link' => link}
     stub_request(:get,

data/test/instagram/test_instagram.rb

@@ -17,13 +17,13 @@ describe RC::Instagram do
   client = RC::Instagram.new(:client_id => 'Z', :client_secret => 'S',
                              :access_token => 'X')
 
-  should 'have correct authorize url' do
+  would 'have correct authorize url' do
     client.authorize_url.should.eq \
       'https://api.instagram.com/oauth/authorize?' \
       'client_id=Z&response_type=code'
   end
 
-  should 'authorize! and get the access token' do
+  would 'authorize! and get the access token' do
     stub_request(:post, 'https://api.instagram.com/oauth/access_token').
       with(:body => {'client_id' => 'Z', 'client_secret' => 'S',
                      'grant_type' => 'authorization_code', 'code' => 'C'}).
@@ -37,7 +37,7 @@ describe RC::Instagram do
     end
   end
 
-  should 'retrieve user profile based on username' do
+  would 'retrieve user profile based on username' do
     stub_request(:get, 'https://api.instagram.com/v1/users/search?' \
                        'client_id=Z&q=restmore').
       to_return(:body => json)

data/test/stackexchange/test_stackexchange.rb

@@ -6,7 +6,7 @@ describe RC::StackExchange do
     WebMock.reset!
   end
 
-  should 'me' do
+  would 'me' do
     stub_request(:get,
       'https://api.stackexchange.com/me?key=yek&site=stackoverflow').
       to_return(:body => '{"name":"meme"}')

data/test/twitter/test_twitter.rb

@@ -6,7 +6,7 @@ describe RC::Twitter do
     WebMock.reset!
   end
 
-  should 'get right' do
+  would 'get right' do
     stub_request(:get,
       'https://api.twitter.com/1.1/account/verify_credentials.json').
       to_return(:body => '{"status": "OK"}')
@@ -25,7 +25,7 @@ describe RC::Twitter do
     WebMock.reset!
   end
 
-  should 'raise exception when encountering error' do
+  would 'raise exception when encountering error' do
     [401, 402, 403].each{ |status| check(status, RestCore::Twitter::Error) }
     [500, 502, 503].each{ |status| check(status, RestCore::Twitter::Error::
                                                  ServerError)              }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest-more
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Lin Jen-Shin (godfat)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-27 00:00:00.000000000 Z
+date: 2014-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.3.0
 description: |-
   Various REST clients such as Facebook and Twitter built with [rest-core][].
 
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Various REST clients such as Facebook and Twitter built with [rest-core][].