ruby_rabbitmq_janus 1.2.2 → 1.2.3.pre.53

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66f20d8377739e714f7694bb0a5094501c89f41d
-  data.tar.gz: a655ab4468aaf165bbe4aba9391cf1df7010e0aa
+  metadata.gz: 86a3d4ef09913351f9fa9de8f78c7966cddbfa58
+  data.tar.gz: e67eb734e40d2c9709ec2e49c696ca9799212bb6
 SHA512:
-  metadata.gz: b9e11959cda823b1bac8d167ac04d61cfa6a789de29cb7d42a2375bd1f5a19850eac643ef975e55a59e1d98fda94673ad108a4c7feb2851d7211c0b46197f0c2
-  data.tar.gz: 86a773c15454746076dfa43b5c49d15b00c37ad0cf0ef07b399c8f9124bc808c80dd180d23646669cb99cb58548af8871989e28ab4dda8c34239a0012324a034
+  metadata.gz: 0168717d3cb9d059ab7af70c079a9bd912cc2d6b0edcdcbd1e9433980127b5874a8ce0cc6ba269134607047e010aabf48932fcc96f0c6dd5f357b3719ba9ad65
+  data.tar.gz: af44f0c6e01d69e5f551d19134f36b1d4d6196c62764533b0f99e4b994041084ba336a5375c72992832b8fbea72da03698be335a8cb1e9fc327a9b59cddc5475

data/README.md

@@ -6,11 +6,11 @@
 
 Ruby Gem for Janus WebRTC Gateway integration using RabbitMQ message queue
 
-This gem is used to communicate to a server Janus through RabbitMQ software (
-Message-oriented middleware). It waiting a messages to Rails API who send to RabbitMQ
-server in a queue for janus server. janus processes a message and send to RabbitMQ server
-in a queue for gem. Once the received message is decoded and returned through the Rails API.
-
+This gem is used to communicate to a server Janus through RabbitMQ software
+(Message-oriented middleware). It waiting a messages to Rails API who send to
+RabbitMQ server in a queue for janus server. janus processes a message and send
+ to RabbitMQ server in a queue for gem. Once the received message is decoded
+ and returned through the Rails API.
 
 This gem is product by [Dazzl.tv](http://dazzl.tv)
 
@@ -48,17 +48,11 @@ Use generator for complete installation :
 ```ruby
 rails g -h
 RubyRabbitmqJanus:
-  ruby_rabbitmq_janus:configuration
-  # Generate a custom configuration file.
-
-  ruby_rabbitmq_janus:default_request
-  # Copy base request file sending to janus in application. It's necessary if you want add your request.
-
-  ruby_rabbitmq_janus:initializer
-  # Generate a initializer to this gem for rails application.
-
-  ruby_rabbitmq_janus:create_request
-  # Create an request to json format for RubyRabbitmqJanus transaction.
+  ruby_rabbitmq_janus:configuration     # Generate a custom configuration file.
+  ruby_rabbitmq_janus:create_request    # Create an request to json format for RubyRabbitmqJanus transaction.
+  ruby_rabbitmq_janus:default_request   # Copy base request file sending to janus in application.
+  ruby_rabbitmq_janus:initializer       # Generate a initializer to this gem for rails application.
+  ruby_rabbitmq_janus:install           # Install RubyRabbitmqJanus in your Rails application
 ```
 
 #### Requests
@@ -90,18 +84,27 @@ rabbitmq and use plugin echotest for janus server.
 
 Use tags for rspec :
 
-| type            | name            |
-| --------------- | --------------- |
-| request         | attach          |
-|                 | create          |
-|                 | detach          |
-|                 | info            |
-|                 | test            |
-| level           | base            |
-|                 | admin           |
-| config          | rabbit          |
-|                 | log             |
-|                 | config          |
+| Describe                                                          | Type            | Name            |
+| -------------------------------------------------------------     | --------------- | --------------- |
+| **Internaly function**                                            | config          |                 |
+| Use bunny gem                                                     |                 | rabbit          |
+| Test log functions                                                |                 | log             |
+| Test configuration function                                       |                 | config          |
+| Test Gem contains CONSTANTS                                       |                 | describe        |
+| **Level request sending to janus (admin monitor API or classic)** | level           |                 |
+| Request with no admin right.                                      |                 | base            |
+| Request with admin right in Janus application.                    |                 | admin           |
+| **Request JSON sending to Rabbitmq -> Janus**                     | request         |                 |
+| Test request attach type                                          |                 | attach          |
+| Test request type create                                          |                 | create          |
+| Test request type detach                                          |                 | detach          |
+| Test request type info                                            |                 | info            |
+| Test request type test                                            |                 | test            |
+
+Example usage rspec with tags :
+```ruby
+rspec --tag --name:config --tag level:base
+```
 
 ## Upgrade
 

data/config/requests/peer/offer.json

@@ -4,8 +4,8 @@
   "handle_id": "<number>",
   "transaction": "<string>",
   "body": {
-    "audio": "true",
-    "video": "true"
+    "audio": true,
+    "video": true
   },
   "jsep": {
     "type": "offer",

data/lib/rrj/errors/init.rb

@@ -15,7 +15,7 @@ module RubyRabbitmqJanus
     end
 
     # Define an exception if gem dont initialize correctly
-    class InstaciateGemFailed < RRJ
+    class InstanciateGemFailed < RRJ
       # Initialize a error for instanciate class. It's a fatal error
       # @param [String] message Text returning in raise
       def initialize(message)

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

@@ -11,5 +11,19 @@ module RubyRabbitmqJanus
         super message, :fatal
       end
     end
+
+    # Execpetion primary for Rabbit class
+    class Rabbit < RRJError
+      def initialize(message)
+        super "[Rabbit]#{message}", :fatal
+      end
+    end
+
+    # Send exception when publish a message to rabbitmq failed
+    class RabbitPublishMessage < Rabbit
+      def initialize(message, request)
+        super "[Publish] #{message} -- #{request}"
+      end
+    end
   end
 end

data/lib/rrj/info.rb

@@ -1,9 +1,23 @@
 # frozen_string_literal: true
+# :reek:TooManyConstants
+
 # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
 # Define constant to gem.
 module RubyRabbitmqJanus
   # Define version to gem
-  VERSION = '1.2.2'
+  VERSION = '1.2.3'
+
+  # Name to gem
+  GEM_NAME = 'ruby_rabbitmq_janus'
+
+  # Authors
+  AUTHORS = ['VAILLANT Jeremy'].freeze
+
+  # Emails
+  EMAILS = ['jeremy@dazzl.tv'].freeze
+
+  # Licence
+  LICENSE = 'MIT'
 
   # Define a summary description to gem
   SUMMARY = 'Ruby RabbitMQ Janus'

data/lib/rrj/init.rb

@@ -87,7 +87,7 @@ module RubyRabbitmqJanus
     #
     # @example Sending an message create
     #   RubyRabbitmqJanus::RRJ.new.message_session('base::create')
-    #   n#=> {"janus":"server_info","name":"Janus WebRTC Gateway" ... }
+    #   #=> {"janus":"server_info","name":"Janus WebRTC Gateway" ... }
     #
     # @return [RubyRabbitmqJanus::Janus::Responses::Standard]
     #   Give an object response to janus server
@@ -202,7 +202,7 @@ module RubyRabbitmqJanus
     #
     # @since 1.0.0
     def handle_message_simple(type, options = { 'replace' => {}, 'add' => {} })
-      @transaction = Janus::Transactions::Handle.new(@session,
+      @transaction = Janus::Transactions::Handle.new(session?(options),
                                                      false,
                                                      handle?(options))
       @transaction.connect { message_handle(type, options) }
@@ -218,9 +218,17 @@ module RubyRabbitmqJanus
       { 'session_id' => @session } unless option.key?('session_id')
     end
 
+    def session?(options)
+      return_value(options, 'session_id', @session)
+    end
+
     def handle?(options)
-      replace = options['replace']
-      replace.key?('handle_id') ? replace['handle_id'] : 0
+      return_value(options, 'handle_id', 0)
+    end
+
+    def return_value(opt, key, value)
+      replace = opt['replace']
+      replace.key?(key) ? replace[key] : value
     end
   end
 end

data/lib/rrj/janus/processus/event.rb

@@ -16,7 +16,10 @@ module RubyRabbitmqJanus
 
         # Create a thred for execute a block code in a thread
         #
-        # @yield Send to publisher the actions when a Janus event is received
+        # @param [Proc] block Block code for execute action when queue
+        #   standard 'from-janus' receive a message.
+        #
+        # @return [Thread] It's a thread who listen queue and execute action
         def run(&block)
           thread.join
           Thread.new do

data/lib/rrj/janus/processus/keepalive.rb

@@ -14,7 +14,7 @@ module RubyRabbitmqJanus
 
         # Create a thread
         def initialize
-          @response = @publish = nil
+          @response = @publisher = nil
           super
         end
 
@@ -30,24 +30,30 @@ module RubyRabbitmqJanus
 
         def transaction_running
           @response = Janus::Responses::Standard.new(create_session)
-          lock.synchronize do
-            condition.signal
-          end
-          loop_session(Tools::Config.instance.ttl)
+          synchronize
+          create_loop_session
+        rescue => error
+          raise Errors::KeepaliveLoopSession, error
+        end
+
+        def synchronize
+          lock.synchronize { condition.signal }
+        end
+
+        def create_loop_session
+          loop { loop_session(Tools::Config.instance.ttl) }
         end
 
         def loop_session(time_to_live)
-          loop do
-            sleep time_to_live
-            @publish.send_a_message(message_keepalive)
-          end
-        rescue => error
-          raise Errors::KeepaliveLoopSession, error
+          sleep time_to_live
+          @publisher.publish(message_keepalive)
+          Tools::Log.instance.info "Keepalive for #{running_session}"
         end
 
         def create_session
-          @publish = Rabbit::Publisher::PublishExclusive.new(rabbit.channel, '')
-          @publish.send_a_message(Janus::Messages::Standard.new('base::create'))
+          @publisher = Rabbit::Publisher::PublishExclusive.new(rabbit.channel,
+                                                               '')
+          @publisher.publish(Janus::Messages::Standard.new('base::create'))
         rescue => error
           raise Errors::KeepaliveCreateSession, error
         end

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

@@ -8,6 +8,13 @@ module RubyRabbitmqJanus
       # This class work with janus and send a series of message
       class Admin < Handle
         # Publish an message in handle
+        #
+        # @param [String] type
+        #   Given a type to request. JSON request writing in 'config/requests/'
+        # @param [Hash] options Replace/add element to request
+        #
+        # @return [Janus::Response::Standard] a response to message pusblishing
+        #   in queue Admin API
         def publish_message_handle(type, options)
           opts = {
             'session_id' => session,
@@ -15,8 +22,7 @@ module RubyRabbitmqJanus
             'admin_secret' => admin_secret
           }
           msg = Janus::Messages::Admin.new(type, opts.merge!(options))
-          publisher = publish.send_a_message(msg)
-          Janus::Responses::Standard.new(read_response(publisher))
+          Janus::Responses::Standard.new(read_response(publisher.publish(msg)))
         end
 
         private
@@ -24,13 +30,13 @@ module RubyRabbitmqJanus
         # Define queue used for admin message
         def choose_queue
           chan = rabbit.channel
-          @publish = Rabbit::Publisher::PublisherAdmin.new(chan)
+          @publisher = Rabbit::Publisher::PublisherAdmin.new(chan)
         end
 
         # Override method for publishing an message and reading a response
         def send_a_message
           Tools::Log.instance.info 'Publish a message ...'
-          Janus::Responses::Standard.new(publish.send_a_message(yield))
+          Janus::Responses::Standard.new(publisher.publish(yield))
         end
 
         # Read a admin pass in configuration file to this gem

data/lib/rrj/janus/transactions/handle.rb

@@ -33,11 +33,16 @@ module RubyRabbitmqJanus
         end
 
         # Publish an message in handle
+        #
+        # @param [String] type Request file used
+        # @param [Hash] options Replace/add element in request
+        #
+        # @return [Janus::Responses::Standard] Response to message sending
         def publish_message_handle(type, options)
           opts = { 'session_id' => session, 'handle_id' => handle }
           msg = Janus::Messages::Standard.new(type, opts.merge!(options))
-          publisher = publish.send_a_message(msg)
-          Janus::Responses::Standard.new(read_response(publisher))
+          response = read_response(publisher.publish(msg))
+          Janus::Responses::Standard.new(response)
         end
 
         private
@@ -61,7 +66,7 @@ module RubyRabbitmqJanus
         def read_response_exclusive
           chan = rabbit.channel
           tmp_publish = Rabbit::Publisher::PublishExclusive.new(chan, '')
-          tmp_publish.send_a_message(yield)
+          tmp_publish.publish(yield)
         end
       end
     end

data/lib/rrj/janus/transactions/transaction.rb

@@ -16,32 +16,33 @@ module RubyRabbitmqJanus
         def initialize(session)
           @rabbit = Rabbit::Connect.new
           @session = session
-          @publish = @exclusive = nil
+          @publisher = @exclusive = nil
         rescue => error
           raise Errors::JanusTransaction, error
         end
 
         private
 
-        attr_reader :rabbit, :session, :response, :handle, :publish, :exclusive
+        attr_reader :rabbit, :session, :response, :handle, :publisher,
+                    :exclusive
 
         def choose_queue
           chan = @rabbit.channel
-          @publish = if @exclusive
-                       Tools::Log.instance.debug \
-                         'Choose an queue Exclusive : ampq.gen-xxx'
-                       Rabbit::Publisher::PublishExclusive.new(chan, '')
-                     else
-                       Tools::Log.instance.debug \
-                         'Choose an queue non Exclusive : to-janus'
-                       Rabbit::Publisher::PublishNonExclusive.new(chan)
-                     end
+          @publisher = if @exclusive
+                         Tools::Log.instance.debug \
+                           'Choose an queue Exclusive : ampq.gen-xxx'
+                         Rabbit::Publisher::PublishExclusive.new(chan, '')
+                       else
+                         Tools::Log.instance.debug \
+                           'Choose an queue non Exclusive : to-janus'
+                         Rabbit::Publisher::PublishNonExclusive.new(chan)
+                       end
         end
 
         def send_a_message
           Tools::Log.instance.info 'Publish a message ...'
-          publish = @publish.send_a_message(yield)
-          Janus::Responses::Standard.new(read_response(publish))
+          response = read_response(@publisher.publish(yield))
+          Janus::Responses::Standard.new(response)
         end
 
         def read_response(publish)

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

@@ -14,7 +14,7 @@ module RubyRabbitmqJanus
         end
 
         # Send an message to queue and waiting a response
-        def send_a_message(request)
+        def publish(request)
           super(request)
           return_response
         end

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

@@ -4,8 +4,15 @@ module RubyRabbitmqJanus
   module Rabbit
     module Publisher
       # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
+      # # Publish message
+      #
+      # Publish message in queue exclusive. Bunny create automaticaly a name for
+      # this queue. The queue name like to 'amq.gen-1A456DGVHDVUS'.
       class PublishExclusive < Publisher
         # Initialize an queue exclusive and generated automaticaly by bunny
+        #
+        # @param [String] exchange Exchange used for the transaction
+        # @param [String] name_queue Name to queue exclusive
         def initialize(exchange, name_queue)
           @reply = exchange.queue(name_queue, exclusive: true)
           super(exchange)
@@ -13,7 +20,7 @@ module RubyRabbitmqJanus
         end
 
         # Send an message to queue and waiting a response
-        def send_a_message(request)
+        def publish(request)
           super(request)
           return_response
         end

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

@@ -14,7 +14,7 @@ module RubyRabbitmqJanus
         end
 
         # Send an message to queue
-        def send_a_message(request)
+        def publish(request)
           super(request)
         end
 

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

@@ -18,11 +18,13 @@ module RubyRabbitmqJanus
         end
 
         # Publish an message in queue
-        def send_a_message(request)
+        def publish(request)
           Tools::Log.instance.info "Send request type : #{request.type}"
           @message = request
           @exchange.publish(@message.to_json,
                             request.options.merge!(reply_to: queue_name))
+        rescue => error
+          raise Errors::RabbitPublishMessage, error, request
         end
 
         private

data/lib/rrj/tools/config.rb

@@ -9,6 +9,8 @@ module RubyRabbitmqJanus
     #
     # @!attribute [r] options
     #   @return [Hash] Return all options to configured in config file.
+    # @!attribute [r] configuration
+    #   @return [String] Path to configuration file used
     class Config
       include Singleton
 

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

@@ -32,7 +32,7 @@ module RubyRabbitmqJanus
 
         # Replace sdp in request
         def replace_sdp
-          request['jsep']['sdp'] = opts['replace']['sdp']
+          request['jsep']['sdp'] = opts['replace']['sdp'].gsub("\n", "\r\n")
         rescue => message
           Tools::Log.instance.warn "Error sdp replace : #{message}"
         end

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

@@ -17,6 +17,7 @@ module RubyRabbitmqJanus
         case @request[key]
         when '<string>' then convert_to_type_string
         when '<number>' then convert_to_type_number
+        when '<boolean>' then convert_to_type_boolean
         end
       end
 
@@ -31,6 +32,15 @@ module RubyRabbitmqJanus
       def convert_to_type_number
         @data.to_i
       end
+
+      # Convert a data to Boolean type
+      def convert_to_type_boolean
+        if @data.casecmp('TRUE')
+          true
+        elsif @data.casecmp('FALSE')
+          false
+        end
+      end
     end
   end
 end

data/spec/fixtures/config/requests/admin/handle_info.json

@@ -0,0 +1,3 @@
+{
+  "error": "Request is False !!"
+}

data/spec/fixtures/config/requests/admin/handles.json

@@ -0,0 +1,3 @@
+{
+  "error": "Request is False !!"
+}

data/spec/fixtures/config/requests/admin/log_level.json

@@ -0,0 +1,3 @@
+{
+  "error": "Request is False !!"
+}

data/spec/fixtures/config/requests/admin/sessions.json

@@ -0,0 +1,3 @@
+{
+  "error": "Request is False !!"
+}

data/spec/fixtures/config/requests/base/attach.json

@@ -0,0 +1,3 @@
+{
+  "error": "Request is False !!"
+}

data/spec/fixtures/config/requests/base/create.json

@@ -0,0 +1,4 @@
+{
+  "janus": "create",
+  "transaction": "<string>"
+}

data/spec/fixtures/config/requests/base/destroy.json

@@ -0,0 +1,3 @@
+{
+  "error": "Request is False !!"
+}

data/spec/fixtures/config/requests/base/detach.json

@@ -0,0 +1,3 @@
+{
+  "error": "Request is False !!"
+}

data/spec/fixtures/config/requests/base/info.json

@@ -0,0 +1,3 @@
+{
+  "error": "Request is False !!"
+}

data/spec/fixtures/config/requests/base/keepalive.json

@@ -0,0 +1,3 @@
+{
+  "error": "Request is False !!"
+}

data/spec/fixtures/config/requests/peer/answer.json

@@ -0,0 +1,3 @@
+{
+  "error": "Request is False !!"
+}

data/spec/fixtures/config/requests/peer/offer.json

@@ -0,0 +1,3 @@
+{
+  "error": "Request is False !!"
+}

data/spec/fixtures/config/requests/peer/trickle.json

@@ -0,0 +1,3 @@
+{
+  "error": "Request is False !!"
+}

data/spec/request/peer/request_offer_spec.rb

@@ -2,13 +2,13 @@
 
 require 'spec_helper'
 
-describe 'RubyRabbitmqJanus::RRJ -- message type offer', broken: true do
+describe 'RubyRabbitmqJanus::RRJ -- message type offer' do
   before(:example) do
     sdp = <<END
 v=0
 o=- 7041456084360858977 2 IN IP4 127.0.0.1
 s=-
-  t=0 0
+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
@@ -94,12 +94,10 @@ a=ssrc:258141567 mslabel:2jKToeOlpzKTn7anwnHOJmzFyhvEYt1kpcMY
 a=ssrc:258141567 label:25d58816-114a-41d2-aa08-1039e09f942f
 END
     @type = 'peer::offer'
-    @options = { 'replace' => { 'sdp' => sdp }, 'add' => {} }
+    @options = { 'replace' => { 'sdp' => sdp.to_s }, 'add' => {} }
   end
 
   describe '#message_handle', type: :request, level: :peer, name: :offer do
-    let(:sdp) { 'v=0\r\no=[..more sdp stuff..]' }
-
     context 'when queue is exclusive' do
       it_behaves_like 'message_handle should match json schema'
     end

data/spec/rrj/rrj_config_spec.rb

@@ -21,7 +21,7 @@ describe RubyRabbitmqJanus::Tools::Config, type: :config, name: :config do
     expect(@cfg.plugin_at).to be_a(String)
   end
 
-  it 'When janus/plugins/0 defualt value is lading' do
+  it 'When janus/plugins/0 default value is loading' do
     expect(@cfg.plugin_at).to eq 'janus.plugin.echotest'
   end
 

data/spec/rrj/rrj_spec.rb

@@ -3,23 +3,49 @@
 require 'spec_helper'
 
 describe 'RubyRabbitmqJanus::RRJ', type: :config, name: :describe do
-  it 'Has a version number' do
-    expect(RubyRabbitmqJanus::VERSION).not_to be nil
+  context 'Has a version number' do
+    let(:data) { RubyRabbitmqJanus::VERSION }
+    it_behaves_like 'constant is', String
   end
 
-  it 'Has a description' do
-    expect(RubyRabbitmqJanus::DESCRIPTION).not_to be nil
+  context 'Has a name' do
+    let(:data) { RubyRabbitmqJanus::GEM_NAME }
+    it_behaves_like 'constant is', String
   end
 
-  it 'Has a summary description' do
-    expect(RubyRabbitmqJanus::SUMMARY).not_to be nil
+  context 'Has a author' do
+    let(:data) { RubyRabbitmqJanus::AUTHORS }
+    it_behaves_like 'constant is', Array
   end
 
-  it 'Has a homepage' do
-    expect(RubyRabbitmqJanus::HOMEPAGE).not_to be nil
+  context 'Has a email' do
+    let(:data) { RubyRabbitmqJanus::EMAILS }
+    it_behaves_like 'constant is', Array
   end
 
-  it 'Has a post install message' do
-    expect(RubyRabbitmqJanus::POST_INSTALL).not_to be nil
+  context 'Has a license' do
+    let(:data) { RubyRabbitmqJanus::LICENSE }
+    it_behaves_like 'constant is', String
+    it { expect('../../LICENSE').to be_an_existing_file }
+  end
+
+  context 'Has a description' do
+    let(:data) { RubyRabbitmqJanus::DESCRIPTION }
+    it_behaves_like 'constant is', String
+  end
+
+  context 'Has a summary description' do
+    let(:data) { RubyRabbitmqJanus::SUMMARY }
+    it_behaves_like 'constant is', String
+  end
+
+  context 'Has a homepage' do
+    let(:data) { RubyRabbitmqJanus::HOMEPAGE }
+    it_behaves_like 'constant is', String
+  end
+
+  context 'Has a post install message' do
+    let(:data) { RubyRabbitmqJanus::POST_INSTALL }
+    it_behaves_like 'constant is', String
   end
 end

data/spec/support/examples_config.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+shared_examples 'constant is' do |type|
+  it { expect(data).not_to be nil }
+  it { expect(data).to be_kind_of(type) }
+end

data/spec/support/{examples.rb → examples_request.rb}

@@ -78,3 +78,20 @@ shared_examples 'message_admin should match json schema' do
     expect(message.to_json).to match_json_schema(@type)
   end
 end
+
+# Simple request
+shared_examples 'peer message_simple should match json empty' do
+  let(:message) { @gateway.message_simple(@type) }
+
+  it 'should match JSON empty' do
+    expect(message.to_json).to eq('{}')
+  end
+end
+
+shared_examples 'peer message_simple should match json schema' do
+  let(:message) { @gateway.message_simple(@type, true) }
+
+  it do
+    expect(message.to_json).to match_json_schema(@type)
+  end
+end

data/spec/support/schemas/request/peer/answer.json

@@ -3,13 +3,11 @@
   "properties": {
     "janus": { "type": "string", "pattern": "ack" },
     "transaction": { "type": "string" },
-    "session_id": { "type": "integer" },
-    "handle_id": { "type": "integer" }
+    "session_id": { "type": "integer" }
   },
   "required": [
     "janus",
     "transaction",
-    "session_id",
-    "handle_id"
+    "session_id"
   ]
 }

data/spec/support/schemas/request/peer/offer.json

@@ -3,13 +3,11 @@
   "properties": {
     "janus": { "type": "string", "pattern": "ack" },
     "transaction": { "type": "string" },
-    "session_id": { "type": "integer" },
-    "handle_id": { "type": "integer" }
+    "session_id": { "type": "integer" }
   },
   "required": [
     "janus",
     "transaction",
-    "session_id",
-    "handle_id"
+    "session_id"
   ]
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_rabbitmq_janus
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3.pre.53
 platform: ruby
 authors:
 - VAILLANT Jeremy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-16 00:00:00.000000000 Z
+date: 2017-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -285,7 +285,7 @@ description: |
   to RabbitMQ server in a queue for gem. Once the received message is decoded and
   returned through the Rails API.
 email:
-- jeremy.vaillant@dazzl.tv
+- jeremy@dazzl.tv
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -359,6 +359,19 @@ files:
 - lib/rrj/tools/requests.rb
 - lib/rrj/tools/tools.rb
 - lib/ruby_rabbitmq_janus.rb
+- spec/fixtures/config/requests/admin/handle_info.json
+- spec/fixtures/config/requests/admin/handles.json
+- spec/fixtures/config/requests/admin/log_level.json
+- spec/fixtures/config/requests/admin/sessions.json
+- spec/fixtures/config/requests/base/attach.json
+- spec/fixtures/config/requests/base/create.json
+- spec/fixtures/config/requests/base/destroy.json
+- spec/fixtures/config/requests/base/detach.json
+- spec/fixtures/config/requests/base/info.json
+- spec/fixtures/config/requests/base/keepalive.json
+- spec/fixtures/config/requests/peer/answer.json
+- spec/fixtures/config/requests/peer/offer.json
+- spec/fixtures/config/requests/peer/trickle.json
 - spec/request/admin/request_handle_info_spec.rb
 - spec/request/admin/request_sessions_spec.rb
 - spec/request/base/request_attach_spec.rb
@@ -367,7 +380,6 @@ files:
 - spec/request/base/request_detach_spec.rb
 - spec/request/base/request_info_spec.rb
 - spec/request/base/request_keepalive_spec.rb
-- spec/request/peer/request_answer_spec.rb
 - spec/request/peer/request_offer_spec.rb
 - spec/request/peer/request_trickle_spec.rb
 - spec/rrj/rrj_config_spec.rb
@@ -376,8 +388,8 @@ files:
 - spec/rrj/rrj_spec.rb
 - spec/spec_helper.rb
 - spec/support/aruba.rb
-- spec/support/examples.rb
-- spec/support/examples_peer.rb
+- spec/support/examples_config.rb
+- spec/support/examples_request.rb
 - spec/support/schemas/config/config.json
 - spec/support/schemas/config/rabbit.json
 - spec/support/schemas/request/admin/handle_info.json
@@ -388,10 +400,6 @@ files:
 - spec/support/schemas/request/base/detach.json
 - spec/support/schemas/request/base/info.json
 - spec/support/schemas/request/base/keepalive.json
-- spec/support/schemas/request/channel/create.json
-- spec/support/schemas/request/channel/destroy.json
-- spec/support/schemas/request/channel/exist.json
-- spec/support/schemas/request/channel/list.json
 - spec/support/schemas/request/peer/answer.json
 - spec/support/schemas/request/peer/offer.json
 - spec/support/schemas/request/peer/trickle.json
@@ -427,9 +435,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1

data/spec/request/peer/request_answer_spec.rb

@@ -1,66 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe 'RubyRabbitmqJanus::RRJ -- message type answer', broken: true do
-  before(:example) do
-    sdp = <<END
-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
-END
-    @type = 'peer::answer'
-    @options = { 'replace' => { 'sdp' => sdp }, 'add' => {} }
-  end
-
-  describe '#message_handle', type: :request, level: :peer, name: :answer do
-    context 'when queue is exclusive' do
-      it_behaves_like 'message_handle should match json schema'
-    end
-
-    context 'when queue is not exclusive' do
-      it_behaves_like 'message_handle should match json empty'
-    end
-  end
-
-  after(:example) { @gateway.handle_message_simple('base::detach') }
-end

data/spec/support/examples_peer.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-# Simple request
-shared_examples 'peer message_simple should match json empty' do
-  let(:message) { @gateway.message_simple(@type) }
-
-  it 'should match JSON empty' do
-    expect(message.to_json).to eq('{}')
-  end
-end
-
-shared_examples 'peer message_simple should match json schema' do
-  let(:message) { @gateway.message_simple(@type, true) }
-
-  it do
-    expect(message.to_json).to match_json_schema(@type)
-  end
-end

data/spec/support/schemas/request/channel/create.json

@@ -1,39 +0,0 @@
-{
-  "type": "object",
-  "properties": {
-    "janus": { "type": "string", "pattern": "success" },
-    "session_id": { "type": "integer" },
-    "transaction": { "type": "string" },
-    "sender": { "type": "integer" },
-    "plugindata": {
-      "type": "hash",
-      "properties": {
-        "data": {
-          "type": "hash",
-          "properties": {
-            "videocontrol": { "type": "string", "pattern": "created" },
-            "channel": { "type": "integer"}
-            },
-            "required": [
-              "videocontrol",
-              "channel"
-            ]
-        },
-        "plugin": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "plugin",
-        "data"
-      ]
-    }
-  },
-  "required": [
-    "janus",
-    "session_id",
-    "sender",
-    "transaction",
-    "plugindata"
-  ]
-}

data/spec/support/schemas/request/channel/destroy.json

@@ -1,39 +0,0 @@
-{
-  "type": "object",
-  "properties": {
-    "janus": { "type": "string", "pattern": "success" },
-    "session_id": { "type": "integer" },
-    "transaction": { "type": "string" },
-    "sender": { "type": "integer" },
-    "plugindata": {
-      "type": "hash",
-      "properties": {
-        "data": {
-          "type": "hash",
-          "properties": {
-            "videocontrol": { "type": "string", "pattern": "destroyed" },
-            "channel": { "type": "integer"}
-          },
-          "required": [
-            "videocontrol",
-            "channel"
-          ]
-        },
-        "plugin": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "data",
-        "plugin"
-      ]
-    }
-  },
-  "required": [
-    "janus",
-    "session_id",
-    "sender",
-    "transaction",
-    "plugindata"
-  ]
-}

data/spec/support/schemas/request/channel/exist.json

@@ -1,41 +0,0 @@
-{
-  "type": "object",
-  "properties": {
-    "janus": { "type": "string", "pattern": "success" },
-    "session_id": { "type": "integer" },
-    "transaction": { "type": "string" },
-    "sender": { "type": "integer" },
-    "plugindata": {
-      "type": "hash",
-      "properties": {
-        "data": {
-          "type": "hash",
-          "properties": {
-            "videocontrol": { "type": "string", "pattern": "success" },
-            "channel": { "type": "integer"},
-            "exists": { "type": "boolean" }
-            },
-            "required": [
-              "videocontrol",
-              "channel",
-              "exists"
-            ]
-        },
-        "plugin": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "plugin",
-        "data"
-      ]
-    }
-  },
-  "required": [
-    "janus",
-    "session_id",
-    "sender",
-    "transaction",
-    "plugindata"
-  ]
-}

data/spec/support/schemas/request/channel/list.json

@@ -1,37 +0,0 @@
-{
-  "type": "object",
-  "properties": {
-    "janus": { "type": "string", "pattern": "success" },
-    "session_id": { "type": "integer" },
-    "transaction": { "type": "string" },
-    "sender": { "type": "integer" },
-    "plugindata": {
-      "type": "hash",
-      "properties": {
-        "data": {
-          "type": "hash",
-          "properties": {
-            "videocontrol": { "type": "string" },
-            "list": { "type": "array" }
-          },
-          "required": [
-            "videocontrol",
-            "list"
-          ]
-        },
-        "plugin": { "type": "string" }
-      },
-      "required": [
-        "data",
-        "plugin"
-      ]
-    }
-  },
-  "required": [
-    "janus",
-    "session_id",
-    "sender",
-    "transaction",
-    "plugindata"
-  ]
-}