angelo 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71b7b6db8f9dc6f54045817b05e45895e9a30158
-  data.tar.gz: 0f7c1f1b602476811076b98df9829f15476819f1
+  metadata.gz: 6587b907b0623b8cc15e44cd6b8bcbe13f74457f
+  data.tar.gz: 7a1f799676dd2aaedc0bc5f2752849ca2edb3b91
 SHA512:
-  metadata.gz: 96b4ed9df8cff7a12a62bbd9e5fcbd7b9ffc912587d094f85beb0dbdf1c59c1e7f0501d8dfdab4f66a960845570731c6582739ce23689a5075d595ceb2db88ea
-  data.tar.gz: 3ebb1e69058a7733e05a5f7f990514a3ebdd001382f20129e7e3862404abc242617fc8cc1d6ee8f0111fc5ecb1f92a8c808c9c1d5af3d0b98e628e8f2927458f
+  metadata.gz: bfaa807fa0ec7facc7475b5d6af7e476138396dccf06607705a27996a19109ebffbdbdc1b308f0f429a2bad7b5bba015301ab9c8c76336a1a944565f9a89c634
+  data.tar.gz: 1913737e3cda415a6741215f6d65a0a54a0247f74bbc7cae1dd55974e95d40983dca9a8d933baa028a8f7f0c44297346104328ad2e790e0915567079afe70d29

data/.travis.yml

@@ -3,4 +3,5 @@ rvm:
   - "1.9.3"
   - "2.0.0"
   - "2.1.2"
+  - "2.1.3"
 script: rake

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 changelog
 =========
 
+### 0.2.1 7 oct 2014
+
+thanks: @chewi
+
+* fix stash socket iteration error handling (#11)
+
 ### 0.2.0 23 sep 2014
 
 * chunked responses with `transfer_encoding :chunked` and `return_obj.each`

data/lib/angelo/stash.rb

@@ -38,7 +38,6 @@ module Angelo
     #
     def << s
       peeraddrs[s] = s.peeraddr
-      yield if block_given?
       stashes[@context] << s
     end
 
@@ -52,7 +51,7 @@ module Angelo
     # as needed
     #
     def each &block
-      stash.each do |s|
+      stash.dup.each do |s|
         begin
           yield s
         rescue Reel::SocketError, IOError, SystemCallError => e
@@ -118,9 +117,8 @@ module Angelo
       include Stash
 
       def << ws
-        super do
-          @server.async.handle_websocket ws
-        end
+        super
+        @server.async.handle_websocket ws
       end
 
     end

data/lib/angelo/version.rb

@@ -1,3 +1,3 @@
 module Angelo
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/test/angelo/stash_spec.rb

@@ -0,0 +1,49 @@
+require_relative '../spec_helper'
+
+describe Angelo::Stash do
+
+  describe 'error handling' do
+
+    class ErrorSocket
+
+      def read *args
+        raise IOError
+      end
+
+      def closed?
+        true
+      end
+
+    end
+
+    class TestStash
+      extend Angelo::Stash::ClassMethods
+      include Angelo::Stash
+
+      def << s
+        peeraddrs[s] = [nil, 'hi from tests']
+        stashes[@context] << s
+      end
+
+    end
+
+    it 'does not skip live sockets when removing dead sockets' do
+      err_sock = ErrorSocket.new
+
+      good_sock = Minitest::Mock.new
+      good_sock.expect :read, "hi"
+      good_sock.expect :hash, 123
+      def good_sock.== o; o == self; end
+
+      stash = TestStash.new nil
+
+      stash << err_sock
+      stash << good_sock
+
+      stash.each {|s| s.read}
+      good_sock.verify
+    end
+
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: angelo
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Kenichi Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-23 00:00:00.000000000 Z
+date: 2014-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reel
@@ -72,6 +72,7 @@ files:
 - test/angelo/filter_spec.rb
 - test/angelo/mustermann_spec.rb
 - test/angelo/params_spec.rb
+- test/angelo/stash_spec.rb
 - test/angelo/static_spec.rb
 - test/angelo/websocket_spec.rb
 - test/angelo_spec.rb