faye-websocket 0.10.2 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88b64bb31b27e5c1784847e0863ed2d5bb31f3ac
-  data.tar.gz: 9a1c4ab3691adff2d6675007147baa9f8bc10e56
+  metadata.gz: 071c3a535b7e31882686fe37a6ad5b1989f3bc2b
+  data.tar.gz: 51eb61ff82dce0cfa852e63fa49b9e478ecde669
 SHA512:
-  metadata.gz: b9bba26e44b9096854a34b50bbae2306f46b89d47626a0a76fbae17e6ca7759cce366f8477f23db11b7d0f9c0945295385e2b75abd57a2ec07fbbfb8152ff296
-  data.tar.gz: 54bb0acac9d51522c0977dcc5321f8581ba68f86714f1157bafd2a5f73de4cfffb7866518981daa9558c288fd0eff47df642ce44b5285bc2842c105eae446957
+  metadata.gz: b130c0c8692ad3eb2995f1e4176325d6aec8eba59c5477ab73d39d41a1d08c4f149477475b09556973e87f8487370432476b799f84aa053af2eb2dafdb4acbb5
+  data.tar.gz: b5dff2177705436fbe8bca454d3dff81e9d63604ee7527d5f78458fbe5348ee5d0b322c174ec969cedab2ff55c71361a9dcef58e91848399906b3d54ca41ba13

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 0.10.3 / 2016-02-24
+
+* Use `PATH_INFO` and `QUERY_STRING` rather than the non-standard `REQUEST_URI` from the Rack env
+
 ### 0.10.2 / 2015-11-26
 
 * Fix the `headers` and `status` methods on `Client`, which were broken in the

data/README.md

@@ -490,7 +490,7 @@ end
 
 (The MIT License)
 
-Copyright (c) 2010-2015 James Coglan
+Copyright (c) 2010-2016 James Coglan
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the 'Software'), to deal in

data/lib/faye/eventsource.rb

@@ -15,8 +15,7 @@ module Faye
     end
 
     def self.determine_url(env)
-      scheme = WebSocket.secure_request?(env) ? 'https:' : 'http:'
-      "#{ scheme }//#{ env['HTTP_HOST'] }#{ env['REQUEST_URI'] }"
+      WebSocket.determine_url(env, ['https', 'http'])
     end
 
     def initialize(env, options = {})

data/lib/faye/websocket.rb

@@ -27,9 +27,13 @@ module Faye
       'thin'     => :Thin
     }
 
-    def self.determine_url(env)
-      scheme = secure_request?(env) ? 'wss:' : 'ws:'
-      "#{ scheme }//#{ env['HTTP_HOST'] }#{ env['REQUEST_URI'] }"
+    def self.determine_url(env, schemes = ['wss', 'ws'])
+      scheme = schemes[secure_request?(env) ? 0 : 1]
+      host   = env['HTTP_HOST']
+      path   = env['PATH_INFO']
+      query  = env['QUERY_STRING'].to_s
+
+      scheme + '://' + host + path + (query.empty? ? '' : '?' + query)
     end
 
     def self.ensure_reactor_running

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faye-websocket
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.3
 platform: ruby
 authors:
 - James Coglan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-26 00:00:00.000000000 Z
+date: 2016-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -215,7 +215,7 @@ files:
 - lib/faye/websocket/api/event.rb
 - lib/faye/websocket/api/event_target.rb
 - lib/faye/websocket/client.rb
-homepage: http://github.com/faye/faye-websocket-ruby
+homepage: https://github.com/faye/faye-websocket-ruby
 licenses:
 - MIT
 metadata: {}
@@ -239,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Standards-compliant WebSocket server and client