spider-gazelle 2.0.4 → 3.0.0

data/lib/spider-gazelle/spider/binding.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'thread'
 
 module SpiderGazelle
@@ -65,7 +67,7 @@ module SpiderGazelle
                 end
             }
             def delegate(client, retries = 0)
-                promise = @select_gazelle.next.write2(client, @indicator)
+                promise = @select_gazelle.next.write2(client, @indicator, wait: :promise)
                 promise.then do
                     client.close
                 end

data/lib/spider-gazelle/upgrades/websocket.rb

@@ -1,26 +1,28 @@
+# frozen_string_literal: true
+
 require 'websocket/driver'
 require 'forwardable'
 
 module SpiderGazelle
     class Websocket < ::Libuv::Q::DeferredPromise
-        attr_reader :env, :url, :loop
+        attr_reader :env, :url, :reactor, :socket
 
 
-        RACK_URL_SCHEME = "rack.url_scheme".freeze
-        HTTP_HOST = "HTTP_HOST".freeze
-        REQUEST_URI= "REQUEST_URI".freeze
-        HTTPS = 'https'.freeze
+        RACK_URL_SCHEME = 'rack.url_scheme'
+        HTTP_HOST = 'HTTP_HOST'
+        REQUEST_URI= 'REQUEST_URI'
+        HTTPS = 'https'
 
 
         extend Forwardable
         def_delegators :@driver, :start, :ping, :protocol, :ready_state, :set_header, :state, :close
-        def_delegators :@socket, :write
+        def_delegators :@socket, :write, :peername
 
         def initialize(tcp, env)
             @socket, @env = tcp, env
 
             # Initialise the promise
-            super tcp.loop, tcp.loop.defer
+            super tcp.reactor, tcp.reactor.defer
 
             scheme = env[RACK_URL_SCHEME] == HTTPS ? 'wss://' : 'ws://'
             @url = scheme + env[HTTP_HOST] + env[REQUEST_URI]
@@ -42,14 +44,14 @@ module SpiderGazelle
         #
         # @param string [String] a string of data to be sent to the far end
         def text(string)
-            @loop.schedule { @driver.text(string.to_s) }
+            @reactor.schedule { @driver.text(string.to_s) }
         end
 
         # Write some binary data to the websocket connection
         #
         # @param array [Array] an array of bytes to be sent to the far end
         def binary(array)
-            @loop.schedule { @driver.binary(array.to_a) }
+            @reactor.schedule { @driver.binary(array.to_a) }
         end
 
         # Used to define a callback when data is received from the client

data/lib/spider-gazelle/version.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
 
 module SpiderGazelle
-    VERSION = '2.0.4'.freeze
-    EXEC_NAME = 'sg'.freeze
+    VERSION = '3.0.0'
+    EXEC_NAME = 'sg'
 end

data/spec/http1_spec.rb

@@ -55,12 +55,18 @@ describe ::SpiderGazelle::Gazelle::Http1 do
         @shutdown_called = 0
         @close_called = 0
 
-        @loop = ::Libuv::Loop.default
-        @timeout = @loop.timer do
+        @loop = ::Libuv::Reactor.default
+        @loop.notifier do |error, context|
+            begin
+                p "Log called: #{context}\n#{error.message}\n#{error.backtrace.join("\n")}\n"
+            rescue Exception
+                p 'error in logger'
+            end
+        end
+        @timeout = @loop.timer {
             @loop.stop
             @general_failure << "test timed out"
-        end
-        @timeout.start(1000)
+        }.start(1000)
 
 
         @return ||= proc {|http1|
@@ -80,7 +86,6 @@ describe ::SpiderGazelle::Gazelle::Http1 do
             @loop.stop
         }
 
-        @app_mode = :thread_pool
         @port = 80
         @tls = false
     end
@@ -94,12 +99,12 @@ describe ::SpiderGazelle::Gazelle::Http1 do
             expect(env['SERVER_PORT']).to eq(80)
 
             body = 'Hello, World!'
-            [200, {'Content-Type' => 'text/plain', 'Content-Length' => body.length.to_s}, [body]]
+            [200, {'Content-Type' => 'text/plain', 'Content-Length' => body.bytesize.to_s}, [body]]
         end
         writes = []
 
         @loop.run {
-            @http1.load(@socket, @port, app, @app_mode, @tls)
+            @http1.load(@socket, @port, app, @tls)
             @http1.parse("GET / HTTP/1.1\r\nConnection: Close\r\n\r\n")
 
             @socket.write_cb = proc { |data|
@@ -107,12 +112,12 @@ describe ::SpiderGazelle::Gazelle::Http1 do
             }
         }
 
