isimud 0.5.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83a83137b7deb41a7c90543b1bc5e357f80f8b3d
-  data.tar.gz: afa7acb7b71b8cd159a7a9cfd95ed461613566ff
+  metadata.gz: 4d99ac21afc822c85ea759b7b8f491c509ff4ff4
+  data.tar.gz: 2497cc27810dcaa21493b5a34171c045e18c04c3
 SHA512:
-  metadata.gz: 205e376894ca96ada6eb0859d24a619e98630e5d757cb30df84ff3674f8a378226778d16c1447956954c9d784f7ae5166782970ee6dff6e1dfcd8f6044426f22
-  data.tar.gz: 813394bb8976e04c1609a317d04c5e4054b868e6d85a83d53b5b67d6588dee2f4dc9b10c865c30b864e3f98ab12e17f4e9f828e287bdaa0586f186e3dbcf9ecf
+  metadata.gz: cb9fbfe6c72af9b21a40e01a706d4a1290fdeb076445ce1ce2fe87ade0e0dd8a7a3dacef53e8e94e616461484c633ba551c18ca6c41284b55e6cfbfb690b2264
+  data.tar.gz: 1f1a254579109ddc7428fafa0a2e2a3861d0cc8f494ec2d3f2950925506a3666d76c6be4350f187ea1d19879f814b4b19de6b901ba73ed9ee6bfa73a57798a14

data/.ruby-version

@@ -1 +1 @@
-2.2.3
+2.3.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    isimud (0.5.2)
+    isimud (0.6.0)
       activerecord (>= 3.2.17)
       activesupport (>= 3.2.17)
       bunny (>= 1.6.0)

data/README.md

@@ -77,6 +77,12 @@ if they do not exist.
 
 ## Changes
 
+### 0.6.0
+
+* Added Client#rebind to change the exchange and routing keys for a durable named queue. 
+* Changed BunnyClient#delete_queue to make it more reliable.
+* EventListener now uses a shared, durable queue for monitoring events on modified EventObserver instances.
+
 ### 0.5.2
 
 * Fixed regexp bug in TestClient affecting message delivery

data/certs/gfeil.pem

@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDeDCCAmCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBBMRQwEgYDVQQDDAtnZW9y
+Z2UuZmVpbDEUMBIGCgmSJomT8ixkARkWBGtlYXMxEzARBgoJkiaJk/IsZAEZFgNj
+b20wHhcNMTYwODA5MjEwNDU1WhcNMTcwODA5MjEwNDU1WjBBMRQwEgYDVQQDDAtn
+ZW9yZ2UuZmVpbDEUMBIGCgmSJomT8ixkARkWBGtlYXMxEzARBgoJkiaJk/IsZAEZ
+FgNjb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDFBKCoLQgCUv1
+86ykJOCtnWhQ12Eymfnu5btV3DKMMLxjUDG18vy1Clhw04afp36Rc+oMvP1VxYeH
+lRWdLtnWy2DAu2dxeFlWvacAegDcmQSw9vfyS7yD8zoLhJGeIflJ3eenTa+nRiQ2
+DBPL1qRdfSrBNBXVlTYvs/PGE0SLJPtil8oRsifqk7ETPCUx5gRSxzzp0JykjrUd
+cIu2u06Dv5GyDVwJu5/m4wLJSc2Bmore7rmOctBSNYtXTcMGVQOfskhncLNeE56V
+R7byYxJ92HQt4svMjbK0hN+27asFpXaVU9ZeNQeEOOsgq8ecdypAWjwlOaH580K5
+aH24zkstAgMBAAGjezB5MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
+BBSXpvM46ec2Ds6ErCpZkXFZtsEh7TAfBgNVHREEGDAWgRRnZW9yZ2UuZmVpbEBr
+ZWFzLmNvbTAfBgNVHRIEGDAWgRRnZW9yZ2UuZmVpbEBrZWFzLmNvbTANBgkqhkiG
+9w0BAQUFAAOCAQEAEXuMNAP35/nzBGj5aodPKIgH2Bvda9IF8OC4sDmQsRsUQzDw
+wRi3rWoNzUU+QexdZqhLXSwGuPNgMgmPKaOu09LjpKKbem9VDicUEhNDL27CYMJZ
+1oO1kEqjbZW60HZcfDNrw8Q6ARBRhKXpPJsbYrR2QRzx1P0oVkFtmc9Qu4gvFy3c
+hIevyUPfcaBRWNfXCQnyFXZcHqcTywEgNyXTJZ6zUNZSHIQPzLOyzqa+muVO8Ob/
+wSKk31gq6KY7rgi11mcLvVzwSuwZFqnonAmu/uin3cbXcOUkqNsyzZ0LQLXNKiwi
+k0RgrsSNtQ8hcsVSQla0Ot+X3WpFI4ZuIfSLFA==
+-----END CERTIFICATE-----

data/isimud.gemspec

@@ -4,14 +4,20 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'isimud/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = 'isimud'
-  spec.version       = Isimud::VERSION
-  spec.authors       = ['George Feil', 'Brian Jenkins']
-  spec.email         = %w{george.feil@keas.com bonkydog@bonkydog.com}
-  spec.summary       = %q{AMQP Messaging for Events and ActiveRecord changes}
-  spec.description   = %q{}
-  spec.homepage      = ''
-  spec.license       = "Copyright (C) 2014 Keas -- All rights reserved"
+  spec.name        = 'isimud'
+  spec.version     = Isimud::VERSION
+  spec.authors     = ['George Feil', 'Brian Jenkins']
+  spec.email       = %w{george.feil@keas.com bonkydog@bonkydog.com}
+  spec.summary     = %q{AMQP Messaging and Event Processing}
+  spec.description = <<-EOT
+Isimud is an AMQP message publishing and consumption gem intended for Rails applications. You can use it to define
+message consumption queues for ActiveRecord instances, or synchronize model updates between processes. It also provides
+an event listener background process for managing queues that consume messages.
+  EOT
+  spec.homepage    = 'https://github.com/KeasInc/isimud'
+  spec.license     = 'MITNFA'
+  spec.cert_chain  = ['certs/gfeil.pem']
+  spec.signing_key = File.expand_path("~/.ssh/gem-private_key.pem") if $0 =~ /gem\z/
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }

data/lib/isimud/bunny_client.rb

@@ -26,8 +26,8 @@ module Isimud
       subscribe_options = options[:subscribe_options] || {}
       log "Isimud: create_queue #{queue_name}: queue_options=#{queue_options.inspect} routing_keys=#{routing_keys.join(',')} subscribe_options=#{subscribe_options.inspect}"
       current_channel = channel
-      queue           = current_channel.queue(queue_name, queue_options)
-      routing_keys.each { |key| queue.bind(exchange_name, routing_key: key, nowait: false) }
+      queue           = find_queue(queue_name, queue_options)
+      bind_routing_keys(queue, exchange_name, routing_keys)
       queue.subscribe(subscribe_options) do |delivery_info, properties, payload|
         begin
           log "Isimud: queue #{queue_name} received #{delivery_info.delivery_tag} routing_key: #{delivery_info.routing_key}"
@@ -46,8 +46,18 @@ module Isimud
       queue
     end
 
+    # replace all bindings on a queue
+    def rebind(queue_name, exchange_name, routing_keys)
+      log "Isimud: rebinding queue #{queue_name} exchange #{exchange_name} routing_keys #{routing_keys.inspect}"
+      queue = find_queue(queue_name)
+      queue.unbind(exchange_name)
+      bind_routing_keys(queue, exchange_name, routing_keys)
+    rescue => e
+      log "Isimud: error rebinding #{queue_name} from #{exchange_name}: #{e.message}", :error
+    end
+
     def delete_queue(queue_name)
-      channel.queue(queue_name).delete
+      channel.queue_delete(queue_name)
     end
 
     def connection
@@ -83,13 +93,24 @@ module Isimud
       @connection = nil
     end
 
-    def publish(exchange, routing_key, payload)
-      channel.topic(exchange, durable: true).publish(payload, routing_key: routing_key, persistent: true)
+    def publish(exchange, routing_key, payload, options = {})
+      channel.topic(exchange, durable: true).publish(payload, options.merge(routing_key: routing_key, persistent: true))
     end
 
     def reconnect
       close
       connect
     end
+
+    private
+
+    def find_queue(queue_name, options = {durable: true})
+      channel.queue(queue_name, options)
+    end
+
+    def bind_routing_keys(queue, exchange_name, routing_keys)
+      routing_keys.each { |key| queue.bind(exchange_name, routing_key: key, nowait: false) }
+    end
+
   end
 end

data/lib/isimud/client.rb

@@ -33,12 +33,15 @@ module Isimud
       @exception_handler = block
     end
 
-    def publish(exchange, routing_key, payload)
+    def publish(exchange, routing_key, payload, options = {})
     end
 
     def reconnect
     end
 
+    def rebind(queue_name, exchange_name, *keys)
+    end
+
     def reset
     end
   end

data/lib/isimud/event.rb

@@ -4,6 +4,7 @@ module Isimud
   class Event
     include Isimud::Logging
     attr_accessor :type, :action, :user_id, :occurred_at, :eventful_type, :eventful_id, :attributes, :parameters
+    attr_reader :timestamp
     attr_writer :exchange
 
     DEFAULT_TYPE = :model
@@ -37,6 +38,7 @@ module Isimud
                          else
                            Time.now.utc
                          end
+      @timestamp       = Time.now
 
       eventful_object = options.delete(:eventful)
 
@@ -67,6 +69,13 @@ module Isimud
       [type.to_s, eventful_type, eventful_id, action].compact.join('.')
     end
 
+    # Message ID, which is generated from the exchange, routing_key, user_id, and timestamp. This is practically
+    # guaranteed to be unique across all publishers.
+    def message_id
+      [exchange, routing_key, user_id, timestamp.to_i, timestamp.nsec].join(':')
+    end
+
+
     # Return hash of data to be serialized to JSON
     # @option options [Boolean] :omit_parameters when set, do not include attributes or parameters in data
     # @return [Hash] data to serialize
@@ -106,7 +115,7 @@ module Isimud
     def publish
       data = self.serialize
       log "Event#publish: #{self.inspect}"
-      Isimud.client.publish(exchange, routing_key, data)
+      Isimud.client.publish(exchange, routing_key, data, message_id: message_id)
     end
   end
 end

data/lib/isimud/event_listener.rb

@@ -140,13 +140,16 @@ module Isimud
 
     def handle_observer_event(payload)
       event = JSON.parse(payload).with_indifferent_access
-      log "EventListener: received observer model message: #{payload.inspect}"
-      if %w(update destroy).include?(event[:action])
-        unregister_observer(event[:type], event[:id])
-      end
-      unless event[:action] == 'destroy'
-        observer = event[:type].constantize.find(event[:id])
-        register_observer(observer) if observer.enable_listener?
+      action = event[:action]
+      log "EventListener: received observer model message: #{event.inspect}"
+      observer = event[:type].constantize.find(event[:id]) unless action == 'destroy'
+      case
+        when action == 'create'
+          register_observer(observer) if observer.enable_listener?
+        when action == 'update' && observer.enable_listener?
+          rebind_observer(observer)
+        else
+          unregister_observer(event[:type], event[:id])
       end
     end
 
@@ -159,26 +162,25 @@ module Isimud
       end
     end
 
+    # Update the bindings for an observer.
+    def rebind_observer(observer)
+      log "EventListener: rebinding observer #{observer.class} #{observer.id}"
+      client.rebind(observer.event_queue_name, events_exchange, observer.routing_keys)
+    end
+
     # Delete a queue for an observer. This also purges all messages associated with it
     def unregister_observer(observer_class, observer_id)
       @observer_mutex.synchronize do
-        if (observer = @observers.delete(observer_key_for(observer_class, observer_id)))
-          begin
-            log "EventListener: unregistering #{observer.class} #{observer.id}"
-            queue_name = observer_class.constantize.event_queue_name(observer_id)
-            client.delete_queue(queue_name)
-          rescue => e
-            log "EventListener: error unregistering #{observer_class} #{observer_id}: #{e.message}", :warn
-          end
-        end
+        log "EventListener: un-registering observer #{observer_class} #{observer_id}"
+        queue_name = observer_class.constantize.event_queue_name(observer_id)
+        client.delete_queue(queue_name)
+        @observers.delete(observer_key_for(observer_class, observer_id))
       end
     end
 
     # Create or return the observer queue which listens for ModelWatcher events
     def observer_queue
-      @observer_queue ||= client.create_queue("#{name}.listener.#{Process.pid}", models_exchange,
-                                              queue_options:     {exclusive: true},
-                                              subscribe_options: {manual_ack: true}, &method(:handle_observer_event))
+      @observer_queue ||= client.create_queue("#{name}.listener", models_exchange, &method(:handle_observer_event))
     end
 
     # Register the observer class watcher

data/lib/isimud/event_observer.rb

@@ -41,12 +41,16 @@ 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.
     def observe_events(client, default_exchange)
-      client.bind(self.class.event_queue_name(id), observed_exchange || default_exchange, *routing_keys) do |message|
+      client.bind(event_queue_name, observed_exchange || default_exchange, *routing_keys) do |message|
         event = Event.parse(message)
         handle_event(event)
       end
     end
 
+    def event_queue_name
+      self.class.event_queue_name(id)
+    end
+
     module ClassMethods
       # Method used to retrieve active observers. Override in your EventObserver class
       def find_active_observers

data/lib/isimud/test_client.rb

@@ -18,6 +18,10 @@ module Isimud
         @routing_keys << Regexp.new(key.gsub(/\./, "\\.").gsub(/\*/, ".*"))
       end
 
+      def unbind(exchange)
+        @routing_keys.clear
+      end
+
       def has_matching_key?(route)
         @routing_keys.any? { |k| route =~ k }
       end
@@ -59,6 +63,12 @@ module Isimud
       create_queue(queue_name, exchange_name, routing_keys: keys, &method)
     end
 
+    def rebind(queue_name, exchange_name, keys)
+      queue = queues[queue_name] || return
+      queue.unbind(exchange_name)
+      keys.each { |key| queue.bind(exchange_name, routing_key: key) }
+    end
+
     def create_queue(queue_name, exchange_name, options = {}, &method)
       keys = options[:routing_keys] || []
       log "Isimud::TestClient: Binding queue #{queue_name} for keys #{keys.inspect}"
@@ -69,7 +79,7 @@ module Isimud
       queue
     end
 
-    def publish(exchange, routing_key, payload)
+    def publish(exchange, routing_key, payload, _options = {})
       log "Isimud::TestClient: Delivering message key: #{routing_key} payload: #{payload}"
       call_queues = queues.values.select { |queue| queue.has_matching_key?(routing_key) }
       call_queues.each do |queue|

data/lib/isimud/version.rb

@@ -1,3 +1,3 @@
 module Isimud
-  VERSION = '0.5.2'
+  VERSION = '0.7.0'
 end

data/release

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+
+require 'colored'
+require 'digest/sha2'
+require File.expand_path('lib/isimud/version.rb')
+
+def run!(command)
+  puts "running #{command}".yellow
+  system(command) || abort("Command #{command} failed, terminating!")
+end
+
+gem_name = 'isimud'
+gem_version = "#{gem_name}-#{Isimud::VERSION}.gem"
+built_gem_path = "pkg/#{gem_version}"
+puts "Building #{gem_name} version #{Isimud::VERSION}".cyan
+run! "gem build #{gem_name}.gemspec"
+run! "mv #{gem_version} #{built_gem_path}"
+
+puts 'Adding and committing checksum'.cyan
+checksum      = Digest::SHA512.new.hexdigest(File.read(built_gem_path))
+checksum_path = "checksum/#{gem_name}-#{Isimud::VERSION}.gem.sha512"
+File.open(checksum_path, 'w') { |f| f.write(checksum) }
+run! "git add #{checksum_path}"
+run! "git commit -m 'added checksum for #{gem_version}' && git push origin"
+
+puts 'Publishing to RubyGems'.cyan
+run! "gem push #{built_gem_path}"
+
+puts 'Testing install'.cyan
+run! "gem install #{gem_name} -v #{Isimud::VERSION} -P MediumSecurity"
+Contact GitHub API Training Shop Blog About

data/spec/isimud/bunny_client_spec.rb

@@ -19,9 +19,14 @@ describe Isimud::BunnyClient do
     let(:channel) { client.channel }
     let(:proc) { Proc.new { puts('hello') } }
     let(:keys) { %w(foo.bar baz.*) }
+    let(:queue_name) { 'my_queue' }
     before do
       Isimud.logger = Logger.new(STDOUT)
     end
+    after do
+      client.delete_queue(queue_name)
+    end
+
 
     it 'creates a new queue' do
       queue = client.bind('my_queue', @exchange_name, keys, &proc)
@@ -39,11 +44,12 @@ describe Isimud::BunnyClient do
 
     it 'calls block when a message is received' do
       @block_called = Array.new
-      queue_name    = 'test queue'
+      queue_name    = 'test_queue'
       client.bind("#{queue_name}", @exchange_name, 'my.test.key') do |payload|
         @block_called << payload
       end
       client.publish(@exchange_name, 'my.test.key', "Hi there")
+      sleep(1)
       expect(@block_called).to eq ['Hi there']
     end
   end

metadata

@@ -1,15 +1,37 @@
 --- !ruby/object:Gem::Specification
 name: isimud
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.7.0
 platform: ruby
 authors:
 - George Feil
 - Brian Jenkins
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2016-08-09 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDeDCCAmCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBBMRQwEgYDVQQDDAtnZW9y
+  Z2UuZmVpbDEUMBIGCgmSJomT8ixkARkWBGtlYXMxEzARBgoJkiaJk/IsZAEZFgNj
+  b20wHhcNMTYwODA5MjEwNDU1WhcNMTcwODA5MjEwNDU1WjBBMRQwEgYDVQQDDAtn
+  ZW9yZ2UuZmVpbDEUMBIGCgmSJomT8ixkARkWBGtlYXMxEzARBgoJkiaJk/IsZAEZ
+  FgNjb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDFBKCoLQgCUv1
+  86ykJOCtnWhQ12Eymfnu5btV3DKMMLxjUDG18vy1Clhw04afp36Rc+oMvP1VxYeH
+  lRWdLtnWy2DAu2dxeFlWvacAegDcmQSw9vfyS7yD8zoLhJGeIflJ3eenTa+nRiQ2
+  DBPL1qRdfSrBNBXVlTYvs/PGE0SLJPtil8oRsifqk7ETPCUx5gRSxzzp0JykjrUd
+  cIu2u06Dv5GyDVwJu5/m4wLJSc2Bmore7rmOctBSNYtXTcMGVQOfskhncLNeE56V
+  R7byYxJ92HQt4svMjbK0hN+27asFpXaVU9ZeNQeEOOsgq8ecdypAWjwlOaH580K5
+  aH24zkstAgMBAAGjezB5MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
+  BBSXpvM46ec2Ds6ErCpZkXFZtsEh7TAfBgNVHREEGDAWgRRnZW9yZ2UuZmVpbEBr
+  ZWFzLmNvbTAfBgNVHRIEGDAWgRRnZW9yZ2UuZmVpbEBrZWFzLmNvbTANBgkqhkiG
+  9w0BAQUFAAOCAQEAEXuMNAP35/nzBGj5aodPKIgH2Bvda9IF8OC4sDmQsRsUQzDw
+  wRi3rWoNzUU+QexdZqhLXSwGuPNgMgmPKaOu09LjpKKbem9VDicUEhNDL27CYMJZ
+  1oO1kEqjbZW60HZcfDNrw8Q6ARBRhKXpPJsbYrR2QRzx1P0oVkFtmc9Qu4gvFy3c
+  hIevyUPfcaBRWNfXCQnyFXZcHqcTywEgNyXTJZ6zUNZSHIQPzLOyzqa+muVO8Ob/
+  wSKk31gq6KY7rgi11mcLvVzwSuwZFqnonAmu/uin3cbXcOUkqNsyzZ0LQLXNKiwi
+  k0RgrsSNtQ8hcsVSQla0Ot+X3WpFI4ZuIfSLFA==
+  -----END CERTIFICATE-----
+date: 2016-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -67,7 +89,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.6
-description: ''
+description: |
+  Isimud is an AMQP message publishing and consumption gem intended for Rails applications. You can use it to define
+  message consumption queues for ActiveRecord instances, or synchronize model updates between processes. It also provides
+  an event listener background process for managing queues that consume messages.
 email:
 - george.feil@keas.com
 - bonkydog@bonkydog.com
@@ -86,6 +111,7 @@ files:
 - Gemfile.lock
 - README.md
 - Rakefile
+- certs/gfeil.pem
 - config.ru
 - config/tddium.yml
 - doc/Isimud.html
@@ -135,6 +161,7 @@ files:
 - lib/rails/generators/isimud/initializer_generator.rb
 - lib/rails/generators/isimud/templates/initializer.rb
 - lib/rails/generators/isimud/templates/isimud.yml
+- release
 - spec/internal/app/models/admin.rb
 - spec/internal/app/models/company.rb
 - spec/internal/app/models/user.rb
@@ -151,9 +178,9 @@ files:
 - spec/isimud/test_client_spec.rb
 - spec/isimud_spec.rb
 - spec/spec_helper.rb
-homepage: ''
+homepage: https://github.com/KeasInc/isimud
 licenses:
-- Copyright (C) 2014 Keas -- All rights reserved
+- MITNFA
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -171,10 +198,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: AMQP Messaging for Events and ActiveRecord changes
+summary: AMQP Messaging and Event Processing
 test_files:
 - spec/internal/app/models/admin.rb
 - spec/internal/app/models/company.rb

metadata.gz.sig

@@ -0,0 +1,2 @@
+�ޖb��=�ҖN?1��Ԉ]�~����e_{�/;��ަg9�L�L�)��!�>=z�@�O��ōV��{�^�|#LOg<��in̻��pI~�9�e;��L�mVDWh�"��Ľ�;
+B�(M�P�q�8i������ɲ�4���='(B���Y�E{Ez�xːde+*U֐!��D�i��Uu?��o�C�sX�1�UĂkW��x��f������E?gH�������i�h���wb�@