rflow 1.0.0a5 → 1.0.0a6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef1b7b3ae0fb683425fec5c44f0c1d39f7f29935
-  data.tar.gz: acc3b05b5b26d9286fe51c4c0d3e6a028d9c0f46
+  metadata.gz: b664558de8f5e223ca41a0b4ead08935897a5388
+  data.tar.gz: e0df2c50c8e75a3cb3291b0a8474a7ed1ecc7485
 SHA512:
-  metadata.gz: d040a8d35aff247bd4200c2b5ac8f4ba4c9b8b9dc48a31292e68db1db07cc3e568a2a33067c600f54d99e3346bc60640f7338f395d9c9ddbc5caf7c7f725145d
-  data.tar.gz: 3f8b6b770e61ad2eb2ad17aa647d516d761d042c38491d958bbcb7b85f1b0d91fc80fa0cdd9d5a6e27af1308d05c2c3324c2e9a595bb1b076eedbb781c1c66a8
+  metadata.gz: 556cc4a467b582aa0c1a5e16dd908c6bf3db66818371ff9beba420c141957f694e9d1729c0baa1da35c398a81cfb49b7debd572c8fd6eee207c4980a4c7fac72
+  data.tar.gz: cd044c4905c4c181d66df6a495d1b9729ae4e88cf831e6470f37a4e9a94ad28043b3bac5dd07fc4aa13ab4161fcb4b5ab3b3c184623c90b22144e0c9c26460c6

data/lib/rflow/component/port.rb

@@ -81,12 +81,14 @@ class RFlow
       def add_connection(key, connection)
         RFlow.logger.debug "Attaching #{connection.class.name} connection '#{connection.name}' (#{connection.uuid}) to port '#{name}' (#{uuid}), key '#{connection.input_port_key}'"
         connections_for[key] << connection
+        @all_connections = nil
       end
 
       # Removes a connection from a given key
       def remove_connection(key, connection)
         RFlow.logger.debug "Removing #{connection.class.name} connection '#{connection.name}' (#{connection.uuid}) from port '#{name}' (#{uuid}), key '#{connection.input_port_key}'"
         connections_for[key].delete(connection)
+        @all_connections = nil
       end
 
       def collect_messages(key, receiver)
@@ -130,7 +132,6 @@ class RFlow
       # establish the connection
       def connect!; raise NotImplementedError, "Raw ports do not know which direction to connect"; end
 
-      private
       def all_connections
         @all_connections ||= connections_for.values.flatten.uniq.extend(ConnectionCollection)
       end
@@ -138,12 +139,13 @@ class RFlow
 
     class InputPort < HashPort
       def connect!
-        connections_for.each do |key, connections|
-          connections.each do |connection|
-            connection.connect_input!
-            @connected = true
-          end
-        end
+        connections_for.each {|key, conns| conns.each {|c| c.connect_input! } }
+        @connected = true
+      end
+
+      def add_connection(key, connection)
+        super
+        connection.connect_input! if connected?
       end
 
       def recv_callback=(callback)
@@ -159,12 +161,13 @@ class RFlow
 
     class OutputPort < HashPort
       def connect!
-        connections_for.each do |key, connections|
-          connections.each do |connection|
-            connection.connect_output!
-            @connected = true
-          end
-        end
+        connections_for.each {|key, conns| conns.each {|c| c.connect_output! } }
+        @connected = true
+      end
+
+      def add_connection(key, connection)
+        super
+        connection.connect_output! if connected?
       end
 
       # Send a message to all connections on all keys for this port,

data/lib/rflow/configuration/connection.rb

@@ -103,7 +103,7 @@ class RFlow
     end
 
     # for testing purposes
-    class NullConfiguration
+    class NullConnectionConfiguration
       attr_accessor :name, :uuid, :options, :input_port_key, :output_port_key, :delivery
     end
   end

data/lib/rflow/configuration/ruby_dsl.rb

@@ -190,13 +190,15 @@ class RFlow
             output_shards = output_component.shard.count
             input_shards = input_component.shard.count
 
+            broadcast_connection = spec[:delivery] == 'broadcast'
             in_shard_connection = output_component.shard == input_component.shard
             one_to_one = output_shards == 1 && input_shards == 1
             one_to_many = output_shards == 1 && input_shards > 1
             many_to_one = output_shards > 1 && input_shards == 1
             many_to_many = output_shards > 1 && input_shards > 1
 
-            connection_type = many_to_many ? RFlow::Configuration::BrokeredZMQConnection : RFlow::Configuration::ZMQConnection
+            use_broker = many_to_many && (broadcast_connection || !in_shard_connection)
+            connection_type = use_broker ? RFlow::Configuration::BrokeredZMQConnection : RFlow::Configuration::ZMQConnection
 
             conn = connection_type.create!(:name => spec[:name],
                                            :delivery => spec[:delivery],
@@ -206,7 +208,7 @@ class RFlow
                                            :input_port => input_port)
 
             # bind on the cardinality-1 side, connect on the cardinality-n side
-            if in_shard_connection
+            if in_shard_connection && !use_broker
               conn.options['output_responsibility'] = 'connect'
               conn.options['input_responsibility'] = 'bind'
               conn.options['output_address'] = "inproc://rflow.#{conn.uuid}"

data/lib/rflow/connection.rb

@@ -69,7 +69,7 @@ class RFlow
     attr_accessor :messages
 
     def initialize
-      super(RFlow::Configuration::NullConfiguration.new)
+      super(RFlow::Configuration::NullConnectionConfiguration.new)
       @messages = []
     end
 
@@ -84,7 +84,7 @@ class RFlow
   # making the internal component visible to the larger RFlow network.
   class ForwardToOutputPort < Connection
     def initialize(target_port)
-      super(RFlow::Configuration::NullConfiguration.new)
+      super(RFlow::Configuration::NullConnectionConfiguration.new)
       @target_port = target_port
     end
 
@@ -99,7 +99,7 @@ class RFlow
   # making the internal component visible to the larger RFlow network.
   class ForwardToInputPort < Connection
     def initialize(target_port)
-      super(RFlow::Configuration::NullConfiguration.new)
+      super(RFlow::Configuration::NullConnectionConfiguration.new)
       @receiver = target_port.component
       @target_port = target_port
     end

data/lib/rflow/version.rb

@@ -1,3 +1,3 @@
 class RFlow
-  VERSION = "1.0.0a5"
+  VERSION = "1.0.0a6"
 end

data/spec/rflow/component/port_spec.rb

@@ -2,67 +2,102 @@ require 'spec_helper'
 
 class RFlow
   class Component
-    describe Port do
-      it "should not be connected" do
-        expect(described_class.new(nil)).not_to be_connected
+    context "Input and output ports" do
+      let(:connection) { RFlow::Connection.new(RFlow::Configuration::NullConnectionConfiguration.new) }
+      let(:message) { RFlow::Message.new('RFlow::Message::Data::Raw') }
+
+      describe Port do
+        it "should not be connected" do
+          expect(described_class.new(nil)).not_to be_connected
+        end
       end
-    end
 
-    describe HashPort do
-      it "should not be connected" do
-        expect(described_class.new(nil)).not_to be_connected
+      describe HashPort do
+        it "should not be connected" do
+          expect(described_class.new(nil)).not_to be_connected
+        end
       end
-    end
 
-    describe InputPort do
-      context "#connect!" do
-        it "should be connected" do
-          connection = double('connection')
-          allow(connection).to receive(:name)
-          allow(connection).to receive(:uuid)
-          allow(connection).to receive(:input_port_key)
-          expect(connection).to receive(:connect_input!)
+      [InputPort, OutputPort].each do |c|
+        describe c do
+          context "#add_connection" do
+            it "should add the connection" do
+              described_class.new(nil).tap do |port|
+                port.add_connection(nil, connection)
+                expect(port[nil]).to include connection
+              end
+            end
+          end
 
-          described_class.new(nil).tap do |port|
-            port.add_connection(nil, connection)
-            expect(port).not_to be_connected
-            port.connect!
-            expect(port).to be_connected
+          context "#remove_connection" do
+            it "should remove the connection" do
+              described_class.new(nil).tap do |port|
+                port.add_connection(nil, connection)
+                port.remove_connection(nil, connection)
+                expect(port[nil]).not_to include connection
+              end
+            end
           end
         end
       end
 
-      context "#(add|remove)_connection" do
-        it "should remove the connection" do
-          connection = double('connection')
-          allow(connection).to receive(:name)
-          allow(connection).to receive(:uuid)
-          allow(connection).to receive(:input_port_key)
+      describe InputPort do
+        context "#connect!" do
+          it "should be connected" do
+            expect(connection).to receive(:connect_input!)
 
-          described_class.new(nil).tap do |port|
-            port.add_connection(nil, connection)
-            expect(port[nil]).to include connection
-            port.remove_connection(nil, connection)
-            expect(port[nil]).not_to include connection
+            described_class.new(nil).tap do |port|
+              port.add_connection(nil, connection)
+              expect(port).not_to be_connected
+              port.connect!
+              expect(port).to be_connected
+            end
           end
         end
       end
-    end
 
-    describe OutputPort do
-      context "#connect!" do
-        it "should be connected" do
-          connection = double('connection')
-          allow(connection).to receive(:name)
-          allow(connection).to receive(:uuid)
-          allow(connection).to receive(:input_port_key)
-          expect(connection).to receive(:connect_output!)
+      describe OutputPort do
+        context "#connect!" do
+          it "should be connected" do
+            expect(connection).to receive(:connect_output!)
+
+            described_class.new(nil).tap do |port|
+              port.add_connection(nil, connection)
+              expect(port).not_to be_connected
+              port.connect!
+              expect(port).to be_connected
+            end
+          end
+        end
+
+        context "#add_connection" do
+          it "should deliver messages to the new connection" do
+            described_class.new(nil).tap do |port|
+              port.connect!
+              port.all_connections # trigger caching
+
+              expect(connection).to receive(:connect_output!)
+              expect(connection).to receive(:send_message).with(message)
+              port.add_connection(nil, connection)
+
+              port.send_message(message)
+            end
+          end
+        end
+
+        context "#remove_connection" do
+          it "should not deliver messages to the old connection" do
+            described_class.new(nil).tap do |port|
+              allow(connection).to receive(:connect_output!)
+              port.add_connection(nil, connection)
+              port.connect!
+              port.all_connections # trigger caching
+
+              expect(connection).not_to receive(:send_message)
+              port.remove_connection(nil, connection)
 
-          described_class.new(nil).tap do |port|
-            port.add_connection(nil, connection)
-            expect(port).not_to be_connected
-            port.connect!
-            expect(port).to be_connected
+              port.send_message(message)
+            end
           end
         end
       end

data/spec/rflow/configuration/ruby_dsl_spec.rb

@@ -176,7 +176,7 @@ class RFlow
       it "should generate PUSH-PULL inproc ZeroMQ connections for in-shard connections" do
         described_class.configure do |c|
 
-          c.shard "s1", :process => 1 do |s|
+          c.shard "s1", :process => 2 do |s|
             s.component 'first', 'First', :opt1 => 'opt1'
             s.component 'second', 'Second', :opt1 => 'opt1', "opt2" => "opt2"
           end
@@ -415,6 +415,38 @@ class RFlow
         end
       end
 
+      it "should generate PUB-SUB brokered ZeroMQ connections for many-to-many in-shard broadcast connections" do
+        described_class.configure do |c|
+
+          c.shard "s1", :process => 3 do |s|
+            s.component 'first', 'First', :opt1 => 'opt1'
+            s.component 'second', 'Second', :opt1 => 'opt1', "opt2" => "opt2"
+          end
+
+          c.connect 'first#out' => 'second#in', :delivery => 'broadcast'
+        end
+
+        expect(Shard).to have(1).shards
+        expect(Component).to have(2).components
+        expect(Port).to have(2).ports
+        expect(Connection).to have(1).connections
+
+        Connection.first.tap do |conn|
+          expect(conn.type).to eq('RFlow::Configuration::BrokeredZMQConnection')
+          expect(conn.name).to eq('first#out=>second#in')
+          expect(conn.output_port_key).to be_nil
+          expect(conn.input_port_key).to be_nil
+          conn.options.tap do |opts|
+            expect(opts['output_socket_type']).to eq('PUB')
+            expect(opts['output_address']).to eq("ipc://rflow.#{conn.uuid}.in")
+            expect(opts['output_responsibility']).to eq('connect')
+            expect(opts['input_socket_type']).to eq('SUB')
+            expect(opts['input_address']).to eq("ipc://rflow.#{conn.uuid}.out")
+            expect(opts['input_responsibility']).to eq('connect')
+          end
+        end
+      end
+
       it "should not allow two components with the same name" do
         expect {
           described_class.configure do |c|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rflow
 version: !ruby/object:Gem::Version
-  version: 1.0.0a5
+  version: 1.0.0a6
 platform: ruby
 authors:
 - Michael L. Artz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-24 00:00:00.000000000 Z
+date: 2014-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools