mimi-messaging 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1be22f48791e6d899580bb5b822b1042de26660a
-  data.tar.gz: 3c09e549007a840afb82e9406891546ab30cd3b2
+SHA256:
+  metadata.gz: cfa2d2cc7cda8ea79f956fd6325a43f873948cf88b9979516f5b6a72b3e3f364
+  data.tar.gz: c52eea14384c0d239fdda08571abf6086dd9059d8a81e8c6b688a9bf3cce88b6
 SHA512:
-  metadata.gz: a402e020ba4a665965fe3be91f3f8ab4dcff20c27851219f827e8217cb8eaf1ca6e37fe42bc39c9988e76c7fdc291d319a9bbdd7835daa1761304535870a6ac6
-  data.tar.gz: 8e451b8e41fcfaa998427d51b8551ab486612c1c15b555ed6c0c3ea21d7c8df993db2fd51049876af6ab930da668d9d79bc001418e53f9ae2747b00c9129906d
+  metadata.gz: 70c5318b5c1b4859715e778246a42571c4a3d97895719b688093189eac1a57b40814494a93f4b24a7e1663b39e4892fd53098e45ca9f9972079fcbf02c06faae
+  data.tar.gz: ca52430fd386ee9cd88c94c0acd3c3336f0323392ed44506bb5ac89d566d6093c8c269ad4fef356dfaaa2ee77fdd16e939d22fb6ca25546a5455a01eea3dde27

data/lib/mimi/messaging.rb

@@ -6,6 +6,9 @@ module Mimi
     include Mimi::Core::Module
     include Mimi::Logger::Instance
 
+    # key in the message headers that is used to pass context id
+    CONTEXT_ID_KEY = 'c'.freeze
+
     default_options(
       require_files: 'app/messaging/**/*.rb',
       mq_host: 'localhost',

data/lib/mimi/messaging/message.rb

@@ -17,8 +17,12 @@ module Mimi
       end
 
       def self.get(name, data = {}, opts = {})
-        d, m, response = Mimi::Messaging.get(
-          queue_name, encode(data), opts.deep_merge(headers: { method_name: name.to_s })
+        headers = {
+          method_name: name.to_s,
+          Mimi::Messaging::CONTEXT_ID_KEY => Mimi::Messaging.logger.context_id
+        }
+        _d, _m, response = Mimi::Messaging.get(
+          queue_name, encode(data), opts.deep_merge(headers: headers)
         )
         raise Timeout::Error unless response
         message = new(decode(response))
@@ -27,8 +31,12 @@ module Mimi
       end
 
       def self.post(name, data = {}, opts = {})
+        headers = {
+          method_name: name.to_s,
+          Mimi::Messaging::CONTEXT_ID_KEY => Mimi::Messaging.logger.context_id
+        }
         Mimi::Messaging.post(
-          queue_name, encode(data), opts.deep_merge(headers: { method_name: name.to_s })
+          queue_name, encode(data), opts.deep_merge(headers: headers)
         )
       end
 

data/lib/mimi/messaging/notification.rb

@@ -14,8 +14,12 @@ module Mimi
       end
 
       def self.broadcast(name, data = {}, opts = {})
+        headers = {
+          method_name: name.to_s,
+          Mimi::Messaging::CONTEXT_ID_KEY => Mimi::Messaging.logger.context_id
+        }
         Mimi::Messaging.broadcast(
-          notification_name, Message.encode(data), opts.merge(headers: { method_name: name.to_s })
+          notification_name, Message.encode(data), opts.merge(headers: headers)
         )
       end
 

data/lib/mimi/messaging/request_processor.rb

@@ -77,6 +77,7 @@ module Mimi
       end
 
       def initialize(d, m, p)
+        initialize_logging_context!(m.headers)
         @request = Mimi::Messaging::Request.new(self.class, d, m, p)
         @result = nil
         method_name = request.method_name
@@ -89,6 +90,18 @@ module Mimi
         end
       end
 
+      # Initializes logging context.
+      #
+      # Starts a new logging contenxt or inherits a context id from the message headers.
+      #
+      # @param headers [Hash,nil] message headers
+      #
+      def initialize_logging_context!(headers)
+        context_id = (headers || {})[Mimi::Messaging::CONTEXT_ID_KEY]
+        return logger.new_context! unless context_id
+        logger.context_id = context_id
+      end
+
       # Request logger
       #
       # Usage:

data/lib/mimi/messaging/version.rb

@@ -1,5 +1,5 @@
 module Mimi
   module Messaging
-    VERSION = '0.1.6'.freeze
+    VERSION = '0.1.7'.freeze
   end
 end

data/lib/tasks/console_helpers.rb

@@ -11,33 +11,92 @@ def message_class_for(queue_name)
   message_class
 end
 
-def get(queue_and_method_name, params = {})
+def get_timeout(value = nil)
+  return @get_current_timeout = value if value
+  help_get_timeout
+  puts
+  puts "Curret GET timeout is set at #{get_current_timeout}s"
+end
+
+def help_get_timeout
+  puts 'Usage: get_timeout <seconds>'
+  puts
+  puts 'Sets a timeout for GET requests.'
+  puts
+  puts 'Example:'
+  puts "  > get_timeout 15"
+end
+
+def get_current_timeout
+  @get_current_timeout || 5 # seconds
+end
+
+def get(queue_and_method_name = nil, params = {})
+  return help_get unless queue_and_method_name
   queue_name, method_name = queue_and_method_name.split('/')
   message_class = message_class_for(queue_name)
   puts "GET #{queue_name}/#{method_name}: #{params}"
   ts = Time.now
-  result = message_class.get(method_name, params)
+  result = message_class.get(method_name, params, timeout: get_current_timeout)
   puts 'Completed in %.1fms' % ((Time.now - ts) * 1000.0)
   result
 end
 
-def post(queue_and_method_name, params = {})
+def help_get
+  puts "Usage: get '<queue_name>/<method_name>' [, params]"
+  puts
+  puts 'Issues a GET request to a given queue/method and sends the message'
+  puts "constructed from params Hash. Awaits for a response for at most 'get_timeout' seconds."
+  puts
+  puts 'Example:'
+  puts "  > get 'accounts/list', page: 2"
+end
+
+def post(queue_and_method_name = nil, params = {})
+  return help_post unless queue_and_method_name
   queue_name, method_name = queue_and_method_name.split('/')
   message_class = message_class_for(queue_name)
   puts "POST #{queue_name}/#{method_name}: #{params}"
   message_class.post(method_name, params)
+  nil
+end
+
+def help_post
+  puts "Usage: post '<queue_name>/<method_name>' [, params]"
+  puts
+  puts 'Issues a POST request to a given queue/method and sends the message'
+  puts 'constructed from params Hash. Returns immediately'
+  puts
+  puts 'Example:'
+  puts "  > post 'accounts/create', name: 'Primary account', currency: 'BTC'"
 end
 
-def listen(notification_name)
+def listen(notification_name = nil, *method_names)
+  return help_listen unless notification_name
   listener_class = Class.new(Mimi::Messaging::Listener)
   listener_class.notification(notification_name)
-  listener_class.before do
-    logger.info "** #{request.canonical_name}: #{params}"
+  method_names.each do |method_name|
+    listener_class.send :define_method, method_name.to_sym do
+      puts "LISTEN #{listener_class.resource_name}/#{request.method_name}: #{params}"
+    end
+    puts "Listener for '#{notification_name}/#{method_name}' registered"
   end
-  puts "Listener for '#{notification_name}' installed"
+  listener_class.start
+  puts "Listener for '#{notification_name}' started"
+  nil
 end
 
-def broadcast(notification_and_method_name, params = {})
+def help_listen
+  puts "Usage: listen '<notification_name>' [, <method_name> ...]"
+  puts
+  puts 'Sets up a listener for notifications specified by notification and method names.'
+  puts
+  puts 'Example:'
+  puts "  > listen 'accounts', :created, :updated"
+end
+
+def broadcast(notification_and_method_name = nil, params = {})
+  return help_broadcast unless notification_and_method_name
   notification_name, method_name = notification_and_method_name.split('/')
   notification_class = Class.new(Mimi::Messaging::Notification)
   notification_class.notification(notification_name)
@@ -45,3 +104,13 @@ def broadcast(notification_and_method_name, params = {})
   notification_class.broadcast(method_name, params)
   nil
 end
+
+def help_broadcast
+  puts "Usage: broadcast '<notification_name>/<method_name>' [, params]"
+  puts
+  puts 'Broadcasts a notification message with a given name and method constructed'
+  puts 'from params Hash.'
+  puts
+  puts 'Example:'
+  puts "  > broadcast 'accounts/updated', id: 213, name: 'Secondary account', currency: 'BCH'"
+end

data/mimi-messaging.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   if spec.respond_to?(:metadata)
     spec.metadata['allowed_push_host'] = 'https://rubygems.org/'
   else
-    raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
+    raise 'RubyGems 2.0 or newer is required to protect against public gem pushes.'
   end
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
@@ -27,13 +27,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'mimi-core', '~> 0.1'
-  spec.add_dependency 'mimi-logger', '~> 0.1'
   spec.add_dependency 'bunny', '~> 2.9'
+  spec.add_dependency 'mimi-core', '~> 0.1'
+  spec.add_dependency 'mimi-logger', '~> 0.2', '>= 0.2.3'
   spec.add_dependency 'msgpack', '~> 1.2'
 
   spec.add_development_dependency 'bundler', '~> 1.11'
+  spec.add_development_dependency 'pry', '~> 0.10'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'pry', '~> 0.10'
 end

metadata

@@ -1,31 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: mimi-messaging
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Alex Kukushkin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-07 00:00:00.000000000 Z
+date: 2018-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: mimi-core
+  name: bunny
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '2.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '2.9'
 - !ruby/object:Gem::Dependency
-  name: mimi-logger
+  name: mimi-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -39,19 +39,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: bunny
+  name: mimi-logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
@@ -81,47 +87,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.11'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '3.0'
 description: Communications via RabbitMQ for mimi
 email:
 - alex@kukushk.in
@@ -179,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Communications via RabbitMQ for mimi