websocket 1.1.4 → 1.2.0

data/spec/support/handshake_requests.rb

@@ -1,11 +1,11 @@
 def client_handshake_75(args = {})
   <<-EOF
-GET #{args[:path] || "/demo"}#{"?#{args[:query]}" if args[:query]} HTTP/1.1\r
+GET #{args[:path] || '/demo'}#{"?#{args[:query]}" if args[:query]} HTTP/1.1\r
 Upgrade: WebSocket\r
 Connection: Upgrade\r
-Host: #{args[:host] || "example.com"}#{":#{args[:port]}" if args[:port]}\r
+Host: #{args[:host] || 'example.com'}#{":#{args[:port]}" if args[:port]}\r
 Origin: http://example.com\r
-\r
+#{(args[:headers] || {}).map{|key, value| "#{key}: #{value}\r\n"}.join('')}\r
   EOF
 end
 
@@ -15,22 +15,22 @@ HTTP/1.1 101 Web Socket Protocol Handshake\r
 Upgrade: WebSocket\r
 Connection: Upgrade\r
 WebSocket-Origin: http://example.com\r
-WebSocket-Location: ws#{args[:secure] ? "s" : ""}://#{args[:host] || "example.com"}#{":#{args[:port]}" if args[:port]}#{args[:path] || "/demo"}\r
+WebSocket-Location: ws#{args[:secure] ? 's' : ''}://#{args[:host] || 'example.com'}#{":#{args[:port]}" if args[:port]}#{args[:path] || '/demo'}\r
 \r
   EOF
 end
 
 def client_handshake_76(args = {})
   request = <<-EOF
-GET #{args[:path] || "/demo"}#{"?#{args[:query]}" if args[:query]} HTTP/1.1\r
+GET #{args[:path] || '/demo'}#{"?#{args[:query]}" if args[:query]} HTTP/1.1\r
 Upgrade: WebSocket\r
 Connection: Upgrade\r
-Host: #{args[:host] || "example.com"}#{":#{args[:port]}" if args[:port]}\r
+Host: #{args[:host] || 'example.com'}#{":#{args[:port]}" if args[:port]}\r
 Origin: http://example.com\r
-Sec-WebSocket-Key1: #{args[:key1] || "4 @1  46546xW%0l 1 5"}\r
-Sec-WebSocket-Key2: #{args[:key2] || "12998 5 Y3 1  .P00"}\r
+#{(args[:headers] || {}).map{|key, value| "#{key}: #{value}\r\n"}.join('')}Sec-WebSocket-Key1: #{args[:key1] || '4 @1  46546xW%0l 1 5'}\r
+Sec-WebSocket-Key2: #{args[:key2] || '12998 5 Y3 1  .P00'}\r
 \r
-#{args[:key3] || "^n:ds[4U"}
+#{args[:key3] || '^n:ds[4U'}
   EOF
   request[0..-2]
 end
@@ -41,7 +41,7 @@ HTTP/1.1 101 WebSocket Protocol Handshake\r
 Upgrade: WebSocket\r
 Connection: Upgrade\r
 Sec-WebSocket-Origin: http://example.com\r
-Sec-WebSocket-Location: ws#{args[:secure] ? "s" : ""}://#{args[:host] || "example.com"}#{":#{args[:port]}" if args[:port]}#{args[:path] || "/demo"}\r
+Sec-WebSocket-Location: ws#{args[:secure] ? 's' : ''}://#{args[:host] || 'example.com'}#{":#{args[:port]}" if args[:port]}#{args[:path] || '/demo'}\r
 \r
 #{args[:challenge] || "8jKS'y:G*Co,Wxa-"}
   EOF
@@ -50,13 +50,13 @@ end
 
 def client_handshake_04(args = {})
   <<-EOF
-GET #{args[:path] || "/demo"}#{"?#{args[:query]}" if args[:query]} HTTP/1.1\r
+GET #{args[:path] || '/demo'}#{"?#{args[:query]}" if args[:query]} HTTP/1.1\r
 Upgrade: websocket\r
 Connection: Upgrade\r
