ruby_rabbitmq_janus 1.1.9 → 1.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3153d60baafdf940b9b95b691e9a96db5ddbb14
-  data.tar.gz: d55879f82f8a52e4dd17834de27b70f19b6a371c
+  metadata.gz: e43decf663e6b315b6bfa75620e9bc85023a0812
+  data.tar.gz: 67843fec8156528f645869d2628661fc419cf8f7
 SHA512:
-  metadata.gz: cc3ff0b7f739fbc25f1a253940f67305ccb8faa8208f60456fb3643c4ab3fc0cb524c42adb81f6e7b4557c72f8e115edc750dea301b4fe76a8ec830765871397
-  data.tar.gz: 72925fdbfee645bd0666faf7ca86877afc9a5f8d7b7a0f280385cc43030672b7a7fa2f2a18fca4ed1eb71276dffdac932ce451d4d28ddfe2663da993931865c4
+  metadata.gz: e4e212150e1e13db4a301f6b432938a061d82f29753086499343c6692ee0a9935ef4b56815304fb6f3e8cc6750ecefc437c0d3004d7a0e0506a895212832458a
+  data.tar.gz: 6ad38904fda8373e035c4520924e28630088e59be4c36d4dfe00a8870cc65c0d22589c153b00e37c31cbf78e5beb6d5460e8f2c365cba5e11ccf2302cf9e4d32

data/lib/generators/ruby_rabbitmq_janus/configuration_generator.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-# Module contains all lib to this gem
 module RubyRabbitmqJanus
   # Module for generators
   module Generators
@@ -10,7 +9,7 @@ module RubyRabbitmqJanus
 
       # Define root path for original file a copied
       def self.source_root
-        root_path = File.realpath(File.join(File.dirname(__FILE__), '..', '..', '..'))
+        root_path = File.realpath(root_path_gem)
         @_rrj_source_root ||= File.join(root_path, 'config')
       end
 
@@ -18,6 +17,13 @@ module RubyRabbitmqJanus
       def copy_configuration
         template 'default.yml', 'config/ruby-rabbitmq-janus.yml'
       end
+
+      private
+
+      # Define a root path
+      def root_path_gem
+        File.join(File.dirname(__FILE__), '..', '..', '..')
+      end
     end
   end
 end

data/lib/generators/ruby_rabbitmq_janus/create_request_generator.rb

@@ -3,15 +3,16 @@
 # Override String class
 class String
   # Character used for delimited an line
-  SEPARATOR_LINE = ','
+  SEP_LINE = ','
   # Character used for delimited an key and this value
-  SEPARATOR_KEY_VALUE = ':'
+  SEP_KEY = ':'
 
   # Converting a string with a format special to hash
   def converting_to_hash
     hash = {}
-    split(SEPARATOR_LINE).each do |couple_hash|
-      hash.merge! HashString.new(couple_hash.split(SEPARATOR_KEY_VALUE)).convert_in_hash
+    split(SEP_LINE).each do |couple_hash|
+      hash.merge! \
+        HashString.new(couple_hash.split(SEP_KEY)).convert_in_hash
     end
     hash
   end
@@ -35,12 +36,16 @@ class HashString
 
   # Test if string is hash
   def test_string_hash
-    value.include?('{') ? HashString.new(format_hash_string).convert_in_hash : value
+    if value.include?('{')
+      HashString.new(format_hash_string).convert_in_hash
+    else
+      value
+    end
   end
 
   # Transform string to hash
   def format_hash_string
-    @array.drop(1).join(':').sub('{', '').sub('}', '').split(String::SEPARATOR_KEY_VALUE)
+    @array.drop(1).join(':').sub('{', '').sub('}', '').split(String::SEP_KEY)
   end
 
   # Return the value for hash object
@@ -58,7 +63,8 @@ module RubyRabbitmqJanus
       argument :janus_type, type: :string, default: ''
       argument :content, type: :string, default: ''
 
-      # Create an file to json format in folder 'config/request/' to you Rails apps
+      # Create an file to json format in folder 'config/request/' to you
+      # Rails apps
       def create_request
         create_file file_json, write_json
       end
@@ -67,7 +73,11 @@ module RubyRabbitmqJanus
 
       # Create a path and name file
       def file_json
-        base_file = type_name.empty? ? 'config/requests' : create_folder?(type_name)
+        base_file = if type_name.empty?
+                      'config/requests'
+                    else
+                      create_folder?(type_name)
+                    end
         "#{base_file}/#{janus_type}.json"
       end
 

data/lib/generators/ruby_rabbitmq_janus/default_request_generator.rb

@@ -8,7 +8,7 @@ module RubyRabbitmqJanus
 
       # Define root path for original file a copied
       def self.source_root
-        root_path = File.realpath(File.join(File.dirname(__FILE__), '..', '..', '..'))
+        root_path = File.realpath(root_path_gem)
         @_rrj_source_root ||= File.join(root_path, 'config')
       end
 
@@ -16,6 +16,13 @@ module RubyRabbitmqJanus
       def copy_default_request
         directory 'requests', 'config/requests'
       end
+
+      private
+
+      # Define a root path
+      def root_path_gem
+        File.join(File.dirname(__FILE__), '..', '..', '..')
+      end
     end
   end
 end

data/lib/rrj/errors/config.rb

@@ -6,7 +6,8 @@ module RubyRabbitmqJanus
     # Define an error if the configuration file is not here
     class ConfigFileNotFound < Errors::RRJError
       def initialize(file)
-        super "Error for configuration file (#{file}), does on exist.", :error
+        super \
+          "Error for configuration file (#{file}), does on exist.", :error
       end
     end
 
@@ -14,7 +15,8 @@ module RubyRabbitmqJanus
     # Define and error if rubrik level is not present
     class LevelNotDefine < Errors::RRJError
       def initialize
-        super 'Error in configuration file : option level is not present.', :warn
+        super \
+          'Error in configuration file : option level is not present.', :warn
       end
     end
   end

data/lib/rrj/errors/error.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:disable Metrics/LineLength
 
 module RubyRabbitmqJanus
   # Define all error in gem
@@ -45,6 +46,7 @@ module RubyRabbitmqJanus
     end
   end
 end
+# rubocop:enable Metrics/LineLength
 
 require 'rrj/errors/janus'
 require 'rrj/errors/janus_message'

data/lib/rrj/errors/janus_response.rb

@@ -40,7 +40,8 @@ module RubyRabbitmqJanus
     # Define an exception for json
     class JanusResponseJson < JanusResponse
       def initialize(message)
-        super "Error transform to JSON : #{message[0]} -- message : #{message[1]}"
+        super \
+          "Error transform to JSON : #{message[0]} -- message : #{message[1]}"
       end
     end
 
@@ -56,7 +57,8 @@ module RubyRabbitmqJanus
     # Define an exception for hash
     class JanusResponseHash < JanusResponse
       def initialize(message)
-        super "Error transform to Hash : #{message[0]} -- message : #{message[1]}"
+        super \
+          "Error transform to Hash : #{message[0]} -- message : #{message[1]}"
       end
     end
 

data/lib/rrj/info.rb

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

data/lib/rrj/janus/messages/admin.rb

@@ -16,10 +16,11 @@ module RubyRabbitmqJanus
 
         private
 
-        # Transform raw request in request to janus, so replace element <string>, <number>
-        # and other with real value
+        # Transform raw request in request to janus, so replace element
+        # <string>, <number> and other with real value
         def prepare_request(options)
-          @request = Tools::Replaces::Admin.new(request, options).transform_request
+          @request = Tools::Replaces::Admin.new(request,
+                                                options).transform_request
           super
         end
       end

data/lib/rrj/janus/messages/message.rb

@@ -11,10 +11,10 @@ module RubyRabbitmqJanus
 
         # Instanciate an message
         # @param template_request [String] Name of request prepare
-        # @param [Hash] options Options to request (replace element or add in body)
+        # @param [Hash] options Options to request
         # @option options [String] :session_id Identifier to session
         # @option options [String] :handle_id Identifier to session manipulate
-        # @option options [Hash] :other Element contains in request sending to janus
+        # @option options [Hash] :other Element contains in request sending
         # @example Initialize a message
         #   Message.new('test', {
         #     "session_id": 42,
@@ -68,7 +68,7 @@ module RubyRabbitmqJanus
 
         # Load raw request
         def load_request_file
-          @request = JSON.parse File.read Tools::Requests.instance.requests[@type]
+          @request = request_instance
           Tools::Log.instance.debug "Opening request : #{to_json}"
         end
 
@@ -76,6 +76,11 @@ module RubyRabbitmqJanus
         def prepare_request(_options)
           Tools::Log.instance.debug "Prepare request for janus : #{to_json}"
         end
+
+        # Return request to json format
+        def request_instance
+          JSON.parse File.read Tools::Requests.instance.requests[@type]
+        end
       end
     end
   end

data/lib/rrj/janus/messages/standard.rb

@@ -15,10 +15,12 @@ module RubyRabbitmqJanus
 
         private
 
-        # Transform raw request in request to janus, so replace element <string>, <number>
+        # Transform raw request in request to janus, so replace element
+        # <string>, <number>
         # and other with real value
         def prepare_request(options)
-          @request = Tools::Replaces::Standard.new(request, options).transform_request
+          @request = Tools::Replaces::Standard.new(request,
+                                                   options).transform_request
           super
         end
       end

data/lib/rrj/janus/processus/event.rb

@@ -10,7 +10,8 @@ module RubyRabbitmqJanus
       class Event < Concurrency
         include Singleton
 
-        # Initialize Event object. Is used for listen an standard out queue to Janus
+        # Initialize Event object. Is used for listen an standard out queue to
+        # Janus
         def initialize
           super
           @publish = @response = nil
@@ -28,8 +29,8 @@ module RubyRabbitmqJanus
 
         # Initialize a thread
         def transaction_running
-          Thread.current.thread_variable_set(:publish,
-                                             Rabbit::Publisher::Listener.new(rabbit))
+          publisher = Rabbit::Publisher::Listener.new(rabbit)
+          Thread.current.thread_variable_set(:publish, publisher)
         end
       end
     end

data/lib/rrj/janus/responses/response.rb

@@ -62,7 +62,8 @@ module RubyRabbitmqJanus
 
         # Test if message response contains an error in plugin
         def error_plugin?
-          @request.key?('plugindata') && @request['plugindata']['data'].key?('error_code')
+          @request.key?('plugindata') && \
+            @request['plugindata']['data'].key?('error_code')
         end
       end
     end

data/lib/rrj/janus/transactions/admin.rb

@@ -14,7 +14,8 @@ module RubyRabbitmqJanus
           end
         end
 
-        # Choose queue, create an handle, connect to rabbitmq server and send messages
+        # Choose queue, create an handle, connect to rabbitmq server and send
+        # messages
         def handle_connect
           rabbit.transaction_long do
             choose_queue
@@ -29,7 +30,7 @@ module RubyRabbitmqJanus
             'session_id' => session,
             'handle_id' => handle,
             'add' => {
-              'admin_secret' => Tools::Config.instance.options['rabbit']['admin_pass']
+              'admin_secret' => admin_secret
             }
           }
           msg = Janus::Messages::Admin.new(type, opts.merge!(options))
@@ -54,6 +55,11 @@ module RubyRabbitmqJanus
           Tools::Log.instance.info 'Publish a message ...'
           Janus::Responses::Standard.new(publish.send_a_message(yield))
         end
+
+        # Read a admin pass in configuration file to this gem
+        def admin_secret
+          Tools::Config.instance.options['rabbit']['admin_pass']
+        end
       end
     end
   end

data/lib/rrj/janus/transactions/session.rb

@@ -4,7 +4,8 @@ module RubyRabbitmqJanus
   module Janus
     module Transactions
       # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
-      # This class work with janus and send a series of message for session level
+      # This class work with janus and send a series of message for session
+      # level
       class Session < Transaction
         # Connect to session and post an message
         def session_connect(exclusive)

data/lib/rrj/rabbit/propertie.rb

@@ -27,11 +27,18 @@ module RubyRabbitmqJanus
       def options_admin
         Tools::Log.instance.debug 'Add options to propertie to message'
         {
-          routing_key: Tools::Config.instance.options['queues']['admin']['queue_to'],
+          routing_key: routing_key,
           correlation_id: @correlation,
           content_type: 'application/json'
         }
       end
+
+      private
+
+      # Read configuration file to gem for reading a admin queue name
+      def routing_key
+        Tools::Config.instance.options['queues']['admin']['queue_to']
+      end
     end
   end
 end

data/lib/rrj/tools/env.rb

@@ -11,8 +11,8 @@ module RubyRabbitmqJanus
       # Test if a string contains a word ENV
       def test_env_var(configuration, key)
         test = configuration[key.to_s]
-        if test.is_a?(String)
-          test.include?('ENV') ? ENV[test.gsub("ENV['", '').gsub("']", '')] : test
+        if test.is_a?(String) && test.include?('ENV')
+          ENV[test.gsub("ENV['", '').gsub("']", '')]
         else
           test
         end

data/lib/rrj/tools/replaces/admin.rb

@@ -31,8 +31,7 @@ module RubyRabbitmqJanus
 
         # Replace admin secret in request
         def replace_admin
