active_event 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a686659ed279d8bc3e3547139ea2b01c637b8d4
-  data.tar.gz: c61ec7d584bf564fb12bb5250af1298dfd40efc6
+  metadata.gz: f2879ba83c33e9ab5c2a5db8263e01e1cc00f983
+  data.tar.gz: d160e8c142951bc87a2a816406ab30bbf6a08b8b
 SHA512:
-  metadata.gz: 624483b1eb07a2a56fa84baa1306d1d5a3e591b055afd059efae69f1fcf6df930754dd419cbc74c84ad1fc4efbd8e3968b05bd0d1c0ca58873e8970b79993ec8
-  data.tar.gz: 0035b8d841c4862928e9022c0ec448fa25cd380aa1b37bd25e19131dee5cea4e83f554e64ddae866c4b64cddefb950d507738a5eff5ae80490abf727a824405c
+  metadata.gz: a4f62dfaedef9fe9c2838b9f4035f093a3ac68df9319e6e3e2e9d7b6fbd6f5d6c3db5c83dbbe234e906e338b4e2f4fd56cfc39e7adbc6551b0da0410b972cc1e
+  data.tar.gz: 21a407982c30b6bf8140fbb682a47201c45568e5d3ce80a8f052b5106bcb0200ba1f160e7ce032910f488b4beaa9dda2bcedfd3f4ba194b620ac934fc6862709

data/lib/active_event/autoload.rb

@@ -1,11 +1,9 @@
 module ActiveEvent
   module Autoload
-    def self.app_path=(path)
-      dirs = []
-      dirs << "#{path}/commands/**/*.rb"
-      dirs << "#{path}/validations/**/*.rb"
-      dirs << "#{path}/events/**/*.rb"
-      ActiveEvent::Support::Autoloader.load_from dirs
+    include ActiveEvent::Support::Autoload
+    private
+    def self.dir_names
+      %W(app/commands app/validations app/events)
     end
   end
 end

data/lib/active_event/command.rb

@@ -20,9 +20,13 @@ module ActiveEvent
     include ActiveModel::Validations
 
     def is_valid_do(&block)
-      valid = valid?
-      block.call() if valid
-      valid
+      if valid?
+        block.call
+      else
+        false
+      end
+    rescue
+      false
     end
   end
 end

data/lib/active_event/domain.rb

@@ -34,7 +34,7 @@ module ActiveEvent
         base.server_uri = 'druby://127.0.0.1:8787'
       end
 
-      def set_config(protocol: 'druby', host: 'localhost', port: 8787)
+      def set_config(protocol = 'druby', host = 'localhost', port = 8787)
         self.server_uri = "#{protocol}://#{host}:#{port}"
       end
     end

data/lib/active_event/event_server.rb

@@ -12,31 +12,37 @@ module ActiveEvent
     end
 
     def self.start(options)
-      instance.start options
+      instance.options = options
+      instance.start
     end
 
-    def start(options)
-      self.options = options
+    def start
       event_connection.start
       listen_for_resend_requests
     end
 
-    def self.resend_events_after(id)
-      events = EventRepository.after_id(id).to_a
-      events.each do |e|
-        event = EventType.create_instance(e.event, e.data.deep_symbolize_keys)
-        event.add_store_infos store_id: e.id
-        self.publish event
+    def resend_events_after(id)
+      if @replay_server_thread.nil? || !@replay_server_thread.alive?
+        @replay_server_thread = Thread.new do
+          Thread.current.priority = -10
+          ReplayServer.start options, id
+        end
+      else
+        ReplayServer.update id
       end
     end
 
     def listen_for_resend_requests
-      event_channel.queue('', auto_delete: true).bind(resend_exchange, routing_key: 'resend').subscribe do |delivery_info, properties, id|
-        puts "received resend request with id #{id}"
-        self.class.resend_events_after id
+      resend_request_queue.subscribe do |delivery_info, properties, id|
+        resend_request_received id
       end
     end
 
+    def resend_request_received (id)
+      puts "received resend request with id #{id}"
+      resend_events_after id.to_i
+    end
+
     def event_connection
       @event_server ||= Bunny.new URI::Generic.build(options[:event_connection]).to_s
     end
