Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 242f007cb9 | |||
| 249bcc106f | |||
| 738a0af1dd | |||
| 68c1b21129 | |||
| 8ee09b2924 | |||
| 7e64cfb6ca | |||
| 1a441fac80 |
+6
-3
@@ -1,13 +1,16 @@
|
||||
sudo: false
|
||||
dist: trusty
|
||||
language: ruby
|
||||
|
||||
rvm:
|
||||
- 1.9.3
|
||||
- 2.0.0
|
||||
- 2.1.10
|
||||
- 2.2.8
|
||||
- 2.3.5
|
||||
- 2.4.2
|
||||
- 2.2.10
|
||||
- 2.3.8
|
||||
- 2.4.6
|
||||
- 2.5.5
|
||||
- 2.6.3
|
||||
- jruby-19mode
|
||||
- jruby-head
|
||||
|
||||
|
||||
+8
-4
@@ -1,15 +1,19 @@
|
||||
### 0.1.4 / 2019-06-10
|
||||
|
||||
- Fix a deprecation warning for using the `=~` operator on `true`
|
||||
|
||||
### 0.1.3 / 2017-11-11
|
||||
|
||||
* Accept extension names and parameters including uppercase letters
|
||||
- Accept extension names and parameters including uppercase letters
|
||||
|
||||
### 0.1.2 / 2015-02-19
|
||||
|
||||
* Make it safe to call `Extensions#close` if the handshake is not complete
|
||||
- Make it safe to call `Extensions#close` if the handshake is not complete
|
||||
|
||||
### 0.1.1 / 2014-12-14
|
||||
|
||||
* Explicitly require `strscan` which is not loaded in a vanilla Ruby environment
|
||||
- Explicitly require `strscan` which is not loaded in a vanilla Ruby environment
|
||||
|
||||
### 0.1.0 / 2014-12-13
|
||||
|
||||
* Initial release
|
||||
- Initial release
|
||||
|
||||
+9
-17
@@ -1,20 +1,12 @@
|
||||
# The MIT license
|
||||
Copyright 2014-2019 James Coglan
|
||||
|
||||
Copyright (c) 2014-2017 James Coglan
|
||||
Licensed under the Apache License, Version 2.0 (the "License"); you may not use
|
||||
this file except in compliance with the License. You may obtain a copy of the
|
||||
License at
|
||||
|
||||
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
|
||||
the Software without restriction, including without limitation the rights to
|
||||
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
|
||||
the Software, and to permit persons to whom the Software is furnished to do so,
|
||||
subject to the following conditions:
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
|
||||
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
|
||||
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
|
||||
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
Unless required by applicable law or agreed to in writing, software distributed
|
||||
under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
|
||||
CONDITIONS OF ANY KIND, either express or implied. See the License for the
|
||||
specific language governing permissions and limitations under the License.
|
||||
|
||||
@@ -309,5 +309,5 @@ the session to release any resources it's using.
|
||||
|
||||
## Examples
|
||||
|
||||
* Consumer: [websocket-driver](https://github.com/faye/websocket-driver-ruby)
|
||||
* Provider: [permessage-deflate](https://github.com/faye/permessage-deflate-ruby)
|
||||
- Consumer: [websocket-driver](https://github.com/faye/websocket-driver-ruby)
|
||||
- Provider: [permessage-deflate](https://github.com/faye/permessage-deflate-ruby)
|
||||
|
||||
@@ -38,7 +38,7 @@ module WebSocket
|
||||
else
|
||||
data = true
|
||||
end
|
||||
if data =~ NUMBER
|
||||
if data != true and data =~ NUMBER
|
||||
data = data =~ /\./ ? data.to_f : data.to_i(10)
|
||||
end
|
||||
|
||||
|
||||
@@ -326,7 +326,7 @@ describe WebSocket::Extensions do
|
||||
end
|
||||
|
||||
it "raises an error if the header is invalid" do
|
||||
expect { @extensions.generate_response("x-webkit- -frame") }.to raise_error
|
||||
expect { @extensions.generate_response("x-webkit- -frame") }.to raise_error(WebSocket::Extensions::Parser::ParseError)
|
||||
end
|
||||
|
||||
it "returns a response for potentially conflicting extensions if their preceding extensions don't build a session" do
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
Gem::Specification.new do |s|
|
||||
s.name = 'websocket-extensions'
|
||||
s.version = '0.1.3'
|
||||
s.version = '0.1.4'
|
||||
s.summary = 'Generic extension manager for WebSocket connections'
|
||||
s.author = 'James Coglan'
|
||||
s.email = 'jcoglan@gmail.com'
|
||||
s.homepage = 'https://github.com/faye/websocket-extensions-ruby'
|
||||
s.license = 'MIT'
|
||||
s.license = 'Apache-2.0'
|
||||
|
||||
s.extra_rdoc_files = %w[README.md]
|
||||
s.rdoc_options = %w[--main README.md --markup markdown]
|
||||
|
||||
Reference in New Issue
Block a user