uv-rays 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a54cf48a95b6b5741a9fc2b6d7958f31bb95f967
-  data.tar.gz: 8d03f743d6112dd2de00f60cb62db1735ec3b69e
+  metadata.gz: f56a60649d5cb855bd637812369d0750f1d60f40
+  data.tar.gz: 4b335f621a8a693f68ccea5d91ae0411a66f7d5c
 SHA512:
-  metadata.gz: 7dc9088e375515895366078388804e9853f4e38653ba362861fc8ea5856d6232a8f83fd0070134f5d1e5549dbf3983b31eecf8da6afb4cf95e26a4bc08e53f0c
-  data.tar.gz: 0ea0dd82810514209115682293d096ceea550e5ebfacc2082dd63a74b9ab204665c962f6ae513dd07f0aa5fe514897af67c0c58438d0f0096608471857164366
+  metadata.gz: 1c5fc97e6d88a8ca1b5829862500c2a02bb760941a1d50fe2234b62a6bd922c604d9e921126a7b438b2650f549a855e2fd92435d9a60bdd3a0ddafb7f64d9d05
+  data.tar.gz: 58ee15889926060f749fbf13cba99ad12a34e50c62f2d7a3b8a6bdc1b166cf57c3e0fbe1912527896180fe8948024a989099942b11e02179ac0b8ca4620b783c

data/lib/faraday/adapter/libuv.rb

@@ -74,11 +74,11 @@ module Faraday
 
     def perform_request(env, opts)
       conn = ::UV::HttpEndpoint.new(env[:url].to_s, opts.merge!(@connection_options))
-      resp = co conn.request(env[:method].to_s.downcase.to_sym,
+      resp = conn.request(env[:method].to_s.downcase.to_sym,
         headers: env[:request_headers],
         path: "/#{env[:url].to_s.split('/', 4)[-1]}",
         keepalive: false,
-        body: read_body(env))
+        body: read_body(env)).value
 
       save_response(env, resp.status.to_i, resp.body, resp) #, resp.reason_phrase)
       nil

data/lib/httpi/adapter/libuv.rb

@@ -63,7 +63,7 @@ class HTTPI::Adapter::Libuv < HTTPI::Adapter::Base
         end
 
         # Use co-routines to make non-blocking requests
-        response = co @client.request(method, req)
+        response = @client.request(method, req).value
         ::HTTPI::Response.new(response.status, response, response.body)
     end
 end

data/lib/uv-rays/connection.rb

@@ -5,8 +5,8 @@ require 'ipaddress' # IP Address parser
 module UV
     def self.try_connect(tcp, handler, server, port)
         if IPAddress.valid? server
-            tcp.finally handler.method(:on_close)
-            tcp.progress handler.method(:on_read)
+            tcp.finally { handler.on_close }
+            tcp.progress { |*data| handler.on_read(*data) }
             tcp.connect server, port do
                 tcp.enable_nodelay
                 tcp.start_tls(handler.using_tls) if handler.using_tls
@@ -109,8 +109,8 @@ module UV
 
             @reactor = tcp.reactor
             @transport = tcp
-            @transport.finally method(:on_close)
-            @transport.progress method(:on_read)
+            @transport.finally { on_close }
+            @transport.progress { |*data| on_read(*data) }
         end
 
         def use_tls(args = {})
@@ -164,7 +164,7 @@ module UV
 
             @reactor = reactor
             @transport = @reactor.udp
-            @transport.progress method(:on_read)
+            @transport.progress { |*args| on_read(*args) }
 
             if not server.nil?
                 server = '127.0.0.1' if server == 'localhost'

data/lib/uv-rays/http/request.rb

@@ -150,22 +150,22 @@ module UV
 
                 if body
                     request_header << body
-                    transport.write(request_header).catch @error
+                    transport.write(request_header).catch &@error
                 elsif file
-                    transport.write(request_header).catch @error
+                    transport.write(request_header).catch &@error
 
                     # Send file
                     fileRef = @reactor.file file, File::RDONLY do
                         # File is open and available for reading
                         pSend = fileRef.send_file(transport, using: :raw, wait: :promise)
-                        pSend.catch @error
+                        pSend.catch &@error
                         pSend.finally do
                             fileRef.close
                         end
                     end
-                    fileRef.catch @error
+                    fileRef.catch &@error
                 else
-                    transport.write(request_header).catch @error
+                    transport.write(request_header).catch &@error
                 end
             end
 
@@ -177,9 +177,7 @@ module UV
                 @headers_callback.call(head) if @headers_callback
             end
 
-
-
-            def on_headers(callback, &blk)
+            def on_headers(&callback)
                 @headers_callback = callback
             end
 

data/lib/uv-rays/scheduler.rb

@@ -182,7 +182,6 @@ module UV
             @scheduled = []
             @next = nil     # Next schedule time
             @timer = nil    # Reference to the timer
-            @timer_callback = method(:on_timer)
 
             # Not really required when used correctly
             @critical = Mutex.new
@@ -211,14 +210,10 @@ module UV
         # @param time [String] a human readable string representing the time period. 3w2d4h1m2s for example.
         # @param callback [Proc] a block or method to execute when the event triggers
         # @return [::UV::Repeat]
-        def every(time, callback = nil, &block)
-            callback ||= block
+        def every(time)
             ms = Scheduler.parse_in(time)
             event = Repeat.new(self, ms)
-
-            if callback.respond_to? :call
-                event.progress callback
-            end
+            event.progress &Proc.new if block_given?
             schedule(event)
             event
         end
@@ -228,14 +223,10 @@ module UV
         # @param time [String] a human readable string representing the time period. 3w2d4h1m2s for example.
         # @param callback [Proc] a block or method to execute when the event triggers
         # @return [::UV::OneShot]
-        def in(time, callback = nil, &block)
-            callback ||= block
+        def in(time)
             ms = @reactor.now + Scheduler.parse_in(time)
             event = OneShot.new(self, ms)
-
-            if callback.respond_to? :call
-                event.progress callback
-            end
+            event.progress &Proc.new if block_given?
             schedule(event)
             event
         end
@@ -245,14 +236,10 @@ module UV
         # @param time [String, Time] a representation of a date and time that can be parsed
         # @param callback [Proc] a block or method to execute when the event triggers
         # @return [::UV::OneShot]
-        def at(time, callback = nil, &block)
-            callback ||= block
+        def at(time)
             ms = Scheduler.parse_at(time) - @time_diff
             event = OneShot.new(self, ms)
-
-            if callback.respond_to? :call
-                event.progress callback
-            end
+            event.progress &Proc.new if block_given?
             schedule(event)
             event
         end
@@ -262,14 +249,10 @@ module UV
         # @param schedule [String] a standard CRON job line.
         # @param callback [Proc] a block or method to execute when the event triggers
         # @return [::UV::Repeat]
-        def cron(schedule, callback = nil, timezone: nil, &block)
-            callback ||= block
+        def cron(schedule, timezone: nil)
             ms = Scheduler.parse_cron(schedule, timezone: timezone)
             event = Repeat.new(self, ms)
-
-            if callback.respond_to? :call
-                event.progress callback
-            end
+            event.progress &Proc.new if block_given?
             schedule(event)
             event
         end
@@ -391,7 +374,7 @@ module UV
 
         # Provide some assurances on timer failure
         def new_timer
-            @timer = @reactor.timer @timer_callback
+            @timer = @reactor.timer { on_timer }
             @timer.finally do
                 new_timer
                 unless @next.nil?

data/lib/uv-rays/tcp_server.rb

@@ -18,7 +18,7 @@ module UV
                 server = '127.0.0.1' if server == 'localhost'
                 if IPAddress.valid? server
                     @server = server
-                    bind(server, port, method(:new_connection))
+                    bind(server, port) { |client| new_connection(client) }
                     listen(1024)
                 else
                     raise ArgumentError, "Invalid server address #{server}"

data/lib/uv-rays/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module UV
-    VERSION = '2.4.0'
+    VERSION = '2.4.1'
 end

data/spec/http_endpoint_spec.rb

@@ -257,7 +257,7 @@ describe UV::HttpEndpoint do
 					objs = WeakRef.new(server)
 
 					request = server.get(:path => '/whatwhat')
-					request.catch(@request_failure)
+					request.catch(&@request_failure)
 					request.finally {
 						tcp.close
 						@timeout.stop

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uv-rays
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-27 00:00:00.000000000 Z
+date: 2017-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libuv