isimud 1.4.6 → 1.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2769638fbc9d69ddf26502e1929baf2884a2e821
-  data.tar.gz: 3f565c195f891af40a07e9c9f05bea6557c9519e
+  metadata.gz: d4207fca361f4d4e6c45f15c44fe366661d5894b
+  data.tar.gz: 5a0e5c2016441e4d23c98efe6fc5c84575c3b96b
 SHA512:
-  metadata.gz: c3aac1635d4399cf011cb013b7d5930bfb9026f7da390ce2d78db1e451dc90b73d44d2d6e2759185b0392820f0fd6a1176dfa9a5db7b4520e117dfbee59b1690
-  data.tar.gz: bb8de5051878f5a25e1552934c9a4c22b44691e45dfd59e30396c76e89de894a037b7617f5bde92cdf7b28fe1ac859560b63fb930e0ed1b7ed22347d2bdad485
+  metadata.gz: f64c5e07ce74f71273c98647359d12a89985eef2a779b0a63f7cb94377316be78bce63fc2554c124df7be9508f8e77054539c22c3ffe1f7a3637e82bc99c2252
+  data.tar.gz: b0808273f6ad6c0364688652ccc7f9bcdcb6d80841629c6ebb1a0142878618c8ef28a5bc99537be095ae707ba057ec7b9fa22ecb31953b50a603e236bafd4e4b

data/README.md

@@ -86,7 +86,7 @@ for each instance.
 2. Custom standalone queues. You may extend EventListener to declare individual queues not associated with a specific
 object instance.
 
-The EventListener process will automatically create queues on initial startup if they do not already exist. This allows
+The EventListener process will automatically create and bind queues on startup if they do not already exist. This allows
 for cold startup on a new AMQP broker.
 
 ### Message Delivery Information and Metadata
@@ -120,6 +120,13 @@ the message is not re-queued.
 
 # Changes
 
+## 1.4.7
+
+* Simplify the AMQP queue lifecycle for EventObserver instances when they are updated.
+  * Any previously existing queue for the instance is deleted on the broker.
+  * When an EventListener process receives the EventObserver update message, it always recreates and rebinds the 
+    queue for the instance.
+
 ## 1.4.6
 
 * When consuming messages, use the channel setting from the delivery_info

data/checksum/isimud-1.4.6.gem.sha512

@@ -0,0 +1 @@
+fe13f8a3d39cb69f6d3dea3520349d29dfd4ea05608b3b233797d32074007b2bb9b502c9bf4682defcd3ca8997a023157e58f9f957380ab0b68f6471d85594b0

data/lib/isimud/event_listener.rb

@@ -121,6 +121,11 @@ module Isimud
       @observers.has_key?(observer_key_for(observer.class, observer.id))
     end
 
+    # @private
+    def find_observer(klass, id)
+      @observers[observer_key_for(klass, id)]
+    end
+
     private
 
     def test_env?
@@ -242,7 +247,7 @@ module Isimud
     def register_observer(observer)
       @observer_mutex.synchronize do
         log "EventListener: registering observer #{observer.class} #{observer.id}"
-        @observers[observer_key_for(observer.class, observer.id)] = observer.observe_events(client, initializing?)
+        @observers[observer_key_for(observer.class, observer.id)] = observer.observe_events(client)
       end
     end
 

data/lib/isimud/event_observer.rb

@@ -53,13 +53,12 @@ module Isimud
     # Create or attach to a queue on the specified exchange. When an event message that matches the observer's routing keys
     # is received, parse the event and call handle_event on same.
     # @param [Isimud::Client] client client instance
-    # @param [Boolean] refresh_bindings when set, refresh bindings on queue (true)
     # @return queue or consumer object
     # @see BunnyClient#subscribe
     # @see TestClient#subscribe
-    def observe_events(client, refresh_bindings = true)
+    def observe_events(client)
       return unless enable_listener?
-      queue = (refresh_bindings || client.kind_of?(Isimud::TestClient)) ? create_queue(client) : client.find_queue(event_queue_name)
+      queue = create_queue(client)
       client.subscribe(queue) do |message|
         event = Event.parse(message)
         handle_event(event)
@@ -99,18 +98,8 @@ module Isimud
     end
 
     def update_queue
-      if enable_listener?
-        routing_key_changes = previous_changes[:exchange_routing_keys]
-        prev_keys    = routing_key_changes.try(:[], 0) || []
-        current_keys = routing_key_changes.try(:[], 1) || exchange_routing_keys
-        queue        = isimud_client.find_queue(event_queue_name)
-        exchange     = observed_exchange || Isimud.events_exchange
-        (prev_keys - current_keys).each { |key| queue.unbind(exchange, routing_key: key) }
-        log "Isimud::EventObserver: binding queue #{event_queue_name} on exchange #{exchange} with bindings [#{current_keys.join(',')}]"
-        (current_keys).each { |key| queue.bind(exchange, routing_key: key) }
-      else
-        isimud_client.delete_queue(event_queue_name)
-      end
+      delete_queue
+      create_queue if enable_listener? && exchange_routing_keys.any?
     end
 
     def delete_queue(client = isimud_client)

data/lib/isimud/test_client.rb

@@ -28,7 +28,6 @@ module Isimud
       end
 
       def cancel
-        @proc = nil
       end
 
       def delete(opts = {})
@@ -81,6 +80,7 @@ module Isimud
     end
 
     def delete_queue(queue_name)
+      log "Isimud::TestClient: deleting queue #{queue_name}"
       queues.delete(queue_name)
     end
 
@@ -89,13 +89,13 @@ module Isimud
       subscribe(queue, &block)
     end
 
-    def find_queue(queue_name, options = {})
+    def find_queue(queue_name, _options = {})
       queues[queue_name] ||= Queue.new(self, queue_name)
     end
 
     def create_queue(queue_name, exchange_name, options = {})
       keys = options[:routing_keys] || []
-      log "Isimud::TestClient: Binding queue #{queue_name} for keys #{keys.inspect}"
+      log "Isimud::TestClient: Binding queue #{queue_name} on exchange #{exchange_name} for keys #{keys.inspect}"
       queue = find_queue(queue_name)
       keys.each do |k|
         queue.bind(exchange_name, routing_key: k)
@@ -103,7 +103,8 @@ module Isimud
       queue
     end
 
-    def subscribe(queue, options = {}, &block)
+    def subscribe(queue, _options = {}, &block)
+      log "Isimud::TestClient: subscribing to events on queue #{queue.name}"
       queue.proc = block
       queue
     end

data/lib/isimud/version.rb

@@ -1,3 +1,3 @@
 module Isimud
-  VERSION = '1.4.6'
+  VERSION = '1.4.7'
 end

data/spec/internal/app/models/company.rb

@@ -22,11 +22,18 @@ class Company < ActiveRecord::Base
   end
 
   def handle_event(event)
+    Rails.logger.info "Company#handle_event: id=#{id} event=#{event.inspect}"
     user = User.find(event.parameters[:id])
     return unless user.company_id == id
-    raise "unexpected action: #{event.action}" unless ['create','destroy' ].include?(event.action.to_s)
-    self.user_count = User.where(company: self).count
-    self.total_points = user_count * points_per_user
+    case event.action
+      when :create
+        Rails.logger.info "recording new user for company #{id}"
+        self.user_count += 1
+        self.total_points += points_per_user
+      when :destroy
+        self.user_count -= 1
+        self.total_points -= points_per_user
+    end
     save!
   end
 end

data/spec/isimud/event_listener_spec.rb

@@ -1,9 +1,14 @@
 require 'spec_helper'
 
 describe Isimud::EventListener do
-  let!(:company) { Company.create(name: 'Google', active: true) }
+  before do
+    @company = Company.create(name: 'Google', active: true)
+    @listener = Isimud::EventListener.new(name: 'all_ears', error_limit: 5, exchange: 'test-listener')
+  end
+
+  let!(:company) { @company }
   let!(:inactive_company) { Company.create(name: 'Radio Shack', active: false) }
-  let!(:listener) { Isimud::EventListener.new(name: 'all_ears', error_limit: 5, exchange: 'test-listener') }
+  let!(:listener) { @listener }
 
   after(:each) do
     Isimud.client.reset
@@ -75,13 +80,9 @@ describe Isimud::EventListener do
 
       context 'handling observer update messages' do
         it 'reloads the observer and processes events accordingly' do
+          expect(listener).to receive(:unregister_observer).with('Company', company.id).and_call_original
+          expect(listener).to receive(:register_observer).with an_instance_of(Company)
           company.update_attributes!(points_per_user: 2)
-          expect(listener).to have_observer(company)
-          expect {
-            User.create!(company: company, first_name: 'Larry', last_name: 'Page')
-            company.reload
-          }.to change(company, :user_count).by(1)
-          expect(company.total_points).to eql(company.user_count * 2)
         end
       end
 

data/spec/isimud/event_observer_spec.rb

@@ -57,14 +57,9 @@ describe Isimud::EventObserver do
       end
 
       it 'creates the queue' do
-        expect(@client).to receive(:find_queue).with(@user.event_queue_name).and_call_original
-        @user.update_attributes(deactivated: false)
-      end
-
-      it 'binds the routing keys' do
-        @user.exchange_routing_keys.each do |k|
-          expect(@queue).to receive(:bind).with(@exchange, routing_key: k).and_call_original
-        end
+        expect(@client).to receive(:create_queue).with("combustion.user.#{@user.id}",
+                                                       @exchange,
+                                                       routing_keys: keys)
         @user.update_attributes(deactivated: false)
       end
     end
@@ -75,23 +70,17 @@ describe Isimud::EventObserver do
         @queue = @client.find_queue(@user.event_queue_name)
       end
 
-      it 'binds new keys' do
-        @user.exchange_routing_keys.each do |k|
-          expect(@queue).to receive(:bind).with(@exchange, routing_key: k).and_call_original
-        end
-        expect(@queue).to receive(:bind).with(@exchange, routing_key: 'some_other_value').and_call_original
+      it 'deletes and recreates the queue' do
+        new_keys = keys << 'some_other_value'
+        expect(@client).to receive(:delete_queue).with(@user.event_queue_name)
+        expect(@client).to receive(:create_queue).with("combustion.user.#{@user.id}",
+                                                       @exchange,
+                                                       routing_keys: new_keys)
         @user.transaction do
           @user.keys << 'some_other_value'
           @user.save!
         end
       end
-
-      it 'removes old keys' do
-        expect(@queue).to receive(:unbind).with(@exchange, routing_key: 'a.b.c')
-        expect(@queue).not_to receive(:unbind).with(@exchange, routing_key: 'd.*.f')
-        @user.keys.delete('a.b.c')
-        @user.save!
-      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: isimud
 version: !ruby/object:Gem::Version
-  version: 1.4.6
+  version: 1.4.7
 platform: ruby
 authors:
 - George Feil
@@ -31,7 +31,7 @@ cert_chain:
   wSKk31gq6KY7rgi11mcLvVzwSuwZFqnonAmu/uin3cbXcOUkqNsyzZ0LQLXNKiwi
   k0RgrsSNtQ8hcsVSQla0Ot+X3WpFI4ZuIfSLFA==
   -----END CERTIFICATE-----
-date: 2016-09-20 00:00:00.000000000 Z
+date: 2017-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -120,6 +120,7 @@ files:
 - checksum/isimud-1.4.3.gem.sha512
 - checksum/isimud-1.4.4.gem.sha512
 - checksum/isimud-1.4.5.gem.sha512
+- checksum/isimud-1.4.6.gem.sha512
 - config.ru
 - config/tddium.yml
 - doc/Isimud.html