rest-core 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: 53be9b581bc7a4fcb1a7e1f1a42341c7298b9434
-  data.tar.gz: 75f8582f77c1fd69d12e1437f487f4785b49ed6d
-!binary "U0hBNTEy":
-  metadata.gz: 164029833febdeb100e027761b780eadc937085193f8713340d48fe59975e30029c6a2a2651ea67073c400bcde86524b4cde8e445f802c1b43b820aea1c48c4b
-  data.tar.gz: 4a8d30cf61afbf17950ce3418b15791c9b948b12f14d3dc7915cf8dedad7239ed80f3cec91dbc8d5192d48149c35f2471bacbb68a7a0a4fc28d71a5b67db91c7
+SHA1:
+  metadata.gz: 13edab18f56e62ce573dc6cff597226d8d5ade6c
+  data.tar.gz: e41513b602d15644f9f4000cfc85a14bd93b71f2
+SHA512:
+  metadata.gz: 70583190f10ad4f2a90075eb894a9f12da622c585353b20a77152de34ea573f5cc1d5c9512ca9d6b19722c13baba87bc829a10a9eb77162bf95c94bdc88b1cc7
+  data.tar.gz: c583d03d2448e7d202a506661aea8a67be6f127f1b2ec3bf97176939585437d78fc28c5bb708f4f9fdcf2501d9e2806f2eb6a75f102949f32f5d238f34665826

data/CHANGES.md

@@ -1,5 +1,9 @@
 # CHANGES
 
+## rest-core 2.0.4 -- 2013-04-30
+
+* [`EmHttpRequest`] Use `EM.schedule` to fix thread-safety issue.
+
 ## rest-core 2.0.3 -- 2013-04-01
 
 * Use `URI.escape(string, UNRESERVED)` for URI escaping instead of

data/lib/rest-core/engine/em-http-request.rb

@@ -8,7 +8,25 @@ require 'rest-core/middleware'
 class RestCore::EmHttpRequest
   include RestCore::Middleware
   def call env, &k
-    future  = Future.create(env, k, env[ASYNC])
+    future = Future.create(env, k, env[ASYNC])
+
+    # eventmachine is not thread-safe, so...
+    # https://github.com/igrigorik/em-http-request/issues/190#issuecomment-16995528
+    ::EventMachine.schedule{ request(future, env) }
+
+    env.merge(RESPONSE_BODY    => future.proxy_body,
+              RESPONSE_STATUS  => future.proxy_status,
+              RESPONSE_HEADERS => future.proxy_headers,
+              FUTURE           => future)
+  end
+
+  def close client
+    (client.instance_variable_get(:@callbacks)||[]).clear
+    (client.instance_variable_get(:@errbacks )||[]).clear
+    client.close
+  end
+
+  def request future, env
     payload = ::RestClient::Payload.generate(env[REQUEST_PAYLOAD])
     client  = ::EventMachine::HttpRequest.new(request_uri(env)).send(
                  env[REQUEST_METHOD],
@@ -21,18 +39,13 @@ class RestCore::EmHttpRequest
                      client.response_header.status,
                      client.response_header)}
 
-    client.errback{future.on_error(client.error) }
+    client.errback{
+      close(client)
+      future.on_error(client.error)}
 
     env[TIMER].on_timeout{
-      (client.instance_variable_get(:@callbacks)||[]).clear
-      (client.instance_variable_get(:@errbacks )||[]).clear
-      client.close
+      close(client)
       future.on_error(env[TIMER].error)
     } if env[TIMER]
-
-    env.merge(RESPONSE_BODY    => future.proxy_body,
-              RESPONSE_STATUS  => future.proxy_status,
-              RESPONSE_HEADERS => future.proxy_headers,
-              FUTURE           => future)
   end
 end

data/lib/rest-core/version.rb

@@ -1,4 +1,4 @@
 
 module RestCore
-  VERSION = '2.0.3'
+  VERSION = '2.0.4'
 end

data/rest-core.gemspec

@@ -2,13 +2,13 @@
 
 Gem::Specification.new do |s|
   s.name = "rest-core"
-  s.version = "2.0.3"
+  s.version = "2.0.4"
 
   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-04-01"
+  s.date = "2013-04-30"
   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.files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest-core
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Cardinal Blue
@@ -9,39 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-01 00:00:00.000000000 Z
+date: 2013-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! 'Modular Ruby clients interface for REST APIs
-
+description: |-
+  Modular Ruby clients interface for REST APIs
 
   There has been an explosion in the number of REST APIs available today.
-
   To address the need for a way to access these APIs easily and elegantly,
-
   we have developed rest-core, which consists of composable middleware
-
   that allows you to build a REST client for any REST API. Or in the case of
-
   common APIs such as Facebook, Github, and Twitter, you can simply use the
-
   dedicated clients provided by [rest-more][].
 
-
-  [rest-more]: https://github.com/cardinalblue/rest-more'
+  [rest-more]: https://github.com/cardinalblue/rest-more
 email:
 - dev (XD) cardinalblue.com
 executables: []
@@ -137,12 +131,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []