aggro 0.0.3 → 0.0.4

data/lib/aggro/zeromq_transport/server.rb

@@ -0,0 +1,92 @@
+module Aggro
+  module ZeroMQTransport
+    # Public: Server to handle messages from nanomsg clients.
+    class Server
+      DEFAULT_WORKER_COUNT = 16
+
+      # Private: Struct to hold request workload data.
+      class Workload < Struct.new(:identity, :message, :socket, :mutex)
+        def finish(reply)
+          mutex.synchronize do
+            socket.send_string identity, ZMQ::SNDMORE
+            socket.send_string '', ZMQ::SNDMORE
+            socket.send_string reply.to_s
+          end
+        end
+      end
+
+      class ServerAlreadyRunning < RuntimeError; end
+
+      def initialize(endpoint, callable = nil, &block)
+        fail ArgumentError unless callable || block_given?
+
+        @callable = block_given? ? block : callable
+        @endpoint = endpoint
+        @inproc_endpoint = "inproc://aggro-server-#{SecureRandom.hex}"
+        @reply_mutex = Mutex.new
+        @work_queue = Queue.new
+      end
+
+      def start
+        fail ServerAlreadyRunning if @running
+
+        @running = true
+        start_master
+        DEFAULT_WORKER_COUNT.times { start_worker }
+
+        self
+      end
+
+      def stop
+        return self unless @running
+
+        @running = false
+
+        self
+      end
+
+      private
+
+      def enqueue_request(socket)
+        id = ''
+        delimiter = ''
+        message = ''
+
+        socket.recv_string id
+        socket.recv_string delimiter
+        socket.recv_string message
+
+        @work_queue << Workload.new(id, message, socket, @reply_mutex)
+      end
+
+      def respond_to_request(workload)
+        return if workload.nil?
+
+        response = '00'
+        response = @callable.call(workload.message)
+      ensure
+        workload.finish response unless workload.nil?
+      end
+
+      def start_master
+        Concurrent::SingleThreadExecutor.new.post do
+          socket = ZeroMQTransport.context.socket(ZMQ::XREP)
+          poller = ZeroMQ::Poller.new
+          poller.register_readable socket
+          socket.setsockopt ZMQ::LINGER, ZeroMQTransport.linger
+          socket.bind @endpoint
+
+          (enqueue_request socket while poller.poll(1) > 0) while @running
+
+          socket.close
+        end
+      end
+
+      def start_worker
+        Concurrent::SingleThreadExecutor.new.post do
+          respond_to_request @work_queue.pop while @running
+        end
+      end
+    end
+  end
+end

data/lib/aggro/{nanomsg_transport → zeromq_transport}/subscriber.rb

@@ -1,7 +1,5 @@
-require 'aggro/nanomsg_transport/subscribe'
-
 module Aggro
-  module NanomsgTransport
+  module ZeroMQTransport
     # Public: Handles subscribing to messages on a given endpoint.
     class Subscriber
       class SubscriberAlreadyRunning < RuntimeError; end
@@ -12,17 +10,12 @@ module Aggro
         @callable = block_given? ? block : callable
         @endpoint = endpoint
         @mutex = Mutex.new
-        @selector = NIO::Selector.new
-
-        ObjectSpace.define_finalizer self, method(:stop)
       end
 
       def add_subscription(topic)
-        start unless @running
+        start unless @mutex.synchronize { @running }
 
-        @mutex.synchronize do
-          sub_socket.add_subscription(topic)
-        end
+        @mutex.synchronize { sub_socket.setsockopt ZMQ::SUBSCRIBE, topic }
 
         self
       end
@@ -31,10 +24,10 @@ module Aggro
         @mutex.synchronize do
           return self if @running
 
-          @running = true
+          sub_socket
           start_on_thread
 
-          sleep 0.01 while @selector.empty?
+          sleep 0.01 until @running
         end
 
         self
@@ -45,9 +38,6 @@ module Aggro
           return self unless @running
 
           @running = false
-          @selector.wakeup
-
-          sleep 0.01 until @selector.empty?
         end
 
         self
@@ -56,24 +46,33 @@ module Aggro
       private
 
       def handle_message
-        message = sub_socket.recv_msg
-        @callable.call(message) if message
+        message = ''
+        sub_socket.recv_string message
+
+        @callable.call message if message.present?
       end
 
       def sub_socket
-        @sub_socket ||= Subscribe.new(@endpoint)
+        @sub_socket ||= begin
+          socket = ZeroMQTransport.context.socket(ZMQ::SUB)
+          socket.connect @endpoint
+
+          socket
+        end
       end
 
       def start_on_thread
         Concurrent::SingleThreadExecutor.new.post do
-          io = IO.new(sub_socket.recv_fd, 'rb', autoclose: false)
-          @selector.register io, :r
+          poller = ZeroMQ::Poller.new
+          poller.register_readable sub_socket
+
+          @running = true
+
+          (handle_message while poller.poll(1) > 0) while @running
 
-          @selector.select { handle_message } while @running
+          poller.deregister_readable sub_socket
 
-          @selector.deregister io
-          io.close
-          sub_socket.terminate
+          sub_socket.close
           @sub_socket = nil
         end
       end

data/spec/lib/aggro/event_serializer_spec.rb

@@ -5,7 +5,7 @@ RSpec.describe EventSerializer do
     it 'should convert a hash to some serialized form' do
       serialized = EventSerializer.serialize event
 
-      expect(serialized).to be_a String
+      expect(serialized).to be_a Array
     end
   end
 

data/spec/lib/aggro/file_store/reader_spec.rb

@@ -4,7 +4,8 @@ RSpec.describe FileStore::Reader do
   let(:data) { { one: 9000, two: 'pizza', three: ['foo', 123] } }
   let(:existing_event) { Event.new :tested_pizza, Time.new(2014), data }
 
-  let(:data_content) { EventSerializer.serialize(existing_event) }
+  let(:raw_content) { EventSerializer.serialize(existing_event) }
+  let(:data_content) { Marshal.dump raw_content }
   let(:index_content) { Marshal.dump data_content.bytesize }
 
   let(:data_io) { StringIO.new(data_content, 'rb') }

data/spec/lib/aggro/file_store/writer_spec.rb

@@ -26,13 +26,14 @@ RSpec.describe FileStore::Writer do
       writer.write(events)
 
       index_io.rewind
-      offsets = ObjectStream.new(index_io, type: 'marshal').to_a
+      offsets = MarshalStream.new(index_io).to_a
       expect(offsets.length).to eq 2
     end
 
     context 'when files already contain data' do
       let(:existing_event) { Event.new 'tested_pizza', Time.new(2014), data }
-      let(:data_content) { EventSerializer.serialize(existing_event) }
+      let(:raw_content) { EventSerializer.serialize(existing_event) }
+      let(:data_content) { Marshal.dump raw_content }
       let(:index_content) { Marshal.dump data_content.bytesize }
 
       it 'should write event data to the data file' do
@@ -46,7 +47,7 @@ RSpec.describe FileStore::Writer do
         writer.write(events)
 
         index_io.rewind
-        offsets = ObjectStream.new(index_io, type: 'marshal').to_a
+        offsets = MarshalStream.new(index_io).to_a
         expect(offsets.length).to eq 3
       end
 
@@ -54,12 +55,14 @@ RSpec.describe FileStore::Writer do
         writer.write(events)
 
         index_io.rewind
-        offsets = ObjectStream.new(index_io, type: 'marshal').to_a
+        offsets = MarshalStream.new(index_io).to_a
 
         expect do
-          EventSerializer.deserialize data_content[0...(offsets[0])]
-          EventSerializer.deserialize data_content[offsets[0]...offsets[1]]
-          EventSerializer.deserialize data_content[offsets[1]...offsets[2]]
+          [
+            data_content[0...(offsets[0])],
+            data_content[offsets[0]...offsets[1]],
+            data_content[offsets[1]...offsets[2]]
+          ].each { |data| EventSerializer.deserialize Marshal.load(data) }
         end.to_not raise_error
       end
     end

data/spec/lib/aggro/local_node_spec.rb

@@ -20,7 +20,7 @@ RSpec.describe LocalNode do
     end
 
     it 'should have a local TCP endpoint with the correct port' do
-      expect(node.endpoint).to eq 'tcp://127.0.0.1:6000'
+      expect(node.endpoint).to eq 'tcp://*:6000'
     end
   end
 
@@ -30,7 +30,7 @@ RSpec.describe LocalNode do
     end
 
     it 'should have a local TCP endpoint with the correct port' do
-      expect(node.publisher_endpoint).to eq 'tcp://127.0.0.1:7000'
+      expect(node.publisher_endpoint).to eq 'tcp://*:7000'
     end
   end
 

data/spec/lib/aggro/marshal_stream_spec.rb

@@ -0,0 +1,17 @@
+RSpec.describe MarshalStream do
+  let(:objects) { [1, :test, 'test'] }
+  let(:io) { StringIO.new }
+
+  describe '#each' do
+    it 'should work as expected' do
+      stream = MarshalStream.new(io).write(*objects)
+
+      io.rewind
+      result = stream.each.to_a
+
+      expect(result[0]).to eq 1
+      expect(result[1]).to eq :test
+      expect(result[2]).to eq 'test'
+    end
+  end
+end

data/spec/lib/aggro/message/events_spec.rb

@@ -3,13 +3,14 @@ RSpec.describe Message::Events do
 
   let(:id) { SecureRandom.uuid }
 
-  let(:event1) { Event.new :tested_pizza, Time.new, foo: 'bar' }
-  let(:event2) { Event.new :tested_system, Time.new, bar: 'foo' }
+  let(:event1) { Event.new :tested_pizza, Time.now.round, foo: 'bar' }
+  let(:event2) { Event.new :tested_system, Time.now.round, bar: 'foo' }
   let(:events) { [event1, event2] }
 
   let(:binary_events) do
-    events.map { |event| EventSerializer.serialize event }.join
+    events.map { |event| Marshal.dump EventSerializer.serialize event }.join
   end
+
   let(:string) { EVENTS_TYPE_CODE + id + binary_events }
 
   let(:message) { Message::Events.new(id, events) }

data/spec/lib/aggro/node_spec.rb

@@ -1,5 +1,5 @@
 RSpec.describe Node do
-  subject(:node) { Node.new('flashing-sparkle') }
+  subject(:node) { Node.new('flashing-sparkle', 'tcp://127.0.0.1:5000') }
 
   describe '#client' do
     it 'should return a client for the node using the current transport' do
@@ -10,10 +10,10 @@ RSpec.describe Node do
   describe '#publisher_endpoint' do
     context 'node returns an Endpoint message' do
       it 'should ask the node for the publisher endpoint' do
-        endpoint = Message::Endpoint.new('endpoint')
+        endpoint = Message::Endpoint.new('tcp://*:8000')
         allow(node).to receive(:client).and_return(double post: endpoint)
 
-        expect(node.publisher_endpoint).to eq 'endpoint'
+        expect(node.publisher_endpoint).to eq 'tcp://127.0.0.1:8000'
       end
     end
 

data/spec/lib/aggro/subscription_spec.rb

@@ -8,7 +8,9 @@ RSpec.describe Subscription do
 
   let(:correlation_id) { SecureRandom.uuid }
   let(:details) {  { name: 'Sebastian', correlation_id: correlation_id } }
-  let(:event) { double(name: 'added_contact', details: details) }
+  let(:event) do
+    double(name: 'added_contact', details: details, occured_at: Time.now)
+  end
 
   let(:invokr) { spy }
   before { stub_const 'Invokr', invokr }
@@ -22,7 +24,7 @@ RSpec.describe Subscription do
           subscription.handle_event event
 
           expect(invokr).to have_received(:invoke).with \
-            on: subscriber, method: 'test_added_contact', using: details
+            on: subscriber, method: 'test_added_contact', using: Hash
         end
       end
 

data/spec/lib/aggro/{nanomsg_transport_spec.rb → zeromq_transport_spec.rb}

@@ -1,26 +1,28 @@
-RSpec.describe NanomsgTransport do
-  let(:host) { 'tcp://127.0.0.1:7250' }
+RSpec.describe ZeroMQTransport do
   let(:message) { SecureRandom.hex }
 
-  xit 'should work for REQREP' do
-    server = NanomsgTransport.server(host) { |rec| @rec = rec }.start
-    client = NanomsgTransport.client host
+  it 'should work for REQREP' do
+    server = ZeroMQTransport.server('tcp://*:7250') { |rec| @rec = rec }.start
+    client = ZeroMQTransport.client 'tcp://localhost:7250'
 
     client.post message
 
     server.stop
     client.close_socket
 
+    sleep 0.1
+
     expect(@rec).to eq message
   end
 
   it 'should work for PUBSUB' do
-    publisher = NanomsgTransport.publisher(host)
+    publisher = ZeroMQTransport.publisher('tcp://*:7350')
     publisher.open_socket
 
     @reced = []
 
-    subscriber = NanomsgTransport.subscriber(host) { |rec| @reced << rec }
+    host = 'tcp://localhost:7350'
+    subscriber = ZeroMQTransport.subscriber(host) { |rec| @reced << rec }
     subscriber.add_subscription('foo').start
 
     sleep 0.1
@@ -28,6 +30,8 @@ RSpec.describe NanomsgTransport do
     publisher.publish 'foobar'
     publisher.publish 'bazbar'
 
+    sleep 0.1
+
     publisher.close_socket
     subscriber.stop
 

data/spec/spec_helper.rb

@@ -16,7 +16,6 @@ RSpec.configure do |config|
   end
 
   config.before(:each) do
-    Aggro.reset
     FileUtils.mkdir_p './tmp/test'
     Aggro.data_dir = './tmp/test'
   end
@@ -24,11 +23,19 @@ RSpec.configure do |config|
   config.after(:each) do
     FileUtils.rm_r './tmp/test' if File.exist? './tmp/test'
     Thread.current[:aggro_context] = nil
+    Aggro.reset unless Aggro.is_a? RSpec::Mocks::Double
+  end
+
+  config.after(:suite) do
+    Aggro.reset
+    Aggro.transport.teardown
   end
 end
 
 require 'aggro'
 
+Aggro.transport.linger = 0
+
 Aggro.constants.each do |const|
   eval "#{const} = Aggro::#{const}"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aggro
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Sebastian Edwards
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-08 00:00:00.000000000 Z
+date: 2015-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -151,35 +151,7 @@ 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'
-- !ruby/object:Gem::Dependency
-  name: nn-core
-  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'
-- !ruby/object:Gem::Dependency
-  name: object-stream
+  name: zeromqrb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -210,7 +182,6 @@ files:
 - Rakefile
 - aggro.gemspec
 - lib/aggro.rb
-- lib/aggro/abstract_store.rb
 - lib/aggro/aggregate.rb
 - lib/aggro/aggregate_ref.rb
 - lib/aggro/attribute_dsl.rb
@@ -235,6 +206,8 @@ files:
 - lib/aggro/handler/start_saga.rb
 - lib/aggro/local_node.rb
 - lib/aggro/locator.rb
+- lib/aggro/logging.rb
+- lib/aggro/marshal_stream.rb
 - lib/aggro/message/ask.rb
 - lib/aggro/message/command.rb
 - lib/aggro/message/create_aggregate.rb
@@ -247,24 +220,13 @@ files:
 - lib/aggro/message/publisher_endpoint_inquiry.rb
 - lib/aggro/message/query.rb
 - lib/aggro/message/result.rb
+- lib/aggro/message/server_error.rb
 - lib/aggro/message/start_saga.rb
 - lib/aggro/message/unhandled_operation.rb
 - lib/aggro/message/unknown_operation.rb
 - lib/aggro/message_parser.rb
 - lib/aggro/message_router.rb
 - lib/aggro/nanomsg_transport.rb
-- lib/aggro/nanomsg_transport/client.rb
-- lib/aggro/nanomsg_transport/connection.rb
-- lib/aggro/nanomsg_transport/publish.rb
-- lib/aggro/nanomsg_transport/publisher.rb
-- lib/aggro/nanomsg_transport/raw_reply.rb
-- lib/aggro/nanomsg_transport/raw_request.rb
-- lib/aggro/nanomsg_transport/reply.rb
-- lib/aggro/nanomsg_transport/request.rb
-- lib/aggro/nanomsg_transport/server.rb
-- lib/aggro/nanomsg_transport/socket_error.rb
-- lib/aggro/nanomsg_transport/subscribe.rb
-- lib/aggro/nanomsg_transport/subscriber.rb
 - lib/aggro/node.rb
 - lib/aggro/node_list.rb
 - lib/aggro/projection.rb
@@ -277,15 +239,21 @@ files:
 - lib/aggro/subscriber.rb
 - lib/aggro/subscription.rb
 - lib/aggro/transform/boolean.rb
+- lib/aggro/transform/date.rb
 - lib/aggro/transform/email.rb
 - lib/aggro/transform/id.rb
 - lib/aggro/transform/integer.rb
 - lib/aggro/transform/money.rb
 - lib/aggro/transform/noop.rb
 - lib/aggro/transform/string.rb
+- lib/aggro/transform/time.rb
 - lib/aggro/transform/time_interval.rb
 - lib/aggro/version.rb
-- spec/lib/aggro/abstract_store_spec.rb
+- lib/aggro/zeromq_transport.rb
+- lib/aggro/zeromq_transport/client.rb
+- lib/aggro/zeromq_transport/publisher.rb
+- lib/aggro/zeromq_transport/server.rb
+- lib/aggro/zeromq_transport/subscriber.rb
 - spec/lib/aggro/aggregate_ref_spec.rb
 - spec/lib/aggro/aggregate_spec.rb
 - spec/lib/aggro/channel_spec.rb
@@ -305,6 +273,7 @@ files:
 - spec/lib/aggro/handler/start_saga_spec.rb
 - spec/lib/aggro/local_node_spec.rb
 - spec/lib/aggro/locator_spec.rb
+- spec/lib/aggro/marshal_stream_spec.rb
 - spec/lib/aggro/message/ask_spec.rb
 - spec/lib/aggro/message/command_spec.rb
 - spec/lib/aggro/message/create_aggregate_spec.rb
@@ -321,8 +290,6 @@ files:
 - spec/lib/aggro/message/unknown_operation_spec.rb
 - spec/lib/aggro/message_parser_spec.rb
 - spec/lib/aggro/message_router_spec.rb
-- spec/lib/aggro/nanomsg_transport/socket_error_spec.rb
-- spec/lib/aggro/nanomsg_transport_spec.rb
 - spec/lib/aggro/node_list_spec.rb
 - spec/lib/aggro/node_spec.rb
 - spec/lib/aggro/projection_spec.rb
@@ -340,6 +307,7 @@ files:
 - spec/lib/aggro/transform/money_spec.rb
 - spec/lib/aggro/transform/string_spec.rb
 - spec/lib/aggro/transform/time_interval_spec.rb
+- spec/lib/aggro/zeromq_transport_spec.rb
 - spec/lib/aggro_spec.rb
 - spec/spec_helper.rb
 homepage: ''
@@ -367,7 +335,6 @@ signing_key:
 specification_version: 4
 summary: Distributed in-memory event-store.
 test_files:
-- spec/lib/aggro/abstract_store_spec.rb
 - spec/lib/aggro/aggregate_ref_spec.rb
 - spec/lib/aggro/aggregate_spec.rb
 - spec/lib/aggro/channel_spec.rb
@@ -387,6 +354,7 @@ test_files:
 - spec/lib/aggro/handler/start_saga_spec.rb
 - spec/lib/aggro/local_node_spec.rb
 - spec/lib/aggro/locator_spec.rb
+- spec/lib/aggro/marshal_stream_spec.rb
 - spec/lib/aggro/message/ask_spec.rb
 - spec/lib/aggro/message/command_spec.rb
 - spec/lib/aggro/message/create_aggregate_spec.rb
@@ -403,8 +371,6 @@ test_files:
 - spec/lib/aggro/message/unknown_operation_spec.rb
 - spec/lib/aggro/message_parser_spec.rb
 - spec/lib/aggro/message_router_spec.rb
-- spec/lib/aggro/nanomsg_transport/socket_error_spec.rb
-- spec/lib/aggro/nanomsg_transport_spec.rb
 - spec/lib/aggro/node_list_spec.rb
 - spec/lib/aggro/node_spec.rb
 - spec/lib/aggro/projection_spec.rb
@@ -422,5 +388,6 @@ test_files:
 - spec/lib/aggro/transform/money_spec.rb
 - spec/lib/aggro/transform/string_spec.rb
 - spec/lib/aggro/transform/time_interval_spec.rb
+- spec/lib/aggro/zeromq_transport_spec.rb
 - spec/lib/aggro_spec.rb
 - spec/spec_helper.rb