uv-rays 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 939125ab88b4466ba538e431f186dccfe37bd638
-  data.tar.gz: 427ddebe1f2451c4938785123457276cc61e9c2c
+  metadata.gz: a5ba5df00f6948a972973d5bfbd9a41af4f5a5d6
+  data.tar.gz: d8dd4e730a3b5152eeaf3b2c85f1dd5939788014
 SHA512:
-  metadata.gz: 8f1f88697b9ce52d05587646e81b833f58f3d998a186f2cbafd6b12beff1cad12c768a8449120615063f511e56d0f0e31bd026c7b64c6848a5f176ac136138c4
-  data.tar.gz: 0e00f1f4bc2b8c8cb1bc2bab1e83c0cc0eca629b591cfe06933134d1cd9fd003847202d48ba58e18a379cceacd3963bf8500499667ed929ffcfda36b7666ef6e
+  metadata.gz: bf3d5fbef4c6587d85bfc99aa6dc0ec3647877d5382c12d2fb5602cba3b34da321ca0e173076a998ecd9e45051fad7730f6ff36a937004c3a862cdc658db41e1
+  data.tar.gz: d02305fa34106ed9d314f5d1d3bb4b2d353689bf1a296eb9a0e0cfb47f7a180afd35d3764da4a3bad5d55f9f5b5c85741ffb5ea6308039e064f2db05d9df2a8f

data/README.md

@@ -1,6 +1,6 @@
 # uv-rays
 
