ruby_rabbitmq_janus 2.2.0.pre.42 → 2.2.0.pre.159

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5f7f8a44b723ed992abbde848a25695bc35df85
-  data.tar.gz: 1c4069bc56dd828876f35e3ed9041f78ee1addfd
+  metadata.gz: 00285c936506050da48005b5aa88d3d1a807033d
+  data.tar.gz: 4936bc5671f055b7916566c9c5bd538151ac8910
 SHA512:
-  metadata.gz: 47cb62ccb6c9ae3c8fda9c57aa30e9aded8a2c75c28521b39338e5cbd68261975cb46cde52604f669484a6679c128ca93b48ea867472e998a7ea86b7b2d75d67
-  data.tar.gz: 882fae4ab47b161503ed0ea8c7b7feb84bcd58bf02e020d71551f8b487278e245ef07c51a7cc4823ec417092fd171b12a8ff352579706dfb0fb7ca6118d8fa02
+  metadata.gz: 503a9222f16ea2e6b1cd67b5a0155dd884be45e866bca9186470b080540bfe608963054cde66f765c568acc2e70dfe62abd8469f4e79abefd7cd2b0679809957
+  data.tar.gz: d1983a18e3d50b7565ac64f872655f9f3a741f4214ea45d6a4483313c3bb4a268145d85cfc6a8939ee0f97de0943f47fe803cc9745ce4bd4727ac8f891bcbe03

data/Rakefile

@@ -5,106 +5,4 @@ require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-RSpec::Core::RakeTask.new(:no_request_spec) do |t|
-  t.rspec_opts = '--tag ~type:request'
-end
-
-RSpec::Core::RakeTask.new(:info) do |t|
-  t.rspec_opts = '--tag name:info'
-end
-
-RSpec::Core::RakeTask.new(:handle_info) do |t|
-  t.rspec_opts = '--tag name:handle_info'
-end
-
-RSpec::Core::RakeTask.new(:handles) do |t|
-  t.rspec_opts = '--tag name:handles'
-end
-
-RSpec::Core::RakeTask.new(:sessions) do |t|
-  t.rspec_opts = '--tag name:sessions'
-end
-
-RSpec::Core::RakeTask.new(:set_locking_debug) do |t|
-  t.rspec_opts = '--tag name:set_locking_debug'
-end
-
-RSpec::Core::RakeTask.new(:set_log_level) do |t|
-  t.rspec_opts = '--tag name:set_log_level'
-end
-
-RSpec::Core::RakeTask.new(:tokens) do |t|
-  t.rspec_opts = '--tag name:tokens'
-end
-
-RSpec::Core::RakeTask.new(:attach) do |t|
-  t.rspec_opts = '--tag name:attach'
-end
-
-RSpec::Core::RakeTask.new(:create) do |t|
-  t.rspec_opts = '--tag name:create'
-end
-
-RSpec::Core::RakeTask.new(:destroy) do |t|
-  t.rspec_opts = '--tag name:destroy'
-end
-
-RSpec::Core::RakeTask.new(:detach) do |t|
-  t.rspec_opts = '--tag name:detach'
-end
-
-RSpec::Core::RakeTask.new(:keepalive) do |t|
-  t.rspec_opts = '--tag name:keepalive'
-end
-
-RSpec::Core::RakeTask.new(:offer) do |t|
-  t.rspec_opts = '--tag name:offer'
-end
-
-RSpec::Core::RakeTask.new(:trickle) do |t|
-  t.rspec_opts = '--tag name:trickle'
-end
-
-RSpec::Core::RakeTask.new(:trickles) do |t|
-  t.rspec_opts = '--tag name:trickles'
-end
-
-RSpec::Core::RakeTask.new(:type_tools) do |t|
-  t.rspec_opts = '--tag type:tools'
-end
-
-RSpec::Core::RakeTask.new(:type_cluster) do |t|
-  t.rspec_opts = '--tag type:cluster'
-end
-
-RSpec::Core::RakeTask.new(:type_config) do |t|
-  t.rspec_opts = '--tag type:config'
-end
-
-RSpec::Core::RakeTask.new(:type_responses) do |t|
-  t.rspec_opts = '--tag type:responses'
-end
-
-RSpec::Core::RakeTask.new(:type_rabbit) do |t|
-  t.rspec_opts = '--tag type:rabbit'
-end
-
-RSpec::Core::RakeTask.new(:type_message) do |t|
-  t.rspec_opts = '--tag type:message'
-end
-
-RSpec::Core::RakeTask.new(:except_request) do |t|
-  t.rspec_opts = '--tag ~type:request'
-end
-
-RSpec::Core::RakeTask.new(:instances) do |t|
-  t.rspec_opts = '--tag instances:true'
-end
-
 task default: :spec
-
-task all: [:info, :handle_info, :sessions, :set_locking_debug,
-           :set_log_level, :tokens, :attach, :create, :destroy,
-           :detach, :keepalive, :offer, :trickle, :trickles,
-           :except_request]
-task two_instances: :instances

