ruby_rabbitmq_janus 2.2.0.pre.159 → 2.2.0.pre.161

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00285c936506050da48005b5aa88d3d1a807033d
-  data.tar.gz: 4936bc5671f055b7916566c9c5bd538151ac8910
+  metadata.gz: 182b09224c0eb5b640dcd29c9a5265db471cd769
+  data.tar.gz: 99833ee6c55b7274ab3e24d6952e84e053c3c15d
 SHA512:
-  metadata.gz: 503a9222f16ea2e6b1cd67b5a0155dd884be45e866bca9186470b080540bfe608963054cde66f765c568acc2e70dfe62abd8469f4e79abefd7cd2b0679809957
-  data.tar.gz: d1983a18e3d50b7565ac64f872655f9f3a741f4214ea45d6a4483313c3bb4a268145d85cfc6a8939ee0f97de0943f47fe803cc9745ce4bd4727ac8f891bcbe03
+  metadata.gz: e62fd19a4055f94140711753854286529a931efa682b6defd849895a77adb21440e34489cfb8e6bdadb948fbfd9aef3062ffffb6372c65fbd23e7c3aeedb868b
+  data.tar.gz: 5de6c2f983e83669028a4deaf4e227d964328c1b8ce87be486d6586402910d2b4154edaa37ac4d7d7cf0985bc11391cc3b71c96baee4c6f37244580a25108bd2

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

@@ -6,7 +6,6 @@
 class CreateRubyRabbitmqJanusTables < ActiveRecord::Migration[5.0]
   def change
     create_table :janus_instances do |table|
-      table.integer :instance
       table.integer :session, limit: 8
       table.boolean :enable
       table.integer :thread, limit: 8

data/lib/rrj/models/active_record.rb

@@ -10,6 +10,8 @@ module RubyRabbitmqJanus
       include RubyRabbitmqJanus::Models::JanusInstanceMethods
       include RubyRabbitmqJanus::Models::JanusInstanceValidations
 
+      alias_attribute :instance, :id
+
       after_create      { callback_create_after }
       after_update      { callback_update_after }
       after_destroy     { callback_destroy_after }

data/lib/rrj/models/concerns/janus_instance_validations.rb

@@ -7,10 +7,6 @@ module RubyRabbitmqJanus
       extend ActiveSupport::Concern
 
       included do
-        # Instance number it's mandatory, unique and with type Integer
-        validates :instance, presence: true,
-                             numericality: { only_integer: true },
-                             uniqueness: true
         # This instance it's a state (enable or disable)
         validates :enable, presence: true,
                            inclusion: { in: [true, false] }

data/lib/rrj/models/mongoid.rb

@@ -11,10 +11,10 @@ module RubyRabbitmqJanus
       include RubyRabbitmqJanus::Models::JanusInstanceMethods
       include RubyRabbitmqJanus::Models::JanusInstanceValidations
 
-      field :instance, type: Integer
-      field :session, type: Integer
-      field :enable, type: Boolean
-      field :thread, type: Integer
+      field :_id,       type: String, as: :instance
+      field :session,   type: Integer
+      field :enable,    type: Boolean
+      field :thread,    type: Integer
 
       set_callback(:create,     :after)   { callback_create_after }
       set_callback(:update,     :after)   { callback_update_after }

data/spec/config/instance.rb

@@ -8,9 +8,46 @@ def create_janus_instances
   end
 end
 
+def attach_base
+  res = nil
+  @gateway.start_transaction(true, @session_instance) do |tr|
+    res = tr.publish_message('base::attach', @session_instance)
+  end
+  @options.merge!('handle_id' => res.sender).merge!(@session_instance)
+end
+
+def attach_admin
+  res = nil
+  @gateway.start_transaction_admin(@session_instance) do |tr|
+    res = tr.publish_message('base::attach', @session_instance)
+  end
+  @options.merge!('handle_id' => res.sender).merge!(@session_instance)
+end
+
+def session
+  res = nil
+  @gateway.start_transaction(true, @instance) do |tr|
+    res = tr.publish_message('base::create', @instance)
+  end
+  @options.merge!('session_id' => res.session).merge!(@instance)
+end
+
+def clear
+  @response = nil
+  @options = {}
+end
+
 def find_instance
-  ji = RubyRabbitmqJanus::Models::JanusInstance.first
+  ji = RubyRabbitmqJanus::Models::JanusInstance.all.sample
   @session = { 'session_id' => ji.session }
   @instance = { 'instance' => ji.instance }
   @session_instance = @session.merge(@instance)
 end
+
+def initializer_rrj(metadata)
+  @gateway = if metadata[:level].eql?(:admin)
+               RubyRabbitmqJanus::RRJAdmin.new
+             else
+               RubyRabbitmqJanus::RRJ.new
+             end
+end

data/spec/request/admin/request_handle_info_spec.rb

@@ -4,13 +4,9 @@ require 'spec_helper'
 
 describe 'RubyRabbitmqJanus::RRJ -- message type handle info' do
   before(:example) do
+    clear
+    attach_admin
     @type = 'admin::handle_info'
-    sender = nil
-    @gateway.start_transaction_admin(@session_instance) do |transaction|
-      sender = transaction.publish_message('base::attach',
-                                           @session_instance).sender
-    end
-    @options = { 'handle_id' => sender }.merge(@session_instance)
   end
 
   describe '#start_transaction_admin', type: :request,

data/spec/request/admin/request_handles_spec.rb

@@ -4,13 +4,9 @@ require 'spec_helper'
 
 describe 'RubyRabbitmqJanus::RRJ -- message type handles list' do
   before(:example) do
+    clear
+    attach_admin
     @type = 'admin::handles'
-    sender = nil
-    @gateway.start_transaction_admin(@session_instance) do |transaction|
-      sender = transaction.publish_message('base::attach',
-                                           @session_instance).sender
-    end
-    @options = { 'handle_id' => sender }.merge(@session_instance)
   end
 
   describe '#start_transaction_admin', type: :request,

data/spec/request/admin/request_sessions_spec.rb

@@ -3,7 +3,10 @@
 require 'spec_helper'
 
 describe 'RubyRabbitmqJanus::RRJ -- message type sessions list' do
-  before(:example) { @type = 'admin::sessions' }
+  before(:example) do
+    clear
+    @type = 'admin::sessions'
+  end
 
   describe '#start_transaction_admin', type: :request,
                                        level: :admin,

data/spec/request/admin/request_set_locking_debug_spec.rb

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

data/spec/request/admin/request_set_log_level_spec.rb

@@ -4,6 +4,7 @@ require 'spec_helper'
 
 describe 'RubyRabbitmqJanus::RRJ -- message type set log level' do
   before(:example) do
+    clear
     @type = 'admin::set_log_level'
     @options = { 'level' => Random.rand(7) }
   end

data/spec/request/base/request_attach_spec.rb

@@ -4,15 +4,14 @@ require 'spec_helper'
 
 describe 'RubyRabbitmqJanus::RRJ -- message type attach' do
   before(:example) do
-    @gateway = RubyRabbitmqJanus::RRJ.new
-
+    clear
     @type = 'base::attach'
   end
 
   describe '#start_transaction', type: :request,
                                  level: :base,
                                  name: :attach do
-    context 'when queue is exclusive' do
+    context 'when queue is exclusive', broken: true do
       include_examples 'transaction should match json schema'
     end
 

data/spec/request/base/request_create_spec.rb

@@ -4,8 +4,7 @@ require 'spec_helper'
 
 describe 'RubyRabbitmqJanus::RRJ -- message type create' do
   before(:example) do
-    @gateway = RubyRabbitmqJanus::RRJ.new
-
+    clear
     @type = 'base::create'
   end
 

data/spec/request/base/request_destroy_spec.rb

@@ -4,8 +4,8 @@ require 'spec_helper'
 
 describe 'RubyRabbitmqJanus::RRJ -- message type destroy' do
   before(:example) do
-    @gateway = RubyRabbitmqJanus::RRJ.new
-
+    clear
+    session
     @type = 'base::destroy'
   end
 

data/spec/request/base/request_detach_spec.rb

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

data/spec/request/base/request_info_spec.rb

@@ -4,8 +4,7 @@ require 'spec_helper'
 
 describe 'RubyRabbitmqJanus::RRJ -- message type info' do
   before(:example) do
-    @gateway = RubyRabbitmqJanus::RRJ.new
-
+    clear
     @type = 'base::info'
   end
 

data/spec/request/base/request_keepalive_spec.rb

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

data/spec/request/peer/request_offer_spec.rb

@@ -2,12 +2,14 @@
 
 require 'spec_helper'
 
+# @todo Create a message reading by janus
 describe 'RubyRabbitmqJanus::RRJ -- message type offer', broken: true do
   before(:example) do
-    @gateway = RubyRabbitmqJanus::RRJ.new
+    clear
+    attach_base
 
     @type = 'peer::offer'
-    @options = {
+    @options.merge!({
       'sdp' => <<-SDP
   v=0
   o=alice 2890844526 2890844526 IN IP4 host.atlanta.example.com
@@ -22,7 +24,7 @@ describe 'RubyRabbitmqJanus::RRJ -- message type offer', broken: true do
   a=rtpmap:31 H261/90000
   a=rtpmap:32 MPV/90000
 SDP
-    }
+    })
   end
 
   describe '#start_transaction_handle', type: :request,

data/spec/request/peer/request_trickle_spec.rb

@@ -2,11 +2,14 @@
 
 require 'spec_helper'
 
-describe 'RubyRabbitmqJanus::RRJ -- message type trickle', broken: true do
+describe 'RubyRabbitmqJanus::RRJ -- message type trickle' do
   before(:example) do
+    clear
+    attach_base
+
     @type = 'peer::trickle'
     candidate = { 'sdpMid' => '..', 'sdpMLineIndex' => 1, 'candidate' => '..' }
-    @options = { 'candidate' => candidate }.merge(@session_instance)
+    @options.merge!('candidate' => candidate)
   end
 
   describe '#start_transaction_handle', type: :request,

data/spec/request/peer/request_trickles_spec.rb

@@ -2,11 +2,14 @@
 
 require 'spec_helper'
 
-describe 'RubyRabbitmqJanus::RRJ -- message type trickles', broken: true do
+describe 'RubyRabbitmqJanus::RRJ -- message type trickles' do
   before(:example) do
+    clear
+    attach_base
+
     @type = 'peer::trickle'
     candidate = { 'sdpMid' => '..', 'sdpMLineIndex' => 1, 'candidate' => '..' }
-    @options = { 'candidate' => [candidate, candidate, candidate] }
+    @options.merge!('candidates' => [candidate, candidate, candidate])
   end
 
   describe '#start_transaction_handle', type: :request,

data/spec/spec_helper.rb

@@ -53,18 +53,10 @@ RSpec.configure do |config|
   # Exclude request with tag broken
   config.filter_run_excluding broken: true
 
+  # Configure Initializer RRJ and create session with Janus Instance
   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)
+    initializer_rrj(example.metadata)
+    clear
+    find_instance
   end
 end

data/spec/support/examples_request.rb

@@ -17,7 +17,7 @@ end
 shared_examples 'transaction should match json empty' do
   let(:message) do
     @gateway.start_transaction(false, @session_instance) do |transaction|
-      @response = transaction.publish_message(@type)
+      @response = transaction.publish_message(@type, @options)
     end
   end
 
@@ -27,7 +27,7 @@ end
 shared_examples 'transaction should match json schema' do
   let(:message) do
     @gateway.start_transaction(true, @session_instance) do |transaction|
-      @response = transaction.publish_message(@type)
+      @response = transaction.publish_message(@type, @options)
     end
   end
 
@@ -56,7 +56,7 @@ end
 
 shared_examples 'transaction admin should match json schema' do
   let(:message) do
-    @gateway.start_transaction_admin do |transaction|
+    @gateway.start_transaction_admin(@instance) do |transaction|
       @response = transaction.publish_message(@type, @options)
     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.159
+  version: 2.2.0.pre.161
 platform: ruby
 authors:
 - VAILLANT Jeremy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-24 00:00:00.000000000 Z
+date: 2017-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler