ruby_rabbitmq_janus 2.2.0.pre.161 → 2.2.0.pre.164

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 182b09224c0eb5b640dcd29c9a5265db471cd769
-  data.tar.gz: 99833ee6c55b7274ab3e24d6952e84e053c3c15d
+  metadata.gz: 96c8fbfa42ec3311a8128965e4bd53a55a7df0a8
+  data.tar.gz: 9f891c23002f7a8911a7921c5e0bc73fae3e7629
 SHA512:
-  metadata.gz: e62fd19a4055f94140711753854286529a931efa682b6defd849895a77adb21440e34489cfb8e6bdadb948fbfd9aef3062ffffb6372c65fbd23e7c3aeedb868b
-  data.tar.gz: 5de6c2f983e83669028a4deaf4e227d964328c1b8ce87be486d6586402910d2b4154edaa37ac4d7d7cf0985bc11391cc3b71c96baee4c6f37244580a25108bd2
+  metadata.gz: fa157e373a5caacaadba89f783d490aad03d789526fdfc9efd63e27b2eee576cd73d0010af1edd89ba573b1c5e3aacab12910d70366033e4b35ab6305a2b28ee
+  data.tar.gz: 898f711848c38e3a258251db1164737c109322f01938ea3225afaf4e1ca8a1ce041156d7f468317506dce3a037101a7e9adf4a309aa97815b08fb4a9c119345a

data/lib/rrj/models/active_record.rb

@@ -10,7 +10,9 @@ module RubyRabbitmqJanus
       include RubyRabbitmqJanus::Models::JanusInstanceMethods
       include RubyRabbitmqJanus::Models::JanusInstanceValidations
 
-      alias_attribute :instance, :id
+      alias_attribute :instance,    :id
+      alias_attribute :session_id,  :session
+      alias_attribute :thread_id,   :thread
 
       after_create      { callback_create_after }
       after_update      { callback_update_after }

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

@@ -8,8 +8,7 @@ module RubyRabbitmqJanus
 
       included do
         # This instance it's a state (enable or disable)
-        validates :enable, presence: true,
-                           inclusion: { in: [true, false] }
+        validates :enable, inclusion: { in: [true, false] }
       end
     end
   end

data/lib/rrj/models/mongoid.rb

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

data/spec/config/database.rb

@@ -8,7 +8,6 @@ def load_active_record
   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

data/spec/config/instance.rb

@@ -4,7 +4,13 @@ def create_janus_instances
   instance = RubyRabbitmqJanus::Models::JanusInstance
 
   (1..2).each do |number|
-    instance.create!(instance: number, enable: true)
+    id_instance = if ENV['MONGO'].match?('true')
+                 { _id: number.to_s }
+               else
+                 { id: number }
+               end
+    janus = instance.create(id_instance.merge(enable: true))
+    janus.save
   end
 end
 
@@ -38,10 +44,12 @@ def clear
 end
 
 def find_instance
-  ji = RubyRabbitmqJanus::Models::JanusInstance.all.sample
-  @session = { 'session_id' => ji.session }
-  @instance = { 'instance' => ji.instance }
-  @session_instance = @session.merge(@instance)
+  janus_instance = RubyRabbitmqJanus::Models::JanusInstance.all.sample
+  unless janus_instance.nil?
+    @session = { 'session_id' => janus_instance.session_id }
+    @instance = { 'instance' => janus_instance.instance }
+    @session_instance = @session.merge(@instance)
+  end
 end
 
 def initializer_rrj(metadata)

data/spec/factories/janus_instance.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+FactoryGirl.define do
+  factory :janus_instance, class: RubyRabbitmqJanus::Models::JanusInstance do
+    enable true
+  end
+end

data/spec/request/base/request_attach_spec.rb

@@ -6,12 +6,13 @@ describe 'RubyRabbitmqJanus::RRJ -- message type attach' do
   before(:example) do
     clear
     @type = 'base::attach'
+    @options = @session_instance
   end
 
   describe '#start_transaction', type: :request,
                                  level: :base,
                                  name: :attach do
-    context 'when queue is exclusive', broken: true do
+    context 'when queue is exclusive' do
       include_examples 'transaction should match json schema'
     end
 

data/spec/request/peer/request_offer_spec.rb

@@ -3,32 +3,18 @@
 require 'spec_helper'
 
 # @todo Create a message reading by janus
-describe 'RubyRabbitmqJanus::RRJ -- message type offer', broken: true do
+describe 'RubyRabbitmqJanus::RRJ -- message type offer' do
   before(:example) do
     clear
     attach_base
 
     @type = 'peer::offer'
-    @options.merge!({
-      'sdp' => <<-SDP
-  v=0
-  o=alice 2890844526 2890844526 IN IP4 host.atlanta.example.com
-  s=
-  c=IN IP4 host.atlanta.example.com
-  t=0 0
-  m=audio 49170 RTP/AVP 0 8 97
-  a=rtpmap:0 PCMU/8000
-  a=rtpmap:8 PCMA/8000
-  a=rtpmap:97 iLBC/8000
-  m=video 51372 RTP/AVP 31 32
-  a=rtpmap:31 H261/90000
-  a=rtpmap:32 MPV/90000
-SDP
-    })
+    @options.merge!('sdp' => SDP_OFFER).merge!(@session_instance)
   end
 
   describe '#start_transaction_handle', type: :request,
                                         level: :peer,
+                                        broken: true,
                                         name: :offer do
     context 'when queue is exclusive' do
       it_behaves_like 'transaction handle should match json schema'

data/spec/rrj/models/janus_instance_definition_spec.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe RubyRabbitmqJanus::Models::JanusInstance, type: :model,
+                                                   name: :janus_instance do
+  let(:model) { RubyRabbitmqJanus::Models::JanusInstance }
+
+  context 'Janus Instance model definition' do
+    if ENV['MONGO'].match?('true')
+      it { expect(model.attribute_names).to include('_id') }
+      it { expect(model.aliased_fields).to eq({ 'id' => '_id', 'session_id' => 'session', 'thread_id' => 'thread', 'instance' => '_id'}) }
+    else
+      it { expect(model.attribute_names).to include('id') }
+      it { expect(model.attribute_aliases).to eq({ 'instance' => 'id', 'session_id' => 'session', 'thread_id' => 'thread' }) }
+    end
+    it { expect(model.attribute_names).to include('session') }
+    it { expect(model.attribute_names).to include('enable') }
+  end
+end

data/spec/rrj/models/janus_instance_transaction_spec.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe RubyRabbitmqJanus::Models::JanusInstance, type: :model,
+                                                   name: :janus_instance do
+  before { RubyRabbitmqJanus::Models::JanusInstance.delete_all }
+  after do
+    RubyRabbitmqJanus::Models::JanusInstance.delete_all
+    create_janus_instances
+  end
+
+  let(:janus_id) do
+    random_instance = [1, 2].sample
+
+    if ENV['MONGO'].match?('true')
+      { _id: random_instance.to_s }
+    else
+      { id: random_instance }
+    end
+  end
+  let(:model) { RubyRabbitmqJanus::Models::JanusInstance }
+
+  context 'Janus Instance simple transaction' do
+    it { expect(model.count).to eq(0) }
+  end
+
+  context 'many janus instances' do
+    before do
+      FactoryGirl.create_list(:janus_instance, 5, enable: false)
+      FactoryGirl.create(:janus_instance, janus_id)
+    end
+
+    let(:one) { model.enabled.first }
+
+    it { expect(model.count).to eq(6) }
+    it { expect(model.enabled.count).to eq(1) }
+    it { expect(model.find_by_session(one.session).thread).to eq(one.thread) }
+    it { expect(model.find_by_instance(one.instance).session).to eq(one.session) }
+  end
+
+  context 'Janus Instance enable' do
+    let(:janus) { FactoryGirl.create(:janus_instance, janus_id) }
+
+    it { expect(janus.valid?).to be_a(TrueClass) }
+    it { expect(janus.session).to be_a(Integer) }
+    it { expect(janus.enable).to be_a(TrueClass) }
+    it { expect(janus.enable).to eq(true) }
+    it { expect(janus.thread).to be_a(Integer) }
+  end
+
+  context 'Janus Instance disable' do
+    let(:janus) { FactoryGirl.create(:janus_instance, enable: false) }
+
+    it { expect(janus.valid?).to be_a(TrueClass) }
+    it { expect(janus.session).to be_nil }
+    it { expect(janus.enable).to be_a(FalseClass) }
+    it { expect(janus.enable).to eq(false) }
+    it { expect(janus.thread).to be_nil }
+  end
+end

data/spec/spec_helper.rb

@@ -4,6 +4,7 @@ require 'bundler/setup'
 require 'pry'
 require 'json-schema-rspec'
 require 'rails'
+require 'factory_girl'
 require 'database_cleaner'
 ENV['MONGO']='true' if ENV['MONGO'].nil?
 require ENV['MONGO'].match?('true') ? 'mongoid' : 'active_record'
@@ -12,6 +13,7 @@ require 'ruby_rabbitmq_janus'
 require 'config/initializer'
 require 'config/database'
 require 'config/instance'
+Dir['spec/factories/*.rb'].each { |f| require File.expand_path(f) }
 
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
@@ -53,6 +55,9 @@ RSpec.configure do |config|
   # Exclude request with tag broken
   config.filter_run_excluding broken: true
 
+  # Configure Factory Girl
+  config.include FactoryGirl::Syntax::Methods
+
   # Configure Initializer RRJ and create session with Janus Instance
   config.before(:example) do |example|
     initializer_rrj(example.metadata)

data/spec/support/sdp.rb

@@ -0,0 +1,136 @@
+# frozen_string_literal: true
+
+SDP_OFFER =<<EOF
+v=0
+o=- 7041456084360858977 2 IN IP4 127.0.0.1
+s=-
+t=0 0
+a=group:BUNDLE audio video
+a=msid-semantic: WMS 2jKToeOlpzKTn7anwnHOJmzFyhvEYt1kpcMY
+m=audio 9 UDP/TLS/RTP/SAVPF 111 103 104 9 0 8 106 105 13 126
+c=IN IP4 0.0.0.0
+a=rtcp:9 IN IP4 0.0.0.0
+a=ice-ufrag:T9QI
+a=ice-pwd:s9YvfGuavTZN0Lqc53JNInEP
+a=fingerprint:sha-256 6D:ED:BC:93:AC:EC:C2:29:03:7D:6A:60:9F:D3:F5:A1:6D:1A:38:CE:F0:C0:EC:C8:5D:87:19:19:BE:0F:89:BB
+a=setup:actpass
+a=mid:audio
+a=extmap:1 urn:ietf:params:rtp-hdrext:ssrc-audio-level
+a=extmap:3 http://www.webrtc.org/experiments/rtp-hdrext/abs-send-time
+a=sendonly
+a=rtcp-mux
+a=rtpmap:111 opus/48000/2
+a=rtcp-fb:111 transport-cc
+a=fmtp:111 minptime=10;useinbandfec=1
+a=rtpmap:103 ISAC/16000
+a=rtpmap:104 ISAC/32000
+a=rtpmap:9 G722/8000
+a=rtpmap:0 PCMU/8000
+a=rtpmap:8 PCMA/8000
+a=rtpmap:106 CN/32000
+a=rtpmap:105 CN/16000
+a=rtpmap:13 CN/8000
+a=rtpmap:126 telephone-event/8000
+a=ssrc:2786155512 cname:/+YL75rdcn+UKbf9
+a=ssrc:2786155512 msid:2jKToeOlpzKTn7anwnHOJmzFyhvEYt1kpcMY e0f2490b-468a-4abc-9770-a5f99b13c152
+a=ssrc:2786155512 mslabel:2jKToeOlpzKTn7anwnHOJmzFyhvEYt1kpcMY
+a=ssrc:2786155512 label:e0f2490b-468a-4abc-9770-a5f99b13c152
+m=video 9 UDP/TLS/RTP/SAVPF 100 101 107 116 117 96 97 99 98
+c=IN IP4 0.0.0.0
+a=rtcp:9 IN IP4 0.0.0.0
+a=ice-ufrag:T9QI
+a=ice-pwd:s9YvfGuavTZN0Lqc53JNInEP
+a=fingerprint:sha-256 6D:ED:BC:93:AC:EC:C2:29:03:7D:6A:60:9F:D3:F5:A1:6D:1A:38:CE:F0:C0:EC:C8:5D:87:19:19:BE:0F:89:BB
+a=setup:actpass
+a=mid:video
+a=extmap:2 urn:ietf:params:rtp-hdrext:toffset
+a=extmap:3 http://www.webrtc.org/experiments/rtp-hdrext/abs-send-time
+a=extmap:4 urn:3gpp:video-orientation
+a=extmap:6 http://www.webrtc.org/experiments/rtp-hdrext/playout-delay
+a=sendonly
+a=rtcp-mux
+a=rtcp-rsize
+a=rtpmap:100 VP8/90000
+a=rtcp-fb:100 ccm fir
+a=rtcp-fb:100 nack
+a=rtcp-fb:100 nack pli
+a=rtcp-fb:100 goog-remb
+a=rtcp-fb:100 transport-cc
+a=rtpmap:101 VP9/90000
+a=rtcp-fb:101 ccm fir
+a=rtcp-fb:101 nack
+a=rtcp-fb:101 nack pli
+a=rtcp-fb:101 goog-remb
+a=rtcp-fb:101 transport-cc
+a=rtpmap:107 H264/90000
+a=rtcp-fb:107 ccm fir
+a=rtcp-fb:107 nack
+a=rtcp-fb:107 nack pli
+a=rtcp-fb:107 goog-remb
+a=rtcp-fb:107 transport-cc
+a=fmtp:107 level-asymmetry-allowed=1;packetization-mode=1;profile-level-id=42e01f
+a=rtpmap:116 red/90000
+a=rtpmap:117 ulpfec/90000
+a=rtpmap:96 rtx/90000
+a=fmtp:96 apt=100
+a=rtpmap:97 rtx/90000
+a=fmtp:97 apt=101
+a=rtpmap:99 rtx/90000
+a=fmtp:99 apt=107
+a=rtpmap:98 rtx/90000
+a=fmtp:98 apt=116
+a=ssrc-group:FID 1022811670 258141567
+a=ssrc:1022811670 cname:/+YL75rdcn+UKbf9
+a=ssrc:1022811670 msid:2jKToeOlpzKTn7anwnHOJmzFyhvEYt1kpcMY 25d58816-114a-41d2-aa08-1039e09f942f
+a=ssrc:1022811670 mslabel:2jKToeOlpzKTn7anwnHOJmzFyhvEYt1kpcMY
+a=ssrc:1022811670 label:25d58816-114a-41d2-aa08-1039e09f942f
+a=ssrc:258141567 cname:/+YL75rdcn+UKbf9
+a=ssrc:258141567 msid:2jKToeOlpzKTn7anwnHOJmzFyhvEYt1kpcMY 25d58816-114a-41d2-aa08-1039e09f942f
+a=ssrc:258141567 mslabel:2jKToeOlpzKTn7anwnHOJmzFyhvEYt1kpcMY
+a=ssrc:258141567 label:25d58816-114a-41d2-aa08-1039e09f942f
+EOF
+
+SDP_ANSWER = <<SDP
+v=0
+o=- 7041456084360858977 2 IN IP4 127.0.0.1
+s=-
+t=0 0
+a=group:BUNDLE audio video
+a=msid-semantic: WMS 2jKToeOlpzKTn7anwnHOJmzFyhvEYt1kpcMY
+m=audio 9 UDP/TLS/RTP/SAVPF 111
+c=IN IP4 0.0.0.0
+a=rtcp:9 IN IP4 0.0.0.0
+a=ice-ufrag:T9QI
+a=ice-pwd:s9YvfGuavTZN0Lqc53JNInEP
+a=fingerprint:sha-256 6D:ED:BC:93:AC:EC:C2:29:03:7D:6A:60:9F:D3:F5:A1:6D:1A:38:CE:F0:C0:EC:C8:5D:87:19:19:BE:0F:89:BB
+a=setup:actpass
+a=mid:audio
+a=extmap:1 urn:ietf:params:rtp-hdrext:ssrc-audio-level
+a=extmap:3 http://www.webrtc.org/experiments/rtp-hdrext/abs-send-time
+a=sendonly
+a=rtcp-mux
+a=rtpmap:111 opus/48000/2
+a=rtcp-fb:111 transport-cc
+a=fmtp:111 minptime=10;useinbandfec=1
+m=video 9 UDP/TLS/RTP/SAVPF 100
+c=IN IP4 0.0.0.0
+a=rtcp:9 IN IP4 0.0.0.0
+a=ice-ufrag:T9QI
+a=ice-pwd:s9YvfGuavTZN0Lqc53JNInEP
+a=fingerprint:sha-256 6D:ED:BC:93:AC:EC:C2:29:03:7D:6A:60:9F:D3:F5:A1:6D:1A:38:CE:F0:C0:EC:C8:5D:87:19:19:BE:0F:89:BB
+a=setup:actpass
+a=mid:video
+a=extmap:2 urn:ietf:params:rtp-hdrext:toffset
+a=extmap:3 http://www.webrtc.org/experiments/rtp-hdrext/abs-send-time
+a=extmap:4 urn:3gpp:video-orientation
+a=extmap:6 http://www.webrtc.org/experiments/rtp-hdrext/playout-delay
+a=sendonly
+a=rtcp-mux
+a=rtcp-rsize
+a=rtpmap:100 VP8/90000
+a=rtcp-fb:100 ccm fir
+a=rtcp-fb:100 nack
+a=rtcp-fb:100 nack pli
+a=rtcp-fb:100 goog-remb
+a=rtcp-fb:100 transport-cc
+SDP

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_rabbitmq_janus
 version: !ruby/object:Gem::Version
-  version: 2.2.0.pre.161
+  version: 2.2.0.pre.164
 platform: ruby
 authors:
 - VAILLANT Jeremy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-25 00:00:00.000000000 Z
+date: 2017-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -276,6 +276,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: factory_girl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.8'
 - !ruby/object:Gem::Dependency
   name: bunny
   requirement: !ruby/object:Gem::Requirement
@@ -491,6 +505,7 @@ files:
 - spec/config/initializer.rb
 - spec/config/instance.rb
 - spec/config/mongoid.yml
+- spec/factories/janus_instance.rb
 - spec/request/admin/request_handle_info_spec.rb
 - spec/request/admin/request_handles_spec.rb
 - spec/request/admin/request_sessions_spec.rb
@@ -509,7 +524,8 @@ 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/janus_instance.rb
+- spec/rrj/models/janus_instance_definition_spec.rb
+- spec/rrj/models/janus_instance_transaction_spec.rb
 - spec/rrj/rabbit/connect_spec.rb
 - spec/rrj/rabbit/propertie_2_spec.rb
 - spec/rrj/rabbit/propertie_spec.rb
@@ -558,6 +574,7 @@ files:
 - spec/support/schemas/request/peer/answer.json
 - spec/support/schemas/request/peer/offer.json
 - spec/support/schemas/request/peer/trickle.json
+- spec/support/sdp.rb
 - spec/support/type.rb
 homepage: https://github.com/dazzl-tv/ruby-rabbitmq-janus
 licenses:

data/spec/rrj/models/janus_instance.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe RubyRabbitmqJanus::Models::JanusInstance, type: :model,
-                                                   name: :janus_instance do
-  let(:model) { RubyRabbitmqJanus::Models::JanusInstance }
-
-  context 'active record model' do
-    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') }
-  end
-end