spider-gazelle 0.2.1 → 1.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79738b050fb90a8bb950a269f6b5e73b4b4361b9
-  data.tar.gz: 0c8658ee11829adfd2cb08b4903334e10930dab4
+  metadata.gz: 2363b13c6111e7a4df5fd28d780ec4adcf5d76ab
+  data.tar.gz: c0e3e7e4da343f021cdda39e1a6a1fe829b6951a
 SHA512:
-  metadata.gz: a7aecd49cd24a1929d6edd7ec652965dc666252ed1ebd225434f18bf2d3c86b17cf7af5970084f88abf05795f3ee1afbc476acf70d6c8cc9c7b613b3013fdb28
-  data.tar.gz: 67bd17a7bf6397bc5b94b0e353395457e2ea0b50c8b38e2525ad747e718b9ce44faee61bfffac8a813611613e161962745962960d9ad90d39c2cad6df506dafe
+  metadata.gz: 34856dafcf2b8e138b2299f40739ae6847886671bbb67101918d0b82e4d66cca77ea64d8c36f4a427d2cfc1b8c54615c1cbd88639fcc8ce6df76ec55f148d3c1
+  data.tar.gz: 46ef37b2469b5dc3a69a7138e20af7895a1666c27c4659f9d4f7923e2662351aab45aba7d34daacdbb2d1801caaf41ad8156ead058e81190637dc12cd82cd636

data/lib/rack/lock_patch.rb

@@ -0,0 +1,42 @@
+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
+
+    def initialize(app, mutex = Mutex.new)
+      @app, @mutex = app, mutex
+      @sig = ConditionVariable.new
+      @count = 0
+    end
+
+    def call(env)
+      old, env[FLAG] = env[FLAG], false
+      @mutex.lock
+      @count += 1
+      @sig.wait(@mutex) if @count > 1
+      response = @app.call(env)
+      body = BodyProxy.new(response[2]) {
+        @mutex.synchronize { unlock }
+      }
+      response[2] = body
+      response
+    ensure
+      unlock unless body
+      @mutex.unlock
+      env[FLAG] = old
+    end
+
+    private
+
+    def unlock
+      @count -= 1
+      @sig.signal
+    end
+  end
+end

data/lib/spider-gazelle.rb

@@ -1,6 +1,7 @@
 require "http-parser"   # C based, fast, http parser
 require "libuv"         # Ruby Libuv FFI wrapper
 require "rack"          # Ruby webserver abstraction
+require "rack/lock_patch" # Single threaded in development mode
 
 require "spider-gazelle/request"        # Holds request information and handles request processing
 require "spider-gazelle/connection"     # Holds connection information and handles request pipelining

data/lib/spider-gazelle/connection.rb

@@ -126,7 +126,7 @@ module SpiderGazelle
     # Unlinks the connection from the rack app
     # This occurs when requested and when the socket closes
     def unlink
-      if not @gazelle.nil?
+      if @gazelle
         # Unlink the progress callback (prevent funny business)
         @socket.progress &DUMMY_PROGRESS
         @gazelle.discard self
@@ -149,7 +149,12 @@ module SpiderGazelle
         # Pass the hijack response to the captor using the promise. This forwards the socket and
         # environment as well as moving continued execution onto the event loop.
         @request.hijacked.resolve Hijack.new(@socket, @request.env)
-      elsif !@socket.closed
+      elsif @socket.closed
+        unless result.nil? || @request.deferred
+          body = result[2]
+          body.close if body.respond_to?(:close)
+        end
+      else
         if @request.deferred
           # Wait for the response using this promise
           promise = @request.deferred.promise
@@ -162,7 +167,7 @@ module SpiderGazelle
 
           return promise
           # NOTE:: Somehow getting to here with a nil request... needs investigation
-        elsif not result.nil?
+        elsif result
           # clear any cached responses just in case
           # could be set by error in the rack application
           @deferred_responses = nil if @deferred_responses
@@ -182,6 +187,10 @@ module SpiderGazelle
 
             write_headers status, headers
 
+            # Send the body in parallel without blocking the next request in dev
+            # Also if this is a head request we still want the body closed
+            body.close if body.respond_to?(:close)
+
             if send_body
               file = @loop.file body.to_path, File::RDONLY
               file.progress do
@@ -205,6 +214,7 @@ module SpiderGazelle
             if send_body
               write_response status, headers, body
             else
+              body.close if body.respond_to?(:close)
               write_headers status, headers
               @socket.shutdown if @request.keep_alive == false
             end
@@ -246,6 +256,8 @@ module SpiderGazelle
           @async_state = :chunked
         end
       end
+
+      body.close if body.respond_to?(:close)
     end
 
     def write_headers(status, headers)
@@ -280,9 +292,6 @@ module SpiderGazelle
 
     # Callback from a response that was marked async
     def deferred_callback(data)
-      # We call close here, like on a regular response
-      body = data[2]
-      body.close if body.respond_to?(:close)
       @loop.next_tick { callback(data) }
     end
 
@@ -310,6 +319,8 @@ module SpiderGazelle
         # Respond with the headers here
         write_response status, headers, body
       elsif body.empty?
+        body.close if body.respond_to?(:close)
+
         @socket.write CLOSE_CHUNK
         @socket.shutdown if @request.keep_alive == false
 
@@ -322,6 +333,7 @@ module SpiderGazelle
       else
         # Send the chunks provided
         body.each &@write_chunk
+        body.close if body.respond_to?(:close)
       end
 
       nil

data/lib/spider-gazelle/const.rb

@@ -27,7 +27,7 @@ module SpiderGazelle
   # REMOTE_USER, or REMOTE_HOST parameters since those are either a security problem or
   # too taxing on performance.
   module Const
-    SPIDER_GAZELLE_VERSION = VERSION = "0.2.1".freeze
+    SPIDER_GAZELLE_VERSION = VERSION = "1.0.0.rc3".freeze
     # CODE_NAME = "Earl of Sandwich Partition"
     SERVER = "SpiderGazelle".freeze
 

data/lib/spider-gazelle/request.rb

@@ -82,18 +82,23 @@ module SpiderGazelle
 
       # Execute the request
       @response = catch :async, &@execute
-      @deferred = @loop.defer if (@response.nil? || @response[0] == -1)
+      if @response.nil? || @response[0] == -1
+        @deferred = @loop.defer
+
+        # close the body for deferred responses
+        unless @response.nil?
+          body = @response[2]
+          body.close if body.respond_to?(:close)
+        end
+      end
       @response
     end
 
     protected
 
-    # Execute the request then close the body
-    # NOTE:: closing the body here might cause issues (see connection.rb)
+    # Execute the request then return the result to the event loop
     def execute(*args)
       result = @app.call @env
-      body = result[2]
-      body.close if body.respond_to?(:close)
       result
     end
 

data/lib/spider-gazelle/spider.rb

@@ -61,8 +61,13 @@ module SpiderGazelle
       #   id => [bind1, bind2]
       # }
 
-      mode = ENV['SG_MODE'] || :thread
-      @mode = mode.to_sym
+      # Single reactor in development
+      if ENV['RACK_ENV'].to_sym == :development
+        @mode = :no_ipc
+      else
+        mode = ENV['SG_MODE'] || :thread
+        @mode = mode.to_sym
+      end
 
       @delegate = method(no_ipc? ? :direct_delegate : :delegate)
       @squash = method(:squash)

data/spec/rack_lock_spec.rb

@@ -0,0 +1,138 @@
+require 'rack/lint'
+require 'rack/lock'
+require 'rack/mock'
+
+require 'rack/lock_patch'
+
+
+module Rack
+  class Lock
+    def would_block
+      @count > 0
+    end
+  end
+end
+
+
+  def lock_app(app)
+    app = Rack::Lock.new(app)
+    return app, Rack::Lint.new(app)
+  end
+
+
+describe Rack::Lock do
+
+  describe 'Proxy' do
+
+    it 'delegate each' do
+      env      = Rack::MockRequest.env_for("/")
+      response = Class.new {
+        attr_accessor :close_called
+        def initialize; @close_called = false; end
+        def each; %w{ hi mom }.each { |x| yield x }; end
+      }.new
+
+      app = lock_app(lambda { |inner_env| [200, {"Content-Type" => "text/plain"}, response] })[1]
+      response = app.call(env)[2]
+      list = []
+      response.each { |x| list << x }
+      expect(list).to eq(%w{ hi mom })
+    end
+
+    it 'delegate to_path' do
+      env  = Rack::MockRequest.env_for("/")
+
+      res = ['Hello World']
+      def res.to_path ; "/tmp/hello.txt" ; end
+
+      app = Rack::Lock.new(lambda { |inner_env| [200, {"Content-Type" => "text/plain"}, res] })
+      body = app.call(env)[2]
+
+      expect(body.respond_to? :to_path).to eq(true)
+      expect(body.to_path).to eq("/tmp/hello.txt")
+    end
+
+    it 'not delegate to_path if body does not implement it' do
+      env  = Rack::MockRequest.env_for("/")
+
+      res = ['Hello World']
+
+      app = lock_app(lambda { |inner_env| [200, {"Content-Type" => "text/plain"}, res] })[1]
+      body = app.call(env)[2]
+
+      expect(body.respond_to? :to_path).to eq(false)
+    end
+  end
+
+  it 'call super on close' do
+    env      = Rack::MockRequest.env_for("/")
+    response = Class.new {
+      attr_accessor :close_called
+      def initialize; @close_called = false; end
+      def close; @close_called = true; end
+    }.new
+
+    app = lock_app(lambda { |inner_env| [200, {"Content-Type" => "text/plain"}, response] })[1]
+    app.call(env)
+    expect(response.close_called).to eq(false)
+    response.close
+    expect(response.close_called).to eq(true)
+  end
+
+  it "not unlock until body is closed" do
+    env      = Rack::MockRequest.env_for("/")
+    response = Object.new
+    lock, app      = lock_app(lambda { |inner_env| [200, {"Content-Type" => "text/plain"}, response] })
+
+    expect(lock.would_block).to eq(false)
+    response = app.call(env)[2]
+    expect(lock.would_block).to eq(true)
+    response.close
+    expect(lock.would_block).to eq(false)
+  end
+
+  it "return value from app" do
+    env  = Rack::MockRequest.env_for("/")
+    body = [200, {"Content-Type" => "text/plain"}, %w{ hi mom }]
+    app  = lock_app(lambda { |inner_env| body })[1]
+
+    res = app.call(env)
+    expect(res[0]).to eq(body[0])
+    expect(res[1]).to eq(body[1])
+    expect(res[2].to_enum.to_a).to eq(["hi", "mom"])
+  end
+
+  it "call synchronize on lock" do
+    env = Rack::MockRequest.env_for("/")
+    lock, app = lock_app(lambda { |inner_env| [200, {"Content-Type" => "text/plain"}, %w{ a b c }] })
+    expect(lock.would_block).to eq(false)
+    app.call(env)
+    expect(lock.would_block).to eq(true)
+  end
+
+  it "unlock if the app raises" do
+    env = Rack::MockRequest.env_for("/")
+    lock, app = lock_app(lambda { raise Exception })
+    expect { app.call(env) }.to raise_error(Exception)
+    expect(lock.would_block).to eq(false)
+  end
+
+  it "unlock if the app throws" do
+    env = Rack::MockRequest.env_for("/")
+    lock, app = lock_app(lambda {|_| throw :bacon })
+    expect { app.call(env) }.to raise_error(ArgumentError)
+    expect(lock.would_block).to eq(false)
+  end
+
+  it "set multithread flag to false" do
+    outer = nil
+    app = lock_app(lambda { |env|
+      outer = env
+      expect(env['rack.multithread']).to eq(false)
+      [200, {"Content-Type" => "text/plain"}, %w{ a b c }]
+    })[1]
+    resp = app.call(Rack::MockRequest.env_for("/"))[2]
+    resp.close
+    expect(outer['rack.multithread']).to eq(true)
+  end
+end

data/spider-gazelle.gemspec

@@ -1,12 +1,8 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
 
-d = File.read(File.expand_path("../lib/spider-gazelle/const.rb", __FILE__))
-if d =~ /VERSION = "(\d+\.\d+\.\d+)"/
-  version = $1
-else
-  version = "0.0.1"
-end
+require 'spider-gazelle/const'
+version = SpiderGazelle::Const::VERSION
 
 Gem::Specification.new do |s|
     s.name        = "spider-gazelle"
@@ -24,7 +20,7 @@ Gem::Specification.new do |s|
 
     s.add_dependency 'rake'
     s.add_dependency 'http-parser'          # Ruby FFI bindings for https://github.com/joyent/http-parser
-    s.add_dependency 'libuv', '>= 0.12.0'   # Ruby FFI bindings for https://github.com/joyent/libuv
+    s.add_dependency 'libuv', '>= 0.12.4'   # Ruby FFI bindings for https://github.com/joyent/libuv
     s.add_dependency 'rack', '>= 1.0.0'     # Ruby web server interface
     s.add_dependency 'websocket-driver'     # Websocket parser
     s.add_dependency 'thread_safe'          # Thread safe hashes

metadata

@@ -1,139 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: spider-gazelle
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 1.0.0.rc3
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-14 00:00:00.000000000 Z
+date: 2014-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   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: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: libuv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.12.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.12.4
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: websocket-driver
   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: thread_safe
   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: radix
   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: rspec
   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'
 - !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: |2
@@ -149,6 +149,7 @@ extra_rdoc_files:
 - README.md
 files:
 - lib/rack/handler/spider-gazelle.rb
+- lib/rack/lock_patch.rb
 - lib/spider-gazelle/app_store.rb
 - lib/spider-gazelle/binding.rb
 - lib/spider-gazelle/connection.rb
@@ -163,6 +164,7 @@ files:
 - spider-gazelle.gemspec
 - README.md
 - LICENSE
+- spec/rack_lock_spec.rb
 homepage: https://github.com/cotag/spider-gazelle
 licenses:
 - MIT
@@ -173,19 +175,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: A fast, parallel and concurrent web server for ruby
-test_files: []
+test_files:
+- spec/rack_lock_spec.rb
 has_rdoc: