funl 0.6 → 0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b5ff91baeb01956c2e26427666b5ce60086a777
-  data.tar.gz: 49f96709858f97aa437782f3059dcda83d69cc39
+  metadata.gz: f7052cdcfcfbc11611386090111ff18932e150dc
+  data.tar.gz: 8d406bc8f898c87a82240a689fec27dc2fe6bf3d
 SHA512:
-  metadata.gz: 022c1cfec28b024802f721039fbfe7aa5a4adff0f11b2f3bac58507dbdf6142a0507f340a85c9ce04d106424d617bd960911cb47fedb38431ed5735897e30217
-  data.tar.gz: fc5c636c27a20f99600f1c8fa208794cade737d11a225d6f9d054ead7fa033c42c0c24e7130a69ce69e9f3fee481349f7a1c5c7560eb59cea4d08e97f21b1571
+  metadata.gz: a69cb87e3c8960f9c354d3ab5bfbe561d54e07088bbcf3f22e479789e17a8bca00b29fde36ecc9a8872a6dec8e9c65bac1bc6b13c8c3a3f115cc96e4c188d4a6
+  data.tar.gz: 2b1fd03f61eb10df1f4f0b71e72991b7b75469f286c08991605a8c7aaccb962ef4045c7b5869f2e667be768ebb445eca6ad3fe0164b8c26f25fe04bb4c58119c

data/COPYING

@@ -1,4 +1,4 @@
-Copyright (c) 2013, Joel VanderWerf, vjoel@users.sourceforge.net
+Copyright (c) 2013-2014, Joel VanderWerf, vjoel@users.sourceforge.net
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/lib/funl/message-sequencer.rb

@@ -107,7 +107,7 @@ module Funl
         readable.read do |msg|
           msgs << msg
         end
-      rescue IOError, SystemCallError => ex
+      rescue ObjectStream::StreamError, IOError, SystemCallError => ex
         log.debug {"closing #{readable}: #{ex}"}
         reject_stream readable
       else

data/lib/funl/stream.rb

@@ -5,7 +5,7 @@ module Funl
   UNSUBSCRIBE     = "unsubscribe".freeze
   SUBSCRIBE_ALL   = "subscribe_all".freeze
   UNSUBSCRIBE_ALL = "unsubscribe_all".freeze
-  
+
   # Mixin depends on stream_type, log, client_id, message_class.
   module Stream
     def client_stream_for io, type: stream_type
@@ -18,6 +18,7 @@ module Funl
     def server_stream_for io, type: stream_type
       ObjectStreamWrapper.new(io, type: type).tap do |stream|
         stream.consume do |h|
+          raise StreamError, "bad handshake: #{h.class}" unless h.kind_of? Hash
           client_id = h["client_id"]
           stream.peer_name = "client #{client_id}"
           log.info "peer is #{stream.peer_name}"
@@ -28,6 +29,7 @@ module Funl
     def message_server_stream_for io, type: stream_type
       ObjectStreamWrapper.new(io, type: type).tap do |stream|
         stream.consume do |h|
+          raise StreamError, "bad handshake: #{h.class}" unless h.kind_of? Hash
           client_id = h["client_id"]
           stream.peer_name = "client #{client_id}"
           log.info "peer is #{stream.peer_name}"

data/lib/funl/version.rb

@@ -1,3 +1,3 @@
 module Funl
-  VERSION = "0.6"
+  VERSION = "0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: funl
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: '0.7'
 platform: ruby
 authors:
 - Joel VanderWerf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-16 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: object-stream
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nio4r
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Sequences messages.
 email: vjoel@users.sourceforge.net
 executables: []
@@ -32,30 +46,30 @@ extra_rdoc_files:
 - README.md
 - COPYING
 files:
-- README.md
 - COPYING
+- README.md
 - Rakefile
-- lib/funl/stream.rb
+- bench/funl-bench.rb
+- bench/msg-rate.rb
 - lib/funl/blobber.rb
-- lib/funl/subscription-tracker.rb
+- lib/funl/client-sequencer.rb
+- lib/funl/client.rb
 - lib/funl/history-client.rb
 - lib/funl/history-worker.rb
-- lib/funl/client.rb
-- lib/funl/message-sequencer.rb
 - lib/funl/message-sequencer-nio.rb
-- lib/funl/client-sequencer.rb
+- lib/funl/message-sequencer-select.rb
+- lib/funl/message-sequencer.rb
 - lib/funl/message.rb
+- lib/funl/stream.rb
+- lib/funl/subscription-tracker.rb
 - lib/funl/version.rb
-- lib/funl/message-sequencer-select.rb
-- bench/msg-rate.rb
-- bench/funl-bench.rb
-- test/test-message-sequencer.rb
 - test/test-client-sequencer.rb
-- test/test-reflect.rb
+- test/test-client.rb
+- test/test-message-sequencer.rb
 - test/test-message.rb
+- test/test-reflect.rb
 - test/test-stream.rb
 - test/test-subscribe.rb
-- test/test-client.rb
 homepage: https://github.com/vjoel/funl
 licenses:
 - BSD
@@ -83,16 +97,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Sequences messages
 test_files:
-- test/test-message-sequencer.rb
-- test/test-client-sequencer.rb
-- test/test-reflect.rb
-- test/test-message.rb
 - test/test-stream.rb
-- test/test-subscribe.rb
+- test/test-message.rb
 - test/test-client.rb
+- test/test-client-sequencer.rb
+- test/test-subscribe.rb
+- test/test-reflect.rb
+- test/test-message-sequencer.rb
 has_rdoc: