message_bus 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea4f0356599eb2162116ae4f248a3cef4fa01273
-  data.tar.gz: af4ca7315e84cd65d5ec9116a1aa61b6f3c69b85
+  metadata.gz: 7aa504726b847a3d9b1721a32bd87ae01d8e4cdc
+  data.tar.gz: 9c0567bf68c1404e4d5b7b48721011fed464504c
 SHA512:
-  metadata.gz: 94b77a368cc509c56978ae656d171309a0b448fc42e0976b961483a022fa9953965b0a64fa8e9e28d1b5af46f8a31a9c4cc8f7fb04b42477e5608341e23a53cf
-  data.tar.gz: 61b01a3d60b13b2853c13f454e24046118fe131291896bbb0b9ff9f181ae2a2c481abdbd184640bbc91f65f51951cd0257e5bbaf4f0715f8703292b4d28b7e1c
+  metadata.gz: ecb0d74d4dc76fdab724e8263644e33d7958fad8649bb9e386258456b19e3320ab8fe60e8d0a23c657b1c9988560c32005e8bc070285400b7f41266e6fb51025
+  data.tar.gz: 209f41516198cb4cd4d9deffd2a386281754e3decf565f4585159ca7ef55289935242e9db3e063aaa6d68f897da407e3d991243771b8f52c7fe5f52e60c396eb

data/CHANGELOG

@@ -1,3 +1,8 @@
+
+23-09-2014
+- Version 1.0.5
+- Fix: missing custom headers from long polls
+
 23-09-2014
 - Version 1.0.4
 - Change: MessageBus.access_control_allow_origin_lookup to extra_response_headers_lookup

data/lib/message_bus/client.rb

@@ -1,5 +1,8 @@
 class MessageBus::Client
-  attr_accessor :client_id, :user_id, :group_ids, :connect_time, :subscribed_sets, :site_id, :cleanup_timer, :async_response, :io
+  attr_accessor :client_id, :user_id, :group_ids, :connect_time,
+                :subscribed_sets, :site_id, :cleanup_timer,
+                :async_response, :io, :headers
+
   def initialize(opts)
     self.client_id = opts[:client_id]
     self.user_id = opts[:user_id]
@@ -99,8 +102,9 @@ class MessageBus::Client
   def write_and_close(data)
     if @io
       @io.write("HTTP/1.1 200 OK\r\n")
-      @io.write("Content-Type: application/json; charset=utf-8\r\n")
-      @io.write("Cache-Control: must-revalidate, private, max-age=0\r\n")
+      @headers.each do |k,v|
+        @io.write("#{k}: #{v}\r\n")
+      end
       @io.write("Content-Length: #{data.bytes.to_a.length}\r\n")
       @io.write("Connection: close\r\n")
       @io.write("\r\n")

data/lib/message_bus/rack/middleware.rb

@@ -85,8 +85,12 @@ class MessageBus::Rack::Middleware
 
     backlog = client.backlog
     headers = {}
+
     headers["Cache-Control"] = "must-revalidate, private, max-age=0"
-    headers["Content-Type"] ="application/json; charset=utf-8"
+    headers["Content-Type"] = "application/json; charset=utf-8"
+    headers["Pragma"] = "no-cache"
+    headers["Expires"] = "0"
+
     if @bus.extra_response_headers_lookup
       @bus.extra_response_headers_lookup.call(env).each do |k,v|
         headers[k] = v
@@ -109,6 +113,7 @@ class MessageBus::Rack::Middleware
     elsif long_polling && env['rack.hijack'] && @bus.rack_hijack_enabled?
       io = env['rack.hijack'].call
       client.io = io
+      client.headers = headers
 
       add_client_with_timeout(client)
       [418, {}, ["I'm a teapot, undefined in spec"]]

data/lib/message_bus/version.rb

@@ -1,3 +1,3 @@
 module MessageBus
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

data/spec/lib/middleware_spec.rb

@@ -55,6 +55,10 @@ describe MessageBus::Rack::Middleware do
       middleware = @async_middleware
       bus = @bus
 
+      @bus.extra_response_headers_lookup do |env|
+        {"FOO" => "BAR"}
+      end
+
       Thread.new do
         wait_for(2000) {middleware.in_async?}
         bus.publish "/foo", "םוֹלשָׁ"
@@ -66,6 +70,8 @@ describe MessageBus::Rack::Middleware do
       parsed = JSON.parse(last_response.body)
       parsed.length.should == 1
       parsed[0]["data"].should == "םוֹלשָׁ"
+
+      last_response.headers["FOO"].should == "BAR"
     end
 
     it "should timeout within its alloted slot" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: message_bus
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Sam Saffron