ruby_rabbitmq_janus 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4878f39325bc19260e50a953e77acfadfda78eb9
-  data.tar.gz: bea625c521c11a72fec35463c9dcd502d0cb740f
+  metadata.gz: 4442e6cfe70b5849e144634d20819ab5b807911a
+  data.tar.gz: 1d7a808a28f4f02621f11f5bc24e5870eb522b05
 SHA512:
-  metadata.gz: 4d6da165b55dac47eabfcf856b8689f053a673de18b7df026c2364803f135d6dcdf494fd74f8f5b462fb81fea9dcb6b3be7846355d331841ee9fdf2b75de2144
-  data.tar.gz: 4742b640660dbc6aee4e4c8dff7a1bb99f9b8fd8af5281c211dde372ec571cb8c92178a59f951149bb587170482197f59ad1673a82678efd7e0b4b87ecd56ded
+  metadata.gz: 243ed337cf2fd115dca62301b556a1a47c0089a85c939aa3ed45fdb13ddf02fa2e6a6693e7c8398d09f38c61ed7a6ac3017d01c5782d332d1016d091f0e195be
+  data.tar.gz: fd60aeb4aa64da37dd9ad5c4e190c45ba3b5a29f6befe73aecce132281a23794d9c2bd14de8a1f628a9fea4fb3b6b4962287560aa138fc6144dabd90ae6df117

data/lib/rrj/info.rb

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

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

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

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

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

data/lib/rrj/rabbit/publish/listener.rb

@@ -25,7 +25,7 @@ module RubyRabbitmqJanus
           lock.synchronize do
             condition.wait(lock)
             Tools::Log.instance.info 'Janus event received .. treatment ..'
-            yield @response.event, @response.data, @response.jsep
+            yield @response.event, @response
           end
         end
 
@@ -34,9 +34,7 @@ module RubyRabbitmqJanus
         # Sending an signal when an response is reading in queue
         def synchronize_response(payload)
           @response = Janus::Responses::Event.new(JSON.parse(payload))
-          Tools::Log.instance.info \
-            "[X] Message number reading ##{@count} --\n\r" \
-            "#{@response.to_hash}"
+          Tools::Log.instance.info "[X] Message number reading ##{@count}"
           @count += 1
           lock.synchronize { condition.signal }
         end

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

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module RubyRabbitmqJanus
+  module Tools
+    module Replaces
+      # Format message request with good data to HASH format for Admin request
+      # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
+      class Admin < Standard
+        private
+
+        # Replace classic elements and for admin elements
+        def replace_classic
+          super
+          replace_admins if request.key?('admin_secret')
+          add_secret if opts.key?('add')
+        end
+
+        # Add string secret for admin request
+        def add_secret
+          values = opts['add']
+          Tools::Log.instance.debug "Values add : #{values}"
+          request.merge!(values)
+        end
+
+        # Replace elements admins if present
+        def replace_admins
+          replace_admin
+          replace_level if request.key?('level')
+          replace_debug if request.key?('debug')
+        end
+
+        # 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')
+        rescue => message
+          Tools::Log.instance.warn "Error replace admin_secret : #{message}"
+        end
+
+        # Replace level element
+        def replace_level
+          request['level'] = opts['level']
+        rescue => message
+          Tools::Log.instance.warn "Error replace level : #{message}"
+        end
+
+        # Replace debug element
+        def replace_debug
+          request['debug'] = opts['debug']
+        rescue => message
+          Tools::Log.instance.warn "Error replace debug : #{message}"
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module RubyRabbitmqJanus
+  module Tools
+    module Replaces
+      # Tools for replace elements in request sending to Rabbitmq
+      # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
+      class Replace
+        # Initialize tool replace
+        def initialize(request, options = {})
+          @request = request
+          @opts = options
+          Tools::Log.instance.debug "Element to replace : #{@opts}"
+        end
+
+        # Replace element in hash request with information used for this transaction
+        # @return HASH request with element replace
+        def transform_request
+          replace_classic
+          unless @opts.empty?
+            replace_other if test_presence?('replace')
+            add_other if test_presence?('add')
+          end
+          @request
+        end
+
+        private
+
+        attr_reader :request, :opts
+
+        # Replace basic elements
+        def replace_classic
+          replace_transaction if @request.key?('transaction')
+        end
+
+        # 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
+        rescue => message
+          Tools::Log.instance.warn "Error transaction replace : #{message}"
+        end
+      end
+    end
+  end
+end
+
+require 'rrj/tools/replaces/standard'
+require 'rrj/tools/replaces/admin'

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

@@ -0,0 +1,117 @@
+# frozen_string_literal: true
+
+module RubyRabbitmqJanus
+  module Tools
+    module Replaces
+      # Format message request with good data to HASH format
+      # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
+      class Standard < Replace
+        private
+
+        # Replace classic elements
+        def replace_classic
+          super
+          replace_session if request.key?('session_id')
+          replace_plugin if request.key?('plugin')
+          replace_handle if request.key?('handle_id')
+          replace_candidate if request.key?('candidate')
+        end
+
+        # Read option session and replace in request
+        def replace_session
+          request['session_id'] = opts['session_id']
+        rescue => message
+          Tools::Log.instance.warn "Error session replace : #{message}"
+        end
+
+        # Replace plugin string
+        def replace_plugin
+          request['plugin'] = Tools::Config.instance.options['janus']['plugins'][0]
+        rescue => message
+          Tools::Log.instance.warn "Error plugin replace : #{message}"
+        end
+
+        # Replace handle integer
+        def replace_handle
+          request['handle_id'] = opts['handle_id']
+        rescue => message
+          Tools::Log.instance.warn "Error handle replace : #{message}"
+        end
+
+        # Replace candidate, or candidates
+        def replace_candidate
+          save_candidate(candidates?)
+        rescue => message
+          Tools::Log.instance.warn "Error candidate replace : #{message}"
+        end
+
+        # Save candidate or candidates in request
+        def save_candidate(value)
+          if opts.key?('candidates')
+            request['candidates'] = value
+          else
+            request['candidate'] = value
+          end
+        end
+
+        # Test candidates or candidate
+        def candidates?
+          options = opts['replace']
+          if options.key?('candidates')
+            request['candidates'] = request['candidate']
+            request.delete('candidate')
+            options['candidates']
+          else
+            options['candidate']
+          end
+        end
+
+        # Replace other element in request
+        def replace_other
+          values = opts['replace']
+          running_hash(rewrite_key_to_string(values))
+        rescue => message
+          Tools::Log.instance.warn "Error REPLACE other field : #{message}"
+        end
+
+        # Adds other element to request
+        def add_other
+          values = opts['add']
+          request['body'].merge!(values)
+        rescue => message
+          Tools::Log.instance.warn "Error ADD other field : #{message}"
+        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
+
+        # Replace value in request Hash
+        def running_hash(hash, parent = 'body')
+          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
+
+        # Return a key to hash parsing
+        def new_parent(key, parent)
+          "#{parent}#{'.' unless parent.empty?}#{key}"
+        end
+
+        # Test presence of key in many hash
+        def test_presence?(presence_of_key)
+          opts.key?(presence_of_key) && request.key?('body')
+        end
+      end
+    end
+  end
+end

data/lib/rrj/tools/tools.rb

@@ -4,8 +4,7 @@ require 'rrj/tools/log'
 require 'rrj/tools/env'
 require 'rrj/tools/config'
 require 'rrj/tools/requests'
-require 'rrj/tools/replaces'
-require 'rrj/tools/replaces_admin'
+require 'rrj/tools/replaces/replace'
 
 module RubyRabbitmqJanus
   # Contains all tools necessary in this gem

data/listen.rb

@@ -6,8 +6,8 @@ require 'ruby_rabbitmq_janus'
 @t = RubyRabbitmqJanus::RRJ.new
 @e = RubyRabbitmqJanus::Janus::Concurrencies::Event.instance
 
-def case_event(data, jsep)
-  puts "REASON : Event : #{data} -- #{jsep}"
+def case_event(response)
+  puts "REASON : Event : #{response.to_hash}"
 end
 
 def case_hangup(data)
@@ -23,12 +23,12 @@ def case_stop
   Thread.current.stop
 end
 
-events = lambda do |reason, data, jsep = nil|
+events = lambda do |reason, response|
   puts "Execute block code with reason : #{reason}"
   case reason
-  when 'event' then case_event(data, jsep)
-  when 'hangup' then case_hangup(data)
-  when 'error' then case_error(data)
+  when 'event' then case_event(response)
+  when 'hangup' then case_hangup(response)
+  when 'error' then case_error(response)
   when 'stop' then case_stop
   else
     puts 'REASON default'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_rabbitmq_janus
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - VAILLANT Jeremy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-21 00:00:00.000000000 Z
+date: 2016-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -366,8 +366,9 @@ files:
 - lib/rrj/tools/config.rb
 - lib/rrj/tools/env.rb
 - lib/rrj/tools/log.rb
-- lib/rrj/tools/replaces.rb
-- lib/rrj/tools/replaces_admin.rb
+- lib/rrj/tools/replaces/admin.rb
+- lib/rrj/tools/replaces/replace.rb
+- lib/rrj/tools/replaces/standard.rb
 - lib/rrj/tools/requests.rb
 - lib/rrj/tools/tools.rb
 - lib/ruby_rabbitmq_janus.rb

data/lib/rrj/tools/replaces.rb

@@ -1,147 +0,0 @@
-# frozen_string_literal: true
-# :reek:TooManyMethods and :reek:NilCheck
-
-module RubyRabbitmqJanus
-  module Tools
-    # Format message request with good data to HASH format
-    # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
-    # rubocop:disable Metrics/ClassLength
-    class Replace
-      # Initialize a tool replace
-      def initialize(request, options = {})
-        @request = request
-        @opts = options
-        Tools::Log.instance.debug "Element to replace : #{@opts}"
-      end
-
-      # Replace element in hash request with information used for this transaction
-      # @return HASH request with element replace
-      def transform_request
-        replace_classic
-        unless @opts.empty?
-          replace_other if test_presence?('replace')
-          add_other if test_presence?('add')
-        end
-        @request
-      end
-
-      private
-
-      attr_reader :request, :opts
-
-      # Replace classic elements
-      def replace_classic
-        replace_transaction if @request.key?('transaction')
-        replace_session if @request.key?('session_id')
-        replace_plugin if @request.key?('plugin')
-        replace_handle if @request.key?('handle_id')
-        replace_candidate if @request.key?('candidate')
-      end
-
-      # 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
-      rescue => message
-        Tools::Log.instance.warn "Error transaction replace : #{message}"
-      end
-
-      # Read option session and replace in request
-      def replace_session
-        @request['session_id'] = @opts['session_id']
-      rescue => message
-        Tools::Log.instance.warn "Error session replace : #{message}"
-      end
-
-      # Replace plugin string
-      def replace_plugin
-        @request['plugin'] = Tools::Config.instance.options['janus']['plugins'][0]
-      rescue => message
-        Tools::Log.instance.warn "Error plugin replace : #{message}"
-      end
-
-      # Replace handle integer
-      def replace_handle
-        @request['handle_id'] = @opts['handle_id']
-      rescue => message
-        Tools::Log.instance.warn "Error handle replace : #{message}"
-      end
-
-      # Replace candidate, or candidates
-      def replace_candidate
-        save_candidate(candidates?)
-      rescue => message
-        Tools::Log.instance.warn "Error candidate replace : #{message}"
-      end
-
-      # Save candidate or candidates in request
-      def save_candidate(value)
-        if @opts.key?('candidates')
-          @request['candidates'] = value
-        else
-          @request['candidate'] = value
-        end
-      end
-
-      # Test candidates or candidate
-      def candidates?
-        opts = @opts['replace']
-        if @opts.key?('candidates')
-          @request['candidates'] = @request['candidate']
-          @request.delete('candidate')
-          opts['candidates']
-        else
-          opts['candidate']
-        end
-      end
-
-      # Replace other element in request
-      def replace_other
-        values = @opts['replace']
-        running_hash(rewrite_key_to_string(values))
-      rescue => message
-        Tools::Log.instance.warn "Error REPLACE other field : #{message}"
-      end
-
-      # Adds other element to request
-      def add_other
-        values = @opts['add']
-        @request['body'].merge!(values)
-      rescue => message
-        Tools::Log.instance.warn "Error ADD other field : #{message}"
-      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
-
-      # Replace value in request Hash
-      def running_hash(hash, parent = 'body')
-        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
-
-      # Return a key to hash parsing
-      def new_parent(key, parent)
-        "#{parent}#{'.' unless parent.empty?}#{key}"
-      end
-
-      # Test presence of key in many hash
-      def test_presence?(presence_of_key)
-        @opts.key?(presence_of_key) && \
-          @request.key?('body') && \
-          !@opts[presence_of_key].nil?
-      end
-    end
-    # rubocop:enable Metrics/ClassLength
-  end
-end

data/lib/rrj/tools/replaces_admin.rb

@@ -1,54 +0,0 @@
-# frozen_string_literal: true
-
-module RubyRabbitmqJanus
-  module Tools
-    # Format message request with good data to HASH format for Admin request
-    # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
-    class AdminReplace < Replace
-      private
-
-      # Replace classic elements and for admin elements
-      def replace_classic
-        super
-        replace_admins if request.key?('admin_secret')
-        add_secret if opts.key?('add')
-      end
-
-      # Add string secret for admin request
-      def add_secret
-        values = opts['add']
-        Tools::Log.instance.debug "Values add : #{values}"
-        request.merge!(values)
-      end
-
-      # Replace elements admins if present
-      def replace_admins
-        replace_admin
-        replace_level if request.key?('level')
-        replace_debug if request.key?('debug')
-      end
-
-      # 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')
-      rescue => message
-        Tools::Log.instance.warn "Error replace admin_secret : #{message}"
-      end
-
-      # Replace level element
-      def replace_level
-        request['level'] = opts['level']
-      rescue => message
-        Tools::Log.instance.warn "Error replace level : #{message}"
-      end
-
-      # Replace debug element
-      def replace_debug
-        request['debug'] = opts['debug']
-      rescue => message
-        Tools::Log.instance.warn "Error replace debug : #{message}"
-      end
-    end
-  end
-end