ruby_rabbitmq_janus 3.0.0.pre.385 → 4.0.0.pre.939113634

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f2ca0d58fac3e63edecd2943918395a4fe895899fe50ebbe98404fab974f8a2
-  data.tar.gz: 18f8ef959a17619e9b2dedd2ca65f6ad407312230128ff5b7444d992ce78e381
+  metadata.gz: 6f1ce541747c48d06da968f51438155d38ce84c15f59b7610cb41e42ee588897
+  data.tar.gz: 10bb4edc2d13ff934c787f84454fde5844738051c9eb118738bcf66ecbbeaa6f
 SHA512:
-  metadata.gz: 80b1d227f402bcb6df27f30e6e6ccf5f87e5dfc614dade152986f8ab5c146450cb4a7876eee551ebbce28dc9bcdd771e6746936a9f3dd4e4f76a30966106b313
-  data.tar.gz: fb2d220836e330d50c26b89fdfcb7cb393e10fd7d2e9c5cd8c54e0b3d79c1b95fce1da43a70db7e9ffeaea14b47a97201fe2128c8b6cfdd636ea145d6c25bd68
+  metadata.gz: 6810f9782b8fcec0cb691e0bafc50708c970812b27a2c0a24d9a4327377746d2aec51a9c4bc3ef416ba1bb5df378c8f79e70d53f69e6ce881d93539ba268f2e0
+  data.tar.gz: 205ee2eee6067cba8698fe8a20a849f2575b880144089ee20655c53e8396a39d9bdbb89284f828eabe6ab66955e7dbd5b933096d29088e1696ba21bed71c4118

data/README.md

@@ -33,7 +33,6 @@ This gem is product by [Dazzl.tv](http://dazzl.tv)
     * [Read documentation](#read-documentation)
     * [Generate developer documentation](#generate-developer-documentation)
 * [Contributing](#contributing)
-* [Plus](#plus)
 
 ## How to use
 
@@ -281,8 +280,3 @@ Bug reports and pull requests are welcome on GitHub at
 https://github.com/dazzl-tv/ruby-rabbitmq-janus This project is intended to be a
 safe, welcoming space for collaboration, and contributors are expected to adhere
 to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
-
-## Plus
-
-Janus Admin Monitor project use this gem for manage data in Janus Meetecho with
-Admin/Monitor API.

data/config/default.yml

@@ -1,7 +1,7 @@
 # Rabbit information connection
 rabbit:
   # Precise RabbitMQ host - Default 'localhost'
-  host: localhost
+  host: rabbit
   # Precise RabbitMQ port - Default '5672'
   port: 5672
   # Precise RabbitMQ vhost - Default '/'
@@ -13,7 +13,7 @@ rabbit:
   # Password for admin request
   admin_pass: janusoverlord
   # Logger level for rabbitmq message
-  level: info
+  level: error
 
 # RabbitMQ Queue information
 queues:
@@ -53,12 +53,12 @@ gem:
   log:
     # Define level to log
     # UNKNOW, FATAL, ERROR, WARN, INFO, DEBUG
-    level: debug
+    level: info
     # Precise type logger
     # stdout    : Output standard.
     # file      : Create log file in path 'log/ruby-rabbitmq-janus.log'.
     # remote    : Use RemoteSyslogLogger (for papertrail)
-    type: file
+    type: stdout
     # Used with type. Complete missing data :
     # stdout    : no option
     # file      : filename used
@@ -73,7 +73,7 @@ gem:
   environment : 'development'
   # Precise ORM used :
   # mongoid or active_record
-  orm: 'mongoid'
+  orm: <%= ENV['MONGO'].eql?('true') ? 'mongoid' : 'active_record' %>
   # Read response json for RSpec
   response_path: 'spec/supports/rrj/responses'
   # Number of process read public queue

data/lib/rrj/errors/error.rb

@@ -34,9 +34,11 @@ module RubyRabbitmqJanus
   end
 end
 
-require 'rrj/errors/base/base'
 require 'rrj/errors/janus/janus'
+
 require 'rrj/errors/process/event'
 require 'rrj/errors/process/event_admin'
+
 require 'rrj/errors/tools/tools'
+
 require 'rrj/errors/rabbit/rabbit'

data/lib/rrj/errors/janus/janus.rb

@@ -1,17 +1,16 @@
 # frozen_string_literal: true
 
-require 'rrj/errors/janus/messages/message'
-require 'rrj/errors/janus/messages/admin'
-require 'rrj/errors/janus/messages/standard'
+module RubyRabbitmqJanus
+  module Errors
+    class BaseJanus < RRJError
+      def initialize(klass, message, level = :warn)
+        super "[Response][#{klass}] #{message}", level
+      end
+    end
+  end
+end
 
-require 'rrj/errors/janus/responses/base'
-
-require 'rrj/errors/janus/responses/code'
 require 'rrj/errors/janus/responses/admin'
+require 'rrj/errors/janus/responses/code'
 require 'rrj/errors/janus/responses/event'
 require 'rrj/errors/janus/responses/standard'
-
-require 'rrj/errors/janus/transactions/transaction'
-require 'rrj/errors/janus/transactions/admin'
-require 'rrj/errors/janus/transactions/handle'
-require 'rrj/errors/janus/transactions/session'

data/lib/rrj/errors/janus/responses/admin.rb

@@ -5,7 +5,7 @@ module RubyRabbitmqJanus
     module Janus
       module Responses
         module Admin
-          class Base < RubyRabbitmqJanus::Errors::Janus::Responses::Base
+          class Base < RubyRabbitmqJanus::Errors::BaseJanus
             def initialize(message)
               super 'Admin', message
             end

data/lib/rrj/errors/janus/responses/event.rb

@@ -5,7 +5,7 @@ module RubyRabbitmqJanus
     module Janus
       module Responses
         module Event
-          class Base < RubyRabbitmqJanus::Errors::Janus::Responses::Base
+          class Base < RubyRabbitmqJanus::Errors::BaseJanus
             def initialize(message)
               super 'Event', message
             end

data/lib/rrj/errors/janus/responses/standard.rb

@@ -5,7 +5,7 @@ module RubyRabbitmqJanus
     module Janus
       module Responses
         module Standard
-          class Base < RubyRabbitmqJanus::Errors::Janus::Responses::Base
+          class Base < RubyRabbitmqJanus::Errors::BaseJanus
             def initialize(message)
               super 'Standard', message
             end

data/lib/rrj/errors/rabbit/rabbit.rb

@@ -8,19 +8,46 @@ module RubyRabbitmqJanus
         super "[Rabbit]#{message}", level
       end
     end
-  end
-end
 
-require 'rrj/errors/rabbit/base_event'
-require 'rrj/errors/rabbit/connect'
-require 'rrj/errors/rabbit/propertie'
+    module Connect
+      # Error when transaction hs no block
+      class MissingAction < RubyRabbitmqJanus::Errors::BaseRabbit
+        def initialize
+          super 'Transaction failed, missing block'
+        end
+      end
+
+      # Error When transaction timeout
+      class TransactionTimeout < RubyRabbitmqJanus::Errors::BaseRabbit
+        def initialize(error)
+          super error
+        end
+      end
+    end
+
+    module Listener
+      # Error when response is empty
+      class ResponseEmpty < RubyRabbitmqJanus::Errors::BaseRabbit
+        def initialize(response)
+          super "Response is empty ! (#{response})"
+        end
+      end
 
-require 'rrj/errors/rabbit/listener/base'
-require 'rrj/errors/rabbit/listener/from'
-require 'rrj/errors/rabbit/listener/from_admin'
+      # Error when response is nil
+      class ResponseNil < RubyRabbitmqJanus::Errors::BaseRabbit
+        def initialize(response)
+          super "Response is nil ! (#{response})"
+        end
+      end
+    end
 
-require 'rrj/errors/rabbit/publisher/base'
-require 'rrj/errors/rabbit/publisher/admin'
-require 'rrj/errors/rabbit/publisher/exclusive'
-require 'rrj/errors/rabbit/publisher/keepalive'
-require 'rrj/errors/rabbit/publisher/non_exclusive'
+    module Publisher
+      # Error when correlation string is not equal
+      class TestCorrelation < RubyRabbitmqJanus::Errors::BaseRabbit
+        def initialize(message, propertie)
+          super "Correlation doesn't equal (msg: #{message}) != (prp: #{propertie})"
+        end
+      end
+    end
+  end
+end

data/lib/rrj/errors/tools/tools.rb

@@ -6,17 +6,53 @@ module RubyRabbitmqJanus
       # Define a super class for all error in Option class
       class BaseTools < RRJError
         def initialize(message, level = :fatal)
-          super("[Tools]#{message}", level)
+          super("[Tools][Config]#{message}", level)
+        end
+      end
+
+      module Config
+        class QueueFrom < RubyRabbitmqJanus::Errors::Tools::BaseTools
+          def initialize
+            super '[QueueFrom] Error for reading standard queue from'
+          end
+        end
+
+        class QueueTo < RubyRabbitmqJanus::Errors::Tools::BaseTools
+          def initialize
+            super '[QueueTo] Error for reading standard queue to'
+          end
+        end
+
+        class QueueAdminFrom < RubyRabbitmqJanus::Errors::Tools::BaseTools
+          def initialize
+            super '[QueueAdminFrom] Error for reading admin queue from'
+          end
+        end
+
+        class QueueAdminTo < RubyRabbitmqJanus::Errors::Tools::BaseTools
+          def initialize
+            super '[QueueAdminTo] Error for reading admin queue to'
+          end
+        end
+
+        class Plugins < RubyRabbitmqJanus::Errors::Tools::BaseTools
+          def initialize
+            super "[Plugins] Error for reading plugins at #{index}"
+          end
+        end
+
+        class AdminPassword < RubyRabbitmqJanus::Errors::Tools::BaseTools
+          def initialize
+            super '[AdminPassword] Error for reading option admin password', :warn
+          end
+        end
+
+        class Rabbitmq < RubyRabbitmqJanus::Errors::Tools::BaseTools
+          def initialize(value)
+            super "[RabbitMQConfig] Missing RabbitMQ configuration for key : #{value}", :fatal
+          end
         end
       end
     end
   end
 end
-
-require 'rrj/errors/tools/gem/cluster'
-require 'rrj/errors/tools/gem/log'
-require 'rrj/errors/tools/gem/option'
-require 'rrj/errors/tools/gem/request'
-
-require 'rrj/errors/tools/replaces/replace'
-require 'rrj/errors/tools/replaces/type'

data/lib/rrj/info.rb

@@ -6,7 +6,7 @@
 # Define constant to gem.
 module RubyRabbitmqJanus
   # Define version to gem
-  VERSION = '3.0.0'
+  VERSION = '4.0.0'
 
   # Name to gem
   GEM_NAME = 'ruby_rabbitmq_janus'

data/lib/rrj/models/active_record.rb

@@ -32,11 +32,9 @@ module RubyRabbitmqJanus
       #
       # @return [Hash] Current model
       #
-      # rubocop:disable Style/HashTransformValues
       def unset(attributes)
-        Hash[attributes.map { |key, _value| [key, nil] }]
+        [attributes.map { |key, _value| [key, nil] }].to_h
       end
-      # rubocop:enable Style/HashTransformValues
     end
   end
 end

data/lib/rrj/rabbit/connect.rb

@@ -15,7 +15,7 @@ module RubyRabbitmqJanus
 
       # Create an transaction with rabbitmq and close after response is received
       def transaction_short(&block)
-        raise Errors::Rabbit::Connect::MissingAction unless block
+        raise RubyRabbitmqJanus::Errors::Connect::MissingAction unless block
 
         response = nil
 
@@ -23,7 +23,8 @@ module RubyRabbitmqJanus
           response = transaction_long(&block)
         end
       rescue Timeout::Error
-        ::Log.error 'The "Short transaction" have raised Timeout exception.'
+        raise RubyRabbitmqJanus::Errors::Connect::TransactionTimeout, \
+              'The "Short transaction" have raised Timeout exception.'
       ensure
         close
         response
@@ -31,14 +32,15 @@ module RubyRabbitmqJanus
 
       # Create an transaction with rabbitmq and not close
       def transaction_long
-        raise Errors::Rabbit::Connect::MissingAction unless block_given?
+        raise RubyRabbitmqJanus::Errors::Connect::MissingAction unless block_given?
 
-        Timeout.timeout(10) do
+        Timeout.timeout(60) do
           start
           yield
         end
       rescue Timeout::Error
-        ::Log.error 'The "Long transaction" have raised Timeout exception.'
+        raise RubyRabbitmqJanus::Errors::Connect::TransactionTimeout, \
+              'The "Long transaction" have raised Timeout exception.'
       end
 
       # Opening a connection with RabbitMQ

data/lib/rrj/rails.rb

@@ -22,8 +22,8 @@ module RubyRabbitmqJanus
 
       Log.debug "[RRJ] Create process : #{number}"
       process = RubyRabbitmqJanus::Process::Concurrencies
-      actions = RubyRabbitmqJanus::ActionEvents.new.actions
-      admin_actions = RubyRabbitmqJanus::ActionAdminEvents.new.actions
+      actions = ActionEvents.new.actions
+      admin_actions = ActionAdminEvents.new.actions
 
       listeners = []
       (1..number).each do

data/lib/rrj/tools/gem/config.rb

@@ -34,7 +34,7 @@ module RubyRabbitmqJanus
 
       # Define HOME RRJ gem
       RRJ_HOME = File.realpath(File.join(File.dirname(__FILE__),
-                                         '..', '..', '..'))
+                                         '..', '..', '..', '..'))
 
       # Define a default name to file configuration
       CONF_DEFAULT = 'config/default.yml'

data/lib/rrj/tools/gem/config/gem.rb

@@ -12,7 +12,7 @@ module RubyRabbitmqJanus
     module ConfigGem
       # @return [Boolean] Read option file for a janus cluster section
       def cluster
-        @options['gem']['cluster']['enabled'].to_s.match?('true')
+        @options['gem']['cluster']['enabled'].to_s.match?('true') || false
       end
 
       # @return [Symbol] read configuration for log level used in this gem

data/lib/rrj/tools/gem/config/janus.rb

@@ -19,6 +19,8 @@ module RubyRabbitmqJanus
       # @return [String] read configuration for plugin with index
       def plugin_at(index = 0)
         @options['janus']['plugins'][index].to_s
+      rescue
+        raise RubyRabbitmqJanus::Errors::Tools::Plugins, index
       end
 
       alias ttl time_to_live

data/lib/rrj/tools/gem/config/queues.rb

@@ -11,21 +11,29 @@ module RubyRabbitmqJanus
       # @return [String] Get to name queue_from (pattern)
       def queue_from
         @options['queues']['standard']['from'].to_s
+      rescue
+        raise RubyRabbitmqJanus::Errors::Tools::QueueFrom
       end
 
       # @return [String] Get to name queue_to (pattern)
       def queue_to
         @options['queues']['standard']['to'].to_s
+      rescue
+        raise RubyRabbitmqJanus::Errors::Tools::QueueTo
       end
 
       # @return [String] Get to name queue_admin_from (pattern)
       def queue_admin_from
         @options['queues']['admin']['from'].to_s
+      rescue
+        raise RubyRabbitmqJanus::Errors::Tools::QueueAdminFrom
       end
 
       # @return [String] Get to name queue_admin_from (pattern)
       def queue_admin_to
         @options['queues']['admin']['to'].to_s
+      rescue
+        raise RubyRabbitmqJanus::Errors::Tools::QueueAdminTo
       end
     end
   end

data/lib/rrj/tools/gem/config/rabbit.rb

@@ -13,6 +13,8 @@ module RubyRabbitmqJanus
       # @return [String] read configuration fir queue admin
       def admin_pass
         @options['rabbit']['admin_pass'].to_s
+      rescue
+        raise RubyRabbitmqJanus::Errors::Tools::AdminPassword
       end
 
       # @return [Symbol] read configuration for bunny log level

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

@@ -56,11 +56,11 @@ module RubyRabbitmqJanus
         end
 
         def rewrite_key_to_string(node)
-          Hash[
+          [
             node.map do |key, value|
               [key.to_s, value?(value)]
             end
-          ]
+          ].to_h
         end
 
         def value?(value)

data/spec/config/database.yml

@@ -6,3 +6,4 @@ adapter: sqlite3
 encoding: utf-8
 database: ':memory:'
 timeout: 5000
+pool: 5

data/spec/ruby_rabbitmq_janus/models/janus_instance_instance_spec.rb

@@ -16,7 +16,7 @@ describe RubyRabbitmqJanus::Models::JanusInstance, type: :model,
   let(:id) { first.id }
 
   context 'when Janus instances are activated.' do
-    let(:instances) { FactoryBot.create_list(:janus_instance, size) }
+    let(:instances) { FactoryBot.create_list(:janus_instance, size, enable: true) }
     let(:count_enabled) { size }
     let(:count_destroyed) { 0 }
     let(:count_disabled) { 0 }