rest-core 3.6.0 → 4.0.0

data/lib/rest-core/util/parse_link.rb

@@ -1,16 +1,17 @@
 
-module RestCore; end
-module RestCore::ParseLink
-  module_function
-  # http://tools.ietf.org/html/rfc5988
-  parname = '"?([^"]+)"?'
-  LINKPARAM = /#{parname}=#{parname}/
-  def parse_link link
-    link.split(',').inject({}) do |r, value|
-      uri, *pairs = value.split(';')
-      params = Hash[pairs.map{ |p| p.strip.match(LINKPARAM)[1..2] }]
-      r[params['rel']] = params.merge('uri' => uri[/<([^>]+)>/, 1])
-      r
+module RestCore
+  module ParseLink
+    module_function
+    # http://tools.ietf.org/html/rfc5988
+    parname = '"?([^"]+)"?'
+    LINKPARAM = /#{parname}=#{parname}/
+    def parse_link link
+      link.split(',').inject({}) do |r, value|
+        uri, *pairs = value.split(';')
+        params = Hash[pairs.map{ |p| p.strip.match(LINKPARAM)[1..2] }]
+        r[params['rel']] = params.merge('uri' => uri[/<([^>]+)>/, 1])
+        r
+      end
     end
   end
 end

data/lib/rest-core/util/parse_query.rb

@@ -1,31 +1,33 @@
 
-module RestCore; end
-module RestCore::ParseQuery
-  module_function
-  begin
-    require 'rack/utils'
-    def parse_query(qs, d = nil)
-      Rack::Utils.parse_query(qs, d)
-    end
-  rescue LoadError
-    # Stolen from Rack
-    def parse_query(qs, d = nil)
-      params = {}
+module RestCore
+  module ParseQuery
+    module_function
+    begin
+      require 'rack/utils'
+      def parse_query(qs, d = nil)
+        Rack::Utils.parse_query(qs, d)
+      end
+    rescue LoadError
+      require 'uri'
+      # Stolen from Rack
+      def parse_query(qs, d = nil)
+        params = {}
 
