spider-gazelle 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 389b76b304d2c434532df00b18f0e772b7bca616
-  data.tar.gz: de17af1941a3ce3cf24a65ec069a1e33bf5490f6
+  metadata.gz: ddf67f2f83bb093e412603cfaccbdff9465fd492
+  data.tar.gz: 418b883c22f28aec01358f7e1583b5102eed3452
 SHA512:
-  metadata.gz: d3751fe5f50137772b2b434cf8ab2bbbeb8c597e343977ca99fd43de1cc5592f7897d756ae04e1ba4d81adbe60de712ab6f8169a42eb3a62bc9b91b6ccd60d90
-  data.tar.gz: 1bd6d81f822682a1c52b0c1f843e0f3323f69cc80e7effd755c092874fd6019692f8a705d92d87509393654034ac3a0d885b4c43ad88660f2247fc6834df5734
+  metadata.gz: 8e6bf5475f273760fb5bcbcd0e73988a292d3f473d95e96a6b043168b303b46403fac5e4c2b1201693ef2b51cdd3b250b1ef593c43ba2407e2e006443101556c
+  data.tar.gz: 5c62a4b4dd5a142b2a0f8090cac2ff67a2004305bf9c0ca78d2c4c8cb4e7043115d8b9b338180d76ab249af439838fce58ea093bac83dbc26d3936fec5c77659

data/bin/sg

@@ -64,29 +64,6 @@ ENV['RACK_ENV'] = options[:environment].to_s
 # Force process mode on Windows (pipes + sockets not working at the moment)
 ENV['SG_MODE'] = 'no_ipc' if ::FFI::Platform.windows?
 
-::Libuv::Loop.default.run do |logger|
-    logger.progress do |level, errorid, error|
-        begin
-            puts "Log called: #{level}: #{errorid}\n#{error.message}\n#{error.backtrace.join("\n")}\n"
-        rescue Exception
-            p 'error in gazelle logger'
-        end
-    end
-
-    puts "Look out! Here comes Spider-Gazelle #{::SpiderGazelle::VERSION}!"
-    puts "* Environment: #{ENV['RACK_ENV']} on #{RUBY_ENGINE || 'ruby'} #{RUBY_VERSION}"
-    server = ::SpiderGazelle::Spider.instance
-    server.loaded.then do
-        puts "* Loading: #{options[:rackup]}"
-        server.load(options[:rackup], options).catch(proc {|e|
-            puts "#{e.message}\n#{e.backtrace.join("\n") unless e.backtrace.nil?}\n"
-        }).finally do
-            # This will execute if the TCP binding is lost
-            server.shutdown
-        end
-
-        puts "* Listening on tcp://#{options[:host]}:#{options[:port]}"
-    end
-end
+::SpiderGazelle::Spider.run options[:rackup], options
 
 puts "\nSpider-Gazelle leaps through the veldt"

data/lib/rack/handler/spider-gazelle.rb

@@ -3,45 +3,37 @@ require 'spider-gazelle'
 
 
 module Rack
-	module Handler
-	    module SpiderGazelle
-			DEFAULT_OPTIONS = {
-				:Host => '0.0.0.0',
-				:Port => 8080,
-				:Verbose => false
-			}
-
-	    	def self.run(app, options = {})
-	    		options = DEFAULT_OPTIONS.merge(options)
-
-	    		if options[:Verbose]
-	    			app = Rack::CommonLogger.new(app, STDOUT)
-	    		end
-
-	    		if options[:environment]
-	    			ENV['RACK_ENV'] = options[:environment].to_s
-	    		end
-
-	    		server = ::SpiderGazelle::Spider.new(app, options)
-
-	    		puts "Spider-Gazelle #{::SpiderGazelle::VERSION} starting..."
-	    		puts "* Environment: #{ENV['RACK_ENV']}"
-	    		puts "* Listening on tcp://#{options[:Host]}:#{options[:Port]}"
-
-	    		yield server if block_given?
-
-	    		server.run
-	    	end
-
-			def self.valid_options
-				{
-					"Host=HOST"       => "Hostname to listen on (default: 0.0.0.0)",
-					"Port=PORT"       => "Port to listen on (default: 8080)",
-					"Quiet"           => "Don't report each request"
-				}
-			end
-	    end
-
-	    register :sg, SpiderGazelle
-	end
+    module Handler
+        module SpiderGazelle
+            DEFAULT_OPTIONS = {
+                :Host => '0.0.0.0',
+                :Port => 8080,
+                :Verbose => false
+            }
+
+            def self.run(app, options = {})
+                options = DEFAULT_OPTIONS.merge(options)
+
+                if options[:Verbose]
+                    app = Rack::CommonLogger.new(app, STDOUT)
+                end
+
+                if options[:environment]
+                    ENV['RACK_ENV'] = options[:environment].to_s
+                end
+
+                ::SpiderGazelle::Spider.run app, options
+            end
+
+            def self.valid_options
+                {
+                    "Host=HOST"       => "Hostname to listen on (default: 0.0.0.0)",
+                    "Port=PORT"       => "Port to listen on (default: 8080)",
+                    "Quiet"           => "Don't report each request"
+                }
+            end
+        end
+
+        register :'spider-gazelle', SpiderGazelle
+    end
 end

data/lib/spider-gazelle/app_store.rb

@@ -1,5 +1,5 @@
 require 'thread'
-require 'radix'
+require 'radix/base'
 
 
 module SpiderGazelle
@@ -14,11 +14,13 @@ module SpiderGazelle
         @loaded = ThreadSafe::Cache.new
 
         # Load an app and assign it an ID
-        def self.load(rackup)
-            id = @loaded[rackup.to_sym]
+        def self.load(app, options={})
+            is_rack_app = !app.is_a?(String)
+            app_key = is_rack_app ? app.class.name.to_sym : app.to_sym
+            id = @loaded[app_key]
 
             if id.nil?
-                app, options = ::Rack::Builder.parse_file rackup
+                app, options = ::Rack::Builder.parse_file(app) unless is_rack_app
 
                 count = 0
                 @mutex.synchronize {
@@ -26,7 +28,7 @@ module SpiderGazelle
                 }
                 id = Radix.convert(count, B10, B65).to_sym
                 @apps[id] = app
-                @loaded[rackup.to_sym] = id
+                @loaded[app_key] = id
             end
 
             id

data/lib/spider-gazelle/binding.rb

@@ -5,8 +5,8 @@ require 'set'
 module SpiderGazelle
     class Binding
         DEFAULT_OPTIONS = {
-            :host => '0.0.0.0',
-            :port => 3000,
+            :Host => '0.0.0.0',
+            :Port => 3000,
             :tls => false,
             :optimize_for_latency => true,
             :backlog => 1024
@@ -21,7 +21,7 @@ module SpiderGazelle
             @options = DEFAULT_OPTIONS.merge(options)
             @loop = loop
             @delegate = delegate
-            @port = @options[:port]
+            @port = @options[:Port]
             @tls = @options[:tls]
             @optimize = @options[:optimize_for_latency]
 
@@ -34,7 +34,7 @@ module SpiderGazelle
         def bind
             # Bind the socket
             @tcp = @loop.tcp
-            @tcp.bind(@options[:host], @port, @new_connection)
+            @tcp.bind(@options[:Host], @port, @new_connection)
             @tcp.listen(@options[:backlog])
 
             # Delegate errors

data/lib/spider-gazelle/connection.rb

@@ -197,8 +197,6 @@ module SpiderGazelle
 
                     # If a file, stream the body in a non-blocking fashion
                     if body.respond_to? :to_path
-                        headers[CONNECTION] = CLOSE if @request.keep_alive == false
-
                         if headers[CONTENT_LENGTH]
                             type = :raw
                         else
@@ -250,8 +248,6 @@ module SpiderGazelle
         end
 
         def write_response(status, headers, body)
-            headers[CONNECTION] = CLOSE if @request.keep_alive == false
-
             if headers[CONTENT_LENGTH]
                 headers[CONTENT_LENGTH] = headers[CONTENT_LENGTH].to_s
                 write_headers(status, headers)
@@ -282,6 +278,8 @@ module SpiderGazelle
         end
 
         def write_headers(status, headers)
+            headers[CONNECTION] = CLOSE if @request.keep_alive == false
+
             header = "HTTP/1.1 #{status} #{fetch_code(status)}\r\n"
             headers.each do |key, value|
                 next if key.start_with? RACK

data/lib/spider-gazelle/request.rb

@@ -87,6 +87,8 @@ module SpiderGazelle
             @env.delete(HTTP_CONNECTION)
 
             @env[REQUEST_URI] = @url.freeze
+            # For Rack::Lint on 1.9, ensure that the encoding is always for spec
+            @body.force_encoding('ASCII-8BIT') if @body.respond_to?(:force_encoding)
             @env[RACK_INPUT] = StringIO.new(@body)
 
             # Break the request into its components
@@ -99,6 +101,7 @@ module SpiderGazelle
             else
                 @env[PATH_INFO] = @url
                 @env[REQUEST_PATH] = @url
+                @env[QUERY_STRING] = ''
             end
 
             # Grab the host name from the request

data/lib/spider-gazelle/spider.rb

@@ -17,6 +17,11 @@ module SpiderGazelle
         STATES = [:reanimating, :running, :squashing, :dead]
         MODES = [:thread, :process, :no_ipc]    # TODO:: implement clustering using processes
 
+        DEFAULT_OPTIONS = {
+            :Host => '0.0.0.0',
+            :Port => 8080,
+            :Verbose => false
+        }
 
         attr_reader :state, :mode, :threads, :logger
 
@@ -66,6 +71,42 @@ module SpiderGazelle
             end
         end
 
+        def run(&block)
+            @web.run &block
+        end
+
+        def self.run(app, options = {})
+            options = DEFAULT_OPTIONS.merge(options)
+
+            instance.run do |logger|
+                logger.progress do |level, errorid, error|
+                    begin
+                        puts "Log called: #{level}: #{errorid}\n#{error.message}\n#{error.backtrace.join("\n")}\n"
+                    rescue Exception
+                        p 'error in gazelle logger'
+                    end
+                end
+
+                puts "Look out! Here comes Spider-Gazelle #{::SpiderGazelle::VERSION}!"
+                puts "* Environment: #{ENV['RACK_ENV']} on #{RUBY_ENGINE || 'ruby'} #{RUBY_VERSION}"
+                server = ::SpiderGazelle::Spider.instance
+                server.loaded.then do
+                    puts "* Loading: #{app}"
+
+                    # yield server if block_given?
+
+                    server.load(app, options).catch(proc {|e|
+                        puts "#{e.message}\n#{e.backtrace.join("\n") unless e.backtrace.nil?}\n"
+                    }).finally do
+                        # This will execute if the TCP binding is lost
+                        server.shutdown
+                    end
+
+                    puts "* Listening on tcp://#{options[:Host]}:#{options[:Port]}"
+                end
+            end
+        end
+
         # Provides a promise that resolves when we are read to start binding applications
         #
         # @return [::Libuv::Q::Promise] that indicates when the gazelles are loaded

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

@@ -1,10 +1,11 @@
 require 'websocket/driver'
+require 'forwardable'
 
 
 module SpiderGazelle
     # TODO:: make a promise that resolves when closed
     class Websocket < ::Libuv::Q::DeferredPromise
-        attr_reader :env, :url, :driver, :socket
+        attr_reader :env, :url, :loop
 
 
         def initialize(tcp, env)
@@ -29,10 +30,15 @@ module SpiderGazelle
             @driver.on(:error, &method(:on_error))
         end
 
-        def start
-            @driver.start
-        end
 
+        extend Forwardable
+        def_delegators :@driver, :start, :ping, :protocol, :ready_state, :set_header, :state, :close
+        def_delegators :@socket, :write
+
+
+        # Write some text to the websocket connection
+        # 
+        # @param string [String] a string of data to be sent to the far end
         def text(string)
             data = string.to_s
             @loop.schedule do
@@ -40,6 +46,9 @@ module SpiderGazelle
             end
         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)
             data = array.to_a
             @loop.schedule do
@@ -47,13 +56,20 @@ module SpiderGazelle
             end
         end
 
+        # Used to define a callback when data is received from the client
+        # 
+        # @param callback [Proc] the callback to be called when data is received
         def progress(callback = nil, &blk)
             @progress = callback || blk
         end
 
-
-        def write(data)
-            @socket.write(data)
+        # Used to define a callback when the websocket connection is established
+        # Data sent before this callback is buffered.
+        # 
+        # @param callback [Proc] the callback to be triggered on establishment
+        def on_open(callback = nil, &blk)
+            callback ||= blk
+            @driver.on(:open, &callback)
         end
 
 

data/lib/spider-gazelle/version.rb

@@ -1,3 +1,3 @@
 module SpiderGazelle
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spider-gazelle
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-19 00:00:00.000000000 Z
+date: 2014-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake