spider-gazelle 0.1.0 → 0.1.1

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

@@ -2,36 +2,87 @@ require 'websocket/driver'
 
 
 module SpiderGazelle
-	class Websocket
-		attr_reader :env, :url, :driver, :socket
-
-
-		def initialize(tcp, env)
-			@socket, @env = tcp, env
-
-			scheme = Rack::Request.new(env).ssl? ? 'wss://' : 'ws://'
-			@url = scheme + env['HTTP_HOST'] + env['REQUEST_URI']
-			@driver = ::WebSocket::Driver.rack(self)
-
-			# Pass data from the socket to the driver
-			@socket.progress do |data|
-				@driver.parse(data)
-			end
-
-			# Driver has indicated that it is closing
-			# We'll close the socket after writing any remaining data
-			@driver.on(:close) {
-				@socket.shutdown
-			}
-		end
-
-		def start
-			@driver.start
-			@socket.start_read
-		end
-
-		def write(string)
-			@socket.write(string)
-		end
-	end
+    # TODO:: make a promise that resolves when closed
+    class Websocket < ::Libuv::Q::DeferredPromise
+        attr_reader :env, :url, :driver, :socket
+
+
+        def initialize(tcp, env)
+            @socket, @env = tcp, env
+
+            # Initialise the promise
+            super(@socket.loop, @socket.loop.defer)
+
+            scheme = env[Request::RACK_URLSCHEME] == Request::HTTPS_URL_SCHEME ? 'wss://' : 'ws://'
+            @url = scheme + env[Request::HTTP_HOST] + env[Request::REQUEST_URI]
+            @driver = ::WebSocket::Driver.rack(self)
+
+            # Pass data from the socket to the driver
+            @socket.progress &method(:socket_read)
+            @socket.finally &method(:socket_close)
+
+
+            # Driver has indicated that it is closing
+            # We'll close the socket after writing any remaining data
+            @driver.on(:close, &method(:on_close))
+            @driver.on(:message, &method(:on_message))
+            @driver.on(:error, &method(:on_error))
+        end
+
+        def start
+            @driver.start
+        end
+
+        def text(string)
+            data = string.to_s
+            @loop.schedule do
+                @driver.text(data)
+            end
+        end
+
+        def binary(array)
+            data = array.to_a
+            @loop.schedule do
+                @driver.binary(data)
+            end
+        end
+
+        def progress(callback = nil, &blk)
+            @progress = callback || blk
+        end
+
+
+        def write(data)
+            @socket.write(data)
+        end
+
+
+        protected
+
+
+        def socket_read(data, tcp)
+            @driver.parse(data)
+        end
+
+        def socket_close
+            if @shutdown_called.nil?
+                @defer.reject(WebSocket::Driver::CloseEvent.new(1006, 'connection was closed unexpectedly'))
+            end
+        end
+
+
+        def on_message(event)
+            @progress.call(event.data, self) unless @progress.nil?
+        end
+
+        def on_error(event)
+            @defer.reject(event)
+        end
+
+        def on_close(event)
+            @shutdown_called = true
+            @socket.shutdown
+            @defer.resolve(event)
+        end
+    end
 end

data/lib/spider-gazelle/version.rb

@@ -1,3 +1,3 @@
 module SpiderGazelle
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
 end

data/spider-gazelle.gemspec

@@ -21,6 +21,8 @@ Gem::Specification.new do |s|
     s.add_dependency 'libuv'                # 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
+    s.add_dependency 'radix'                # Converts numbers to the unicode representation
 
     s.add_development_dependency 'rspec'    # Testing framework
     s.add_development_dependency 'yard'     # Comment based documentation generation

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spider-gazelle
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-27 00:00:00.000000000 Z
+date: 2014-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -80,6 +80,34 @@ dependencies:
     - - ">="
       - !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
@@ -121,6 +149,8 @@ extra_rdoc_files:
 - README.md
 files:
 - lib/rack/handler/spider-gazelle.rb
+- lib/spider-gazelle/app_store.rb
+- lib/spider-gazelle/binding.rb
 - lib/spider-gazelle/connection.rb
 - lib/spider-gazelle/error.rb
 - lib/spider-gazelle/gazelle.rb