-Host: #{args[:host] || "example.com"}#{":#{args[:port]}" if args[:port]}\r
-Sec-WebSocket-Origin: http://example.com\r
-Sec-WebSocket-Version: #{args[:version] || "4"}\r
-Sec-WebSocket-Key: #{args[:key] || "dGhlIHNhbXBsZSBub25jZQ=="}\r
+Host: #{args[:host] || 'example.com'}#{":#{args[:port]}" if args[:port]}\r
+#{(args[:headers] || {}).map{|key, value| "#{key}: #{value}\r\n"}.join('')}Sec-WebSocket-Origin: http://example.com\r
+Sec-WebSocket-Version: #{args[:version] || '4'}\r
+Sec-WebSocket-Key: #{args[:key] || 'dGhlIHNhbXBsZSBub25jZQ=='}\r
 \r
   EOF
 end
@@ -66,7 +66,7 @@ def server_handshake_04(args = {})
 HTTP/1.1 101 Switching Protocols\r
 Upgrade: websocket\r
 Connection: Upgrade\r
-Sec-WebSocket-Accept: #{args[:accept] || "s3pPLMBiTxaQ9kYGzzhZRbK+xOo="}\r
+Sec-WebSocket-Accept: #{args[:accept] || 's3pPLMBiTxaQ9kYGzzhZRbK+xOo='}\r
 \r
   EOF
 end

data/spec/support/incoming_frames.rb

@@ -1,54 +1,54 @@
-shared_examples_for 'valid_incoming_frame' do
-  let(:decoded_text_array) { decoded_text == "" ? [""] : Array(decoded_text) } # Bug in Ruby 1.8 -> Array("") => [] instead of [""]
+RSpec.shared_examples_for 'valid_incoming_frame' do
+  let(:decoded_text_array) { Array(decoded_text) }
   let(:frame_type_array) { Array(frame_type) }
 
-  its(:class) { should eql(WebSocket::Frame::Incoming) }
-  its(:data) { should eql(encoded_text || "") }
-  its(:version) { should eql(version) }
-  its(:type) { should be_nil }
-  its(:decoded?) { should be_false }
-  its(:to_s) { should eql(encoded_text || "") }
+  its(:class) { is_expected.to eql(WebSocket::Frame::Incoming) }
+  its(:data) { is_expected.to eql(encoded_text || '') }
+  its(:version) { is_expected.to eql(version) }
+  its(:type) { is_expected.to be_nil }
+  its(:decoded?) { is_expected.to be false }
+  its(:to_s) { is_expected.to eql(encoded_text || '') }
 
-  it "should have specified number of returned frames" do
+  it 'should have specified number of returned frames' do
     decoded_text_array.each_with_index do |da, index|
       n = subject.next
-      n.should_not be_nil, "Should return frame for #{da}, #{frame_type_array[index]}"
-      n.class.should eql(WebSocket::Frame::Incoming), "Should be WebSocket::Frame::Incoming, #{n} received instead"
+      expect(n).not_to be_nil, "Should return frame for #{da}, #{frame_type_array[index]}"
+      expect(n.class).to eql(WebSocket::Frame::Incoming), "Should be WebSocket::Frame::Incoming, #{n} received instead"
     end
-    subject.next.should be_nil
+    expect(subject.next).to be_nil
     if error.is_a?(Class)
-      subject.error.should eql(error.new.message)
+      expect(subject.error).to eql(error.new.message)
     else
-      subject.error.should eql(error)
+      expect(subject.error).to eql(error)
     end
   end
 
-  it "should return valid decoded frame for each specified decoded texts" do
+  it 'should return valid decoded frame for each specified decoded texts' do
     decoded_text_array.each_with_index do |da, index|
       f = subject.next
-      f.decoded?.should be_true
-      f.type.should eql(frame_type_array[index])
-      f.code.should eql(close_code) if defined?(close_code)
-      f.to_s.should eql(da)
+      expect(f.decoded?).to be true
+      expect(f.type).to eql(frame_type_array[index])
+      expect(f.code).to eql(close_code) if defined?(close_code)
+      expect(f.to_s).to eql(da)
     end
   end
 
-  context "with raising" do
-    before { WebSocket.should_raise = true }
-    after { WebSocket.should_raise = false }
+  context 'with raising' do
+    before(:each) { WebSocket.should_raise = true }
+    after(:each) { WebSocket.should_raise = false }
 
