uv-rays 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 663ee2734c50410a550b07bb2cf2e0fa868fa9a3
-  data.tar.gz: d268b959e9d47496538b8133fb4049c316838057
+  metadata.gz: 062fbd42aaa4ac76d836fbf53f1d20c069b2b0e6
+  data.tar.gz: f282b28e0a2b1c6831f14091f87928be777ad061
 SHA512:
-  metadata.gz: bf48b38bea0a918df33883661c51906bb7aebedb51356589495827de3a67549ccb31a86f547bfed83aa85f0402ae3aebf88976e30b8fbce5058ba8f24e6466be
-  data.tar.gz: 91f4931a148d3219d01673253ba19c1411187477545609486a0a2f6f957d6405669363a7bcf4a534f24194364a71419ad89b2fc4401f4ed6b9a461113de37bd0
+  metadata.gz: 1d8151d7d1240523a47ab1902e75abd95a61f0a30fb76422e6da23e486b1321022dfdda115e686ff11b55cc27e58317ac39260415b808e47574429a45f560f90
+  data.tar.gz: 0d8a947d398f9be35e9a3f5c4192cabdf7a2a02cc38dcdac4f8628c4a9bb0c86dca16f98dcf30e1bdc67e71bb082244faaa2a7ca3efcdf8ba7866abc044e15e5

data/lib/uv-rays/connection.rb

@@ -6,7 +6,7 @@ module UV
             tcp.progress handler.method(:on_read)
             tcp.connect server, port do
                 tcp.enable_nodelay
-                tcp.start_tls(handler.using_tls) unless handler.using_tls == false
+                tcp.start_tls(handler.using_tls) if handler.using_tls
 
                 # on_connect could call use_tls so must come after start_tls
                 handler.on_connect(tcp)
@@ -182,7 +182,7 @@ module UV
             else
                 # Async DNS resolution
                 # Note:: send here will chain the promise
-                tcp.loop.lookup(server).then do |result|
+                @loop.lookup(recipient_address).then do |result|
                     @transport.send result[0][0], recipient_port, data
                 end
             end

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

@@ -30,7 +30,7 @@ module UV
 
                 @path = options[:path]
                 @method = options[:method]
-                @uri = encode_host(endpoint.host, endpoint.port) + @path
+                @uri = "#{endpoint.scheme}#{encode_host(endpoint.host, endpoint.port)}#{@path}"
             end
 
             def resolve(response)

data/lib/uv-rays/http_endpoint.rb

@@ -26,17 +26,19 @@ module UV
     end # CookieJar
 
 
-    class HttpEndpoint < TcpConnection
-        TRANSFER_ENCODING="TRANSFER_ENCODING"
-        CONTENT_ENCODING="CONTENT_ENCODING"
-        CONTENT_LENGTH="CONTENT_LENGTH"
-        CONTENT_TYPE="CONTENT_TYPE"
-        LAST_MODIFIED="LAST_MODIFIED"
-        KEEP_ALIVE="CONNECTION"
-        LOCATION="LOCATION"
-        HOST="HOST"
-        ETAG="ETAG"
-        CRLF="\r\n"
+    class HttpEndpoint < OutboundConnection
+        TRANSFER_ENCODING="TRANSFER_ENCODING".freeze
+        CONTENT_ENCODING="CONTENT_ENCODING".freeze
+        CONTENT_LENGTH="CONTENT_LENGTH".freeze
+        CONTENT_TYPE="CONTENT_TYPE".freeze
+        LAST_MODIFIED="LAST_MODIFIED".freeze
+        KEEP_ALIVE="CONNECTION".freeze
+        LOCATION="LOCATION".freeze
+        HOST="HOST".freeze
+        ETAG="ETAG".freeze
+        CRLF="\r\n".freeze
+        HTTPS="https://".freeze
+        HTTP="http://".freeze
 
 
         @@defaults = {
@@ -44,7 +46,7 @@ module UV
             :keepalive => true
         }
 
-        attr_reader :host, :port, :using_tls, :loop, :cookiejar
+        attr_reader :scheme, :host, :port, :using_tls, :loop, :cookiejar
         attr_reader :connect_timeout, :inactivity_timeout
 
         def initialize(uri, options = {})
@@ -52,12 +54,10 @@ module UV
             @inactivity_timeout  = options[:inactivity_timeout] ||= 10   # default connection inactivity (post-setup) timeout
 
 
-            @using_tls = options[:tls] || options[:ssl] || false
-            @using_tls.delete(:server) unless @using_tls == false
-
             uri = uri.kind_of?(Addressable::URI) ? uri : Addressable::URI::parse(uri.to_s)
-            @https = uri.scheme == "https"
+            @https = uri.scheme == "https" || @using_tls
             uri.port ||= (@https ? 443 : 80)
+            @scheme = @https ? HTTPS : HTTP
 
 
             @loop = Libuv::Loop.current || Libuv::Loop.default
@@ -117,7 +117,7 @@ module UV
             }
 
             ##
-            # TODO:: Add middleware here
+            # TODO:: Add response middleware here
             request.then blk if blk
 
             # Add to pending requests and schedule using the breakpoint
@@ -168,6 +168,9 @@ module UV
             @connecting = false
             @ready = true
 
+            # start tls if connection is encrypted
+            use_tls() if @https
+
             # Update timeouts
             stop_timer
             if @inactivity_timeout > 0

data/lib/uv-rays/version.rb

@@ -1,3 +1,3 @@
 module UV
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
 end

data/spec/connection_spec.rb

@@ -15,9 +15,10 @@ module TestConnect
 		@loop.stop
 	end
 
-	def on_read(data, connection, port = nil)
+	def on_read(data, connection, port = nil, udp_test = nil)
 		@received = data
 		close_connection(:after_writing)
+		@loop.stop if udp_test 	# misc is set when test connect is a UDP connection
 	end
 
 	def check
@@ -36,10 +37,8 @@ module TestServer
 		write('hello')
 	end
 
-	def on_read(*args) #data, ip, port, conection)
-		#p "was sent #{data} from port #{port}"
-		#send_datagram(data, ip, port)
-		@loop.stop
+	def on_read(data, ip, port, conection)
+		send_datagram(data, ip, port)
 	end
 end
 
@@ -157,7 +156,7 @@ describe UV::Connection do
 			res = @klass.check
 			expect(res[0]).to eq(nil)
 			expect(res[1]).to eq(nil)
-			expect(res[2]).to eq(nil) #'hello' (libuv receive bug?)
+			expect(res[2]).to eq('hello')
 		end
 	end
 end

data/spec/http_endpoint_spec.rb

@@ -9,7 +9,7 @@ module HttpServer
 	end
 
 	def on_message_complete(parser)
-		write("HTTP/1.1 200 OK\r\nContent-type: text/html\r\nContent-length: 0\r\n\r\n")
+		write("HTTP/1.1 200 OK\r\nContent-type: text/html\r\nContent-length: 1\r\n\r\ny")
 	end
 
 	def on_read(data, connection)
@@ -84,6 +84,8 @@ describe UV::HttpEndpoint do
 			expect(@response[:headers].status).to eq(200)
 			expect(@response[:headers].cookies).to eq({})
 			expect(@response[:headers].keep_alive).to eq(true)
+
+			expect(@response[:body]).to eq('y')
 		end
 
 		it "should send multiple requests on the same connection", :network => true do

data/uv-rays.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
     gem.required_ruby_version = '>= 1.9.2'
     gem.require_paths = ["lib"]
 
-    gem.add_runtime_dependency     'libuv', '>= 0.11.19'
+    gem.add_runtime_dependency     'libuv', '>= 0.11.20'
     gem.add_runtime_dependency     'bisect'
     gem.add_runtime_dependency     'tzinfo'
     gem.add_runtime_dependency     'cookiejar'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uv-rays
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-08 00:00:00.000000000 Z
+date: 2014-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libuv
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.19
+        version: 0.11.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.19
+        version: 0.11.20
 - !ruby/object:Gem::Dependency
   name: bisect
   requirement: !ruby/object:Gem::Requirement