funl 0.4 → 0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ac4ecb6a3ca14c04c14cc5af85e34ba3d421123
-  data.tar.gz: a9a6a618dfb48a4baed545c71767b5ac544cba98
+  metadata.gz: 7f896217f8f6185a6894823174f381b98be0af3d
+  data.tar.gz: 497d37bb1d3180d02e12eeebcbd47d643ed836cd
 SHA512:
-  metadata.gz: 1794536193b70a6a965357d64c9d53b58f7c168d1e3c4a17a8b588d1b2e5550fae9b3bccbe5fb2393be397a1482e088b0784dd6aff5dfc4b5fd2ba00989864f0
-  data.tar.gz: abadb9d061fba91923f6781b2132526468943ba848ddb01477008ae77cbc56a2af12cbfe709de9700ac3630177a2211e8e8bc7ad4577361a508dc96ad091cf3e
+  metadata.gz: dded12ff33c1585f69b04305b1942850734bd49017c01d277785907278f2fff0ea09cc664792df414187c86a75fbf96b84784ecd2abd157b469ecfd3687a707d
+  data.tar.gz: aa9fb5d8155ee50e9366327e2457e88bdfd0da12b92de899b8597855bbc9626f82bd69035858fb3999d0c84c143685d70e215519f245d1d97a0da6a7a537864e

data/lib/funl/client-sequencer.rb

@@ -52,13 +52,14 @@ module Funl
 
     def handle_conn conn
       stream = ObjectStream.new(conn, type: stream_type)
-      msg = {"client_id" => next_id}
+      client_id = next_id
       @next_id += 1
+      msg = {"client_id" => client_id}
       stream << msg
     rescue IOError, SystemCallError => ex
-      log.error "write error for client #{next_id}: #{ex}"
+      log.error "write error for client #{client_id}: #{ex}"
     else
-      log.info "recognized client #{next_id}"
+      log.info "recognized client #{client_id}"
     ensure
       stream.close if stream and not stream.closed?
     end

data/lib/funl/message-sequencer.rb

@@ -108,7 +108,7 @@ module Funl
               if msg.control?
                 handle_control readable, *msg.control_op
               else
-                handle_message msg
+                handle_message msg, readable
               end
             end
           end
@@ -120,17 +120,17 @@ module Funl
     end
 
     def handle_control stream, op_type, tags = nil
-      log.debug {"#{stream} #{op_type} #{tags}"}
+      log.debug {"#{stream.peer_name} #{op_type} #{tags}"}
 
       case op_type
       when SUBSCRIBE_ALL
-        @subscribers_to_all += [stream]
+        @subscribers_to_all |= [stream]
       
       when SUBSCRIBE
         tags.each do |tag|
-          @subscribers[tag] += [stream]
+          @subscribers[tag] |= [stream]
         end
-        @tags[stream] += tags
+        @tags[stream] |= tags
 
       when UNSUBSCRIBE_ALL
         @subscribers_to_all.delete stream
@@ -151,7 +151,7 @@ module Funl
       write_succeeds?(ack, stream)
     end
 
-    def handle_message msg
+    def handle_message msg, origin_conn
       log.debug {"handling message #{msg.inspect}"}
 
       @tick += 1
@@ -159,13 +159,24 @@ module Funl
       msg.delta = nil
 
       tags = msg.tags
+      reflect = false
       dest_streams =
         if !tags or (tags.empty? rescue true)
           @subscribers_to_all.dup
         else
+          reflect = tags.delete(true)
           tags.inject(@subscribers_to_all) {|a,tag| a + @subscribers[tag]}
         end
 
+      if reflect
+        log.debug {"reflecting message"}
+        reflect_msg = Message[
+          client: msg.client_id,
+          local:  msg.local_tick,
+          global: msg.global_tick]
+        write_succeeds? reflect_msg, origin_conn
+      end
+
       dest_streams.each do |stream|
         write_succeeds? msg, stream
       end

data/lib/funl/message.rb

@@ -15,7 +15,13 @@ module Funl
     # messages are pipelined, delta > 1.
     attr_accessor :delta
 
-    # Application-defined metadata. May be used for filtering etc.
+    # Application-defined metadata. May be used for filtering etc. Must be an
+    # array or nil. If mseq detects +true+ among the tags, then mseq _reflects_
+    # the message: it sends the message back to the sender (minus tags and blob,
+    # and with updated global_tick). This is so that a client can send mseq a
+    # message with tags it does not subscribe to and know when it has arrived.
+    # The +true+ is removed from the tag list before mseq sends it to
+    # subscribers.
     attr_accessor :tags
 
     # Application-defined payload data. See blobber.rb.

data/lib/funl/version.rb

@@ -1,3 +1,3 @@
 module Funl
-  VERSION = "0.4"
+  VERSION = "0.5"
 end

data/test/test-reflect.rb

@@ -0,0 +1,72 @@
+require 'funl/message-sequencer'
+require 'socket'
+
+include Funl
+
+require 'minitest/autorun'
+
+class TestReflect < Minitest::Test
+  attr_reader :log, :mseq
+
+  def setup
+    @log = Logger.new($stderr)
+    log.level = Logger::WARN
+    
+    client_socks = []
+    server_socks = []
+    2.times do
+      cl, sv = UNIXSocket.pair
+      client_socks << cl
+      server_socks << sv
+    end
+    
+    dummy, _ = UNIXSocket.pair
+
+    @mseq = MessageSequencer.new dummy, *server_socks, log: log
+    mseq.start
+    
+    @streams = client_socks.each_with_index.map do |s,i|
+      stream = ObjectStreamWrapper.new(s, type: mseq.stream_type)
+      stream.write_to_outbox({"client_id" => "client #{i}"})
+      global_tick = stream.read["tick"]
+      stream.expect Message
+      stream
+    end
+  end
+  
+  def teardown
+    mseq.stop rescue nil
+  end
+
+  def test_reflect
+    snd, rcv = @streams
+    rcv << Message.control(SUBSCRIBE, ["foo"])
+    ack = rcv.read
+    assert ack.control?
+    assert_equal 0, ack.global_tick
+    reflect = true
+    
+    snd << Message[
+      client: 0, local: 1, global: 0, delta: 1,
+      tags: [reflect, "bar"], blob: ""]
+    snd << Message[
+      client: 0, local: 2, global: 0, delta: 2,
+      tags: [reflect, "foo"], blob: ""]
+    
+    m = rcv.read
+    assert_equal 2, m.global_tick
+    assert_equal ["foo"], m.tags
+
+    m = snd.read
+    assert_equal 1, m.global_tick
+    assert_equal 1, m.local_tick
+    assert_equal nil, m.tags
+    assert_equal nil, m.blob
+
+    m = snd.read
+    assert_equal 2, m.global_tick
+    assert_equal 2, m.local_tick
+    assert_equal nil, m.tags
+    assert_equal nil, m.blob
+  end
+end

data/test/test-subscribe.rb

@@ -184,4 +184,30 @@ class TestSubscribe < Minitest::Test
     assert_equal 3, m.global_tick
     assert_equal ["foo"], m.tags
   end
+  
+  def test_redundant_subscribe
+    snd, rcv = @streams
+    2.times do
+      rcv << Message.control(SUBSCRIBE, ["foo"])
+      ack = rcv.read
+      assert ack.control?
+    end
+    
+    snd << Message[
+      client: 0, local: 0, global: 0, delta: 1,
+      tags: ["foo"], blob: "1"]
+    snd << Message[
+      client: 0, local: 0, global: 0, delta: 2,
+      tags: ["foo"], blob: "2"]
+    
+    m = rcv.read
+    assert_equal 1, m.global_tick
+    assert_equal ["foo"], m.tags
+    assert_equal "1", m.blob
+    
+    m = rcv.read
+    assert_equal 2, m.global_tick
+    assert_equal ["foo"], m.tags
+    assert_equal "2", m.blob
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: funl
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: '0.5'
 platform: ruby
 authors:
 - Joel VanderWerf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-01 00:00:00.000000000 Z
+date: 2013-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: object-stream
@@ -35,22 +35,23 @@ files:
 - README.md
 - COPYING
 - Rakefile
-- lib/funl/stream.rb
-- lib/funl/blobber.rb
-- lib/funl/subscription-tracker.rb
-- lib/funl/history-client.rb
+- lib/funl/client-sequencer.rb
+- lib/funl/message-sequencer.rb
 - lib/funl/history-worker.rb
+- lib/funl/stream.rb
 - lib/funl/client.rb
-- lib/funl/message-sequencer.rb
-- lib/funl/client-sequencer.rb
+- lib/funl/history-client.rb
+- lib/funl/subscription-tracker.rb
 - lib/funl/message.rb
+- lib/funl/blobber.rb
 - lib/funl/version.rb
-- test/test-message-sequencer.rb
-- test/test-client-sequencer.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
 homepage: https://github.com/vjoel/funl
 licenses:
 - BSD
@@ -78,15 +79,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.4
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: Sequences messages
 test_files:
-- test/test-message-sequencer.rb
-- test/test-client-sequencer.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: