aggro 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a2dbb5a149c0626edec59aacb503a28aa93c152
-  data.tar.gz: f7285648aa894911f91f15734278542ff0a1fcd8
+  metadata.gz: 87f15442c120f8553416f7cbb2b18e345a1dd0a3
+  data.tar.gz: 7963f8f2fbec1eea359339daa103b52eef7e450d
 SHA512:
-  metadata.gz: 99b6e4dec758672a0bce1be028c1d9c212a2a8cf1569485b8bed67dc09a26343e541b02618056dfc28f8afe790f44306a6e10951215ac95f555165a326efd796
-  data.tar.gz: 3d87f27e547b8475e7f4055d8438513e02830bff4d8aaf1ebdab4533f1680758ca625f45fd2f2db0ee5af3eea048b7aef200bcdd88b3d074ad56d50c159572b9
+  metadata.gz: 00dddfea09997a76c17f5ed118b52be604dd4e9b412f3cfc1cacc58656a3a7b87bb2aad41eeb64ee64a2b2583e307816987a85af2bf7d4a3385f54574fe71999
+  data.tar.gz: c99308f889a0bf8906515dbbbf36025cb322d1cabf27a6b4e58666a780bda2d784055dc57feb48da00da6e06e1136eeef814059b8508005b9999679996e9f378

data/.travis.yml

@@ -1,15 +1,11 @@
 language: ruby
 rvm:
   - 2.2.0
-  - jruby-19mode
   - ruby-head
   - jruby-head
 matrix:
   allow_failures:
-    - rvm: jruby-19mode
     - rvm: jruby-head
     - rvm: ruby-head
 script: bundle exec rspec
-before_install:
-  - git clone git://github.com/nanomsg/nanomsg.git
-  - cd nanomsg && ./autogen.sh && ./configure && sudo make install && sudo ldconfig && cd ${TRAVIS_BUILD_DIR}
+before_install: sudo apt-get install libzmq3-dev

data/aggro.gemspec

@@ -29,7 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'concurrent-ruby'
   spec.add_runtime_dependency 'consistent-hashing'
   spec.add_runtime_dependency 'invokr'
-  spec.add_runtime_dependency 'nio4r'
-  spec.add_runtime_dependency 'nn-core'
-  spec.add_runtime_dependency 'object-stream'
+  spec.add_runtime_dependency 'zeromqrb'
 end

data/lib/aggro.rb

@@ -6,9 +6,9 @@ require 'concurrent'
 require 'consistent_hashing'
 require 'invokr'
 require 'fileutils'
-require 'msgpack'
-require 'object-stream'
+require 'uri'
 require 'yaml'
+require 'zero_mq'
 
 # Private: Define methods to protect handlers from code reloading.
 module Aggro
@@ -31,9 +31,9 @@ module Aggro
   end
 end
 
-require 'aggro/abstract_store'
 require 'aggro/attribute_dsl'
 require 'aggro/event_dsl'
+require 'aggro/logging'
 
 require 'aggro/message/ask'
 require 'aggro/message/command'
@@ -47,6 +47,7 @@ require 'aggro/message/ok'
 require 'aggro/message/publisher_endpoint_inquiry'
 require 'aggro/message/query'
 require 'aggro/message/result'
+require 'aggro/message/server_error'
 require 'aggro/message/start_saga'
 require 'aggro/message/unhandled_operation'
 require 'aggro/message/unknown_operation'
@@ -58,12 +59,14 @@ require 'aggro/handler/query'
 require 'aggro/handler/start_saga'
 
 require 'aggro/transform/boolean'
+require 'aggro/transform/date'
 require 'aggro/transform/email'
 require 'aggro/transform/id'
 require 'aggro/transform/integer'
 require 'aggro/transform/money'
 require 'aggro/transform/noop'
 require 'aggro/transform/string'
+require 'aggro/transform/time'
 require 'aggro/transform/time_interval'
 
 require 'aggro/aggregate'
@@ -81,9 +84,9 @@ require 'aggro/event_serializer'
 require 'aggro/file_store'
 require 'aggro/local_node'
 require 'aggro/locator'
+require 'aggro/marshal_stream'
 require 'aggro/message_parser'
 require 'aggro/message_router'
-require 'aggro/nanomsg_transport'
 require 'aggro/node'
 require 'aggro/node_list'
 require 'aggro/projection'
@@ -94,6 +97,7 @@ require 'aggro/saga_status'
 require 'aggro/server'
 require 'aggro/subscriber'
 require 'aggro/subscription'
+require 'aggro/zeromq_transport'
 
 # Public: Module for namespacing and configuration methods.
 module Aggro
@@ -112,6 +116,7 @@ module Aggro
 
   class << self
     attr_writer :data_dir
+    attr_writer :logger
     attr_writer :port
     attr_writer :publisher_port
     attr_writer :transport
@@ -159,6 +164,10 @@ module Aggro
     end
   end
 
+  def logger
+    @logger ||= -> (_level, _progname, _message = nil, &_block) {}
+  end
+
   def node_list
     @node_list ||= begin
       NodeList.new.tap do |node_list|
@@ -182,14 +191,23 @@ module Aggro
     @event_bus.shutdown if @event_bus
     @event_bus = nil
     @local_node = nil
-    @node_list = nil
+    reset_clients && @node_list = nil
     @port = nil
-    @publisher = nil
     @publisher_port = nil
+    @server.stop if @server
     @server = nil
     @store = nil
   end
 
+  def reset_clients
+    return unless @node_list
+
+    @node_list.nodes
+      .select { |node| node.is_a? Node }
+      .map(&:client)
+      .each(&:disconnect!)
+  end
+
   def server
     return unless cluster_config.server_node?
 
@@ -201,6 +219,6 @@ module Aggro
   end
 
   def transport
-    @transport ||= NanomsgTransport
+    @transport ||= ZeroMQTransport
   end
 end

data/lib/aggro/aggregate.rb

@@ -3,16 +3,15 @@ module Aggro
   module Aggregate
     extend ActiveSupport::Concern
     include EventDSL
+    include Logging
 
     def initialize(id)
       @id = id
 
-      @projections = self.class.projections.reduce({}) do |h, (name, klass)|
-        class_eval { define_method(name) { @projections[name] } }
-        h.merge name => klass.new(id)
-      end
+      start_projections
+      restore_from_event_stream
 
-      Aggro.event_bus.subscribe(id, self)
+      log INFO, 'Restored to memory'
     end
 
     private
@@ -24,6 +23,10 @@ module Aggro
 
       handler = self.class.handler_for_command(command.class)
       instance_exec command, &handler
+    rescue => e
+      log ERROR, "Couldn't apply command\n#{e}\n#{e.backtrace.join "\n"}"
+
+      raise e
     ensure
       @_context = nil
     end
@@ -34,15 +37,35 @@ module Aggro
       @event_caller ||= EventProxy.new(self, @id)
     end
 
+    def log(level, message, &block)
+      super level, "#{self.class}/#{@id}", message, &block
+    end
+
+    def restore_from_event_stream
+      Aggro.event_bus.subscribe(@id, self)
+    rescue => e
+      log FATAL, "Couldn't restore from events\n#{e}\n#{e.backtrace.join "\n"}"
+    end
+
     def run_query(query)
       return unless self.class.responds_to? query
 
       handler = self.class.handler_for_query(query.class)
       instance_exec query, &handler
-    rescue RuntimeError => e
+    rescue => e
+      log ERROR, "Couldn't complete query\n#{e}\n#{e.backtrace.join "\n"}"
       QueryError.new(e)
     end
 
+    def start_projections
+      @projections = self.class.projections.reduce({}) do |h, (name, klass)|
+        class_eval { define_method(name) { @projections[name] } }
+        h.merge name => klass.new(@id)
+      end
+    rescue => e
+      log FATAL, "Couldn't start projections\n#{e}\n#{e.backtrace.join "\n"}"
+    end
+
     class_methods do
       def allows(command_class, &block)
         command_handlers[command_class] = block if block
@@ -53,10 +76,14 @@ module Aggro
       end
 
       def create(id = SecureRandom.uuid)
+        fail ArgumentError unless id && id.length == 36
+
         find(id).create
       end
 
       def find(id)
+        fail ArgumentError unless id && id.length == 36
+
         AggregateRef.new id, name
       end
 

data/lib/aggro/attribute_dsl.rb

@@ -43,6 +43,10 @@ module Aggro
         create_attrs name, Transform::Boolean
       end
 
+      def date(name)
+        create_attrs name, Transform::Date
+      end
+
       def email(name)
         create_attrs name, Transform::Email
       end
@@ -72,6 +76,10 @@ module Aggro
         create_attrs name, Transform::String
       end
 
+      def time(name)
+        create_attrs name, Transform::Time
+      end
+
       def time_interval(name)
         require 'time-interval'
 

data/lib/aggro/client.rb

@@ -5,6 +5,10 @@ module Aggro
       @transport_client = Aggro.transport.client(endpoint)
     end
 
+    def disconnect!
+      @transport_client.close_socket
+    end
+
     def post(message)
       MessageParser.parse @transport_client.post message
     end

data/lib/aggro/cluster_config.rb

@@ -23,6 +23,11 @@ module Aggro
       @nodes ||= {}.freeze
     end
 
+    def server_node=(value)
+      @is_server_node = value
+      persist_config
+    end
+
     def server_node?
       @is_server_node == true
     end

data/lib/aggro/concurrent_actor.rb

@@ -1,6 +1,6 @@
 module Aggro
   # Private: Wraps a given target in an concurrent actor.
-  class ConcurrentActor < Concurrent::Actor::Context
+  class ConcurrentActor < Concurrent::Actor::RestartingContext
     def initialize(target)
       @target = target
     end

data/lib/aggro/event_bus.rb

@@ -1,6 +1,8 @@
 module Aggro
   # Public: Publishes events to any subscribed listeners.
   class EventBus
+    attr_reader :remote_publishers
+
     def initialize
       @remote_publishers = {}
     end
@@ -11,6 +13,7 @@ module Aggro
       return unless subscriptions.key? topic
 
       subscriptions[topic].each do |subscription|
+        sleep 0.01 until subscription.caught_up
         subscription.handle_event event
       end
     end
@@ -39,8 +42,6 @@ module Aggro
 
     private
 
-    attr_reader :remote_publishers
-
     def catchup_local(topic, subscription)
       Aggro.store.read([topic]).first.events.each do |event|
         subscription.handle_event event
@@ -66,6 +67,8 @@ module Aggro
       else
         catchup_remote(topic, subscription, node)
       end
+
+      subscription.notify_subscription_caught_up
     end
 
     def handle_events(topic, events)

data/lib/aggro/event_serializer.rb

@@ -4,11 +4,11 @@ module Aggro
     module_function
 
     def deserialize(serialized)
-      Marshal.load serialized
+      Event.new(serialized[0], Time.parse(serialized[1]), serialized[2])
     end
 
     def serialize(deserialized)
-      Marshal.dump deserialized
+      [deserialized.name, deserialized.occured_at.iso8601, deserialized.details]
     end
   end
 end

data/lib/aggro/file_store.rb

@@ -3,7 +3,7 @@ require 'aggro/file_store/writer'
 
 module Aggro
   # Public: Stores and retrieves events by serializing them to flat files.
-  class FileStore < AbstractStore
+  class FileStore
     INDEX_DIRECTORY = 'indexes'.freeze
     EVENT_DIRECTORY = 'events'.freeze
     REGISTRY_FILE = 'registry'.freeze
@@ -84,7 +84,7 @@ module Aggro
 
     def initialize_registry
       File.open(@registry_file) do |file|
-        ObjectStream.new(file, type: 'marshal').each do |id, type|
+        MarshalStream.new(file).each do |id, type|
           registry[id] = type
         end
       end

data/lib/aggro/file_store/reader.rb

@@ -1,5 +1,5 @@
 module Aggro
-  class FileStore < AbstractStore
+  class FileStore
     # Private: Deserialized events from an IO object.
     class Reader
       def initialize(data_io, index_io)
@@ -8,13 +8,21 @@ module Aggro
       end
 
       def read
-        ObjectStream.new(@data_io, type: 'marshal')
+        Enumerator.new do |yielder|
+          stream.each do |raw_event|
+            yielder << EventSerializer.deserialize(raw_event)
+          end
+        end
       end
 
       private
 
       def index
-        @index ||= ObjectStream.new(@index_io, type: 'marshal')
+        @index ||= MarshalStream.new @index_io
+      end
+
+      def stream
+        @stream ||= MarshalStream.new @data_io
       end
     end
   end

data/lib/aggro/file_store/writer.rb

@@ -1,5 +1,5 @@
 module Aggro
-  class FileStore < AbstractStore
+  class FileStore
     # Private: Serializes events to an IO object.
     class Writer
       def initialize(data_io, index_io)
@@ -9,7 +9,7 @@ module Aggro
 
       def write(events)
         events.each do |event|
-          @data_io.write EventSerializer.serialize(event)
+          @data_io.write Marshal.dump EventSerializer.serialize(event)
           write_to_index @data_io.pos
         end
 

data/lib/aggro/handler/query.rb

@@ -37,15 +37,15 @@ module Aggro
       end
 
       def handle_known
-        if channel.handles_query?(query)
-          result = channel.run_query(query)
-
-          Message::Result.new result.value(5)
+        if channel
+          if channel.handles_query?(query)
+            handle_supported
+          else
+            Message::UnhandledOperation.new
+          end
         else
-          Message::UnhandledOperation.new
+          Message::InvalidTarget.new
         end
-      rescue NoMethodError
-        Message::InvalidTarget.new
       end
 
       def handle_local
@@ -55,6 +55,18 @@ module Aggro
       def handle_unknown
         Message::UnknownOperation.new
       end
+
+      def handle_supported
+        result = channel.run_query(query)
+
+        result.wait(5)
+
+        if result.fulfilled?
+          Message::Result.new result.value
+        else
+          Message::Result.new Aggro::QueryError.new('Query timed out')
+        end
+      end
     end
   end
 end