ruby_rabbitmq_janus 0.1.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c04994698a3ccfc133c0826a4bcd92dcc58ff41d
-  data.tar.gz: f9e4b1151c22937d7e31b572c4166a103e27709e
+  metadata.gz: 6030e029ea0bd2a5679dcad05087626f714ff188
+  data.tar.gz: a58783ef89a8357ca40f1fbcb67caf83ec622d07
 SHA512:
-  metadata.gz: b07f2dbd3e7e6dc9cd32eed1f321da24ff80348b98d222e609c5a6f2ba24d7afa50a43b262a154be81cbee55b05b744c7627cc8e0fbe33f09aa78924c48e5d14
-  data.tar.gz: b45f399e4e97bbad4b33f5a9e529f2508464c4128215b5b74b89ef915ac74eaba31b6e72396733f9e34057a59adfc6dac332d5fbaa6d320708ab8662bd8ac238
+  metadata.gz: 9e8fc17ef4c1567c5e59080c6516661fb0f7300e77ccaaf2dd45d181f6111b736085ad58a56d6f2e3808a8e6adb518d18e5854980e4d49e7a75de3a2badcd75e
+  data.tar.gz: 0ef125e275f278881be03b53c194d81d7a1a562faad21b2aa88c571876c705776a401d9be961fc247974e2b77ec04fddbadbb6f22af10bdd148be7238796ccee

data/README.md

@@ -1,5 +1,4 @@
 # ruby-rabbitmq-janus
-
 Ruby Gem for Janus WebRTC Gateway integration using RabbitMQ message queue
 
 This gem is used to communicate to a server Janus through RabbitMQ software (
@@ -12,6 +11,9 @@ in a queue for gem. Once the received message is decoded and returned through th
  * [Installation](#installation)
  * [Configuration](#configuration)
  * [Usage](#usage)
+    * [Usage Synchrounous](#usage-with-synchronous-request)
+    * [Usage Asynchrounous](#usage-with-asynchronous-request)
+    * [Aliases](#aliases)
 * [Development](#development)
  * [RSpec](#rspec-test)
  * [Documentation](#documentation)
@@ -22,7 +24,7 @@ in a queue for gem. Once the received message is decoded and returned through th
 
 Use bitbucket for installing gem in your Gemfile
 ```ruby
-gem 'ruby-rabbitmq-janus', '~> 0.1.0'
+gem 'ruby_rabbitmq_janus'
 ```
 
 ### Configuration
@@ -31,13 +33,15 @@ If you want used a customize configuration see [ruby-rabbitmq-janus.yml](config/
 
 ### Usage
 
-Exemple usage :
+#### Usage with synchronous request
+
+Exemple usage simple :
 ```ruby
 # Initialize gem
 transaction = RubyRabbitmqJanus::RRJ.new
 
 # Send a message type 'create'
-create = transaction.message_template_ask('create')
+create = transaction.message_template_ask_sync('create')
 => {"janus"=>"create",
  "transaction"=>"U5MZ8IYNLF",
  "correlation"=>"6e77d355-6c3e-450c-89ad-a5daeb8e006a"}
@@ -45,7 +49,7 @@ create_response = transaction.message_template_response(create)
 => {"janus"=>"success", "transaction"=>"U5MZ8IYNLF", "data"=>{"id"=>7123088323743398}}
 
 # Destroy session created
-destroy = transaction.message_template_ask('destroy')
+destroy = transaction.message_template_ask_sync('destroy')
 => {"janus"=>"destroy",
  "session_id"=>7123088323743398,
  "transaction"=>"PKS63VJD8C",
@@ -54,10 +58,44 @@ destroy_response = transaction_template_response(destroy)
 => {"janus"=>"success", "session_id"=>7123088323743398, "transaction"=>"PKS63VJD8C"}
 ```
 
-The methods message_template_ask and message_template_response have an aliases :wink:
+Example usage with a complex request :
+```ruby
+# Initialize gem
+transaction = RubyRabbitmqJanus::RRJ.new
+
+# Send a request type
+transaction.transaction_plugin do |session_running|
+  test = transaction.ask_sync('test', session_running)
+  session = transaction.response_sync(session_running)
+end
+```
+
+#### Usage with asynchronous request
+
+Exemple usage simple :
+
 ```ruby
-message_template_ask => ask
-message_template_response => response
+# Initialize gem
+transaction = RubyRabbitmqJanus::RRJ.new
+
+# Send a message type create
+create = transaction.ask_async('create')
+=> {"janus"=>"success", "session_id"=>1144864650609378, "transaction"=>"0XGUTFDLBK"}
+
+# Send a message type destroy
+transaction.ask_async('destroy', create)
+=> {"janus"=>"success", "session_id"=>1144864650609378, "transaction"=>"UPODB8YEG1"}
+```
+
+#### Aliases
+
+```ruby
+# Aliases to methods synchronous
+message_template_ask_sync => ask_sync
+message_template_response => response_sync
+
+# Aliases to methods asynchronous
+message_template_ask_async => ask_async
 ```
 
 ## Development

data/config/requests/test.json

@@ -0,0 +1,9 @@
+{
+  "janus": "message",
+  "session_id": "<number>",
+  "handle_id": "<number>",
+  "transaction": "<string>",
+  "body": {
+    "audio": false
+  }
+}

data/config.reek

@@ -1,3 +1,3 @@
 ---
 TooManyInstanceVariables:
-  max_instance_variables: 7
+  max_instance_variables: 8

data/lib/rrj/config.rb

@@ -5,9 +5,9 @@ require 'yaml'
 module RubyRabbitmqJanus
   # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
   # Loading a yaml file for apply a configuration to gem.
-  # @!attribute [r] options
-  #   @return  [RubyRabbitmqJanus::Config] Options to gem.
   class Config
+    include Singleton
+
     attr_reader :options
 
     # Define a default path to file configuration
@@ -20,12 +20,11 @@ module RubyRabbitmqJanus
     CUSTOMIZE_CONF = 'config/ruby-rabbitmq-janus.yml'
 
     # Initialize configuration file default or customize if exist
-    # @param logs [RubyRabbitmqJanus::Log] Load RubyRabbitmqJanus::Log to gem
-    def initialize(logs)
-      @logs = logs
-      @options = load_configuration(File.join(DEFAULT_PATH, DEFAULT_CONF))
-      override_configuration(File.join(Dir.pwd, CUSTOMIZE_CONF))
-      precise_log_level
+    def initialize
+      @options = nil
+      conf_customize
+      conf_default
+      define_log_level_used
     end
 
     private
@@ -33,20 +32,26 @@ module RubyRabbitmqJanus
     # Load configuration file yaml
     # @return [Yaml] Configuration file
     # @param file [String] Path to configuration file (with name)
+    # :reek:UtilityFunction { public_methods_only: true }
     def load_configuration(file)
-      @logs.info("Loading configuration file : #{file}")
+      Log.instance.info("Loading configuration file : #{file}")
       YAML.load(File.read(file))
     end
 
     # Load customize configuration file if exist
-    # @return [Yaml] Configuration file
-    # @param file [String] Path to configuration file (with name)
-    def override_configuration(file)
+    def conf_customize
+      file = File.join(Dir.pwd, CUSTOMIZE_CONF)
       @options = load_configuration(file) if File.exist?(file)
     end
 
-    def precise_log_level
-      @logs.level = @options['gem']['log']['level']
+    # Load default configuration if customize configuration doesn't exist
+    def conf_default
+      file = File.join(DEFAULT_PATH, DEFAULT_CONF)
+      @options ||= load_configuration(file)
+    end
+
+    def define_log_level_used
+      Log.instance.level = @options['gem']['log']['level']
     end
   end
 end

data/lib/rrj/init.rb

@@ -3,21 +3,20 @@
 module RubyRabbitmqJanus
   # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
   # Initialize gem
-  # @!attribute [r] rabbit
-  #   @return [RubyRabbitmqJanus::RabbitMQ] Object RabbitMQ for connection to RabbitMQ
-  #   server
-  # @!attribute [r] logs
-  #   @return [RubyRabbitmqJanus::Log] Object Log for manipulate logs
-  # @!attribute [r] settings
-  #   @return [RubyRabbitmqJanus::Config] Object Config to gem
+  # @!attribute [r] session
+  #   @return [Hash] Response to request sending in transaction
   class RRJ
+    attr_reader :session
+
     # Returns a new instance of RubyRabbitmqJanus
     def initialize
-      @logs = Log.instance
+      Log.instance
+      Config.instance
+      Requests.instance
+
+      @rabbit = RabbitMQ.new
 
-      @settings = RubyRabbitmqJanus::Config.new(@logs)
-      @requests = RubyRabbitmqJanus::Requests.new(@logs)
-      @rabbit = RubyRabbitmqJanus::RabbitMQ.new(@settings, @requests.requests, @logs)
+      @session = nil
     end
 
     # Send a message, to RabbitMQ, with a template JSON
@@ -27,8 +26,8 @@ module RubyRabbitmqJanus
     # @option opts [String] :janus The message type
     # @option opts [String] :transaction The transaction identifier
     # @option opts [Hash] :data The option data to request
-    def message_template_ask(template_used = 'info', opts = {})
-      @rabbit.ask_request(template_used, opts)
+    def message_template_ask_sync(template_used = 'info', opts = {})
+      @rabbit.ask_request_sync(template_used, opts)
     end
 
     # Send a message to RabbitMQ for reading a response
@@ -41,7 +40,34 @@ module RubyRabbitmqJanus
       @rabbit.ask_response(info_request)
     end
 
-    alias ask message_template_ask
-    alias response message_template_response
+    # Manage a transaction with an plugin in janus
+    # Is create an session and attach with a plugin configured in file conf to gem, then
+    # when a treatment is complet is destroy a session
+    # @yieldparam session_attach [Hash] Use a session created
+    # @yieldreturn [Hash] Contains a result to transaction with janus server
+    def transaction_plugin
+      @session = yield attach_session
+      destroy_session
+    end
+
+    def message_template_ask_async(template_used = 'info', opts = {})
+      @rabbit.ask_request_async(template_used, opts)
+    end
+
+    alias ask_async message_template_ask_async
+    alias ask_sync message_template_ask_sync
+    alias response_sync message_template_response
+
+    private
+
+    def attach_session
+      Log.instance.debug 'Create an session'
+      response_sync(ask_sync('attach', ask_sync('create')))
+    end
+
+    def destroy_session
+      Log.instance.debug 'Destroy an session'
+      response_sync(ask_sync('destroy', response_sync(ask_sync('detach', @session))))
+    end
   end
 end

data/lib/rrj/janus/janus.rb

@@ -9,23 +9,31 @@ module RubyRabbitmqJanus
     # Returns a new instance of Janus
     # @param connection [String] Connection to RabbitMQ server
     # @param logs [RRJ::Log] Instance to log
-    def initialize(connection, options, logs)
+    def initialize(connection)
       @channel = connection.create_channel
-      @queues = options['queues']
-      @plugins = options['janus']['plugins']
-      @logs = logs
     end
 
     # Send a message to RabbitMQ
+    # @param request [String] Type request used by transaction
+    # @param opts [Hash] Contains the parameters used by request if necessary
+    # @return [Hash] Result to request
     def send(request, opts)
-      message = MessageJanus.new(@plugins, @logs, opts)
-      message.send(request, @channel, @queues['queue_to'])
+      message = Sync.new(opts, @channel)
+      message.send(request)
+    end
+
+    def send_async(request, opts)
+      message = ASync.new(opts, @channel)
+      message.send(request)
     end
 
     # Read a message to RabbitMQ
+    # @param info_message [Hash] Information request asking to janus
+    # @param connection [Object] Object contains a information to connection
+    # @return [Hash] Result to request
     def read(info_message, connection)
-      response = ResponseJanus.new(@channel, connection, @logs, info_message)
-      response.read(@queues['queue_from'])
+      response = ResponseJanus.new(@channel, connection, info_message)
+      response.read
     end
   end
 end

data/lib/rrj/janus/message.rb

@@ -1,84 +1,31 @@
 # frozen_string_literal: true
 
-require 'json'
 require 'securerandom'
+require 'thread'
 
 module RubyRabbitmqJanus
   # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
   # Message Janus sending to rabbitmq server
   class MessageJanus
     # Initialiaze a message posting to RabbitMQ
-    def initialize(plugins, logs, opts)
+    # @param plugins [String] Name of plugin used by transaction
+    # @param logs [RubyRabbitmqJanus::Log] Instance log
+    # @param opts [Hash] Contains information to request sending
+    def initialize(opts_request, channel)
       @correlation = SecureRandom.uuid
-      @opts = opts
-      @plugins = plugins
-      @logs = logs
-      @my_request = nil
-      @message = nil
-    end
-
-    # Send a message to RabbitMQ server
-    def send(json, channel, queue_to)
-      @message = channel.default_exchange
-      @message.publish(test_request_and_replace(json),
-                       routing_key: queue_to,
-                       correlation_id: @correlation,
-                       content_type: 'application/json')
-      return_info_message
+      @options_request = opts_request
+      @channel = channel
     end
 
     private
 
-    # Prepare a hash request and replace information necessary for janus
-    def test_request_and_replace(json_file)
-      @my_request = JSON.parse(File.read(json_file))
-      replaces
-      @my_request.to_json
-    end
-
-    def replaces
-      replace_transaction
-      if @opts
-        replace_element('session_id')
-        replace_plugin
-        replace_element(@opts['handle_id'] ? 'handle_id' : 'sender', 'handle_id')
-      end
-    end
-
-    # Replace a transaction field with an String format
-    def replace_transaction
-      @my_request['transaction'] = [*('A'..'Z'), *('0'..'9')].sample(10).join
-    end
-
-    # Replace a session_id field with an Integer
-    def replace_element(value, value_replace = value)
-      add_return(value_replace, value_data_or_precise(value)) \
-        if @my_request[value_replace]
-    end
-
-    # Replace plugin used for transaction
-    def replace_plugin
-      my_plugin = @my_request['plugin']
-      if my_plugin
-        my_plugin = @plugins[my_plugin.delete('<plugin[').delete(']').to_i]
-        add_return('plugin', my_plugin)
-      end
-    end
-
-    # Prepare an Hash with information necessary to read a response in RabbitMQ queue
-    def return_info_message
-      @my_request['correlation'] = @correlation
-      @logs.debug @my_request
-      @my_request
-    end
-
-    def add_return(key, value)
-      @my_request[key] = value
-      @my_request.merge!(key => value)
-    end
+    attr_reader :channel, :options_request, :opts, :correlation, :my_request, :message
+    attr_reader :log
 
-    def value_data_or_precise(key)
-      @opts[key] || @opts['data']['id']
+    def define_request_sending(json)
+      request = Replace.new(json, @options_request)
+      @my_request = request.to_hash
+      request.to_json
     end
   end
 end

data/lib/rrj/janus/message_async.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module RubyRabbitmqJanus
+  # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
+  # Message Janus sending to rabbitmq server
+  class ASync < MessageJanus
+    def initialize(opts_request, channel)
+      super
+      @response = nil
+      @condition = ConditionVariable.new
+      @lock = Mutex.new
+      @reply = channel.queue('', exclusive: true)
+    end
+
+    # Send a message to RabbitMQ server
+    # @param json [String] Name of request used
+    # @param channel [Bunny::Channel] Channel used in transaction
+    # @param queue_to [String] Name of queue used for sending request in RabbitMQ
+    # @return [Hash] Result to request executed
+    def send(json)
+      Log.instance.debug 'Send a message ASYNCHRONE'
+      subscribe
+      channel_publish_message(json)
+    end
+
+    private
+
+    attr_reader :lock, :response
+
+    def channel_publish_message(json)
+      message = channel.default_exchange
+      message.publish(define_request_sending(json),
+                      reply_to: @reply.name,
+                      routing_key: Config.instance.options['queues']['queue_to'],
+                      correlation_id: correlation,
+                      content_type: 'application/json')
+      @lock.synchronize { @condition.wait(lock) }
+      @response
+    end
+
+    def subscribe
+      @reply.subscribe do |_delivery_info, properties, payload|
+        parse_queue properties, payload
+      end
+    end
+
+    def parse_queue(properties, payload)
+      if properties[:correlation_id] == correlation
+        @response = JSON.parse payload
+        @lock.synchronize { @condition.signal }
+      end
+    end
+  end
+end

data/lib/rrj/janus/message_sync.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module RubyRabbitmqJanus
+  # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
+  # Message Janus sending to rabbitmq server
+  class Sync < MessageJanus
+    def initialize(opts_request, channel)
+      super
+    end
+
+    # Send a message to RabbitMQ server
+    # @param json [String] Name of request used
+    # @param channel [Bunny::Channel] Channel used in transaction
+    # @param queue_to [String] Name of queue used for sending request in RabbitMQ
+    # @return [Hash] Result to request executed
+    def send(json)
+      message = channel.default_exchange
+      Log.instance.debug 'Send a message SYNCHRONE'
+      message.publish(define_request_sending(json),
+                      routing_key: Config.instance.options['queues']['queue_to'],
+                      correlation_id: correlation,
+                      content_type: 'application/json')
+      return_info_message
+    end
+
+    private
+
+    # Prepare an Hash with information necessary to read a response in RabbitMQ queue
+    def return_info_message
+      my_request['properties'] = { 'correlation' => correlation }
+      my_request
+    end
+  end
+end

data/lib/rrj/janus/response.rb

@@ -6,20 +6,20 @@ module RubyRabbitmqJanus
   # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
   # Response Janus received to RabbitMQ server
   class ResponseJanus
-    def initialize(channel, connection, logs, opts = {})
+    # Initialiaze a response reading in RabbitMQ queue
+    def initialize(channel, connection, opts = {})
       @channel = channel
       @connection = connection
       @opts = opts
-      @logs = logs
       @response = nil
     end
 
     # Read a response to janus (in RabbitMQ queue)
     # @return [Hash] resultat to request
-    def read(queue_from)
-      option_sub = { block: true, manual_ack: false, exclusive: false }
-      the_queue = @channel.queue(queue_from)
-      the_queue.subscribe(option_sub) do |info, prop, pay|
+    def read
+      Log.instance.debug 'Read a response'
+      the_queue = @channel.queue(Config.instance.options['queues']['queue_from'])
+      the_queue.subscribe(block: true) do |info, prop, pay|
         listen(info, prop, pay)
       end
       return_response_json
@@ -29,12 +29,13 @@ module RubyRabbitmqJanus
 
     # Listen a response to queue
     def listen(_delivery_info, properties, payload)
-      if @opts['correlation'] == properties[:correlation_id]
+      if @opts['properties']['correlation'] == properties[:correlation_id]
         @response = payload
         @connection.close
       end
     end
 
+    # Format the response returning
     def return_response_json
       @response = JSON.parse(@response)
       case @opts['janus']
@@ -43,16 +44,12 @@ module RubyRabbitmqJanus
       when 'attach'
         merge('handle_id')
       end
-      @logs.debug @response
       @response
     end
 
-    def resp
-      @response['data']['id']
-    end
-
+    # Update value to element in Hash
     def merge(key)
-      @response[key] = resp
+      @response[key] = @response['data']['id']
     end
   end
 end

data/lib/rrj/log.rb

@@ -17,38 +17,45 @@ module RubyRabbitmqJanus
     # Define a default level to gem (:warn, :info, :debug)
     DEFAULT_LEVEL = :debug
 
+    attr_reader :log_file
+
     # Returns a new instance to Log
     def initialize
       @logs = Logging.logger[Time.now.to_s + ' --']
       @logs.level = DEFAULT_LEVEL
-      @logs.add_appenders Logging.appenders.file(DEFAULT_LOG_DIR + '/' + DEFAULT_LOG_NAME)
+      @log_file = DEFAULT_LOG_DIR + '/' + DEFAULT_LOG_NAME
+      @logs.add_appenders Logging.appenders.file(@log_file)
 
-      welcome = "\n"\
-        "====================================\n" \
-        "### Start gem Rails Rabbit Janus ###\n" \
-        '===================================='
+      welcome = '### Start gem Rails Rabbit Janus ###'
       @logs.info(welcome)
     end
 
+    # Level to log
+    # @return [Integer] The level to log instance
     def level
       @logs.level
     end
 
+    # Save level to log
+    # @param level [Symbol] Save log level used by this gem
     def level=(level)
       @logs.level = level
     end
 
     # Write a message in log with a warn level
+    # @param message [String] Message writing in warning level in log
     def warn(message)
       @logs.warn(message)
     end
 
     # Write a message in log with a info level
+    # @param message [String] Message writing in info level in log
     def info(message)
       @logs.info(message)
     end
 
     # Write a message in log with a debug level
+    # @param message [String] Message writing in debug level in log
     def debug(message)
       @logs.debug(message)
     end

data/lib/rrj/rabbitmq/rabbitmq.rb

@@ -7,22 +7,24 @@ module RubyRabbitmqJanus
   # Class for connection with RabbitMQ Server
   class RabbitMQ
     # Return a new instance to RabbitMQ
-    # @param configuration [RRJ::Config] Configuration file to gem
-    # @param requests [Hash] Request sending to RabbitMQ
-    # @param logs [RRJ::Log] Log to gem
-    def initialize(configuration, requests, logs)
-      @settings = configuration
-      @logs = logs
-      @requests = requests
+    def initialize
       @connection = Bunny.new(read_options_server)
-      @response = nil
-      @janus = nil
+      @janus, @response = nil
     end
 
     # Connect to server RabbitMQ and post a message in queue ('to-janus' by default)
-    def ask_request(request_type, opts)
+    def ask_request_sync(request_type, opts)
       execute_request do
-        @response = @janus.send(@requests[request_type.to_s], opts)
+        rqt = Requests.instance.requests[request_type.to_s]
+        @response = @janus.send(rqt, opts)
+        close_server_rabbitmq
+      end
+    end
+
+    def ask_request_async(request_type, opts)
+      execute_request do
+        rqt = Requests.instance.requests[request_type.to_s]
+        @response = @janus.send_async(rqt, opts)
         close_server_rabbitmq
       end
     end
@@ -49,10 +51,22 @@ module RubyRabbitmqJanus
     end
 
     # Use configuration information to connect RabbitMQ
+    # This method smells of :reek:DuplicateMethodCall
+    # This method smells of :reek:TooManyStatements
+    # This method smells of :reek:FeatureEnvy
     def read_options_server
       hash = {}
-      @settings.options.fetch('server').each do |key, server|
-        hash.merge!(key.to_sym => server.to_s)
+      hash.merge!(define_options)
+      hash['log_level'] = Log.instance.level
+      hash['log_file'] = Log.instance.log_file
+      hash
+    end
+
+    # This method smells of :reek:UtilityFunction
+    def define_options
+      hash = {}
+      Config.instance.options.fetch('server').each do |key, server|
+        hash[key.to_sym] = server.to_s
       end
       hash
     end
@@ -60,7 +74,7 @@ module RubyRabbitmqJanus
     # Execute request
     def execute_request
       open_server_rabbitmq
-      @janus = Janus.new(@connection, @settings.options, @logs)
+      @janus = Janus.new(@connection)
       yield
       @response
     end

data/lib/rrj/request/path.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'key_path'
+
+module RubyRabbitmqJanus
+  # aze
+  # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
+  class Path
+    attr_reader :path, :parent, :child, :value
+
+    def initialize(key)
+      @path = KeyPath::Path.new key
+      @parent = @path.parent.to_s
+      @child = @path.to_s.gsub(@parent + '.', '')
+    end
+
+    def path
+      @path.to_s
+    end
+  end
+end

data/lib/rrj/request/replaces.rb

@@ -0,0 +1,109 @@
+# frozen_string_literal: true
+
+require 'json'
+require 'key_path'
+
+module RubyRabbitmqJanus
+  # Format message request with good data
+  # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
+  class Replace
+    def initialize(json_file, opts)
+      @request = JSON.parse(File.read(json_file))
+      @opts = opts
+      @path = nil
+    end
+
+    def to_hash
+      Hash @request
+    end
+
+    def to_json
+      replaces
+      @request.to_json
+    end
+
+    private
+
+    # Replace element in json request with information used by transaction
+    def replaces
+      create_transaction
+      return unless @opts
+      replace_standard_elements
+      replace_specific_elements if @opts.key?(:other_key) && @request.key?('body')
+    end
+
+    # Create an transaction string and replace in request field with an String format
+    def create_transaction
+      @request['transaction'] = [*('A'..'Z'), *('0'..'9')].sample(10).join
+    end
+
+    def replace_standard_elements
+      replace_element('session_id')
+      replace_plugin
+      replace_element(@opts['handle_id'] ? 'handle_id' : 'sender', 'handle_id')
+    end
+
+    def replace_specific_elements
+      if request_as_replace_specific
+        new_hash = rewrite_key_to_string(@opts[:other_key])
+        running_hash(new_hash)
+      end
+    end
+
+    # Replace a session_id field with an Integer
+    def replace_element(value, value_replace = value)
+      add_return(value_replace, value_data_or_precise(value)) \
+        if @request[value_replace]
+    end
+
+    # Format the response return
+    def value_data_or_precise(key)
+      @opts[key] || @opts['data']['id']
+    end
+
+    # Format the json used for request sending
+    def add_return(key, value)
+      @request[key] = value
+      @request.merge!(key => value)
+    end
+
+    # Replace plugin used for transaction
+    def replace_plugin
+      my_plugin = @request['plugin']
+      if my_plugin
+        number = TypeData.new(my_plugin)
+        add_return('plugin', Config.instance.options['janus']['plugins'][number.format])
+      end
+    end
+
+    # Rewrite key symbol to string
+    def rewrite_key_to_string(node)
+      Hash[
+        node.map do |key, value|
+          [key.to_s, value.is_a?(Hash) ? rewrite_key_to_string(value) : value]
+        end
+      ]
+    end
+
+    def running_hash(hash, parent = '')
+      hash.each do |key, value|
+        if value.is_a?(Hash)
+          running_hash(value, new_parent(key, parent))
+        else
+          @request[parent][key] = value
+        end
+      end
+    end
+
+    def request_as_replace_specific
+      ['<string>', '<number>'].each do |value|
+        return true if @request['body'].value?(value)
+      end
+    end
+
+    # This is method smells of :reek:UtilityFunction
+    def new_parent(key, parent)
+      "#{parent}#{'.' unless parent.empty?}#{key}"
+    end
+  end
+end

data/lib/rrj/{requests.rb → request/requests.rb}

@@ -5,17 +5,18 @@ module RubyRabbitmqJanus
   # Load files json in config/request.
   # This file is used for sending a request to RabbitMQ
   # @!attribute [r] requests
-  #   @return [RubyRabbitmqJanus::Request] Array to request
   class Requests
+    include Singleton
+
     attr_reader :requests
 
     # Define folder to request
     PATH_REQUEST = 'config/requests/'
 
     # Load all requests in folder
-    def initialize(logs)
+    def initialize
       @requests = {}
-      logs.info "Loading all requests in : #{PATH_REQUEST}"
+      Log.instance.info "Loading all requests in : #{PATH_REQUEST}"
       Dir[File.join(PATH_REQUEST, '*')].count do |file|
         if File.file?(file)
           read_file(file)

data/lib/rrj/request/type_data.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module RubyRabbitmqJanus
+  # Format data with type corresponding
+  class TypeData
+    def initialize(type, value = nil)
+      @type = type
+      @value = value
+    end
+
+    # Cast a string
+    def format
+      case @type
+      when '<number>'
+        @value.to_i
+      when '<string>'
+        @value.to_s
+      when /^(?<plugin\[[0-9]\]>)/
+        extract_plugin_number
+      end
+    end
+
+    private
+
+    # Extract the number of plugin to used for this request
+    def extract_plugin_number
+      @type.delete('<plugin[').delete(']').to_i
+    end
+  end
+end

data/lib/rrj/version.rb

@@ -3,7 +3,7 @@
 # Define constant to gem.
 module RubyRabbitmqJanus
   # Define version to gem
-  VERSION = '0.1.1'
+  VERSION = '0.3.0'
 
   # Define a summary description to gem
   SUMMARY = 'Ruby RabbitMQ Janus'

data/lib/ruby_rabbitmq_janus.rb

@@ -4,11 +4,17 @@ require 'rrj/version'
 require 'rrj/init'
 require 'rrj/log'
 require 'rrj/config'
-require 'rrj/requests'
+
+require 'rrj/request/requests'
+require 'rrj/request/type_data'
+require 'rrj/request/replaces'
+require 'rrj/request/path'
 
 require 'rrj/rabbitmq/rabbitmq'
 
 require 'rrj/janus/janus'
 require 'rrj/janus/message'
+require 'rrj/janus/message_sync'
+require 'rrj/janus/message_async'
 require 'rrj/janus/response'
 require 'rrj/janus/error'

data/rrj.gemspec

@@ -32,4 +32,6 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'bunny', '~> 2.5'
   spec.add_runtime_dependency 'logging', '~> 2.1'
+  spec.add_runtime_dependency 'key_path', '~> 1.2'
+  spec.add_runtime_dependency 'thread', '~> 0.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_rabbitmq_janus
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.3.0
 platform: ruby
 authors:
 - VAILLANT Jeremy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-07 00:00:00.000000000 Z
+date: 2016-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -224,6 +224,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: key_path
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: thread
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.2
 description: This gem is used to communicate to a server Janus through RabbitMQ software
   (Message-oriented middleware). It waiting a messages to Rails API who send to RabbitMQ
   server in a queue for janus server. Janus processes a message and send to RabbitMQ
@@ -253,15 +281,21 @@ files:
 - config/requests/destroy.json
 - config/requests/detach.json
 - config/requests/info.json
+- config/requests/test.json
 - lib/rrj/config.rb
 - lib/rrj/init.rb
 - lib/rrj/janus/error.rb
 - lib/rrj/janus/janus.rb
 - lib/rrj/janus/message.rb
+- lib/rrj/janus/message_async.rb
+- lib/rrj/janus/message_sync.rb
 - lib/rrj/janus/response.rb
 - lib/rrj/log.rb
 - lib/rrj/rabbitmq/rabbitmq.rb
-- lib/rrj/requests.rb
+- lib/rrj/request/path.rb
+- lib/rrj/request/replaces.rb
+- lib/rrj/request/requests.rb
+- lib/rrj/request/type_data.rb
 - lib/rrj/version.rb
 - lib/ruby_rabbitmq_janus.rb
 - rrj.gemspec