-          cfg = Tools::Config.instance.options['rabbit']
-          request['admin_secret'] = Tools::Env.instance.test_env_var(cfg, 'admin_pass')
+          request['admin_secret'] = admin_pass
         rescue => message
           Tools::Log.instance.warn "Error replace admin_secret : #{message}"
         end
@@ -50,6 +49,13 @@ module RubyRabbitmqJanus
         rescue => message
           Tools::Log.instance.warn "Error replace debug : #{message}"
         end
+
+        # Given a admin pass for request
+        def admin_pass
+          cfg = Tools::Config.instance.options['rabbit']
+          key = 'admin_pass'
+          Tools::Env.instance.test_env_var(cfg, key)
+        end
       end
     end
   end

data/lib/rrj/tools/replaces/replace.rb

@@ -14,7 +14,8 @@ module RubyRabbitmqJanus
           Tools::Log.instance.debug "Element to replace : #{@opts}"
         end
 
-        # Replace element in hash request with information used for this transaction
+        # Replace element in hash request with information used for this
+        # transaction
         # @return HASH request with element replace
         def transform_request
           replace_classic
@@ -36,9 +37,11 @@ module RubyRabbitmqJanus
           replace_plugin if @request.key?('plugin')
         end
 
-        # Create an transaction string and replace in request field with an String format
+        # Create an transaction string and replace in request field with an
+        # String format
         def replace_transaction
-          @request['transaction'].replace [*('A'..'Z'), *('0'..'9')].sample(10).join
+          @request['transaction'].replace \
+            [*('A'..'Z'), *('0'..'9')].sample(10).join
         rescue => message
           Tools::Log.instance.warn "Error transaction replace : #{message}"
         end
@@ -52,10 +55,15 @@ module RubyRabbitmqJanus
 
         # Replace plugin string
         def replace_plugin
-          @request['plugin'] = Tools::Config.instance.options['janus']['plugins'][0]
+          @request['plugin'] = plugin
         rescue => message
           Tools::Log.instance.warn "Error plugin replace : #{message}"
         end
+
+        # Return a first plugin to array in config gem
+        def plugin
+          Tools::Config.instance.options['janus']['plugins'][0]
+        end
       end
     end
   end

data/lib/rrj/tools/replaces/standard.rb

@@ -78,11 +78,16 @@ module RubyRabbitmqJanus
         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]
+              [key.to_s, value?(value)]
             end
           ]
         end
 
+        # Test the value is an array
+        def value?(value)
+          value.is_a?(Hash) ? rewrite_key_to_string(value) : value
+        end
+
         # Replace value in request Hash
         def running_hash(hash, parent = 'body')
           hash.each do |key, value|

data/spec/request/admin/request_handle_info_spec.rb

@@ -5,7 +5,8 @@ require 'spec_helper'
 describe 'RubyRabbitmqJanus::RRJ -- message type handle_info' do
   before(:example) { @type = 'admin::handle_info' }
 
-  describe '#message_admin', type: :request, level: :admin, name: :handle_info do
+  describe '#message_admin', type: :request,
+                             level: :admin, name: :handle_info do
     include_examples 'message_handle_admin should match json schema'
   end
 

data/spec/request/peer/request_trickle_spec.rb

@@ -7,7 +7,9 @@ describe 'RubyRabbitmqJanus::RRJ -- message type trickle', broken: true do
   before(:example) { @type = 'peer::trickle' }
 
   describe '#message_handle', type: :request, level: :peer, name: :trickle do
-    let(:cdd) { { 'sdpMid' => 'video', 'sdpMLineIndex' => 1, 'candidate' => '...' } }
+    let(:cdd) do
+      { 'sdpMid' => 'video', 'sdpMLineIndex' => 1, 'candidate' => '...' }
+    end
     let(:candidate) { { 'candidate' => cdd } }
     let(:candidates) { { 'candidates' => [cdd, cdd] } }
 

data/spec/rrj/rrj_rabbitmq_spec.rb

@@ -4,7 +4,8 @@ require 'spec_helper'
 
 describe 'RubyRabbitmqJanus::RabitMQ', type: :config, name: :rabbit do
   it 'Start connection with RabbitMQ server' do
-    expect(RubyRabbitmqJanus::Rabbit::Connect.new.start.class).to eq Bunny::Session
+    expect(RubyRabbitmqJanus::Rabbit::Connect.new.start.class).to \
+      eq Bunny::Session
   end
 
   it 'Close connection with RabbitMQ Server' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_rabbitmq_janus
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 1.1.10
 platform: ruby
 authors:
 - VAILLANT Jeremy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-01 00:00:00.000000000 Z
+date: 2016-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler