message_bus 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f26f77d34d537d666747db10d116e2620239f35
-  data.tar.gz: 1af42d9201dea09f8f533709cad6d4cf3afb7707
+  metadata.gz: ea4f0356599eb2162116ae4f248a3cef4fa01273
+  data.tar.gz: af4ca7315e84cd65d5ec9116a1aa61b6f3c69b85
 SHA512:
-  metadata.gz: 2880b09a9223afbfa3d4ae0b9cfad08ddf9dec05d3f5058930019bf7fefbdaaad3d22b4803dd50ad6fff2a70a736794cfa99f66cfab061adbba3ccbdaedc2892
-  data.tar.gz: 974187d731c56cb02a8c56297737f38d4cbb72b588598d9ad4f9ef19fc65a0955867f0545fc6b160bc3bf0a30ce6155643ec7b46d7b3a7873f8a4ffbf427f808
+  metadata.gz: 94b77a368cc509c56978ae656d171309a0b448fc42e0976b961483a022fa9953965b0a64fa8e9e28d1b5af46f8a31a9c4cc8f7fb04b42477e5608341e23a53cf
+  data.tar.gz: 61b01a3d60b13b2853c13f454e24046118fe131291896bbb0b9ff9f181ae2a2c481abdbd184640bbc91f65f51951cd0257e5bbaf4f0715f8703292b4d28b7e1c

data/CHANGELOG

@@ -1,3 +1,7 @@
+23-09-2014
+- Version 1.0.4
+- Change: MessageBus.access_control_allow_origin_lookup to extra_response_headers_lookup
+
 23-09-2014
 - Version 1.0.3
 - Change: MessageBus.access_control_allow_origin to MessageBus.access_control_allow_origin_lookup

data/lib/message_bus.rb

@@ -141,9 +141,9 @@ module MessageBus::Implementation
     @is_admin_lookup
   end
 
-  def access_control_allow_origin_lookup(&blk)
-    @access_control_allow_origin_lookup = blk if blk
-    @access_control_allow_origin_lookup
+  def extra_response_headers_lookup(&blk)
+    @extra_response_headers_lookup = blk if blk
+    @extra_response_headers_lookup
   end
 
   def client_filter(channel, &blk)

data/lib/message_bus/rack/middleware.rb

@@ -87,7 +87,15 @@ class MessageBus::Rack::Middleware
     headers = {}
     headers["Cache-Control"] = "must-revalidate, private, max-age=0"
     headers["Content-Type"] ="application/json; charset=utf-8"
-    headers["Access-Control-Allow-Origin"] = @bus.access_control_allow_origin_lookup.call(env) if @bus.access_control_allow_origin_lookup
+    if @bus.extra_response_headers_lookup
+      @bus.extra_response_headers_lookup.call(env).each do |k,v|
+        headers[k] = v
+      end
+    end
+
+    if env["REQUEST_METHOD"] == "OPTIONS"
+      return [200, headers, ["OK"]]
+    end
 
     ensure_reactor
 

data/lib/message_bus/version.rb

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

data/spec/lib/middleware_spec.rb

@@ -163,8 +163,8 @@ describe MessageBus::Rack::Middleware do
     end
 
     it "should include access control headers" do
-      @bus.access_control_allow_origin_lookup do |env|
-        "http://rainbows.com"
+      @bus.extra_response_headers_lookup do |env|
+        {"FOO" => "BAR"}
       end
 
       client_id = "ABCD"
@@ -175,7 +175,7 @@ describe MessageBus::Rack::Middleware do
         '/bar' => nil
       }
 
-      last_response.headers["Access-Control-Allow-Origin"].should == "http://rainbows.com"
+      last_response.headers["FOO"].should == "BAR"
     end
 
     it "should respond with a 200 to a subscribe" do

metadata

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