@@ -49,15 +55,18 @@ module ActiveEvent
       @event_exchange ||= event_channel.fanout options[:event_exchange]
     end
 
-    def resend_exchange
-      @resend_exchange ||= event_channel.direct "resend_#{options[:event_exchange]}"
+    def resend_request_exchange
+      @resend_request_exchange ||= event_channel.direct "resend_request_#{options[:event_exchange]}"
+    end
+
+    def resend_request_queue
+      @resend_request_queue ||= event_channel.queue('', auto_delete: true).bind(resend_request_exchange, routing_key: 'resend_request')
     end
 
     def options
       @options
     end
 
-    private
     attr_writer :options
   end
 end

data/lib/active_event/event_source_server.rb

@@ -0,0 +1,56 @@
+require 'reloader/sse'
+require 'bunny'
+module ActiveEvent
+  module EventSourceServer
+    def subscribe_to(queue, &block)
+      queue.subscribe(block: true, &block)
+    end
+
+    def event_queue
+      @event_queue ||= event_channel.queue('', auto_delete: true).bind(event_exchange)
+    end
+
+    def event_connection
+      @event_server ||= Bunny.new URI::Generic.build(options[:event_connection]).to_s
+    end
+
+    def event_channel
+      @event_channel ||= event_connection.create_channel
+    end
+
+    def event_exchange
+      @event_exchange ||= event_channel.fanout options[:event_exchange]
+    end
+
+    def default_options
+      {
+          event_connection: {
+              scheme: 'amqp',
+              userinfo: nil,
+              host: '127.0.0.1',
+              port: 9797,
+          },
+          event_exchange: 'events'
+      }
+    end
+
+    def parse_options(args)
+      options = default_options
+      options.merge! YAML.load_file(config_file)[env].deep_symbolize_keys! unless config_file.blank?
+    end
+
+    def config_file
+      File.expand_path('config/disco.yml', Rails.root)
+    end
+
+    def options
+      @options ||= parse_options(ARGV)
+    end
+
+    def env
+      @env = ENV['PROJECTION_ENV'] || ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development'
+    end
+
+    attr_writer :options
+  end
+end

data/lib/active_event/replay_server.rb

@@ -0,0 +1,94 @@
+require 'singleton'
+require 'bunny'
+require 'thread'
+module ActiveEvent
+  class ReplayServer
+    include Singleton
+
+    def self.start(options, id)
+      instance.options = options
+      instance.start id
+    end
+
+    def self.update(id)
+      instance.queue << id
+    end
+
+    def start(id)
+      event_connection.start
+      @last_id = id
+      start_republishing
+      send_done_message
+    end
+
+    def queue
+      @queue ||= Queue.new
+    end
+
+    def send_done_message
+      resend_exchange.publish 'replay_done'
+    end
+
+    def start_republishing
+      loop do
+        @events = EventRepository.after_id(@last_id).to_a
+        return if @events.empty?
+        republish_events
+      end
+    end
+
+    def republish_events
+      while has_next_event?
+        return if new_id?
+        republish next_event
+        Thread.pass
+      end
+    end
+
+    def new_id?
+      unless queue.empty?
+        new_id = queue.pop
+        if new_id < @last_id
+          @last_id = new_id
+          return true
+        end
+      end
+      false
+    end
+
+    def republish(e)
+      type = e.event
+      body = e.data.to_json
+      resend_exchange.publish body, {type: type, headers: {store_id: e.id, replayed: true}}
+      puts "Republished #{type} with #{body}"
+    end
+
+    def next_event
+      e = @events.shift
+      @last_id = e.id
+      e
+    end
+
+    def has_next_event?
+      @events.length > 0
+    end
+
+    def event_connection
+      @event_server ||= Bunny.new URI::Generic.build(options[:event_connection]).to_s
+    end
+
+    def event_channel
+      @event_channel ||= event_connection.create_channel
+    end
+
+    def resend_exchange
+      @resend_exchange ||= event_channel.fanout "resend_#{options[:event_exchange]}"
+    end
+
+    def options
+      @options
+    end
+
+    attr_writer :options
+  end
+end

data/lib/active_event/support/attr_setter.rb

@@ -21,7 +21,7 @@ module ActiveEvent::Support
       def attributes(*args)
         super
         args.each do |attr|
-          define_method "#{attr}=", -> (value) { attributes[attr] = value }
+          define_method "#{attr}=", lambda { |value| attributes[attr] = value }
         end
       end
     end

data/lib/active_event/support/autoload.rb

@@ -0,0 +1,44 @@
+module ActiveEvent::Support
+  module Autoload
+    extend ActiveSupport::Concern
+    module ClassMethods
+      def app_path=(path)
+        set_dirs path
+        Autoloader.load_from dirs
+      end
+
+      def reload_module(module_name)
+        path = [parent.name, module_name.to_s].join('::').underscore
+        Autoloader.reload module_name, path
+      end
+
+      def reload
+        Autoloader.reload_from dirs
+      end
+
+      def watchable_dirs
+        watchable_dirs = {}
+        dir_names.each do |dir_name|
+          watchable_dirs[dir_name] = [:rb]
+        end
+        watchable_dirs
+      end
+
+      private
+
+      def dir_names
+        []
+      end
+
+      def set_dirs(path)
+        @dirs = dir_names.map do |dir_name|
+          "#{path}/#{dir_name}/**/*.rb"
+        end
+      end
+
+      def dirs
+        @dirs ||= ''
+      end
+    end
+  end
+end

data/lib/active_event/support/autoloader.rb

@@ -5,5 +5,34 @@ module ActiveEvent::Support
         require file
       end
     end
+
+    def self.reload_from(dirs)
+      Dir[*dirs].each do |path|
+        reload get_module_name(path), path
+      end
+    end
+
+    def self.reload(name, path)
+      const_name, namespace_name = name.to_s.split('::').reverse
+      if namespace_name.nil?
+        Object.send(:remove_const, const_name) if Object.const_defined?(const_name)
+      else
+        namespace = const_get(namespace_name)
+        namespace.send(:remove_const, const_name) if namespace.const_defined?(const_name)
+      end
+      $".delete_if { |s| s.include?(path) }
+      require path
+    end
+
+    private
+    def self.get_module_name(path)
+      segments = path.split('/')
+      seg = if 1 == (segments.length - 2) - (segments.index('app') || segments.index('domain')) #no namespace
+              segments.last.split('.').first
+            else
+              [segments[-2], segments.last.split('.').first].join('/')
+            end
+      seg.camelcase.to_sym
+    end
   end
 end

data/lib/active_event/version.rb

@@ -1,7 +1,7 @@
 module ActiveEvent
   # Returns the version of the currently loaded ActiveEvent as a Gem::Version
   def self.version
-    Gem::Version.new '0.1.0'
+    Gem::Version.new '0.2.0'
   end
 
   module VERSION #:nodoc:

data/lib/active_event.rb

@@ -10,6 +10,7 @@ module ActiveEvent
   autoload :Domain
   autoload :EventServer
   autoload :EventType
+  autoload :ReplayServer
   autoload :Validations
   autoload :ValidationsRegistry
 
@@ -18,6 +19,7 @@ module ActiveEvent
 
     autoload :AttrInitializer
     autoload :AttrSetter
+    autoload :Autoload
     autoload :Autoloader
   end
 

data/spec/lib/event_server_spec.rb

@@ -6,15 +6,17 @@ describe ActiveEvent::EventServer do
     @server = ActiveEvent::EventServer.instance
     @event = TestEvent.new
   end
-  it 'resends requests' do
-    allow(@event).to receive(:event)
-    allow(@event).to receive(:id)
-    allow(@event).to receive(:data).and_return({})
-    expect(ActiveEvent::EventType).to receive(:create_instance).twice.and_return(Object)
-    expect(Object).to receive(:add_store_infos).twice
-    expect(ActiveEvent::EventRepository).to receive(:after_id).and_return([@event, @event])
-    expect(@server.class).to receive(:publish).twice
-    @server.class.resend_events_after 1
+  describe 'resend_events_after' do
+    it 'starts the replay server if its not running' do
+      expect(ActiveEvent::ReplayServer).to receive(:start)
+      @server.resend_events_after(1).join
+    end
+
+    it 'updates the replay server if its running' do
+      @server.instance_variable_set(:@replay_server_thread, Thread.new {sleep 1})
+      expect(ActiveEvent::ReplayServer).to receive(:update)
+      @server.resend_events_after 1
+    end
   end
 
   it 'publishes an event' do

data/spec/lib/replay_server_spec.rb

@@ -0,0 +1,66 @@
+require_relative '../spec_helper'
+describe ActiveEvent::ReplayServer do
+  class TestEvent
+  end
+  before :all do
+    @server = ActiveEvent::ReplayServer.instance
+    @event = TestEvent.new
+  end
+
+  it 'republishes an event' do
+    allow(@server).to receive(:resend_exchange).and_return(Object)
+    expect(@server.resend_exchange).to receive(:publish).with("{\"bla\":\"Test2\"}", {:type => "TestEvent", :headers => {store_id: 0, replayed: true}})
+    expect(@event).to receive(:event).and_return(@event.class.name)
+    expect(@event).to receive(:data).and_return(bla: 'Test2')
+    expect(@event).to receive(:id).and_return(0)
+    @server.republish(@event)
+  end
+
+  it 'starts and stop republishing events' do
+    expect(ActiveEvent::EventRepository).to receive(:after_id).and_return([1, 2, 3, 4], [])
+    expect(@server).to receive(:republish_events).once
+    @server.start_republishing
+  end
+
+  it 'republish all found events' do
+    @server.instance_variable_set(:@events, [1, 2, 3, 4])
+    expect(Thread).to receive(:pass).exactly(4).times
+    expect(@server).to receive(:next_event).exactly(4).times { @server.instance_variable_get(:@events).shift }
+    expect(@server).to receive(:republish).exactly(4).times
+    @server.republish_events
+  end
+
+  describe 'new_id?' do
+    before :each do
+      @server.instance_variable_set(:@last_id, 4)
+    end
+
+    it 'overrides id if smaller' do
+      @server.queue << 1
+      expect(@server.new_id?).to be_true
+      expect(@server.instance_variable_get(:@last_id)).to eq 1
+    end
+
+    it 'does nothing if id is greater' do
+      @server.queue << 5
+      expect(@server.new_id?).to be_false
+      expect(@server.instance_variable_get(:@last_id)).not_to eq 5
+    end
+
+    it 'does nothing if queue is empty' do
+      @server.queue.clear
+      expect(@server.new_id?).to be_false
+    end
+  end
+
+  it 'can update start id while running' do
+    expect(ActiveEvent::EventRepository).to receive(:after_id).with(1).and_return([2, 3, 4], [])
+    expect(ActiveEvent::EventRepository).to receive(:after_id).with(2).and_return([3, 4])
+    expect(@server).to receive(:next_event).exactly(3).times { @server.instance_variable_get(:@events).shift }
+    expect(@server).to receive(:republish).exactly(3).times
+    expect(Thread).to receive(:pass).exactly(3).times
+    @server.instance_variable_set(:@last_id, 2)
+    @server.queue << 1
+    @server.start_republishing
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_event
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Andreas Reischuck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-11 00:00:00.000000000 Z
+date: 2013-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -147,9 +147,12 @@ files:
 - lib/active_event/command.rb
 - lib/active_event/domain.rb
 - lib/active_event/event_server.rb
+- lib/active_event/event_source_server.rb
 - lib/active_event/event_type.rb
+- lib/active_event/replay_server.rb
 - lib/active_event/support/attr_initializer.rb
 - lib/active_event/support/attr_setter.rb
+- lib/active_event/support/autoload.rb
 - lib/active_event/support/autoloader.rb
 - lib/active_event/validations.rb
 - lib/active_event/validations_registry.rb
@@ -162,6 +165,7 @@ files:
 - spec/lib/domain_spec.rb
 - spec/lib/event_server_spec.rb
 - spec/lib/event_type_spec.rb
+- spec/lib/replay_server_spec.rb
 - spec/lib/support/attr_initializer_spec.rb
 - spec/lib/support/attr_setter_spec.rb
 - spec/models/event_spec.rb
@@ -197,6 +201,7 @@ test_files:
 - spec/lib/domain_spec.rb
 - spec/lib/event_server_spec.rb
 - spec/lib/event_type_spec.rb
+- spec/lib/replay_server_spec.rb
 - spec/lib/support/attr_initializer_spec.rb
 - spec/lib/support/attr_setter_spec.rb
 - spec/models/event_spec.rb