active_projection 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9052c28e84c5b64ab1b4350b291e02077f824ec
-  data.tar.gz: a7ad85d0ff185230ba7d350efa4a123143e60499
+  metadata.gz: a021d20d944d3f69ff88671afb2b3dd63ad306b0
+  data.tar.gz: 648e52cba7a201f5bc37036c28ffedc742fa26bc
 SHA512:
-  metadata.gz: b617e60a34666ba1fb02b110113c6d94a7b72c7f91d1c2a64d4272e44e7eec28894c4a4234491638b4babccae0cf1600a22089ce8630f7c9d3e33471c2662467
-  data.tar.gz: 1abea3c7eb6b8921ecbf7a4c3896642dd0ac55301439dd09b5013a51c4a12f9c8713b912f36004ac15d6aad45dff4751b48f4c4dec7eb4d6f39be76d747fd867
+  metadata.gz: 16138af067df4265c38f11c20e6d7594893181c2e854079c52babeda32f0f3d3e70f3b3770e6eb281c713e13c80dba5dc1092657bf41279956dd4bcf369a3406
+  data.tar.gz: 9d6b556fb2014e0a26ecd8232fa710041c35a91362ba77bbc089c1cb3f8867e2d4194111b6b9f6dc598fec924f2464095577080fa46860f392d1261edb559199

data/app/models/active_projection/projection_repository.rb

@@ -1,8 +1,8 @@
 module ActiveProjection
   class ProjectionRepository
 
-    def self.all
-      Projection.all
+    def self.last_ids
+      Projection.all.to_a.map { |p| p.last_id }
     end
 
     def self.get_last_id(id)

data/lib/active_projection/autoload.rb

@@ -1,20 +1,42 @@
 module ActiveProjection
   module Autoload
+    include ActiveEvent::Support::Autoload
+    private
+    def self.dir_names
+      %W(app/models)
+    end
+
+    def self.reload
+      ActiveEvent::Support::Autoloader.reload_from pdirs
+      super
+    end
+
     def self.worker_config=(config)
-      dirs = []
-      projections_dir = "#{config[:path]}**/*.rb"
+      set_pdirs config
+      ActiveEvent::Support::Autoloader.load_from pdirs
+    end
+
+    def self.watchable_dirs
+      watchable_dirs = super
+      watchable_dirs['app/projections'] = [:rb]
+      watchable_dirs
+    end
+
+    private
+    def self.set_pdirs(config)
+      @pdirs = []
+      projections_dir = "#{config[:path]}/app/projections/**/*.rb"
       if config[:count] == 1
-        dirs << projections_dir
+        @pdirs << projections_dir
       else
         Dir[*projections_dir].each_with_index.map { |item, i| i % config[:count] == config[:number] ? item : nil }.compact.each do |dir|
-          dirs << dir
+          @pdirs << dir
         end
       end
-      ActiveEvent::Support::Autoloader.load_from dirs
     end
 
-    def self.app_path=(path)
-      ActiveEvent::Support::Autoloader.load_from "#{path}/models/**/*.rb"
+    def self.pdirs
+      @pdirs ||= []
     end
   end
 end

data/lib/active_projection/event_client.rb

@@ -5,28 +5,71 @@ module ActiveProjection
     include Singleton
 
     def self.start(options)
-      instance.start options
+      instance.options = options
+      instance.start
     end
 
-    def start(options)
-      self.options = options
+    def start
       event_connection.start
-      begin
-        event_channel.queue('', auto_delete: true).bind(event_exchange).subscribe do |delivery_info, properties, body|
-          puts "Received #{properties.type} with #{body}"
-          ProjectionTypeRegistry.process(properties.headers.deep_symbolize_keys, Object.const_get(properties.type).new((JSON.parse body).deep_symbolize_keys))
-        end
-      rescue Interrupt => _
-        event_channel.close
-        event_connection.close
-      end
-      last_ids = ProjectionRepository.all.to_a.map { |p| p.last_id }
-      request_events_after last_ids.min || 0
+      listen_for_events
+      request_missing_events
       event_channel.work_pool.join
     end
 
-    def request_events_after(id)
-      resend_exchange.publish id.to_s, routing_key: 'resend'
+    def listen_for_events
+      subscribe_to event_queue do |delivery_info, properties, body|
+        event_received properties, body
+      end
+    end
+
+    def request_missing_events
+      listen_for_replayed_events
+      send_request_for min_last_id
+    end
+
+    def listen_for_replayed_events
+      subscribe_to replay_queue do |delivery_info, properties, body|
+        event_received properties, body unless replay_done? body
+      end
+    end
+
+    def send_request_for(id)
+      resend_request_exchange.publish id.to_s, routing_key: 'resend_request'
+    end
+
+    def replay_done?(body)
+      if 'replay_done' == body
+        puts 'Projections should be up to date now'
+        replay_queue.unbind(resend_exchange)
+        return true
+      end
+      false
+    end
+
+    def event_received(properties, body)
+      RELOADER.execute_if_updated
+      puts "Received #{properties.type} with #{body}"
+      ProjectionTypeRegistry.process properties.headers.deep_symbolize_keys, build_event(properties.type, JSON.parse(body))
+    end
+
+    def build_event(type, data)
+      Object.const_get(type).new(data.deep_symbolize_keys)
+    end
+
+    def replay_queue
+      @replay_queue ||= event_channel.queue('', auto_delete: true).bind(resend_exchange)
+    end
+
+    def event_queue
+      @event_queue ||= event_channel.queue('', auto_delete: true).bind(event_exchange)
+    end
+
+    def min_last_id
+      ProjectionRepository.last_ids.min || 0
+    end
+
+    def subscribe_to(queue, &block)
+      queue.subscribe(&block)
     end
 
     def event_connection
@@ -42,14 +85,17 @@ module ActiveProjection
     end
 
     def resend_exchange
-      @resend_exchange ||= event_channel.direct "resend_#{options[:event_exchange]}"
+      @resend_exchange ||= event_channel.fanout "resend_#{options[:event_exchange]}"
+    end
+
+    def resend_request_exchange
+      @resend_request_exchange ||= event_channel.direct "resend_request_#{options[:event_exchange]}"
     end
 
     def options
       @options
     end
 
-    private
     attr_writer :options
   end
 end

data/lib/active_projection/projection_type.rb

@@ -20,7 +20,7 @@ module ActiveProjection
     end
 
     def evaluate(headers)
-      return false unless ProjectionRepository.solid? projection_id #projection is broken and shouldn't process any incoming event
+      return false unless ProjectionRepository.solid? projection_id || headers[:replayed]# process only replayed events if projection is broken
       last_id = ProjectionRepository.get_last_id projection_id
       case
         when last_id + 1 == headers[:store_id] #process incoming event

data/lib/active_projection/version.rb

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

data/spec/models/projection_repository_spec.rb

@@ -4,7 +4,7 @@ require_relative '../support/active_record'
 describe ActiveProjection::ProjectionRepository do
   before :all do
     5.times do |i|
-      FactoryGirl.create :projection, id: i, class_name: "TestProjection#{i}"
+      FactoryGirl.create :projection, id: i, class_name: "TestProjection#{i}", last_id: 5 - i
     end
   end
   describe 'create_or_get' do
@@ -24,4 +24,7 @@ describe ActiveProjection::ProjectionRepository do
       expect(ActiveProjection::Projection.where(id:0).first.solid).to be_false
     end
   end
+    it 'returns array of last ids' do
+      expect(ActiveProjection::ProjectionRepository.last_ids).to eq [5,4,3,2,1]
+    end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_projection
 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: active_event
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement