rest-core 3.5.92 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71fc71379386c45f55e01051b376bf514a1075c7
-  data.tar.gz: f928e5b82c9a3f1363b63f26ab44ced207bb9eed
+  metadata.gz: 5e2e3b27d9cdd63bf53ffecbe03691cd958f57da
+  data.tar.gz: 1c9a5d20dd052ee3ab3888d6a495ce13cfbc94ed
 SHA512:
-  metadata.gz: 5d381aac49625af92235bd160607220756cd596f8ffdcabc9a90512185564e65e3a4356a0650227e9b6aa5edacedd6b0b3cf4cfdf0883adca4fb48be38f00d6a
-  data.tar.gz: bfa47194947c204e83e027d3311ec950ec35a5a7417f727317120844908ebab2c3f32bfc1caa212d7f483aa5682ace607c0e580159fde3020c32cd7c889a5ddb
+  metadata.gz: fcc573e74f35f9f8baacc09ce81f76111ad91b35b8bccd2f344203efee0a27e589e9c67322252287d55f768b0465fadd0146256dec3a92213f1b951a621f0c8c
+  data.tar.gz: 12741fd1e4bff91d66226c86867be01ae0d9004cf85142fd28a38da12245bcb9a29840943c54b3d06c221e688c2ddd990574ecc92f28372fc2040a9e40718177

data/.travis.yml

@@ -13,7 +13,3 @@ before_install:
   - rvm use --install $TRAVIS_RUBY_VERSION --binary --latest
 install: 'bundle install --retry=3'
 script: 'ruby -vr bundler/setup -S rake test'
-
-matrix:
-  allow_failures:
-    - rvm: rbx

data/CHANGES.md

@@ -1,5 +1,22 @@
 # CHANGES
 
+## rest-core 3.6.0 -- 2016-01-27
+
+### Incompatible changes
+
+* Client.defer would now raise an error if the block would raise an error.
+
+### Enhancements
+
+* EventSource would now try to close the socket (actually, pipe from
+  httpclient) if there's no data coming in in 35 seconds,
+  (RC::EventSource::READ_WAIT) therefore we could reconnect in this case.
+  This is mostly for rest-firebase, reference:
+  <https://github.com/CodementorIO/rest-firebase/issues/8>
+  We would surely need a way to configure this timeout rather than
+  hard coding it for 35 seconds as different services could use different
+  timeout. Thanks @volksport for investigating this.
+
 ## rest-core 3.5.92 -- 2015-12-28
 
 ### Enhancements

data/README.md

@@ -796,13 +796,14 @@ the priority here is:
 * Mariusz Pruszynski (@snicky)
 * Mr. Big Cat (@miaout17)
 * Nicolas Fouché (@nfo)
+* Robert Balousek (@volksport)
 * Szu-Kai Hsu (@brucehsu)
 
 ## LICENSE:
 
 Apache License 2.0
 
-Copyright (c) 2011-2015, Lin Jen-Shin (godfat)
+Copyright (c) 2011-2016, 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.

data/Rakefile

@@ -8,9 +8,8 @@ end
 
 Gemgem.init(dir) do |s|
   require 'rest-core/version'
-  s.name     = 'rest-core'
-  s.version  = RestCore::VERSION
-  s.homepage = 'https://github.com/godfat/rest-core'
+  s.name    = 'rest-core'
+  s.version = RestCore::VERSION
   %w[httpclient mime-types].each{ |g| s.add_runtime_dependency(g) }
   s.add_runtime_dependency('timers', '>=4.0.1')
 end

data/lib/rest-core/builder.rb

@@ -105,18 +105,26 @@ class RestCore::Builder
 
       def thread_pool; RestCore::ThreadPool[self]; end
 
-      def defer
+      def defer returns=:future_body
         raise ArgumentError.new('no block given') unless block_given?
-        promise = RestCore::Promise.new(RestCore::CLIENT => self)
+        promise = RestCore::Promise.new({RestCore::CLIENT => self},
+          lambda{ |res|
+            if err = res[FAIL].find{ |f| f.kind_of?(Exception) }
+              Promise.set_backtrace(err) unless err.backtrace
+              raise err
+            else
+              res
+            end
+          })
         give_promise(WeakRef.new(promise))
         promise.defer do
           begin
