websocket 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 867a294ded953698c44e679d6de8764c5da9c98a
-  data.tar.gz: a2eb7f03a1bf0881e5a13968eaec06a7b8ab81c7
+  metadata.gz: dd819fd576b9bc42e42b888bf9407c20e1557d62
+  data.tar.gz: b5a0b3732a0058688c3d2121833dd4909b5d9371
 SHA512:
-  metadata.gz: fa5d680161502ea411f19ec76af3629db2d20dbd3929348c02ad8c96b62aef78bf7b4f5080a9512da104f237c7efeff55e551a48b626d4443ae58d28a5579143
-  data.tar.gz: 8e3c61c2b533bea813f5320f09daf394824412808d7c4052ab0f68c228a43bd2e7dfa0187a0fe07632f96098f9eb15906c7028ac2fcc06217d0764922978215e
+  metadata.gz: ba657ffa0c0efe8cfbdca9fa5b229bb8aba86eda86a37eca0d7511695a42008e86c18ad8e89280773a97212ad1b08b3b811bdf9219974f1205c6effb1f9d5c90
+  data.tar.gz: 6ed217acb30fd88f14b7007a4df1e4534f7d0f01057c450ed463fe7cdaa94023d2de51ba8c373bc6f383e13e07bacecea731ee079d7102cc7b351d01c26f1049

data/.travis.yml

@@ -5,8 +5,10 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1.1
+  - ree
+  - rbx
   - jruby-18mode
   - jruby-19mode
-  - rbx-18mode
-  - rbx-19mode
-  - ree
+  - ruby-head
+  - jruby-head

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.1.3
+
+- fix close code support
+
 ## 1.1.2
 
 - fix support for rack input that is blocking (i.e. Passenger)

data/lib/websocket/frame/handler/handler05.rb

@@ -5,14 +5,6 @@ module WebSocket
     module Handler
       class Handler05 < Handler04
 
-        def encode_frame
-          if @frame.code
-            @frame.data = Data.new([@frame.code].pack('n') + @frame.data.to_s)
-            @frame.code = nil
-          end
-          super
-        end
-
         # Since handler 5 masking should be enabled by default
         def masking?; true; end
 

data/lib/websocket/frame/handler/handler07.rb

@@ -18,8 +18,30 @@ module WebSocket
         # Hash of frame opcodes and it's names
         FRAME_TYPES_INVERSE = FRAME_TYPES.invert
 
+        def encode_frame
+          if @frame.type == :close
+            code = @frame.code || 1000
+            @frame.data = Data.new([code].pack('n') + @frame.data.to_s)
+            @frame.code = nil
+          end
+          super
+        end
+
+        def decode_frame
+          result = super
+          if has_close_code?(result)
+            code = result.data.slice!(0..1)
+            result.code = code.unpack('n').first
+          end
+          result
+        end
+
         private
 
+        def has_close_code?(frame)
+          frame && frame.type == :close && !frame.data.empty?
+        end
+
         # Convert frame type name to opcode
         # @param [Symbol] frame_type Frame type name
         # @return [Integer] opcode or nil

data/lib/websocket/version.rb

@@ -1,3 +1,3 @@
 module WebSocket
-  VERSION = '1.1.2'
+  VERSION = '1.1.3'
 end

data/spec/frame/incoming_07_spec.rb

@@ -13,9 +13,10 @@ describe 'Incoming frame draft 07' do
   it_should_behave_like 'valid_incoming_frame'
 
   context "should properly decode close frame" do
-    let(:encoded_text) { "\x88\x05" + decoded_text }
+    let(:encoded_text) { "\x88\x07\x03\xE8" + decoded_text }
     let(:frame_type) { :close }
     let(:decoded_text) { "Hello" }
+    let(:close_code) { 1000 }
 
     it_should_behave_like 'valid_incoming_frame'
   end

data/spec/frame/outgoing_07_spec.rb

@@ -3,8 +3,9 @@ require 'spec_helper'
 
 describe 'Outgoing frame draft 07' do
   let(:version) { 7 }
-  let(:frame) { WebSocket::Frame::Outgoing.new(:version => version, :data => decoded_text, :type => frame_type) }
+  let(:frame) { WebSocket::Frame::Outgoing.new(:version => version, :data => decoded_text, :type => frame_type, :code => close_code) }
   let(:decoded_text) { "" }
+  let(:close_code) { nil }
   let(:encoded_text) { "\x81\x00" }
   let(:frame_type) { :text }
   let(:require_sending) { true }
@@ -13,10 +14,20 @@ describe 'Outgoing frame draft 07' do
 
   it_should_behave_like 'valid_outgoing_frame'
 
-  context "should properly encode close frame" do
+  context "should properly encode close frame without close code" do
     let(:frame_type) { :close }
     let(:decoded_text) { "Hello" }
-    let(:encoded_text) { "\x88\x05" + decoded_text }
+    let(:encoded_text) { "\x88\x07\x03\xE8" + decoded_text }
+    let(:require_sending) { true }
+
+    it_should_behave_like 'valid_outgoing_frame'
+  end
+
+  context "should properly encode close frame with close code" do
+    let(:frame_type) { :close }
+    let(:decoded_text) { "Hello" }
+    let(:close_code) { 1001 }
+    let(:encoded_text) { "\x88\x07\x03\xE9" + decoded_text }
     let(:require_sending) { true }
 
     it_should_behave_like 'valid_outgoing_frame'

data/spec/support/incoming_frames.rb

@@ -28,6 +28,7 @@ shared_examples_for 'valid_incoming_frame' do
       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)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: websocket
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Bernard Potocki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-13 00:00:00.000000000 Z
+date: 2014-05-03 00:00:00.000000000 Z
 dependencies: []
 description: Universal Ruby library to handle WebSocket protocol
 email:
@@ -17,8 +17,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - README.md
@@ -95,17 +95,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Universal Ruby library to handle WebSocket protocol