-      (qs || '').split(d ? /[#{d}] */n : /[&;] */n).each do |p|
-        k, v = p.split('=', 2).map { |x| URI.decode_www_form_component(x) }
-        if cur = params[k]
-          if cur.class == Array
-            params[k] << v
+        (qs || '').split(d ? /[#{d}] */n : /[&;] */n).each do |p|
+          k, v = p.split('=', 2).map { |x| URI.decode_www_form_component(x) }
+          if cur = params[k]
+            if cur.class == Array
+              params[k] << v
+            else
+              params[k] = [cur, v]
+            end
           else
-            params[k] = [cur, v]
+            params[k] = v
           end
-        else
-          params[k] = v
         end
-      end
 
-      return params
+        return params
+      end
     end
   end
 end

data/lib/rest-core/version.rb

@@ -1,4 +1,4 @@
 
 module RestCore
-  VERSION = '3.6.0'
+  VERSION = '4.0.0'
 end

data/rest-core.gemspec

@@ -1,174 +1,137 @@
 # -*- encoding: utf-8 -*-
-# stub: rest-core 3.6.0 ruby lib
+# stub: rest-core 4.0.0 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "rest-core"
-  s.version = "3.6.0"
+  s.name = "rest-core".freeze
+  s.version = "4.0.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 = "2016-01-27"
-  s.description = "Modular Ruby clients interface for REST APIs.\n\nThere has been an explosion in the number of REST APIs available today.\nTo address the need for a way to access these APIs easily and elegantly,\nwe have developed rest-core, which consists of composable middleware\nthat allows you to build a REST client for any REST API. Or in the case of\ncommon APIs such as Facebook, Github, and Twitter, you can simply use the\ndedicated clients provided by [rest-more][].\n\n[rest-more]: https://github.com/godfat/rest-more"
-  s.email = ["godfat (XD) godfat.org"]
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Lin Jen-Shin (godfat)".freeze]
+  s.date = "2016-02-04"
+  s.description = "Various [rest-builder](https://github.com/godfat/rest-builder) middleware\nfor building REST clients.\n\nCheckout [rest-more](https://github.com/godfat/rest-more) for pre-built\nclients.".freeze
+  s.email = ["godfat (XD) godfat.org".freeze]
   s.files = [
-  ".gitignore",
-  ".gitmodules",
-  ".travis.yml",
-  "CHANGES.md",
-  "Gemfile",
-  "LICENSE",
-  "NOTE.md",
-  "README.md",
-  "Rakefile",
-  "TODO.md",
-  "example/simple.rb",
-  "example/use-cases.rb",
-  "lib/rest-core.rb",
-  "lib/rest-core/builder.rb",
-  "lib/rest-core/client.rb",
-  "lib/rest-core/client/simple.rb",
-  "lib/rest-core/client/universal.rb",
-  "lib/rest-core/client_oauth1.rb",
-  "lib/rest-core/engine.rb",
-  "lib/rest-core/engine/dry.rb",
-  "lib/rest-core/engine/http-client.rb",
-  "lib/rest-core/error.rb",
-  "lib/rest-core/event.rb",
-  "lib/rest-core/event_source.rb",
-  "lib/rest-core/middleware.rb",
-  "lib/rest-core/middleware/auth_basic.rb",
-  "lib/rest-core/middleware/bypass.rb",
-  "lib/rest-core/middleware/cache.rb",
-  "lib/rest-core/middleware/clash_response.rb",
-  "lib/rest-core/middleware/common_logger.rb",
-  "lib/rest-core/middleware/default_headers.rb",
-  "lib/rest-core/middleware/default_payload.rb",
-  "lib/rest-core/middleware/default_query.rb",
-  "lib/rest-core/middleware/default_site.rb",
-  "lib/rest-core/middleware/defaults.rb",
-  "lib/rest-core/middleware/error_detector.rb",
-  "lib/rest-core/middleware/error_detector_http.rb",
-  "lib/rest-core/middleware/error_handler.rb",
-  "lib/rest-core/middleware/follow_redirect.rb",
-  "lib/rest-core/middleware/json_request.rb",
-  "lib/rest-core/middleware/json_response.rb",
-  "lib/rest-core/middleware/oauth1_header.rb",
-  "lib/rest-core/middleware/oauth2_header.rb",
-  "lib/rest-core/middleware/oauth2_query.rb",
-  "lib/rest-core/middleware/query_response.rb",
-  "lib/rest-core/middleware/retry.rb",
-  "lib/rest-core/middleware/smash_response.rb",
-  "lib/rest-core/middleware/timeout.rb",
-  "lib/rest-core/promise.rb",
-  "lib/rest-core/test.rb",
-  "lib/rest-core/thread_pool.rb",
-  "lib/rest-core/timer.rb",
-  "lib/rest-core/util/clash.rb",
-  "lib/rest-core/util/config.rb",
-  "lib/rest-core/util/dalli_extension.rb",
-  "lib/rest-core/util/hmac.rb",
-  "lib/rest-core/util/json.rb",
-  "lib/rest-core/util/parse_link.rb",
-  "lib/rest-core/util/parse_query.rb",
-  "lib/rest-core/util/payload.rb",
-  "lib/rest-core/util/smash.rb",
-  "lib/rest-core/version.rb",
-  "rest-core.gemspec",
-  "task/README.md",
-  "task/gemgem.rb",
-  "test/config/rest-core.yaml",
-  "test/test_auth_basic.rb",
-  "test/test_builder.rb",
-  "test/test_cache.rb",
-  "test/test_clash.rb",
-  "test/test_clash_response.rb",
-  "test/test_client.rb",
-  "test/test_client_oauth1.rb",
-  "test/test_config.rb",
-  "test/test_dalli_extension.rb",
-  "test/test_default_headers.rb",
-  "test/test_default_payload.rb",
-  "test/test_default_query.rb",
-  "test/test_default_site.rb",
-  "test/test_error_detector.rb",
-  "test/test_error_detector_http.rb",
-  "test/test_error_handler.rb",
-  "test/test_event_source.rb",
-  "test/test_follow_redirect.rb",
-  "test/test_future.rb",
-  "test/test_httpclient.rb",
-  "test/test_json_request.rb",
-  "test/test_json_response.rb",
-  "test/test_oauth1_header.rb",
-  "test/test_oauth2_header.rb",
-  "test/test_parse_link.rb",
-  "test/test_payload.rb",
-  "test/test_promise.rb",
-  "test/test_query_response.rb",
-  "test/test_retry.rb",
-  "test/test_simple.rb",
-  "test/test_smash.rb",
-  "test/test_smash_response.rb",
-  "test/test_thread_pool.rb",
-  "test/test_timeout.rb",
-  "test/test_universal.rb"]
-  s.homepage = "https://github.com/godfat/rest-core"
-  s.licenses = ["Apache License 2.0"]
-  s.rubygems_version = "2.5.1"
-  s.summary = "Modular Ruby clients interface for REST APIs."
+  ".gitignore".freeze,
+  ".gitmodules".freeze,
+  ".travis.yml".freeze,
+  "CHANGES.md".freeze,
+  "Gemfile".freeze,
+  "LICENSE".freeze,
+  "NOTE.md".freeze,
+  "README.md".freeze,
+  "Rakefile".freeze,
+  "TODO.md".freeze,
+  "example/simple.rb".freeze,
+  "example/use-cases.rb".freeze,
+  "lib/rest-core.rb".freeze,
+  "lib/rest-core/client/universal.rb".freeze,
+  "lib/rest-core/client_oauth1.rb".freeze,
+  "lib/rest-core/event.rb".freeze,
+  "lib/rest-core/middleware/auth_basic.rb".freeze,
+  "lib/rest-core/middleware/bypass.rb".freeze,
+  "lib/rest-core/middleware/cache.rb".freeze,
+  "lib/rest-core/middleware/clash_response.rb".freeze,
+  "lib/rest-core/middleware/common_logger.rb".freeze,
+  "lib/rest-core/middleware/default_headers.rb".freeze,
+  "lib/rest-core/middleware/default_payload.rb".freeze,
+  "lib/rest-core/middleware/default_query.rb".freeze,
+  "lib/rest-core/middleware/default_site.rb".freeze,
+  "lib/rest-core/middleware/defaults.rb".freeze,
+  "lib/rest-core/middleware/error_detector.rb".freeze,
+  "lib/rest-core/middleware/error_detector_http.rb".freeze,
+  "lib/rest-core/middleware/error_handler.rb".freeze,
+  "lib/rest-core/middleware/follow_redirect.rb".freeze,
+  "lib/rest-core/middleware/json_request.rb".freeze,
+  "lib/rest-core/middleware/json_response.rb".freeze,
+  "lib/rest-core/middleware/oauth1_header.rb".freeze,
+  "lib/rest-core/middleware/oauth2_header.rb".freeze,
+  "lib/rest-core/middleware/oauth2_query.rb".freeze,
+  "lib/rest-core/middleware/query_response.rb".freeze,
+  "lib/rest-core/middleware/retry.rb".freeze,
+  "lib/rest-core/middleware/smash_response.rb".freeze,
+  "lib/rest-core/middleware/timeout.rb".freeze,
+  "lib/rest-core/test.rb".freeze,
+  "lib/rest-core/util/clash.rb".freeze,
+  "lib/rest-core/util/config.rb".freeze,
+  "lib/rest-core/util/dalli_extension.rb".freeze,
+  "lib/rest-core/util/hmac.rb".freeze,
+  "lib/rest-core/util/json.rb".freeze,
+  "lib/rest-core/util/parse_link.rb".freeze,
+  "lib/rest-core/util/parse_query.rb".freeze,
+  "lib/rest-core/util/smash.rb".freeze,
+  "lib/rest-core/version.rb".freeze,
+  "rest-core.gemspec".freeze,
+  "task/README.md".freeze,
+  "task/gemgem.rb".freeze,
+  "test/config/rest-core.yaml".freeze,
+  "test/test_auth_basic.rb".freeze,
+  "test/test_cache.rb".freeze,
+  "test/test_clash.rb".freeze,
+  "test/test_clash_response.rb".freeze,
+  "test/test_client_oauth1.rb".freeze,
+  "test/test_config.rb".freeze,
+  "test/test_dalli_extension.rb".freeze,
+  "test/test_default_headers.rb".freeze,
+  "test/test_default_payload.rb".freeze,
+  "test/test_default_query.rb".freeze,
+  "test/test_default_site.rb".freeze,
+  "test/test_error_detector.rb".freeze,
+  "test/test_error_detector_http.rb".freeze,
+  "test/test_error_handler.rb".freeze,
+  "test/test_follow_redirect.rb".freeze,
+  "test/test_json_request.rb".freeze,
+  "test/test_json_response.rb".freeze,
+  "test/test_oauth1_header.rb".freeze,
+  "test/test_oauth2_header.rb".freeze,
+  "test/test_parse_link.rb".freeze,
+  "test/test_query_response.rb".freeze,
+  "test/test_retry.rb".freeze,
+  "test/test_smash.rb".freeze,
+  "test/test_smash_response.rb".freeze,
+  "test/test_timeout.rb".freeze,
+  "test/test_universal.rb".freeze]
+  s.homepage = "https://github.com/godfat/rest-core".freeze
+  s.licenses = ["Apache License 2.0".freeze]
+  s.rubygems_version = "2.5.2".freeze
+  s.summary = "Various [rest-builder](https://github.com/godfat/rest-builder) middleware".freeze
   s.test_files = [
-  "test/test_auth_basic.rb",
-  "test/test_builder.rb",
-  "test/test_cache.rb",
-  "test/test_clash.rb",
-  "test/test_clash_response.rb",
-  "test/test_client.rb",
-  "test/test_client_oauth1.rb",
-  "test/test_config.rb",
-  "test/test_dalli_extension.rb",
-  "test/test_default_headers.rb",
-  "test/test_default_payload.rb",
-  "test/test_default_query.rb",
-  "test/test_default_site.rb",
-  "test/test_error_detector.rb",
-  "test/test_error_detector_http.rb",
-  "test/test_error_handler.rb",
-  "test/test_event_source.rb",
-  "test/test_follow_redirect.rb",
-  "test/test_future.rb",
-  "test/test_httpclient.rb",
-  "test/test_json_request.rb",
-  "test/test_json_response.rb",
-  "test/test_oauth1_header.rb",
-  "test/test_oauth2_header.rb",
-  "test/test_parse_link.rb",
-  "test/test_payload.rb",
-  "test/test_promise.rb",
-  "test/test_query_response.rb",
-  "test/test_retry.rb",
-  "test/test_simple.rb",
-  "test/test_smash.rb",
-  "test/test_smash_response.rb",
-  "test/test_thread_pool.rb",
-  "test/test_timeout.rb",
-  "test/test_universal.rb"]
+  "test/test_auth_basic.rb".freeze,
+  "test/test_cache.rb".freeze,
+  "test/test_clash.rb".freeze,
+  "test/test_clash_response.rb".freeze,
+  "test/test_client_oauth1.rb".freeze,
+  "test/test_config.rb".freeze,
+  "test/test_dalli_extension.rb".freeze,
+  "test/test_default_headers.rb".freeze,
+  "test/test_default_payload.rb".freeze,
+  "test/test_default_query.rb".freeze,
+  "test/test_default_site.rb".freeze,
+  "test/test_error_detector.rb".freeze,
+  "test/test_error_detector_http.rb".freeze,
+  "test/test_error_handler.rb".freeze,
+  "test/test_follow_redirect.rb".freeze,
+  "test/test_json_request.rb".freeze,
+  "test/test_json_response.rb".freeze,
+  "test/test_oauth1_header.rb".freeze,
+  "test/test_oauth2_header.rb".freeze,
+  "test/test_parse_link.rb".freeze,
+  "test/test_query_response.rb".freeze,
+  "test/test_retry.rb".freeze,
+  "test/test_smash.rb".freeze,
+  "test/test_smash_response.rb".freeze,
+  "test/test_timeout.rb".freeze,
+  "test/test_universal.rb".freeze]
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<httpclient>, [">= 0"])
-      s.add_runtime_dependency(%q<mime-types>, [">= 0"])
-      s.add_runtime_dependency(%q<timers>, [">= 4.0.1"])
+      s.add_runtime_dependency(%q<rest-builder>.freeze, [">= 0"])
     else
-      s.add_dependency(%q<httpclient>, [">= 0"])
-      s.add_dependency(%q<mime-types>, [">= 0"])
-      s.add_dependency(%q<timers>, [">= 4.0.1"])
+      s.add_dependency(%q<rest-builder>.freeze, [">= 0"])
     end
   else
-    s.add_dependency(%q<httpclient>, [">= 0"])
-    s.add_dependency(%q<mime-types>, [">= 0"])
-    s.add_dependency(%q<timers>, [">= 4.0.1"])
+    s.add_dependency(%q<rest-builder>.freeze, [">= 0"])
   end
 end

data/test/test_cache.rb

@@ -137,6 +137,8 @@ describe RC::Cache do
     2.times{ c.get(*args).yield[RC::REQUEST_URI].should.eq uri }
   end
 
+  # TODO: Pork::Error: Missing assertions
+  # https://travis-ci.org/godfat/rest-core/jobs/105298775
   would 'preserve promise and preserve wrapped call' do
     c = json_client
     stub_request(:get, 'http://me').to_return(:body => '{"a":"b"}')

data/test/test_default_payload.rb

@@ -37,7 +37,7 @@ describe RC::DefaultPayload do
   would 'accept non-hash payload' do
     u = RC::Universal.new(:log_method => false)
     e = {RC::REQUEST_PAYLOAD => 'payload'}
-    u.request_full(e, u.dry)[RC::REQUEST_PAYLOAD].should.eq('payload')
+    u.request_full( e, u.dry)[RC::REQUEST_PAYLOAD].should.eq('payload')
 
     u.payload = 'default'
     u.request_full( e, u.dry)[RC::REQUEST_PAYLOAD].should.eq('payload')

data/test/test_error_handler.rb

@@ -19,21 +19,22 @@ describe RC::ErrorHandler do
     would 'give an error with callback' do
       client.new.get('/', {}, RC::FAIL => [exp.new('fail')]){ |res|
         res.should.kind_of?(exp)
-      }
+      }.wait
     end
   end
 
   describe 'error_handler gives an exception' do
     would 'raise an error with future' do
       lambda{
-      client.new(:error_handler => lambda{ |res| exp.new }).
-        get('/', {}, RC::FAIL => [true])
+        client.new(:error_handler => lambda{ |res| exp.new }).
+          get('/', {}, RC::FAIL => [true])
       }.should.raise(exp)
     end
 
     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) }
+        get('/', {}, RC::FAIL => [true]){ |res| res.should.kind_of?(exp) }.
+        wait
     end
   end
 

data/test/test_timeout.rb

@@ -1,6 +1,5 @@
 
 require 'rest-core/test'
-require 'rest-core/engine'
 
 describe RC::Timeout do
   app = RC::Timeout.new(RC::Dry.new, 0)
@@ -18,7 +17,7 @@ describe RC::Timeout do
   would 'run the process to setup timeout' do
     env = {'timeout' => 2}
     mock(app).process(env)
-    app.call(env){|e| e[RC::TIMER].should.kind_of?(RC::Timer)}
+    app.call(env){|e| e[RC::TIMER].should.kind_of?(PromisePool::Timer)}
   end
 
   would "not raise timeout error if there's already an error" do
@@ -32,7 +31,7 @@ describe RC::Timeout do
     Object.new.instance_eval do
       @block = nil
       def on_timeout; @block = true; Thread.new{yield}; end
-      def error     ; 'boom'; end
+      def error     ; RuntimeError.new('boom')        ; end
       def cancel    ;       ; end
       def timer     ; @block; end
       self
@@ -42,7 +41,7 @@ describe RC::Timeout do
   def sleeping_app
     RC::Builder.client do
       run Class.new(RC::Engine){
-        def request _, _
+        def request _
           sleep
         end
       }
@@ -68,6 +67,8 @@ describe RC::Timeout do
     a.wait
   end
 
+  # TODO: ConcurrencyError: interrupted waiting for mutex
+  # https://travis-ci.org/godfat/rest-core/jobs/105298777
   would 'interrupt the task if timing out' do
     rd, wr = IO.pipe
     timer = Object.new.instance_eval do
@@ -80,14 +81,14 @@ describe RC::Timeout do
           @block = nil
         end
       end
-      def error     ; 'boom'; end
-      def cancel    ;       ; end
-      def timer     ; @block; end
+      def error     ; RuntimeError.new('boom'); end
+      def cancel    ;                         ; end
+      def timer     ; @block                  ; end
       self
     end
     a = RC::Builder.client do
       run Class.new(RC::Engine){
-        def request _, env
+        def request env
           env['pipe'].puts
           sleep
         end