faye-websocket 0.2.0 → 0.3.0

data/lib/faye/websocket/adapter.rb

@@ -0,0 +1,21 @@
+module Faye
+  class WebSocket
+    
+    module Adapter
+      def websocket?
+        e = defined?(@env) ? @env : env
+        WebSocket.websocket?(e)
+      end
+      
+      def eventsource?
+        e = defined?(@env) ? @env : env
+        EventSource.eventsource?(e)
+      end
+      
+      def async_connection?
+        websocket? or eventsource?
+      end
+    end
+    
+  end
+end

data/lib/faye/websocket/api.rb

@@ -1,14 +1,20 @@
 module Faye
   class WebSocket
     
-    CONNECTING = 0
-    OPEN       = 1
-    CLOSING    = 2
-    CLOSED     = 3
-    
     module API
-      attr_reader   :url, :ready_state, :buffered_amount
-      attr_accessor :onopen, :onmessage, :onerror, :onclose
+      module ReadyStates
+        CONNECTING = 0
+        OPEN       = 1
+        CLOSING    = 2
+        CLOSED     = 3
+      end
+      
+      require File.expand_path('../api/event_target', __FILE__)
+      require File.expand_path('../api/event', __FILE__)
+      include EventTarget
+      include ReadyStates
+      
+      attr_reader :url, :ready_state, :buffered_amount
       
       def receive(data)
         return false unless ready_state == OPEN
@@ -49,61 +55,6 @@ module Faye
           close.call
         end
       end
-      
-      def add_event_listener(event_type, listener, use_capture = false)
-        @listeners ||= {}
-        list = @listeners[event_type] ||= []
-        list << listener
-      end
-      
-      def remove_event_listener(event_type, listener, use_capture = false)
-        return unless @listeners and @listeners[event_type]
-        return @listeners.delete(event_type) unless listener
-        
-        @listeners[event_type].delete_if(&listener.method(:==))
-      end
-      
-      def dispatch_event(event)
-        event.target = event.current_target = self
-        event.event_phase = Event::AT_TARGET
-        
-        callback = __send__("on#{ event.type }")
-        callback.call(event) if callback
-        
-        return unless @listeners and @listeners[event.type]
-        @listeners[event.type].each do |listener|
-          listener.call(event)
-        end
-      end
-    end
-    
-    class Event
-      attr_reader   :type, :bubbles, :cancelable
-      attr_accessor :target, :current_target, :event_phase, :data
-      
-      CAPTURING_PHASE = 1
-      AT_TARGET       = 2
-      BUBBLING_PHASE  = 3
-      
-      def initialize(event_type, options = {})
-        @type = event_type
-        metaclass = (class << self ; self ; end)
-        options.each do |key, value|
-          metaclass.__send__(:define_method, key) { value }
-        end
-      end
-      
-      def init_event(event_type, can_bubble, cancelable)
-        @type       = event_type
-        @bubbles    = can_bubble
-        @cancelable = cancelable
-      end
-      
-      def stop_propagation
-      end
-      
-      def prevent_default
-      end
     end
     
   end

data/lib/faye/websocket/api/event.rb

@@ -0,0 +1,33 @@
+module Faye::WebSocket::API
+  class Event
+    
+    attr_reader   :type, :bubbles, :cancelable
+    attr_accessor :target, :current_target, :event_phase, :data
+    
+    CAPTURING_PHASE = 1
+    AT_TARGET       = 2
+    BUBBLING_PHASE  = 3
+    
+    def initialize(event_type, options = {})
+      @type = event_type
+      metaclass = (class << self ; self ; end)
+      options.each do |key, value|
+        metaclass.__send__(:define_method, key) { value }
+      end
+    end
+    
+    def init_event(event_type, can_bubble, cancelable)
+      @type       = event_type
+      @bubbles    = can_bubble
+      @cancelable = cancelable
+    end
+    
+    def stop_propagation
+    end
+    
+    def prevent_default
+    end
+    
+  end
+end
+

data/lib/faye/websocket/api/event_target.rb

@@ -0,0 +1,34 @@
+module Faye::WebSocket::API
+  module EventTarget
+    
+    attr_accessor :onopen, :onmessage, :onerror, :onclose
+    
+    def add_event_listener(event_type, listener, use_capture = false)
+      @listeners ||= {}
+      list = @listeners[event_type] ||= []
+      list << listener
+    end
+    
+    def remove_event_listener(event_type, listener, use_capture = false)
+      return unless @listeners and @listeners[event_type]
+      return @listeners.delete(event_type) unless listener
+      
+      @listeners[event_type].delete_if(&listener.method(:==))
+    end
+    
+    def dispatch_event(event)
+      event.target = event.current_target = self
+      event.event_phase = Event::AT_TARGET
+      
+      callback = __send__("on#{ event.type }")
+      callback.call(event) if callback
+      
+      return unless @listeners and @listeners[event.type]
+      @listeners[event.type].each do |listener|
+        listener.call(event)
+      end
+    end
+    
+  end
+end
+

data/spec/faye/websocket/client_spec.rb

@@ -3,9 +3,9 @@
 require "spec_helper"
 
 WebSocketSteps = EM::RSpec.async_steps do
-  def server(port, secure, &callback)
+  def server(port, backend, secure, &callback)
     @server = EchoServer.new
-    @server.listen(port, secure)
+    @server.listen(port, backend, secure)
     @port = port
     EM.add_timer(0.1, &callback)
   end
@@ -135,21 +135,31 @@ describe Faye::WebSocket::Client do
     end
   end
   
-  describe "with a plain-text server" do
+  describe "with a plain-text Thin server" do
     let(:socket_url)  { plain_text_url }
     let(:blocked_url) { secure_url }
     
-    before { server 8000, false }
+    before { server 8000, :thin, false }
     after  { sync ; stop }
     
     it_should_behave_like "socket client"
   end
   
-  describe "with a secure server" do
+  describe "with a plain-text Rainbows server" do
+    let(:socket_url)  { plain_text_url }
+    let(:blocked_url) { secure_url }
+    
+    before { server 8000, :rainbows, false }
+    after  { sync ; stop }
+    
+    it_should_behave_like "socket client"
+  end
+  
+  describe "with a secure Thin server" do
     let(:socket_url)  { secure_url }
     let(:blocked_url) { plain_text_url }
     
-    before { server 8000, true }
+    before { server 8000, :thin, true }
     after  { sync ; stop }
     
     it_should_behave_like "socket client"

data/spec/rainbows.conf

@@ -0,0 +1,3 @@
+Rainbows! do
+  use :EventMachine
+end

data/spec/spec_helper.rb

@@ -1,9 +1,12 @@
 require 'rubygems'
 require 'bundler/setup'
+require 'thin'
+require 'rainbows'
 require File.expand_path('../../lib/faye/websocket', __FILE__)
 require File.expand_path('../../vendor/em-rspec/lib/em-rspec', __FILE__)
 
 Thin::Logging.silent = true
+Unicorn::Configurator::DEFAULTS[:logger] = Logger.new(StringIO.new)
 
 module EncodingHelper
   def encode(message)
@@ -30,16 +33,27 @@ class EchoServer
     [-1, {}, []]
   end
   
-  def listen(port, ssl = false)
-    Rack::Handler.get('thin').run(self, :Port => port) do |s|
-      if ssl
-        s.ssl = true
-        s.ssl_options = {
-          :private_key_file => File.expand_path('../server.key', __FILE__),
-          :cert_chain_file  => File.expand_path('../server.crt', __FILE__)
-        }
+  def listen(port, backend, ssl = false)
+    case backend
+    when :rainbows
+      rackup = Unicorn::Configurator::RACKUP
+      rackup[:port] = port
+      rackup[:set_listener] = true
+      options = rackup[:options]
+      options[:config_file] = File.expand_path('../rainbows.conf', __FILE__)
+      @server = Rainbows::HttpServer.new(self, options)
+      @server.start
+    when :thin
+      Rack::Handler.get('thin').run(self, :Port => port) do |s|
+        if ssl
+          s.ssl = true
+          s.ssl_options = {
+            :private_key_file => File.expand_path('../server.key', __FILE__),
+            :cert_chain_file  => File.expand_path('../server.crt', __FILE__)
+          }
+        end
+        @server = s
       end
-      @server = s
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faye-websocket
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-21 00:00:00.000000000 Z
+date: 2012-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &18014780 !ruby/object:Gem::Requirement
+  requirement: &18778460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,32 +21,43 @@ dependencies:
         version: 0.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *18014780
+  version_requirements: *18778460
 - !ruby/object:Gem::Dependency
-  name: thin
-  requirement: &18013820 !ruby/object:Gem::Requirement
+  name: rack
+  requirement: &18778060 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
-  version_requirements: *18013820
+  version_requirements: *18778060
+- !ruby/object:Gem::Dependency
+  name: rainbows
+  requirement: &18777520 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: *18777520
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &18012580 !ruby/object:Gem::Requirement
+  requirement: &18777020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *18012580
+  version_requirements: *18777020
 - !ruby/object:Gem::Dependency
-  name: rack
-  requirement: &18011960 !ruby/object:Gem::Requirement
+  name: rake-compiler
+  requirement: &18776640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,18 +65,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18011960
+  version_requirements: *18776640
 - !ruby/object:Gem::Dependency
-  name: rake-compiler
-  requirement: &18010240 !ruby/object:Gem::Requirement
+  name: thin
+  requirement: &18776100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *18010240
+  version_requirements: *18776100
 description: 
 email: jcoglan@gmail.com
 executables: []
@@ -85,12 +96,22 @@ files:
 - lib/faye/websocket/api.rb
 - lib/faye/websocket/hybi_parser/handshake.rb
 - lib/faye/websocket/hybi_parser/stream_reader.rb
+- lib/faye/websocket/api/event_target.rb
+- lib/faye/websocket/api/event.rb
+- lib/faye/websocket/adapter.rb
 - lib/faye/websocket.rb
-- lib/faye/thin_extensions.rb
+- lib/faye/eventsource.rb
+- lib/faye/adapters/thin.rb
+- lib/faye/adapters/rainbows.rb
+- lib/faye/adapters/goliath.rb
+- lib/faye/adapters/rainbows_client.rb
+- examples/app.rb
 - examples/client.rb
 - examples/haproxy.conf
+- examples/sse.html
+- examples/config.ru
 - examples/server.rb
-- examples/index.html
+- examples/ws.html
 - examples/autobahn_client.rb
 - spec/faye/websocket/draft75_parser_spec.rb
 - spec/faye/websocket/client_spec.rb
@@ -98,8 +119,9 @@ files:
 - spec/faye/websocket/hybi_parser_spec.rb
 - spec/server.key
 - spec/server.crt
+- spec/rainbows.conf
 - spec/spec_helper.rb
-homepage: http://github.com/jcoglan/faye-websocket-ruby
+homepage: http://github.com/faye/faye-websocket-ruby
 licenses: []
 post_install_message: 
 rdoc_options: