rest-core 2.1.2 → 3.0.0

data/lib/rest-core/test.rb

@@ -1,19 +1,16 @@
 
-require 'fiber'
-require 'em-http-request'
 require 'rest-core'
 
-require 'rr'
 require 'webmock'
+require 'muack'
 require 'bacon'
 
 # for testing lighten (serialization)
 require 'yaml'
 
-include RR::Adapters::RRMethods
-include WebMock::API
 WebMock.disable_net_connect!(:allow_localhost => true)
 Bacon.summary_on_exit
+Bacon::Context.send(:include, Muack::API, WebMock::API)
 
 module Kernel
   def eq? rhs
@@ -34,41 +31,3 @@ module Kernel
     f.close!
   end
 end
-
-# https://github.com/bblimke/webmock/pull/280
-class ::EventMachine::WebMockHttpClient
-  def build_request_signature
-    headers, body = @req.headers, @req.body
-
-    @conn.middleware.select {|m| m.respond_to?(:request) }.each do |m|
-      headers, body = m.request(self, headers, body)
-    end
-
-    method = @req.method
-    uri = @req.uri.clone
-    auth = @req.headers[:'proxy-authorization']
-    query = @req.query
-
-    if auth
-      userinfo = auth.join(':')
-      userinfo = WebMock::Util::URI.encode_unsafe_chars_in_userinfo(userinfo)
-      if @req
-        @req.proxy.reject! {|k,v| t.to_s == 'authorization' }
-      else
-        options.reject! {|k,v| k.to_s == 'authorization' } #we added it to url userinfo
-      end
-      uri.userinfo = userinfo
-    end
-
-    uri.query = encode_query(@req.uri, query).slice(/\?(.*)/, 1)
-
-    body = form_encode_body(body) if body.is_a?(Hash)
-
-    WebMock::RequestSignature.new(
-      method.downcase.to_sym,
-      uri.to_s,
-      :body => body || (@req.file && File.read(@req.file)),
-      :headers => headers
-    )
-  end
-end

data/lib/rest-core/thread_pool.rb

@@ -0,0 +1,122 @@
+
+# reference implementation: puma
+# https://github.com/puma/puma/blob/v2.7.1/lib/puma/thread_pool.rb
+
+require 'thread'
+require 'rest-core'
+
+class RestCore::ThreadPool
+  include RestCore
+
+  class Queue
+    def initialize
+      @queue = []
+      @mutex = Mutex.new
+      @condv = ConditionVariable.new
+    end
+
+    def << task
+      mutex.synchronize do
+        queue << task
+        condv.signal
+      end
+    end
+
+    def pop timeout=60
+      mutex.synchronize do
+        if queue.empty?
+          condv.wait(mutex, timeout)
+          queue.shift || lambda{ false } # shutdown idle workers
+        else
+          queue.shift
+        end
+      end
+    end
+
+    def clear
+      queue.clear
+    end
+
+    protected
+    attr_reader :queue, :mutex, :condv
+  end
+
+  class Task < Struct.new(:job)
+    # this should never fail
+    def call
+      job.call unless cancelled
+    end
+
+    # called from the other thread telling us it's timed out
+    def cancel
+      @cancelled = true
+    end
+    protected
+    attr_reader :thread, :mutex, :cancelled
+  end
+
+  def self.[] client_class
+    (@pools ||= {})[client_class] ||= new(client_class)
+  end
+
+  attr_reader :client_class
+
+  def initialize client_class
+    @client_class = client_class
+    @queue        = Queue.new
+    @mutex        = Mutex.new
+    @workers      = []
+    @waiting      = 0
+  end
+
+  def inspect
+    "#<#{self.class.name} client_class=#{client_class}>"
+  end
+
+  def max_size
+    client_class.pool_size
+  end
+
+  def idle_time
+    client_class.pool_idle_time
+  end
+
+  def defer &job
+    mutex.synchronize do
+      task = Task.new(job)
+      queue << task
+      spawn_worker if waiting == 0 && workers.size < max_size
+      task
+    end
+  end
+
+  def trim force=false
+    queue << lambda{ false } if force || waiting > 0
+  end
+
+  # Block on shutting down, and should not add more jobs while shutting down
+  def shutdown
+    workers.size.times{ trim(true) }
+    workers.first.join && trim(true) until workers.empty?
+    queue.clear
+  end
+
+  protected
+  attr_reader :queue, :mutex, :condv, :workers, :waiting
+
+  private
+  def spawn_worker
+    workers << Thread.new{
+      Thread.current.abort_on_exception = !!$DEBUG
+
+      task = nil
+      begin
+        mutex.synchronize{ @waiting += 1 }
+        task = queue.pop(idle_time)
+        mutex.synchronize{ @waiting -= 1 }
+      end while task.call
+
+      mutex.synchronize{ workers.delete(Thread.current) }
+    }
+  end
+end