-    it "should have specified number of returned frames" do
+    it 'should have specified number of returned frames' do
       expect do
         decoded_text_array.each_with_index do |da, index|
           n = subject.next
-          n.should_not be_nil, "Should return frame for #{da}, #{frame_type_array[index]}"
-          n.class.should eql(WebSocket::Frame::Incoming), "Should be WebSocket::Frame::Incoming, #{n} received instead"
+          expect(n).not_to be_nil, "Should return frame for #{da}, #{frame_type_array[index]}"
+          expect(n.class).to eql(WebSocket::Frame::Incoming), "Should be WebSocket::Frame::Incoming, #{n} received instead"
         end
-        subject.next.should be_nil
+        expect(subject.next).to be_nil
         if error.is_a?(Class)
-          subject.error.should eql(error.new.message)
+          expect(subject.error).to eql(error.new.message)
         else
-          subject.error.should eql(error)
+          expect(subject.error).to eql(error)
         end
       end.to raise_error(error) if error
     end

data/spec/support/outgoing_frames.rb

@@ -1,14 +1,14 @@
-shared_examples_for 'valid_outgoing_frame' do
-  its(:class) { should eql(WebSocket::Frame::Outgoing) }
-  its(:version) { should eql(version) }
-  its(:type) { should eql(frame_type) }
-  its(:data) { should eql(decoded_text) }
-  its(:to_s) { should eql(encoded_text) }
+RSpec.shared_examples_for 'valid_outgoing_frame' do
+  its(:class) { is_expected.to eql(WebSocket::Frame::Outgoing) }
+  its(:version) { is_expected.to eql(version) }
+  its(:type) { is_expected.to eql(frame_type) }
+  its(:data) { is_expected.to eql(decoded_text) }
+  its(:to_s) { is_expected.to eql(encoded_text) }
 
-  context "after parsing" do
-    before { subject.to_s }
-    its(:error) { should eql(error) }
-    its(:require_sending?) { should eql(require_sending) }
+  context 'after parsing' do
+    before(:each) { subject.to_s }
+    its(:error) { is_expected.to eql(error) }
+    its(:require_sending?) { is_expected.to eql(require_sending) }
   end
 
 end

data/websocket.gemspec

@@ -14,6 +14,6 @@ Gem::Specification.new do |s|
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ["lib"]
 end

metadata

@@ -1,24 +1,35 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: websocket
-version: !ruby/object:Gem::Version
-  version: 1.1.4
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 1
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
-authors:
+authors: 
 - Bernard Potocki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-03 00:00:00.000000000 Z
+
+date: 2014-07-24 00:00:00 +02:00
+default_executable: 
 dependencies: []
+
 description: Universal Ruby library to handle WebSocket protocol
-email:
+email: 
 - bernard.potocki@imanel.org
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
-- ".gitignore"
-- ".travis.yml"
+
+files: 
+- .gitignore
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - README.md
@@ -86,30 +97,39 @@ files:
 - spec/support/outgoing_frames.rb
 - spec/support/overwrites.rb
 - websocket.gemspec
+has_rdoc: true
 homepage: http://github.com/imanel/websocket-ruby
 licenses: []
-metadata: {}
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
   - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
   - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.3.7.1
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Universal Ruby library to handle WebSocket protocol
-test_files:
+test_files: 
 - spec/frame/incoming_03_spec.rb
 - spec/frame/incoming_04_spec.rb
 - spec/frame/incoming_05_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 3d5e949888cd78a33c1418916aa773e1408a9302
-  data.tar.gz: d74a71f238b56bf1711dd7b117cde1d3cf5bc037
-SHA512:
-  metadata.gz: 5a7e71df6d11c0fc817d094845dd059a0d2ec00586f7373a714bde6d3ee9dbf15e27ecbb94c00aef039f2fc85da34933b21110d767429a8aa2bce35cb192cd9f
-  data.tar.gz: 48e22828b858a469f179bcf08ecc8acbc427f6f863e1cf38a3ca3e5b36a9a4c06a93a72b024e6dd5b7f1b11864cb6abefbef6334c7f789cfbe1451e766c0a0ed