-        expect(@shutdown_called).to be == 1
-        expect(@close_called).to be == 0
         expect(writes).to eq([
             "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nContent-Length: 13\r\nConnection: close\r\n\r\n",
             "Hello, World!"
         ])
+        expect(@shutdown_called).to be == 1
+        expect(@close_called).to be == 0
     end
 
     it "should fill out the environment properly", http1: true do
@@ -121,7 +126,7 @@ describe ::SpiderGazelle::Gazelle::Http1 do
             expect(env['REQUEST_PATH']).to eq('/')
             expect(env['QUERY_STRING']).to eq('test=ing')
             expect(env['SERVER_NAME']).to eq('spider.gazelle.net')
-            expect(env['SERVER_PORT']).to eq(3000)
+            expect(env['SERVER_PORT']).to eq('3000')
             expect(env['REMOTE_ADDR']).to eq('127.0.0.1')
             expect(env['rack.url_scheme']).to eq('http')
 
@@ -130,7 +135,7 @@ describe ::SpiderGazelle::Gazelle::Http1 do
         end
 
         @loop.run {
-            @http1.load(@socket, @port, app, @app_mode, @tls)
+            @http1.load(@socket, @port, app, @tls)
             @http1.parse("GET /?test=ing HTTP/1.1\r\nHost: spider.gazelle.net:3000\r\nConnection: Close\r\n\r\n")
         }
 
@@ -146,7 +151,7 @@ describe ::SpiderGazelle::Gazelle::Http1 do
         writes = []
 
         @loop.run {
-            @http1.load(@socket, @port, app, @app_mode, @tls)
+            @http1.load(@socket, @port, app, @tls)
             @http1.parse("GET / HTTP/1.1\r\nConnection: Close\r\n\r\n")
 
             @socket.write_cb = proc { |data|
@@ -170,7 +175,7 @@ describe ::SpiderGazelle::Gazelle::Http1 do
         writes = []
 
         @loop.run {
-            @http1.load(@socket, @port, app, @app_mode, @tls)
+            @http1.load(@socket, @port, app, @tls)
             @http1.parse("GET / HTTP/1.1\r\n\r\n")
 
             @socket.write_cb = proc { |data|
@@ -221,7 +226,7 @@ describe ::SpiderGazelle::Gazelle::Http1 do
 
         writes = []
         @loop.run {
-            @http1.load(@socket, @port, app, @app_mode, @tls)
+            @http1.load(@socket, @port, app, @tls)
             @http1.parse("GET /1 HTTP/1.1\r\n\r\nGET /2 HTTP/1.1\r\n\r\nGET /3 HTTP/1.1\r\n\r\n")
             @http1.parse("GET /4 HTTP/1.1\r\nConnection: Close\r\n\r\n")
 
@@ -260,7 +265,7 @@ describe ::SpiderGazelle::Gazelle::Http1 do
         writes = []
 
         @loop.run {
-            @http1.load(@socket, @port, app, @app_mode, @tls)
+            @http1.load(@socket, @port, app, @tls)
             @http1.parse("GET / HTTP/1.1\r\nConnection: Close\r\n\r\n")
 
             @socket.write_cb = proc { |data|
@@ -310,7 +315,7 @@ describe ::SpiderGazelle::Gazelle::Http1 do
 
         writes = []
         @loop.run {
-            @http1.load(@socket, @port, app, @app_mode, @tls)
+            @http1.load(@socket, @port, app, @tls)
             @http1.parse("GET /1 HTTP/1.1\r\n\r\nGET /2 HTTP/1.1\r\n\r\nGET /3 HTTP/1.1\r\n\r\n")
             @http1.parse("GET /4 HTTP/1.1\r\nConnection: Close\r\n\r\n")
 
@@ -351,7 +356,7 @@ describe ::SpiderGazelle::Gazelle::Http1 do
         writes = []
 
         @loop.run {
-            @http1.load(@socket, @port, app, @app_mode, @tls)
+            @http1.load(@socket, @port, app, @tls)
             @http1.parse("GET / HTTP/1.1\r\nConnection: Close\r\n\r\n")
 
             @socket.write_cb = proc { |data|

data/spider-gazelle.gemspec

@@ -18,16 +18,16 @@ Gem::Specification.new do |s|
       Look out! Here comes the Spidergazelle!
     EOF
 
-    s.add_dependency 'rake'
-    s.add_dependency 'http-parser'          # Ruby FFI bindings for https://github.com/joyent/http-parser
-    s.add_dependency 'libuv',  '>= 2.0.5'   # Ruby FFI bindings for https://github.com/libuv/libuv
-    s.add_dependency 'uv-rays','>= 1.2.0'   # Provides buffering tools
-    s.add_dependency 'rack', '>= 1.0.0'     # Ruby web server interface
-    s.add_dependency 'websocket-driver'     # Websocket parser
-    s.add_dependency 'http-2'               # HTTP2 parsing and response management
+    s.add_dependency 'http-parser', '~> 1.1'    # Ruby FFI bindings for https://github.com/joyent/http-parser
+    s.add_dependency 'libuv',  '~> 3.0' # Ruby FFI bindings for https://github.com/libuv/libuv
+    s.add_dependency 'uv-rays','~> 2.0' # Provides buffering tools
+    s.add_dependency 'rack',   '~> 2.0' # Ruby web server interface
+    s.add_dependency 'websocket-driver', '~> 0.6'   # Websocket parser
+    s.add_dependency 'http-2', '~> 0.8' # HTTP2 parsing and response management
 
-    s.add_development_dependency 'rspec'    # Testing framework
-    s.add_development_dependency 'yard'     # Comment based documentation generation
+    s.add_development_dependency 'rspec', '~> 3.5'  # Testing framework
+    s.add_development_dependency 'rake', '~> 11.2'  # Task runner
+    s.add_development_dependency 'yard', '~> 0.9'   # Comment based documentation generation
 
     s.files = Dir["{lib,bin}/**/*"] + %w(Rakefile spider-gazelle.gemspec README.md LICENSE)
     s.test_files = Dir["spec/**/*"]

metadata

@@ -1,141 +1,141 @@
 --- !ruby/object:Gem::Specification
 name: spider-gazelle
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 3.0.0
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-30 00:00:00.000000000 Z
+date: 2016-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: http-parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: http-parser
+  name: libuv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: libuv
+  name: uv-rays
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: uv-rays
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: websocket-driver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0.6'
 - !ruby/object:Gem::Dependency
-  name: websocket-driver
+  name: http-2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
-  name: http-2
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: '3.5'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.2'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 description: |2
         Spidergazelle, spidergazelle, amazingly agile, she leaps through the veldt,
         Spidergazelle, spidergazelle! She don’t care what you think, she says what the hell!
@@ -153,7 +153,6 @@ files:
 - Rakefile
 - bin/sg
 - lib/rack/handler/spider-gazelle.rb
-- lib/rack/lock_patch.rb
 - lib/spider-gazelle.rb
 - lib/spider-gazelle/gazelle.rb
 - lib/spider-gazelle/gazelle/app_store.rb
@@ -169,7 +168,6 @@ files:
 - lib/spider-gazelle/upgrades/websocket.rb
 - lib/spider-gazelle/version.rb
 - spec/http1_spec.rb
-- spec/rack_lock_spec.rb
 - spider-gazelle.gemspec
 homepage: https://github.com/cotag/spider-gazelle
 licenses:
@@ -197,5 +195,3 @@ specification_version: 4
 summary: A fast, parallel and concurrent web server for ruby
 test_files:
 - spec/http1_spec.rb
-- spec/rack_lock_spec.rb
-has_rdoc: 

data/lib/rack/lock_patch.rb

@@ -1,39 +0,0 @@
-require 'thread'
-require 'rack/body_proxy'
-
-require 'rack/lock' # ensure this loads first
-
-module Rack
-    # Rack::Lock locks every request inside a mutex, so that every request
-    # will effectively be executed synchronously.
-    class Lock
-        # FLAG = 'rack.multithread'.freeze # defined in rack/lock
-        RACK_MULTITHREAD ||= FLAG
-
-        def initialize(app, mutex = Mutex.new)
-            @app, @mutex = app, mutex
-            @sig = ConditionVariable.new
-            @count = 0
-        end
-
-        def call(env)
-            @mutex.lock
-            @count += 1
-            @sig.wait(@mutex) if @count > 1
-            response = @app.call(env.merge(RACK_MULTITHREAD => false))
-            returned = response << BodyProxy.new(response.pop) {
-                @mutex.synchronize { unlock }
-            }
-        ensure
-            unlock unless returned
-            @mutex.unlock
-        end
-
-        private
-
-        def unlock
-            @count -= 1
-            @sig.signal
-        end
-    end
-end