websocket 1.0.7 → 1.1.0

data/spec/support/frames_base.rb

@@ -2,10 +2,8 @@ module WebSocket
   module Frame
     class Base
 
-      private
-
       def incoming_masking?
-        masking?
+        @handler.masking?
       end
 
       def outgoing_masking?

data/spec/support/incoming_frames.rb

@@ -16,7 +16,11 @@ shared_examples_for 'valid_incoming_frame' do
       n.class.should eql(WebSocket::Frame::Incoming), "Should be WebSocket::Frame::Incoming, #{n} received instead"
     end
     subject.next.should be_nil
-    subject.error.should eql(error)
+    if error.is_a?(Class)
+      subject.error.should eql(error.new.message)
+    else
+      subject.error.should eql(error)
+    end
   end
 
   it "should return valid decoded frame for each specified decoded texts" do
@@ -27,4 +31,25 @@ shared_examples_for 'valid_incoming_frame' do
       f.to_s.should eql(da)
     end
   end
+
+  context "with raising" do
+    before { WebSocket.should_raise = true }
+    after { WebSocket.should_raise = false }
+
+    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"
+        end
+        subject.next.should be_nil
+        if error.is_a?(Class)
+          subject.error.should eql(error.new.message)
+        else
+          subject.error.should eql(error)
+        end
+      end.to raise_error(error) if error
+    end
+  end
 end

data/spec/support/overwrites.rb

@@ -0,0 +1,9 @@
+module WebSocket
+
+  module Handshake
+    class Base
+      attr_reader :handler
+    end
+  end
+
+end

data/websocket.gemspec

@@ -12,8 +12,6 @@ Gem::Specification.new do |s|
   s.summary     = %q{Universal Ruby library to handle WebSocket protocol}
   s.description = %q{Universal Ruby library to handle WebSocket protocol}
 
-  s.add_development_dependency 'rspec', '~> 2.11'
-
   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) }

metadata

@@ -1,47 +1,23 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: websocket
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 1.1.0
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 7
-  version: 1.0.7
 platform: ruby
-authors: 
+authors:
 - Bernard Potocki
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-01-27 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 2
-        - 11
-        version: "2.11"
-  type: :development
-  version_requirements: *id001
+date: 2013-06-17 00:00:00.000000000 Z
+dependencies: []
 description: Universal Ruby library to handle WebSocket protocol
-email: 
+email:
 - bernard.potocki@imanel.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - CHANGELOG.md
@@ -49,6 +25,8 @@ files:
 - README.md
 - Rakefile
 - lib/websocket.rb
+- lib/websocket/error.rb
+- lib/websocket/exception_handler.rb
 - lib/websocket/frame.rb
 - lib/websocket/frame/base.rb
 - lib/websocket/frame/data.rb
@@ -107,41 +85,39 @@ files:
 - spec/support/handshake_requests.rb
 - spec/support/incoming_frames.rb
 - spec/support/outgoing_frames.rb
+- spec/support/overwrites.rb
 - websocket.gemspec
 homepage: http://github.com/imanel/websocket-ruby
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 2598655559376715147
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 2598655559376715147
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 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
@@ -168,4 +144,4 @@ test_files:
 - spec/support/handshake_requests.rb
 - spec/support/incoming_frames.rb
 - spec/support/outgoing_frames.rb
-has_rdoc: 
+- spec/support/overwrites.rb