-            yield
-          ensure
-            promise.done
+            promise.done(yield)
+          rescue => e
+            promise.reject(e)
           end
         end
-        promise
+        promise.send(returns)
       end
 
       def give_promise weak_promise, ps=promises, m=mutex

data/lib/rest-core/event_source.rb

@@ -5,6 +5,8 @@ require 'rest-core'
 class RestCore::EventSource < Struct.new(:client, :path, :query, :opts,
                                          :socket)
   include RestCore
+  READ_WAIT = 35
+
   def start
     self.mutex = Mutex.new
     self.condv = ConditionVariable.new
@@ -100,7 +102,7 @@ class RestCore::EventSource < Struct.new(:client, :path, :query, :opts,
   private
   # called in requesting thread after the request is done
   def onmessage_for sock
-    until sock.eof?
+    while IO.select([sock], [], [], READ_WAIT)
       event = sock.readline("\n\n").split("\n").inject({}) do |r, i|
         k, v = i.split(': ', 2)
         r[k] = v
@@ -108,9 +110,16 @@ class RestCore::EventSource < Struct.new(:client, :path, :query, :opts,
       end
       onmessage(event['event'], event['data'], sock)
     end
-    sock.close
+    close_sock(sock)
     onerror(EOFError.new, sock)
   rescue IOError, SystemCallError => e
+    close_sock(sock)
+    onerror(e, sock)
+  end
+
+  def close_sock sock
+    sock.close
+  rescue IOError => e
     onerror(e, sock)
   end
 

data/lib/rest-core/promise.rb

@@ -119,8 +119,8 @@ class RestCore::Promise
   end
 
   # called in Client.defer to mark this promise as done
-  def done
-    fulfill('', 0, {})
+  def done body=''
+    fulfill(body, 0, {})
   end
 
   # It's considered done only if the HTTP request is done, and we're not

data/lib/rest-core/test.rb

@@ -21,4 +21,9 @@ class Pork::Executor
   ensure
     f.close!
   end
+
+  def stub_select_for_stringio
+    stub(IO).select(where([is_a(StringIO)]), [], [],
+                    RestCore::EventSource::READ_WAIT){ |rd, *| rd }
+  end
 end

data/lib/rest-core/version.rb

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

data/rest-core.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: rest-core 3.5.92 ruby lib
+# stub: rest-core 3.6.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "rest-core"
-  s.version = "3.5.92"
+  s.version = "3.6.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 = "2015-12-28"
+  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.files = [

data/test/test_event_source.rb

@@ -76,6 +76,7 @@ SSE
   end
 
   would 'reconnect' do
+    stub_select_for_stringio
     stub_request(:get, 'https://a?b=c').to_return(:body => <<-SSE)
 event: put
 data: 0
@@ -109,6 +110,7 @@ SSE
   end
 
   would 'not cache' do
+    stub_select_for_stringio
     stub_request(:get, 'https://a?b=c').to_return(:body => <<-SSE)
 event: put
 data: 0

data/test/test_promise.rb

@@ -48,13 +48,24 @@ describe RC::Promise do
   would 'work, wait, done' do
     @client.pool_size = 3
     flag = 0
-    promise = @client.defer do
+    promise = @client.defer(:itself) do
       flag.should.eq 0
       flag += 1
     end
     @client.wait
     flag.should.eq 1
     promise.should.done?
+  end if Object.respond_to?(:itself)
+
+  would 'work, check body' do
+    @client.pool_size = 3
+    flag = 0
+    result = @client.defer do
+      flag.should.eq 0
+      flag += 1
+    end
+    result.should.eq 1
+    flag.should.eq 1
   end
 
   would 'warn on callback error' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest-core
 version: !ruby/object:Gem::Version
-  version: 3.5.92
+  version: 3.6.0
 platform: ruby
 authors:
 - Lin Jen-Shin (godfat)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-28 00:00:00.000000000 Z
+date: 2016-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient