spider-gazelle 0.1.6 → 0.1.7

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

@@ -1,104 +1,94 @@
+require 'spider-gazelle/const'
 require 'websocket/driver'
 require 'forwardable'
 
-
 module SpiderGazelle
-    # TODO:: make a promise that resolves when closed
-    class Websocket < ::Libuv::Q::DeferredPromise
-        attr_reader :env, :url, :loop
-
-
-        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
-
-
-        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
-                @driver.text(data)
-            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
-                @driver.binary(data)
-            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
-
-        # 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
-
-
-        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
+  class Websocket < ::Libuv::Q::DeferredPromise
+    include Const
+
+    attr_reader :env, :url, :loop
+
+    extend Forwardable
+    def_delegators :@driver, :start, :ping, :protocol, :ready_state, :set_header, :state, :close
+    def_delegators :@socket, :write
+
+    def initialize(tcp, env)
+      @socket, @env = tcp, env
+
+      # Initialise the promise
+      super @socket.loop, @socket.loop.defer
+
+      scheme = env[RACK_URL_SCHEME] == HTTPS ? '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 &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
+
+    # Write some text to the websocket connection
+    #
+    # @param string [String] a string of data to be sent to the far end
+    def text(string)
+      @loop.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) }
+    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
+
+    # 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
+
+    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/spider-gazelle.gemspec

@@ -1,10 +1,16 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-require "spider-gazelle/version"
+
+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
 
 Gem::Specification.new do |s|
     s.name        = "spider-gazelle"
-    s.version     = SpiderGazelle::VERSION
+    s.version     = version
     s.authors     = ["Stephen von Takach"]
     s.email       = ["steve@cotag.me"]
     s.license     = 'MIT'
@@ -26,7 +32,6 @@ Gem::Specification.new do |s|
 
     s.add_development_dependency 'rspec'    # Testing framework
     s.add_development_dependency 'yard'     # Comment based documentation generation
-    
 
     s.files = Dir["{lib,bin}/**/*"] + %w(Rakefile spider-gazelle.gemspec README.md LICENSE)
     s.test_files = Dir["spec/**/*"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spider-gazelle
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-21 00:00:00.000000000 Z
+date: 2014-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -152,12 +152,11 @@ files:
 - lib/spider-gazelle/app_store.rb
 - lib/spider-gazelle/binding.rb
 - lib/spider-gazelle/connection.rb
-- lib/spider-gazelle/error.rb
+- lib/spider-gazelle/const.rb
 - lib/spider-gazelle/gazelle.rb
 - lib/spider-gazelle/request.rb
 - lib/spider-gazelle/spider.rb
 - lib/spider-gazelle/upgrades/websocket.rb
-- lib/spider-gazelle/version.rb
 - lib/spider-gazelle.rb
 - bin/sg
 - Rakefile

data/lib/spider-gazelle/error.rb

@@ -1,16 +0,0 @@
-
-module SpiderGazelle
-    module Error
-
-        # Indicate that we couldn't parse the request
-        ERROR_400_RESPONSE = "HTTP/1.1 400 Bad Request\r\nConnection: close\r\n\r\n".freeze
-
-        # The standard empty 404 response for bad requests.
-        ERROR_404_RESPONSE = "HTTP/1.1 404 Not Found\r\n\r\nNOT FOUND".freeze
-
-        # Indicate that there was an internal error, obviously.
-        ERROR_500_RESPONSE = "HTTP/1.1 500 Internal Server Error\r\n\r\n".freeze
-
-
-    end
-end

data/lib/spider-gazelle/version.rb

@@ -1,3 +0,0 @@
-module SpiderGazelle
-    VERSION = "0.1.6"
-end