data/lib/rest-core/timer.rb

@@ -0,0 +1,30 @@
+
+require 'timers'
+
+class RestCore::Timer
+  TimerGen = Timers.new
+
+  attr_accessor :timeout, :error
+  def initialize timeout, error, &block
+    self.timeout = timeout
+    self.error   = error
+    self.block   = block
+    start
+  end
+
+  def on_timeout &block
+    self.block = block
+  end
+
+  def cancel
+    timer.cancel
+  end
+
+  def start
+    return if timeout.nil? || timeout.zero?
+    self.timer = TimerGen.after(timeout){ block.call }
+  end
+
+  protected
+  attr_accessor :block, :timer
+end

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

@@ -4,19 +4,11 @@ require 'openssl'
 module RestCore; end
 module RestCore::Hmac
   module_function
-  # Fallback to ruby-hmac gem in case system openssl
-  # lib doesn't support SHA256 (OSX 10.5)
   def sha256 key, data
     OpenSSL::HMAC.digest('sha256', key, data)
-  rescue RuntimeError
-    require 'hmac-sha2'
-    HMAC::SHA256.digest(key, data)
   end
 
   def sha1 key, data
     OpenSSL::HMAC.digest('sha1', key, data)
-  rescue RuntimeError
-    require 'hmac-sha1'
-    HMAC::SHA1.digest(key, data)
   end
 end

data/lib/rest-core/version.rb

@@ -1,4 +1,4 @@
 
 module RestCore
-  VERSION = '2.1.2'
+  VERSION = '3.0.0'
 end

data/lib/rest-core/wrapper.rb

@@ -24,10 +24,10 @@ module RestCore::Wrapper
   end
 
   def initialize &block
+    @engine    = nil
     @middles ||= []
     instance_eval(&block) if block_given?
     @wrapped ||= to_app
-    @engine    = nil
   end
 
   def use middle, *args, &block

data/rest-core.gemspec

@@ -1,16 +1,16 @@
 # -*- encoding: utf-8 -*-
+# stub: rest-core 3.0.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "rest-core"
-  s.version = "2.1.2"
+  s.version = "3.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [
-  "Cardinal Blue",
-  "Lin Jen-Shin (godfat)"]
-  s.date = "2013-05-31"
-  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/cardinalblue/rest-more"
-  s.email = ["dev (XD) cardinalblue.com"]
+  s.require_paths = ["lib"]
+  s.authors = ["Lin Jen-Shin (godfat)"]
+  s.date = "2014-05-04"
+  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.files = [
   ".gitignore",
   ".gitmodules",
@@ -22,7 +22,6 @@ Gem::Specification.new do |s|
   "README.md",
   "Rakefile",
   "TODO.md",
-  "example/multi.rb",
   "example/simple.rb",
   "example/use-cases.rb",
   "lib/rest-core.rb",
@@ -31,15 +30,14 @@ Gem::Specification.new do |s|
   "lib/rest-core/client/simple.rb",
   "lib/rest-core/client/universal.rb",
   "lib/rest-core/client_oauth1.rb",
-  "lib/rest-core/engine/auto.rb",
+  "lib/rest-core/engine.rb",
   "lib/rest-core/engine/dry.rb",
-  "lib/rest-core/engine/em-http-request.rb",
-  "lib/rest-core/engine/future/future.rb",
-  "lib/rest-core/engine/future/future_fiber.rb",
-  "lib/rest-core/engine/future/future_thread.rb",
+  "lib/rest-core/engine/http-client.rb",
+  "lib/rest-core/engine/net-http-persistent.rb",
   "lib/rest-core/engine/rest-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",
@@ -60,11 +58,12 @@ Gem::Specification.new do |s|
   "lib/rest-core/middleware/oauth2_header.rb",
   "lib/rest-core/middleware/oauth2_query.rb",
   "lib/rest-core/middleware/timeout.rb",
-  "lib/rest-core/middleware/timeout/timer_em.rb",
-  "lib/rest-core/middleware/timeout/timer_thread.rb",
   "lib/rest-core/patch/multi_json.rb",
   "lib/rest-core/patch/rest-client.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/hmac.rb",
   "lib/rest-core/util/json.rb",
   "lib/rest-core/util/parse_query.rb",
@@ -72,7 +71,7 @@ Gem::Specification.new do |s|
   "lib/rest-core/version.rb",
   "lib/rest-core/wrapper.rb",
   "rest-core.gemspec",
-  "task/.gitignore",
+  "task/README.md",
   "task/gemgem.rb",
   "test/test_auth_basic.rb",
   "test/test_builder.rb",
@@ -81,25 +80,27 @@ Gem::Specification.new do |s|
   "test/test_client_oauth1.rb",
   "test/test_default_payload.rb",
   "test/test_default_query.rb",
-  "test/test_em-http-request.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_json_request.rb",
   "test/test_json_response.rb",
   "test/test_oauth1_header.rb",
+  "test/test_oauth2_header.rb",
   "test/test_payload.rb",
+  "test/test_promise.rb",
   "test/test_rest-client.rb",
   "test/test_simple.rb",
+  "test/test_thread_pool.rb",
   "test/test_timeout.rb",
   "test/test_universal.rb",
   "test/test_wrapper.rb"]
-  s.homepage = "https://github.com/cardinalblue/rest-core"
+  s.homepage = "https://github.com/godfat/rest-core"
   s.licenses = ["Apache License 2.0"]
-  s.post_install_message = "# [rest-core] Since 2.1.0, Incompatible changes for POST requests:\n\n* We no longer support Rails-like POST payload, like translating\n  `{:foo => [1, 2]}` to `'foo[]=1&foo[]=2'`. It would now be translated to\n  `'foo=1&foo=2'`. If you like `'foo[]'` as the key, simply pass it as\n  `{'foo[]' => [1, 2]}`.\n\n* This also applies to nested hashes like `{:foo => {:bar => 1}`. If you\n  want that behaviour, just pass `{'foo[bar]' => 1}` which would then be\n  translated to `'foo[bar]=1'`.\n"
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.3"
+  s.rubygems_version = "2.2.2"
   s.summary = "Modular Ruby clients interface for REST APIs."
   s.test_files = [
   "test/test_auth_basic.rb",
@@ -109,17 +110,21 @@ Gem::Specification.new do |s|
   "test/test_client_oauth1.rb",
   "test/test_default_payload.rb",
   "test/test_default_query.rb",
-  "test/test_em-http-request.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_json_request.rb",
   "test/test_json_response.rb",
   "test/test_oauth1_header.rb",
+  "test/test_oauth2_header.rb",
   "test/test_payload.rb",
+  "test/test_promise.rb",
   "test/test_rest-client.rb",
   "test/test_simple.rb",
+  "test/test_thread_pool.rb",
   "test/test_timeout.rb",
   "test/test_universal.rb",
   "test/test_wrapper.rb"]
@@ -128,11 +133,17 @@ 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-client>, [">= 0"])
+      s.add_runtime_dependency(%q<httpclient>, [">= 0"])
+      s.add_runtime_dependency(%q<mime-types>, [">= 0"])
+      s.add_runtime_dependency(%q<timers>, [">= 0"])
     else
-      s.add_dependency(%q<rest-client>, [">= 0"])
+      s.add_dependency(%q<httpclient>, [">= 0"])
+      s.add_dependency(%q<mime-types>, [">= 0"])
+      s.add_dependency(%q<timers>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rest-client>, [">= 0"])
+    s.add_dependency(%q<httpclient>, [">= 0"])
+    s.add_dependency(%q<mime-types>, [">= 0"])
+    s.add_dependency(%q<timers>, [">= 0"])
   end
 end

data/task/README.md

@@ -0,0 +1,54 @@
+# Gemgem
+
+## DESCRIPTION:
+
+Provided tasks:
+
+    rake clean        # Remove ignored files
+    rake gem:build    # Build gem
+    rake gem:install  # Install gem
+    rake gem:release  # Release gem
+    rake gem:spec     # Generate gemspec
+    rake test         # Run tests in memory
+
+## REQUIREMENTS:
+
+* Tested with MRI (official CRuby) 1.9.3, 2.0.0, Rubinius and JRuby.
+
+## INSTALLATION:
+
+    git submodule add git://github.com/godfat/gemgem.git task
+
+And in Rakefile:
+
+``` ruby
+begin
+  require "#{dir = File.dirname(__FILE__)}/task/gemgem"
+rescue LoadError
+  sh 'git submodule update --init'
+  exec Gem.ruby, '-S', $PROGRAM_NAME, *ARGV
+end
+
+Gemgem.init(dir) do |s|
+  s.name    = 'your-gem'
+  s.version = '0.1.0'
+end
+```
+
+## LICENSE:
+
+Apache License 2.0
+
+Copyright (c) 2011-2013, Lin Jen-Shin (godfat)
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+<http://www.apache.org/licenses/LICENSE-2.0>
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.