data/lib/generators/ruby_rabbitmq_janus/templates/initializer.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 # This test disable this gems execution when you running an task with rake
-if File.basename($PROGRAM_NAME) == 'rake'
+# or if your start a Rails Console
+if File.basename($PROGRAM_NAME).match?('rake') || defined?(::Rails::Console)
   # Configure RRJ for rake task
   ::RRJ = RubyRabbitmqJanus::RRJTask.new
 else

data/lib/generators/ruby_rabbitmq_janus/templates/migration.rb

@@ -9,7 +9,7 @@ class CreateRubyRabbitmqJanusTables < ActiveRecord::Migration[5.0]
       table.integer :instance
       table.integer :session, limit: 8
       table.boolean :enable
-      table.boolean :thread
+      table.integer :thread, limit: 8
     end
   end
 end

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

@@ -6,50 +6,44 @@ module RubyRabbitmqJanus
       # Define a super class for Janus::Responses::ResponseStandard
       class BaseResponseStandard < BaseResponse
         def initialize(message, level = :fatal)
-          super "[Response] #{message}", level
+          super "[Response]#{message}", level
         end
       end
 
       module ResponseStandard
-        # Error for Janus::Responses::ResponseStandard#initialize
         class Session < BaseResponseStandard
           def initialize
-            super 'Error reading response session (data_id in response)'
+            super '[Session] Error reading response session (data_id in response)'
           end
         end
 
-        # Error for Janus::Responses::ResponseStandard#session_id
         class SessionId < BaseResponseStandard
           def initialize
-            super 'Error reading response session_id'
+            super '[SessionId] Error reading response session_id'
           end
         end
 
-        # Error for Janus::Responses::ResponseStandard#plugin
         class Plugin < BaseResponseStandard
           def initialize
-            super 'Error reading response plugin'
+            super '[Plugin] Error reading response plugin'
           end
         end
 
-        # Error for Janus::Responses::ResponseStandard#plugin_data
         class PluginData < BaseResponseStandard
           def initialize
-            super 'Error reading response plugin data'
+            super '[PluginData] Error reading response plugin data'
           end
         end
 
-        # Error for Janus::Responses::ResponseStandard#data
         class Data < BaseResponseStandard
           def initialize
-            super 'Error reading response data'
+            super '[Data] Error reading response data'
           end
         end
 
-        # Error for Janus::Responses::ResponseStandard#sdp
         class SDP < BaseResponseStandard
           def initialize
-            super 'Error reading SDP (jsep > sdp in response)'
+            super '[SDP] Error reading SDP (jsep > sdp in response)'
           end
         end
       end

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

@@ -6,36 +6,32 @@ module RubyRabbitmqJanus
       # Define a super class for all error in Tools::Option class
       class BaseCluster < BaseTools
         def initialize(message, level = :fatal)
-          super("[Cluster] #{message}", level)
+          super("[Cluster]#{message}", level)
         end
       end
 
       module Cluster
-        # Error for Tools::Option#initialize
-        class Initializer < RubyRabbitmqJanus::Errors::Tools::BaseCluster
+        class CreateSession < RubyRabbitmqJanus::Errors::Tools::BaseCluster
           def initialize
-            super 'Error in initializer', :fatal
+            super '[CreateSession] Error during create session (just one instance to Janus)'
           end
         end
 
-        # Error for Tools::Option#queue_to
         class QueueTo < RubyRabbitmqJanus::Errors::Tools::BaseCluster
-          def initalize
-            super 'Error for create string queue_to'
+          def initialize
+            super '[QueueTo] Error for create string queue_to'
           end
         end
 
-        # Error for Tools::Option#queue_admin_to
         class QueueAdminTo < RubyRabbitmqJanus::Errors::Tools::BaseCluster
-          def initalize
-            super 'Error for create string queue_admin_to'
+          def initialize
+            super '[QueueAdminTo] Error for create string queue_admin_to'
           end
         end
 
-        # Error if restart thread to instance failed
         class RestartInstance < RubyRabbitmqJanus::Errors::Tools::BaseCluster
-          def initialize(option)
-            super "Error for restart thread to instance #{option}"
+          def initialize
+            super '[RestartInstance] Error for restart Janus Instance'
           end
         end
       end

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

@@ -5,75 +5,64 @@
 module RubyRabbitmqJanus
   module Errors
     module Tools
-      # Define a super class for all error in class Config
       class BaseConfig < BaseTools
         def initialize(message, level = :fatal)
-          super("[Config] #{message}", level)
+          super("[Config]#{message}", level)
         end
       end
 
       module Config
-        # Error for Tools::Config#initialize
-        class Initialize < RubyRabbitmqJanus::Errors::Tools::BaseConfig
-          def initialize
-            super 'Error in initalizer'
-          end
-        end
-
-        # Error for Tools::Config#queue_from
         class QueueFrom < RubyRabbitmqJanus::Errors::Tools::BaseConfig
           def initialize
-            super 'Error for reading standard queue from'
+            super '[QueueFrom] Error for reading standard queue from'
           end
         end
 
-        # Error for Tools::Config#queue_to
         class QueueTo < RubyRabbitmqJanus::Errors::Tools::BaseConfig
           def initialize
-            super 'Error for reading standard queue to'
+            super '[QueueTo] Error for reading standard queue to'
           end
         end
 
-        # Error for config#queue_admin_from
         class QueueAdminFrom < RubyRabbitmqJanus::Errors::Tools::BaseConfig
           def initialize
-            super 'Error for reading admin queue from'
+            super '[QueueAdminFrom] Error for reading admin queue from'
           end
         end
 
-        # Error for Tools::Config#queue_admin_to
         class QueueAdminTo < RubyRabbitmqJanus::Errors::Tools::BaseConfig
           def initialize
-            super 'Error for reading admin queue to'
+            super '[QueueAdminTo] Error for reading admin queue to'
           end
         end
 
-        # Error for Tools::Config#log_level
-        class LevelNotDefine < RubyRabbitmqJanus::Errors::Tools::BaseConfig
+        class LogLevel < RubyRabbitmqJanus::Errors::Tools::BaseConfig
           def initialize
-            super 'Error for reading option level', :warn
+            super '[LogLevel] Error for reading option level', :warn
           end
         end
 
-        # Error for Tools::Config#log_level
-        class LevelRabbitMissing < RubyRabbitmqJanus::Errors::Tools::BaseConfig
+        class LogLevelRabbit < RubyRabbitmqJanus::Errors::Tools::BaseConfig
           def initialize
-            super 'Error for reading option level for rabbitmq', :warn
+            super '[LogLevelRabbit] Error for reading option level for rabbitmq', :warn
           end
         end
 
-        # Error for Tools::Config#time_to_live (or #ttl)
-        class TTLNotFound < RubyRabbitmqJanus::Errors::Tools::BaseConfig
+        class TimeToLive < RubyRabbitmqJanus::Errors::Tools::BaseConfig
           def initialize
-            super 'Keepalive TTL option is not reading in config file', :warn
+            super '[TimeToLive] Keepalive TTL option is not reading in config file', :warn
           end
         end
 
-        # Error for Tools::Config#plugin_at
         class PluginAt < RubyRabbitmqJanus::Errors::Tools::BaseConfig
           def initialize(parameter)
-            super 'Plugin is not found in configuration file, ' \
-                  "with parameter #{parameter}", :warn
+            super "[PluginAt] Plugin is not found in configuration file, with parameter #{parameter}", :warn
+          end
+        end
+
+        class Cluster < RubyRabbitmqJanus::Errors::Tools::BaseConfig
+          def initialize(parameter)
+            super '[Cluster] Cluster parameter is missing', :warn
           end
         end
       end

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

@@ -1,83 +1,76 @@
 # frozen_string_literal: true
 
+# @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
+
 module RubyRabbitmqJanus
   module Errors
     module Tools
-      # Define super class for all errors in Log class
       class BaseLog < BaseTools
         def initialize(message, level = :warn)
-          super("[Log] #{message}", level)
+          super("[Log]#{message}", level)
         end
       end
 
       module Log
-        # Error for Tools::Log#initialize
-        class Initialize < RubyRabbitmqJanus::Errors::Tools::BaseLog
-          def initialize
-            super 'Error in initializer', :fatal
-          end
-        end
-
-        # Error for Tools::Log#unknow
-        class Unknow < RubyRabbitmqJanus::Errors::Tools::BaseLog
+        class Unknown < RubyRabbitmqJanus::Errors::Tools::BaseLog
           def initialize
-            super 'Error for writing in logger with level :unknown'
+            super '[Unknown] Error for writing in logger with level :unknown'
           end
         end
 
         # Error for Tools::Log#fatal
         class Fatal < RubyRabbitmqJanus::Errors::Tools::BaseLog
           def initialize
-            super 'Error for writing in logger with level :fatal'
+            super '[Fatal] Error for writing in logger with level :fatal'
           end
         end
 
         # Error for Tools::Log#error
         class Error < RubyRabbitmqJanus::Errors::Tools::BaseLog
           def initialize
-            super 'Error for writing in logger with level :error'
+            super '[Error] Error for writing in logger with level :error'
           end
         end
 
         # Error for Tools::Log#warn
         class Warn < RubyRabbitmqJanus::Errors::Tools::BaseLog
           def initialize
-            super 'Error for writing in logger with level :warning'
+            super '[Warn] Error for writing in logger with level :warning'
           end
         end
 
         # Error for Tools::Log#info
         class Info < RubyRabbitmqJanus::Errors::Tools::BaseLog
           def initialize
-            super 'Error for writing in logger with level :nfo'
+            super '[Info] Error for writing in logger with level :nfo'
           end
         end
 
         # Error for Tools::Log#debug
         class Debug < RubyRabbitmqJanus::Errors::Tools::BaseLog
           def initialize
-            super 'Error for writing in logger with level :debug'
+            super '[Debug] Error for writing in logger with level :debug'
           end
         end
 
         # Error for Tools::Log#logger
         class Logger < RubyRabbitmqJanus::Errors::Tools::BaseLog
           def initialize
-            super 'Error return logger to instance'
+            super '[Logger] Error return logger to instance'
           end
         end
 
         # Error for Tools::Log#logdev
         class Logdev < RubyRabbitmqJanus::Errors::Tools::BaseLog
           def initialize
-            super 'Error filname to logger instance'
+            super '[Logdev] Error filname to logger instance'
           end
         end
 
         # Error for Tools::Log#save_level
         class SaveLevel < RubyRabbitmqJanus::Errors::Tools::BaseLog
           def initialize
-            super 'Error for changing log level'
+            super '[SaveLevel] Error for changing log level'
           end
         end
       end

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

@@ -54,8 +54,6 @@ module RubyRabbitmqJanus
 
         def data_id
           data['id'].to_i
-        rescue => error
-          raise Errors::JanusResponseDataId, error
         end
       end
     end

data/lib/rrj/models/active_record.rb

@@ -10,9 +10,18 @@ module RubyRabbitmqJanus
       include RubyRabbitmqJanus::Models::JanusInstanceMethods
       include RubyRabbitmqJanus::Models::JanusInstanceValidations
 
-      after_create      { callback_after_after }
+      after_create      { callback_create_after }
       after_update      { callback_update_after }
       after_destroy     { callback_destroy_after }
+
+      private
+
+      # Update attributes to document
+      #
+      # @param [Hash] List of attribute to update with this value
+      def set(attributes)
+        update_columns(attributes)
+      end
     end
   end
 end

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

@@ -8,14 +8,9 @@ module RubyRabbitmqJanus
     class Cluster
       include Singleton
 
-      attr_reader :sessions
-
       # Initialize object for managing each instance to Janus
       def initialize
         @current_instance = nil
-        @sessions = []
-      rescue
-        raise Errors::Tools::Cluster::Initializer
       end
 
       # Create session (just one Janus Instance)

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

@@ -35,8 +35,6 @@ module RubyRabbitmqJanus
         loading_configuration_customize
         loading_configuration_default
         Tools::Log.instance.save_level(log_level)
-      rescue
-        raise Errors::Tools::Config::Initialize
       end
 
       # Get to name queue_from (pattern)
@@ -79,13 +77,13 @@ module RubyRabbitmqJanus
       def log_level
         @options['gem']['log']['level'].upcase.to_sym || :INFO
       rescue
-        raise Errors::Tools::Config::LevelNotDefine
+        raise Errors::Tools::Config::LogLevel
       end
 
       def log_level_rabbit
         @options['rabbit']['level'].upcase.to_sym || :INFO
       rescue
-        raise Errors::Tools::Config::LevelNotDefine
+        raise Errors::Tools::Config::LogLevelRabbit
       end
 
       # @return [Integer]
@@ -93,7 +91,7 @@ module RubyRabbitmqJanus
       def time_to_live
         @options['janus']['session']['keepalive'].to_i || 50
       rescue
-        raise Errors::Tools::Config::TTLNotFound
+        raise Errors::Tools::Config::TimeToLive
       end
 
       alias ttl time_to_live

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

@@ -40,8 +40,6 @@ module RubyRabbitmqJanus
         @level = logs.level
         @progname = logs.progname
         @logs = ActiveSupport::TaggedLogging.new(logs)
-      rescue
-        raise Errors::Tools::Log::Initialize
       end
 
       # Write a message in log with a `UNKNOWN` level
@@ -50,7 +48,7 @@ module RubyRabbitmqJanus
       def unknown(message)
         write_tag { @logs.unknown(filter(message)) }
       rescue
-        raise Errors::Tools::Log::Unknow
+        raise Errors::Tools::Log::Unknown
       end
 
       # Write a message in log with a `FATAL` level

data/spec/config/database.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+def load_active_record
+  # Configure active record
+  active_record = YAML::load(File.open('./spec/config/database.yml'))
+
+  # Connect to database
+  ActiveRecord::Base.establish_connection(active_record)
+  unless ActiveRecord::Base.connection.table_exists? 'janus_instances'
+    ActiveRecord::Base.connection.create_table(:janus_instances) do |table|
+      table.integer :instance
+      table.integer :session, limit: 8
+      table.boolean :enable
+      table.integer :thread, limit: 8
+    end
+  end
+end
+
+def load_mongo
+  # DatabaseCleaner[:mongoid, { connection: :test }]
+  Mongoid.load!('./spec/config/mongoid.yml', :test)
+end
+
+def after_load_database
+  DatabaseCleaner.clean
+  create_janus_instances
+end

data/spec/config/database.yml

@@ -0,0 +1,8 @@
+---
+
+# Used for Activerecord in spec
+
+adapter: :sqlite3
+encoding: utf-8
+database: ':memory:'
+timeout: 5000

data/spec/config/initializer.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+# Test events response
+class EventTest
+  def actions
+    lambda do |reason, payload|
+      RubyRabbitmqJanus::Tools::Log.instance.info "Reason : #{reason}"
+      RubyRabbitmqJanus::Tools::Log.instance.info "Payload : #{payload}"
+    end
+  end
+end
+
+# Initialize listener
+actions = EventTest.new.actions
+@event = RubyRabbitmqJanus::Janus::Concurrencies::Event.instance
+@event.run(&actions)

data/spec/config/instance.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+def create_janus_instances
+  instance = RubyRabbitmqJanus::Models::JanusInstance
+
+  (1..2).each do |number|
+    instance.create!(instance: number, enable: true)
+  end
+end
+
+def find_instance
+  ji = RubyRabbitmqJanus::Models::JanusInstance.first
+  @session = { 'session_id' => ji.session }
+  @instance = { 'instance' => ji.instance }
+  @session_instance = @session.merge(@instance)
+end

data/spec/config/mongoid.yml

@@ -0,0 +1,12 @@
+---
+
+# Used for MongoID in spec
+
+test:
+  clients:
+    default:
+      database: rrj_test
+      hosts:
+        - mongo:27017
+  options:
+    raise_not_found_error: true

data/spec/request/admin/request_set_locking_debug_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'RubyRabbitmqJanus::RRJ -- message type set locking debug' do
+describe 'RubyRabbitmqJanus::RRJ -- message type set locking debug', broken: true do
   before(:example) do
     @type = 'admin::set_locking_debug'
     @options = { 'debug' => [true, false].sample }

data/spec/request/base/request_attach_spec.rb

@@ -3,7 +3,11 @@
 require 'spec_helper'
 
 describe 'RubyRabbitmqJanus::RRJ -- message type attach' do
-  before(:example) { @type = 'base::attach' }
+  before(:example) do
+    @gateway = RubyRabbitmqJanus::RRJ.new
+
+    @type = 'base::attach'
+  end
 
   describe '#start_transaction', type: :request,
                                  level: :base,

data/spec/request/base/request_create_spec.rb

@@ -3,7 +3,11 @@
 require 'spec_helper'
 
 describe 'RubyRabbitmqJanus::RRJ -- message type create' do
-  before(:example) { @type = 'base::create' }
+  before(:example) do
+    @gateway = RubyRabbitmqJanus::RRJ.new
+
+    @type = 'base::create'
+  end
 
   describe '#start_transaction', type: :request,
                                  level: :base,

data/spec/request/base/request_destroy_spec.rb

@@ -3,7 +3,11 @@
 require 'spec_helper'
 
 describe 'RubyRabbitmqJanus::RRJ -- message type destroy' do
-  before(:example) { @type = 'base::destroy' }
+  before(:example) do
+    @gateway = RubyRabbitmqJanus::RRJ.new
+
+    @type = 'base::destroy'
+  end
 
   describe '#start_transaction', type: :request,
                                  level: :base,

data/spec/request/base/request_detach_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'RubyRabbitmqJanus::RRJ -- mesage type detach' do
+describe 'RubyRabbitmqJanus::RRJ -- mesage type detach', broken: true do
   before(:example) { @type = 'base::detach' }
 
   describe '#start_transaction_handle', type: :request,

data/spec/request/base/request_info_spec.rb

@@ -3,7 +3,11 @@
 require 'spec_helper'
 
 describe 'RubyRabbitmqJanus::RRJ -- message type info' do
-  before(:example) { @type = 'base::info' }
+  before(:example) do
+    @gateway = RubyRabbitmqJanus::RRJ.new
+
+    @type = 'base::info'
+  end
 
   describe '#start_transaction', type: :request,
                                  level: :base,

data/spec/request/base/request_keepalive_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'RubyRabbitmqJanus::RRJ -- message type keepalive' do
+describe 'RubyRabbitmqJanus::RRJ -- message type keepalive', broken: true do
   before(:example) { @type = 'base::keepalive' }
 
   describe '#start_transaction', type: :request,

data/spec/request/peer/request_offer_spec.rb

@@ -4,6 +4,8 @@ require 'spec_helper'
 
 describe 'RubyRabbitmqJanus::RRJ -- message type offer', broken: true do
   before(:example) do
+    @gateway = RubyRabbitmqJanus::RRJ.new
+
     @type = 'peer::offer'
     @options = {
       'sdp' => <<-SDP

data/spec/request/peer/request_trickle_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'RubyRabbitmqJanus::RRJ -- message type trickle' do
+describe 'RubyRabbitmqJanus::RRJ -- message type trickle', broken: true do
   before(:example) do
     @type = 'peer::trickle'
     candidate = { 'sdpMid' => '..', 'sdpMLineIndex' => 1, 'candidate' => '..' }

data/spec/request/peer/request_trickles_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'RubyRabbitmqJanus::RRJ -- message type trickles' do
+describe 'RubyRabbitmqJanus::RRJ -- message type trickles', broken: true do
   before(:example) do
     @type = 'peer::trickle'
     candidate = { 'sdpMid' => '..', 'sdpMLineIndex' => 1, 'candidate' => '..' }

data/spec/rrj/messages/messages_admin_spec.rb

@@ -3,6 +3,7 @@
 require 'spec_helper'
 
 describe RubyRabbitmqJanus::Janus::Messages::Admin, type: :messages,
+                                                    level: :admin,
                                                     name: :admin do
   let(:template) { 'base::info' }
   let(:msg_new) { RubyRabbitmqJanus::Janus::Messages::Admin.new(template) }

data/spec/rrj/messages/messages_message_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 
 describe RubyRabbitmqJanus::Janus::Messages::Message, type: :messages,
                                                       name: :message do
-  before { gateway }
+before { @gateway }
   let(:template) { 'base::info' }
   let(:msg_new) { RubyRabbitmqJanus::Janus::Messages::Message.new(template) }
 

data/spec/rrj/models/{active_record_spec.rb → janus_instance.rb}

@@ -4,15 +4,10 @@ require 'spec_helper'
 
 describe RubyRabbitmqJanus::Models::JanusInstance, type: :model,
                                                    name: :janus_instance do
-  before do
-    Object.send(:remove_const, :Mongoid) if defined?(Mongoid)
-    require 'active_record' unless defined?(ActiveRecord::Core)
-  end
-
   let(:model) { RubyRabbitmqJanus::Models::JanusInstance }
 
   context 'active record model' do
-    it { expect(model.attribute_names).to include('id') }
+    it { expect(model.attribute_names).to include(ENV['MONGO'].match?('true') ? '_id' : 'id') }
     it { expect(model.attribute_names).to include('instance') }
     it { expect(model.attribute_names).to include('session') }
     it { expect(model.attribute_names).to include('enable') }

data/spec/rrj/rabbit/propertie_2_spec.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe RubyRabbitmqJanus::Rabbit::Propertie, type: :rabbit,
+                                               name: :propertie do
+  let(:rabbit) { RubyRabbitmqJanus::Rabbit::Propertie.new }
+
+  describe '#options' do
+    it { expect(rabbit.options).to match_json_schema(:rabbit_options) }
+  end
+
+  describe '#options_admin' do
+    context 'For admin request' do
+      it do
+        expect(rabbit.options_admin('admin::sessions')).to \
+          match_json_schema(:rabbit_options_admin)
+      end
+    end
+
+    context 'For base request' do
+      it do
+        expect(rabbit.options_admin('request::create')).to \
+          match_json_schema(:rabbit_options)
+      end
+    end
+  end
+end

data/spec/rrj/rabbit/propertie_spec.rb

@@ -2,30 +2,6 @@
 
 require 'spec_helper'
 
-describe RubyRabbitmqJanus::Rabbit::Propertie, type: :rabbit,
-                                               name: :propertie do
-  let(:rabbit) { RubyRabbitmqJanus::Rabbit::Propertie.new }
-
-  describe '#options' do
-    it { expect(rabbit.options).to match_json_schema(:rabbit_options) }
-  end
-
-  describe '#options_admin' do
-    context 'For admin request' do
-      it do
-        expect(rabbit.options_admin('admin::sessions')).to \
-          match_json_schema(:rabbit_options_admin)
-      end
-    end
-
-    context 'For base request' do
-      it do
-        expect(rabbit.options_admin('request::create')).to \
-          match_json_schema(:rabbit_options)
-      end
-    end
-  end
-end
 describe RubyRabbitmqJanus::Rabbit::Propertie, type: :rabbit,
                                                name: :propertie,
                                                instances: true do

data/spec/rrj/responses/responses_admin_spec.rb

@@ -3,6 +3,8 @@
 require 'spec_helper'
 
 describe RubyRabbitmqJanus::Janus::Responses::Admin, type: :responses,
+                                                     level: :admin,
+                                                     broken: true,
                                                      name: :admin do
   let(:message) do
     @gateway.start_transaction_admin do |transaction|

data/spec/rrj/tools/gem/rrj_cluster_spec.rb

@@ -3,20 +3,37 @@
 require 'spec_helper'
 
 describe RubyRabbitmqJanus::Tools::Cluster, type: :tools, name: :cluster do
+  let(:cluster) { RubyRabbitmqJanus::Tools::Cluster.instance }
+  let(:model) { RubyRabbitmqJanus::Models::JanusInstance }
+  let(:number_of_instance) { Random.new.rand(100) }
+  let(:name_queue) { "to-janus-#{number_of_instance}" }
+  let(:name_queue_admin) { "to-janus-admin-#{number_of_instance}" }
+
+  it do
+    expect(cluster.queue_to(number_of_instance)).to eql(name_queue)
+  end
+
   it do
-    expect(RubyRabbitmqJanus::Tools::Cluster.instance.queue_to(42)).to \
-      eql('to-janus-42')
+    expect(cluster.queue_admin_to(number_of_instance)).to eql(name_queue_admin)
   end
 
   it do
-    expect(RubyRabbitmqJanus::Tools::Cluster.instance.queue_admin_to(42)).to \
-      eql('to-janus-admin-42')
+    expect { cluster.create_session }.not_to raise_error
+  end
+
+  it do
+    expect { cluster.restart_session }.not_to raise_error
+  end
+
+  context 'When active record is loaded', orm: :active_record do
+    it do
+      expect(cluster.create_session).to be_a(model)
+    end
   end
 
-  context 'when created sessions with active record' do
+  context 'When mongoid is loaded', orm: :mongoid do
     it do
-      expect(RubyRabbitmqJanus::Tools::Cluster.instance.create_session).to \
-        be_a(Integer)
+      expect(cluster.create_session).to be_a(model)
     end
   end
 end

data/spec/rrj/tools/gem/rrj_log_spec.rb

@@ -3,53 +3,81 @@
 require 'spec_helper'
 
 describe 'RubyRabbitmqJanus::Log', type: :tools, name: :log do
+  let(:levels) {
+    {
+      DEBUG: Logger::DEBUG,
+      INFO: Logger::INFO,
+      WARN: Logger::WARN,
+      ERROR: Logger::ERROR,
+      FATAL: Logger::FATAL,
+      UNKNOWN: Logger::UNKNOWN
+    }
+  }
+  let(:sensitives) { %i[admin_secret apisecret] }
+  let(:log) { RubyRabbitmqJanus::Tools::Log.instance }
+  let(:log_constant) { RubyRabbitmqJanus::Tools::Log }
+  let(:new_level) { Random.new.rand(5) }
+  let(:message) { '## test ##' }
+  let(:last_line) { IO.readlines('log/ruby-rabbitmq-janus.log')[-1..-1][0] }
+
+  it 'Default levels' do
+    expect(log_constant::LEVELS).to eql(levels)
+  end
+
+  it 'Defaults sensitives word' do
+    expect(log_constant::SENSITIVES).to eql(sensitives)
+  end
+
   it 'Log instance is correctly loading' do
-    expect(RubyRabbitmqJanus::Tools::Log.instance).not_to be(nil)
+    expect(log).not_to be(nil)
   end
 
   it 'Default level log is INFO' do
     # 0 = debug
     # ...
     # 5 = unknown
-    expect(RubyRabbitmqJanus::Tools::Log.instance.level).to eq(0)
+    expect(log.level).to eq(0)
   end
 
-  let(:message) { '## test ##' }
-  let(:last_line) { IO.readlines('log/ruby-rabbitmq-janus.log')[-1..-1][0] }
-
   context 'when write a message unknown' do
-    before { RubyRabbitmqJanus::Tools::Log.instance.unknown(message) }
+    before { log.unknown(message) }
 
     it { expect(last_line).to include('A, [RubyRabbitmqJanus] ## test ##') }
   end
 
   context 'when write a message fatal' do
-    before { RubyRabbitmqJanus::Tools::Log.instance.fatal(message) }
+    before { log.fatal(message) }
 
     it { expect(last_line).to include('F, [RubyRabbitmqJanus] ## test ##') }
   end
 
   context 'when write a message error' do
-    before { RubyRabbitmqJanus::Tools::Log.instance.error(message) }
+    before { log.error(message) }
 
     it { expect(last_line).to include('E, [RubyRabbitmqJanus] ## test ##') }
   end
 
   context 'when write a message warn' do
-    before { RubyRabbitmqJanus::Tools::Log.instance.warn(message) }
+    before { log.warn(message) }
 
     it { expect(last_line).to include('W, [RubyRabbitmqJanus] ## test ##') }
   end
 
   context 'when write a message info' do
-    before { RubyRabbitmqJanus::Tools::Log.instance.info(message) }
+    before { log.info(message) }
 
     it { expect(last_line).to include('I, [RubyRabbitmqJanus] ## test ##') }
   end
 
   context 'when write a message debug' do
-    before { RubyRabbitmqJanus::Tools::Log.instance.debug(message) }
+    before { log.debug(message) }
 
     it { expect(last_line).to include('D, [RubyRabbitmqJanus] ## test ##') }
   end
+
+  context 'Whane level is changed' do
+    it 'Change level' do
+      expect(log.save_level(new_level)).to eql(log.level)
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -4,8 +4,14 @@ require 'bundler/setup'
 require 'pry'
 require 'json-schema-rspec'
 require 'rails'
-require 'active_record'
+require 'database_cleaner'
+ENV['MONGO']='true' if ENV['MONGO'].nil?
+require ENV['MONGO'].match?('true') ? 'mongoid' : 'active_record'
+
 require 'ruby_rabbitmq_janus'
+require 'config/initializer'
+require 'config/database'
+require 'config/instance'
 
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
@@ -18,24 +24,9 @@ end
 end
 
 RSpec.configure do |config|
-  # Configure active record
-  # rubocop:disable Style/ColonMethodCall
-  # rubocop:disable Security/YAMLLoad
-  configuration = YAML::load(File.open('config/database.yml'))
-  # rubocop:enable Style/ColonMethodCall
-  # rubocop:enable Security/YAMLLoad
-
-  # Connect to database
-  ActiveRecord::Base.establish_connection(configuration)
-  config.before(:all) do
-    unless ActiveRecord::Base.connection.table_exists? 'janus_instances'
-      ActiveRecord::Base.connection.create_table(:janus_instances) do |table|
-        table.integer :instance
-        table.integer :session, limit: 8
-        table.boolean :enable
-      end
-    end
-  end
+  DatabaseCleaner.strategy = :truncation
+  ENV['MONGO'].match?('true') ? load_mongo : load_active_record
+  after_load_database
 
   config.expect_with :rspec do |c|
     c.syntax = :expect
@@ -59,65 +50,21 @@ RSpec.configure do |config|
     config.json_schemas[json_index] = json_file
   end
 
-  # Configure requests test before sending request
-  config.before(:example, level: :base) { gateway }
-  config.before(:example, level: :peer) { gateway }
-  config.before(:example, level: :admin) { gateway_admin }
-  config.before(:example, type: :responses) { gateway }
-  config.before(:example, type: :messages) { gateway }
-  config.before(:example, name: :admin) { gateway_admin }
-  config.before(:example, name: :event) { gateway }
-  config.before(:example, name: :standard) { gateway }
-
   # Exclude request with tag broken
   config.filter_run_excluding broken: true
-end
-
-# :reek:UtilityFunction
-def singleton
-  Singleton.__init__(RubyRabbitmqJanus::Tools::Log)
-  Singleton.__init__(RubyRabbitmqJanus::Tools::Config)
-  Singleton.__init__(RubyRabbitmqJanus::Tools::Requests)
-  Singleton.__init__(RubyRabbitmqJanus::Tools::Cluster)
-end
-
-def gateway
-  singleton
-  @gateway = RubyRabbitmqJanus::RRJ.new
-  @response = nil
-  @options = {}
-  find_instance
-end
-
-def gateway_admin
-  singleton
-  @gateway = RubyRabbitmqJanus::RRJAdmin.new
-  @response = nil
-  @options = {}
-  find_instance
-end
-
-def gateway_event
-  actions = EventTest.new.actions
-  @event = RubyRabbitmq::Janus::Concurencies::Event.instance
-  @event.run(&actions)
-  gateway
-  find_instance
-end
-
-def find_instance
-  ji = RubyRabbitmqJanus::Models::JanusInstance.first
-  @session = { 'session_id' => ji.session }
-  @instance = { 'instance' => ji.instance }
-  @session_instance = @session.merge(@instance)
-end
 
-# Test events response
-class EventTest
-  def actions
-    lambda do |reason, payload|
-      p "Reason : #{reason}"
-      p "Payload : #{payload}"
-    end
+  config.before(:example) do |example|
+    @gateway = if example.metadata[:level]
+                 RubyRabbitmqJanus::RRJAdmin.new
+               else
+                 RubyRabbitmqJanus::RRJ.new
+               end
+
+    ji = RubyRabbitmqJanus::Models::JanusInstance.first
+    @response = nil
+    @options = {}
+    @session = { 'session_id' => ji.session }
+    @instance = { 'instance' => ji.instance }
+    @session_instance = @session.merge(@instance)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_rabbitmq_janus
 version: !ruby/object:Gem::Version
-  version: 2.2.0.pre.42
+  version: 2.2.0.pre.159
 platform: ruby
 authors:
 - VAILLANT Jeremy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-23 00:00:00.000000000 Z
+date: 2017-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -262,6 +262,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.2'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: bunny
   requirement: !ruby/object:Gem::Requirement
@@ -472,6 +486,11 @@ files:
 - lib/tasks/delete_all_instance.rake
 - lib/tasks/delete_one_instance.rake
 - lib/tasks/delete_unless_instance.rake
+- spec/config/database.rb
+- spec/config/database.yml
+- spec/config/initializer.rb
+- spec/config/instance.rb
+- spec/config/mongoid.yml
 - spec/request/admin/request_handle_info_spec.rb
 - spec/request/admin/request_handles_spec.rb
 - spec/request/admin/request_sessions_spec.rb
@@ -490,9 +509,9 @@ files:
 - spec/rrj/messages/messages_admin_spec.rb
 - spec/rrj/messages/messages_message_spec.rb
 - spec/rrj/messages/messages_standard_spec.rb
-- spec/rrj/models/active_record_spec.rb
-- spec/rrj/models/mongoid_spec.rb
+- spec/rrj/models/janus_instance.rb
 - spec/rrj/rabbit/connect_spec.rb
+- spec/rrj/rabbit/propertie_2_spec.rb
 - spec/rrj/rabbit/propertie_spec.rb
 - spec/rrj/rabbit/publish/admin_spec.rb
 - spec/rrj/rabbit/publish/base_publisher_spec.rb

data/spec/rrj/models/mongoid_spec.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-# rubocop:disable Style/ConstantName
-
-require 'spec_helper'
-
-describe RubyRabbitmqJanus::Models::JanusInstance, type: :model,
-                                                   name: :janus_instance do
-  before do
-    ActiveRecord::Core = nil if defined?(ActiveRecord)
-    require 'mongoid' unless defined?(Mongoid)
-  end
-
-  context 'mongoid model' do
-    let(:model) { RubyRabbitmqJanus::Models::JanusInstance }
-
-    it { expect(model.attribute_names).to include('id') }
-    it { expect(model.attribute_names).to include('instance') }
-    it { expect(model.attribute_names).to include('session') }
-    it { expect(model.attribute_names).to include('enable') }
-  end
-
-  after do
-    Object.send(:remove_const, :Mongoid) if defined?(Mongoid)
-    require 'active_record' unless defined?(ActiveRecord)
-  end
-end
-# rubocop:enable Style/ConstantName