faye-websocket 0.6.3 → 0.7.0

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 0.7.0 / 2013-09-09
+
+* Allow the server to send custom headers with EventSource responses
+
+
 ### 0.6.3 / 2013-08-04
 
 * Stop implicitly depending on Rack 1.4

data/README.md

@@ -249,17 +249,23 @@ The `EventSource` object exposes the following properties:
 When you initialize an EventSource with `Faye::EventSource.new`, you can pass
 configuration options after the `env` parameter. Available options are:
 
+* <b>`:headers`</b> is a hash containing custom headers to be set on the
+  EventSource response.
 * <b>`:retry`</b> is a number that tells the client how long (in seconds) it
   should wait after a dropped connection before attempting to reconnect.
 * <b>`:ping`</b> is a number that tells the server how often (in seconds) to
   send 'ping' packets to the client to keep the connection open, to defeat
   timeouts set by proxies. The client will ignore these messages.
 
-For example, this creates a connection that pings every 15 seconds and is
-retryable every 10 seconds if the connection is broken:
+For example, this creates a connection that allows access from any origin, pings
+every 15 seconds and is retryable every 10 seconds if the connection is broken:
 
 ```ruby
-es = Faye::EventSource.new(es, :ping => 15, :retry => 10)
+es = Faye::EventSource.new(es,
+  :headers => {'Access-Control-Allow-Origin' => '*'},
+  :ping    => 15,
+  :retry   => 10
+)
 ```
 
 You can send a ping message at any time by calling `es.ping`. Unlike WebSocket

data/lib/faye/eventsource.rb

@@ -31,6 +31,11 @@ module Faye
 
       @ready_state = WebSocket::API::CONNECTING
 
+      headers = ::WebSocket::Driver::Headers.new
+      if options[:headers]
+        options[:headers].each { |k,v| headers[k] = v }
+      end
+
       if callback = @env['async.callback']
         callback.call([101, {}, @stream])
       end
@@ -39,7 +44,8 @@ module Faye
                     "Content-Type: text/event-stream\r\n" +
                     "Cache-Control: no-cache, no-store\r\n" +
                     "Connection: close\r\n" +
-                    "\r\n\r\n" +
+                    headers.to_s +
+                    "\r\n" +
                     "retry: #{ (@retry * 1000).floor }\r\n\r\n")
 
       EventMachine.next_tick { open }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faye-websocket
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-04 00:00:00.000000000 Z
+date: 2013-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: progressbar
   requirement: !ruby/object:Gem::Requirement