Bump version to 0.1.4

With the code as it was, it will generate a warning like such:

.../websocket-extensions-0.1.3/lib/websocket/extensions/parser.rb:41:
warning: deprecated Object#=~ is called on TrueClass; it always returns
nil

So we will avoid if the variable is TrueClass.

.travis.yml

@@ -1,10 +1,21 @@
+sudo: false
+dist: trusty
 language: ruby
 
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.3
+  - 2.1.10
+  - 2.2.10
+  - 2.3.8
+  - 2.4.6
+  - 2.5.5
+  - 2.6.3
   - jruby-19mode
-  - rbx-2.2
+  - jruby-head
 
-script: bundle exec rspec -c spec/
+before_install:
+  - '[[ "$(ruby --version)" == *"1.9.3"* ]] && gem update --system 2.4.8 || true'
+
+script:
+  - bundle exec rspec -c spec

CHANGELOG.md

@@ -1,7 +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
+
+### 0.1.2 / 2015-02-19
+
+- 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

CODE_OF_CONDUCT.md

@@ -0,0 +1,4 @@
+# Code of Conduct
+
+All projects under the [Faye](https://github.com/faye) umbrella are covered by
+the [Code of Conduct](https://github.com/faye/code-of-conduct).

LICENSE.md

@@ -0,0 +1,12 @@
+Copyright 2014-2019 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
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+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.

README.md

@@ -309,29 +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)
-
-## License
-
-(The MIT License)
-
-Copyright (c) 2014 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
-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:
-
-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.
+- Consumer: [websocket-driver](https://github.com/faye/websocket-driver-ruby)
+- Provider: [permessage-deflate](https://github.com/faye/permessage-deflate-ruby)

lib/websocket/extensions.rb

@@ -98,9 +98,9 @@ module WebSocket
     end
 
     def generate_response(header)
-      offers   = Parser.parse_header(header)
       sessions = []
       response = []
+      offers   = Parser.parse_header(header)
 
       @in_order.each do |ext|
         offer = offers.by_name(ext.name)
@@ -155,6 +155,8 @@ module WebSocket
     end
 
     def close
+      return unless @sessions
+
       @sessions.each do |ext, session|
         session.close rescue nil
       end

lib/websocket/extensions/parser.rb

@@ -4,8 +4,8 @@ module WebSocket
   class Extensions
 
     class Parser
-      TOKEN    = /([!#\$%&'\*\+\-\.\^_`\|~0-9a-z]+)/
-      NOTOKEN  = /([^!#\$%&'\*\+\-\.\^_`\|~0-9a-z])/
+      TOKEN    = /([!#\$%&'\*\+\-\.\^_`\|~0-9A-Za-z]+)/
+      NOTOKEN  = /([^!#\$%&'\*\+\-\.\^_`\|~0-9A-Za-z])/
       QUOTED   = /"((?:\\[\x00-\x7f]|[^\x00-\x08\x0a-\x1f\x7f"])*)"/
       PARAM    = %r{#{TOKEN.source}(?:=(?:#{TOKEN.source}|#{QUOTED.source}))?}
       EXT      = %r{#{TOKEN.source}(?: *; *#{PARAM.source})*}
@@ -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
 

spec/websocket/extensions_spec.rb

@@ -325,11 +325,14 @@ describe WebSocket::Extensions do
         expect(@extensions.generate_response("deflate, tar")).to eq "deflate; mode=compress"
       end
 
-      it "returns a response for potentially conflicting extensions if their preceeding extensions don't build a session" do
+      it "raises an error if the header is invalid" do
+        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
         allow(@ext).to receive(:create_server_session).and_return(nil)
         expect(@extensions.generate_response("deflate, tar")).to eq "tar; gzip"
       end
-
     end
   end
 end

websocket-extensions.gemspec

@@ -1,17 +1,17 @@
 Gem::Specification.new do |s|
-  s.name              = 'websocket-extensions'
-  s.version           = '0.1.1'
-  s.summary           = 'Generic extension manager for WebSocket connections'
-  s.author            = 'James Coglan'
-  s.email             = 'jcoglan@gmail.com'
-  s.homepage          = 'http://github.com/faye/websocket-extensions-ruby'
-  s.license           = 'MIT'
+  s.name     = 'websocket-extensions'
+  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  = 'Apache-2.0'
 
-  s.extra_rdoc_files  = %w[README.md]
-  s.rdoc_options      = %w[--main README.md --markup markdown]
-  s.require_paths     = %w[lib]
+  s.extra_rdoc_files = %w[README.md]
+  s.rdoc_options     = %w[--main README.md --markup markdown]
+  s.require_paths    = %w[lib]
 
-  s.files = %w[README.md CHANGELOG.md] + Dir.glob('lib/**/*.rb')
+  s.files = %w[CHANGELOG.md LICENSE.md README.md] + Dir.glob('lib/**/*.rb')
 
   s.add_development_dependency 'rspec'
 end