-[![Build Status](https://travis-ci.org/cotag/uv-rays.png?branch=master)](https://travis-ci.org/cotag/uv-rays)
+[![Build Status](https://travis-ci.org/cotag/uv-rays.svg?branch=master)](https://travis-ci.org/cotag/uv-rays)
 
 UV-Rays was designed to eliminate the complexities of high-performance threaded network programming, allowing engineers to concentrate on their application logic.
 

data/Rakefile

@@ -8,7 +8,7 @@ require 'yard'                  # yard documentation
 task :default => :limited_spec
 RSpec::Core::RakeTask.new(:limited_spec) do |t|
     # Exclude network tests
-    # t.rspec_opts = "--tag ~network" 
+    t.rspec_opts = "--tag ~network" 
 end
 RSpec::Core::RakeTask.new(:spec)
 

data/lib/uv-rays/abstract_tokenizer.rb

@@ -57,7 +57,17 @@ module UV
                     end
                 else
                     # This will work with a regex
-                    index = messages.last.nil? ? 0 : @input[0...-last.length].rindex(messages.last) + messages.last.length
+                    index = if messages.last.nil?
+                        0
+                    else
+                        # Possible that rindex will not find a match
+                        check = @input[0...-last.length].rindex(messages.last)
+                        if check.nil?
+                            0
+                        else
+                            check + messages.last.length
+                        end
+                    end
                     indicator_val = @input[index...-last.length]
                     @input = indicator_val + last
                 end

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

@@ -88,9 +88,9 @@ module UV
             #         String - custom auth string (OAuth, etc)
             def encode_auth(k,v)
                 if v.is_a? Array
-                    FIELD_ENCODING % [k, ["Basic", Base64.encode64(v.join(":")).split.join].join(" ")]
+                    FIELD_ENCODING % [k, ["Basic", Base64.strict_encode64(v.join(":"))].join(" ")]
                 else
-                    encode_field(k,v)
+                    encode_field(k, v)
                 end
             end
 

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

@@ -82,8 +82,17 @@ module UV
                 if body
                     transport.write(body).catch error
                 elsif file
-                    # TODO:: Send file
-                    #@conn.stream_file_data @req.file, :http_chunks => false
+                    # Send file
+                    fileRef = @endpoint.loop.file file, File::RDONLY
+                    fileRef.progress do
+                        # File is open and available for reading
+                        pSend = fileRef.send_file(transport, :raw)
+                        pSend.catch error
+                        pSend.finally do
+                            fileRef.close
+                        end
+                    end
+                    fileRef.catch error
                 end
             end
 

data/lib/uv-rays/scheduler.rb

@@ -53,10 +53,10 @@ module UV
             @last_scheduled = @loop.now
 
             
-            parsed_time = parse_in(time, :quiet)
+            parsed_time = Scheduler.parse_in(time, :quiet)
             if parsed_time.nil?
                 # Parse at will throw an error if time is invalid
-                parsed_time = parse_at(time) - @scheduler.time_diff
+                parsed_time = Scheduler.parse_at(time) - @scheduler.time_diff
             else
                 parsed_time += @last_scheduled
             end
@@ -84,7 +84,7 @@ module UV
         #
         # @param schedule [String] a standard CRON job line or a human readable string representing a time period.
         def update(every)
-            time = parse_in(every, :quiet) || parse_cron(every, :quiet)
+            time = Scheduler.parse_in(every, :quiet) || Scheduler.parse_cron(every, :quiet)
             raise ArgumentError.new("couldn't parse \"#{o}\"") if time.nil?
 
             @every = time
@@ -238,6 +238,7 @@ module UV
             else
                 @schedules << event
             end
+            @next = nil if @next == event
 
             # optimal algorithm for inserting into an already sorted list
             Bisect.insort(@scheduled, event)
@@ -287,7 +288,16 @@ module UV
                 end
 
                 if not @next.nil?
-                    @timer.start(@next - @loop.now)
+                    in_time = @next - @loop.now
+
+                    # Ensure there are never negative start times
+                    if in_time > 30
+                        @timer.start(in_time)
+                    else
+                        @loop.next_tick do
+                            on_timer
+                        end
+                    end
                 end
             end
         end
@@ -295,6 +305,7 @@ module UV
         # Is called when the libuv timer fires
         def on_timer
             schedule = @scheduled.shift
+            @schedules.delete(schedule)
             schedule.trigger
 
             # execute schedules that are within 30ms of this event
@@ -302,6 +313,7 @@ module UV
             now = @loop.now + 30
             while @scheduled.first && @scheduled.first.next_scheduled <= now
                 schedule = @scheduled.shift
+                @schedules.delete(schedule)
                 schedule.trigger
             end
             check_timer

data/lib/uv-rays/version.rb

@@ -1,3 +1,3 @@
 module UV
-    VERSION = '0.2.3'
+    VERSION = '0.2.4'
 end

data/spec/buffered_tokenizer_spec.rb

@@ -10,60 +10,6 @@ describe UV::BufferedTokenizer do
         end
 
 
-        it "should not return anything when a complete message is not available" do
-            msg1 = "test"
-
-            result = @buffer.extract(msg1)
-            expect(result).to eq([])
-        end
-
-        it "should tokenize messages where the data is a complete message" do
-            msg1 = "test\n\r"
-
-            result = @buffer.extract(msg1)
-            expect(result).to eq(['test'])
-        end
-
-        it "should return multiple complete messages" do
-            msg1 = "test\n\rwhoa\n\r"
-
-            result = @buffer.extract(msg1)
-            expect(result).to eq(['test', 'whoa'])
-        end
-        
-        it "should tokenize messages where the delimiter is split" do
-            msg1 = "test\n"
-            msg2 = "\rwhoa\n\r"
-
-            result = @buffer.extract(msg1)
-            expect(result).to eq([])
-            result = @buffer.extract(msg2)
-            expect(result).to eq(['test', 'whoa'])
-
-
-            msg3 = "test\n"
-            msg4 = "\rwhoa\n"
-            msg5 = "\r"
-
-            result = @buffer.extract(msg3)
-            expect(result).to eq([])
-            result = @buffer.extract(msg4)
-            expect(result).to eq(['test']        )
-
-            result = @buffer.extract(msg5)
-            expect(result).to eq(['whoa'])
-        end
-    end
-
-    describe 'delimiter' do
-
-        before :each do
-            @buffer = UV::BufferedTokenizer.new({
-                delimiter: "\n\r"
-            })
-        end
-
-
         it "should not return anything when a complete message is not available" do
             msg1 = "test"
 

data/spec/connection_spec.rb

@@ -38,7 +38,10 @@ module TestServer
 	end
 
 	def on_read(data, ip, port, conection)
-		send_datagram(data, ip, port)
+		# ephemeral port is used for sending on windows and linux?
+		# Bound port seems to be used on OSX...
+		# TODO:: Needs investigation, might be a Libuv bug
+		send_datagram(data, ip, 3211)
 	end
 end
 
@@ -70,7 +73,7 @@ describe UV::Connection do
 	end
 	
 	describe 'basic tcp client server' do
-		it "should send some data and shutdown the socket", :network => true do
+		it "should send some data and shutdown the socket" do
 			@loop.run { |logger|
 				logger.progress do |level, errorid, error|
 					begin
@@ -91,7 +94,7 @@ describe UV::Connection do
 			expect(res[2]).to eq('hello')
 		end
 
-		it "should not call connect on connection failure", :network => true do
+		it "should not call connect on connection failure" do
 			@loop.run { |logger|
 				logger.progress do |level, errorid, error|
 					begin
@@ -113,7 +116,7 @@ describe UV::Connection do
 	end
 
 	describe 'basic tcp client server with tls' do
-		it "should send some data and shutdown the socket", :network => true do
+		it "should send some data and shutdown the socket" do
 			@loop.run { |logger|
 				logger.progress do |level, errorid, error|
 					begin
@@ -137,7 +140,7 @@ describe UV::Connection do
 	end
 
 	describe 'basic udp client server' do
-		it "should send some data and close the socket", :network => true do
+		it "should send some data and close the socket" do
 			@loop.run { |logger|
 				logger.progress do |level, errorid, error|
 					begin

data/spec/http_endpoint_spec.rb

@@ -40,6 +40,33 @@ module OldServer
 end
 
 
+#
+# TODO:: Write tests for bad server responses
+# Need to be able to recover when: 
+# * no response is sent
+# * disconnect
+# * bad length etc
+#
+module BadServer
+	def post_init
+		@parser = ::HttpParser::Parser.new(self)
+        @state = ::HttpParser::Parser.new_instance
+        @state.type = :request
+	end
+
+	def on_message_complete(parser)
+		write("HTTP/1.0 200 OK\r\nContent-type: text/html\r\nContent-length: 0\r\n\r\n")
+	end
+
+	def on_read(data, connection)
+		if @parser.parse(@state, data)
+            p 'parse error'
+            p @state.error
+        end
+	end
+end
+
+
 describe UV::HttpEndpoint do
 	before :each do
 		@loop = Libuv::Loop.new
@@ -57,7 +84,7 @@ describe UV::HttpEndpoint do
 	end
 	
 	describe 'basic http request' do
-		it "should send a request then receive a response", :network => true do
+		it "should send a request then receive a response" do
 			@loop.run { |logger|
 				logger.progress do |level, errorid, error|
 					begin
@@ -88,7 +115,7 @@ describe UV::HttpEndpoint do
 			expect(@response[:body]).to eq('y')
 		end
 
-		it "should send multiple requests on the same connection", :network => true do
+		it "should send multiple requests on the same connection" do
 			@loop.run { |logger|
 				logger.progress do |level, errorid, error|
 					begin
@@ -129,7 +156,7 @@ describe UV::HttpEndpoint do
 			expect(@response2[:headers].keep_alive).to eq(true)
 		end
 
-		it "should send pipelined requests on the same connection", :network => true do
+		it "should send pipelined requests on the same connection" do
 			@loop.run { |logger|
 				logger.progress do |level, errorid, error|
 					begin
@@ -172,7 +199,7 @@ describe UV::HttpEndpoint do
 	end
 
 	describe 'old http request' do
-		it "should send a request then receive a response", :network => true do
+		it "should send a request then receive a response" do
 			@loop.run { |logger|
 				logger.progress do |level, errorid, error|
 					begin
@@ -201,7 +228,7 @@ describe UV::HttpEndpoint do
 			expect(@response[:headers].keep_alive).to eq(false)
 		end
 
-		it "should send multiple requests", :network => true do
+		it "should send multiple requests" do
 			@loop.run { |logger|
 				logger.progress do |level, errorid, error|
 					begin
@@ -242,7 +269,7 @@ describe UV::HttpEndpoint do
 			expect(@response2[:headers].keep_alive).to eq(false)
 		end
 
-		it "should fail to send pipelined requests", :network => true do
+		it "should fail to send pipelined requests" do
 			@loop.run { |logger|
 				logger.progress do |level, errorid, error|
 					begin

metadata

@@ -1,153 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: uv-rays
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-27 00:00:00.000000000 Z
+date: 2014-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libuv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.11.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.11.20
 - !ruby/object:Gem::Dependency
   name: bisect
   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'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   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'
 - !ruby/object:Gem::Dependency
   name: cookiejar
   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'
 - !ruby/object:Gem::Dependency
   name: ipaddress
   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'
 - !ruby/object:Gem::Dependency
   name: addressable
   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'
 - !ruby/object:Gem::Dependency
   name: http-parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.4
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '10.1'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Opinionated abstractions for Libuv
@@ -192,17 +192,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Abstractions for working with Libuv