janus_gateway 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c10a9ee81c818aee4fe4073e737cf3eda8191e04
-  data.tar.gz: 9340bc834c427717721675b34b7960e1d3caf302
+  metadata.gz: bc4b9beb3a1785cdd57969399012134c3d9cf1f6
+  data.tar.gz: 6f0f36f3d20e628ce3e71a9bba8048e29c7e0fcf
 SHA512:
-  metadata.gz: 9889e2845a169b208ccb1e8d45d0f2e0102e1d2bf3a3fd996905475e1957ebe5e1536dbbe017bbb4914f983baa3805213cf72bf43f3d088f4976556fd0f889e2
-  data.tar.gz: f0934ba4c35e31de9b7e75f13277a779fd3c9ff8d47d7074cb37f828729fb92236321fca3821bd7242ad7c30d4c3bf4cdbf357aab5240c704ce320d20c3642e7
+  metadata.gz: 61469d3bf261e225d482a2a1a5ad7fe06c6e475125ad7bf106d1106361617e4a0aa8a23f9432bcd23669ba15203e405cfd80ebda369fe4b1899eaefe007b3962
+  data.tar.gz: b8105fbd4c6e7a56939d4667c031d8356e245d531b311747a3df0bb59702c1febffcf5c786081ee8eacd5deedf6ec90dfc8a389bfe29884b41b32a48f7658f27

data/README.md

@@ -1,6 +1,9 @@
-janus-gateway-ruby [![Build Status](https://travis-ci.org/cargomedia/janus-gateway-ruby.svg)](https://travis-ci.org/cargomedia/janus-gateway-ruby)
+janus-gateway-ruby
 ==================
-Minimalistic [janus-gateway](https://github.com/meetecho/janus-gateway) client for ruby
+Minimalistic client for the [Janus](https://github.com/meetecho/janus-gateway) WebRTC gateway.
+
+[![Build Status](https://img.shields.io/travis/cargomedia/janus-gateway-ruby/master.svg)](https://travis-ci.org/cargomedia/janus-gateway-ruby)
+[![Gem Version](https://img.shields.io/gem/v/janus_gateway.svg)](https://rubygems.org/gems/janus_gateway)
 
 Installation
 ------------

data/lib/janus_gateway.rb

@@ -1,5 +1,4 @@
 module JanusGateway
-
   require 'json'
   require 'events'
   require 'concurrent'

data/lib/janus_gateway/client.rb

@@ -1,7 +1,5 @@
 module JanusGateway
-
   class Client
-
     attr_accessor :transport
 
     # @param [JanusGateway::Transport]
@@ -9,8 +7,8 @@ module JanusGateway
     def initialize(transport, options = {})
       @transport = transport
       @options = {
-        :token => nil,
-        :admin_secret => nil
+        token: nil,
+        admin_secret: nil
       }.merge(options)
     end
 
@@ -29,13 +27,13 @@ module JanusGateway
     # @param [Hash] data
     # @return [Concurrent::Promise]
     def send_transaction(data)
-      extra_fields = @options.delete_if { |k, v| v.nil? }
+      extra_fields = @options.delete_if { |_, v| v.nil? }
       @transport.send_transaction(data.merge(extra_fields))
     end
 
     # @return [TrueClass, FalseClass]
-    def is_connected?
-      @transport.is_connected?
+    def connected?
+      @transport.connected?
     end
 
     # @param [Symbol, String] event
@@ -43,6 +41,5 @@ module JanusGateway
     def on(event, &block)
       @transport.on(event, &block)
     end
-
   end
 end

data/lib/janus_gateway/error.rb

@@ -1,24 +1,18 @@
 module JanusGateway
-
   class Error < StandardError
+    # @return [Integer]
+    attr_reader :code
+
+    # @return [String]
+    attr_reader :info
 
     # @param [Integer] error_code
     # @param [String] error_info
     def initialize(error_code, error_info)
-      @code, @info = error_code, error_info
+      @code = error_code
+      @info = error_info
 
       super("<Code: #{code}> <Info: #{info}>")
     end
-
-    # @return [Integer]
-    def code
-      @code
-    end
-
-    # @return [String]
-    def info
-      @info
-    end
-
   end
 end

data/lib/janus_gateway/plugin/rtpbroadcast.rb

@@ -1,12 +1,9 @@
 module JanusGateway::Plugin
-
   class Rtpbroadcast < JanusGateway::Resource::Plugin
-
     # @param [JanusGateway::Client] client
     # @param [JanusGateway::Resource::Session] session
     def initialize(client, session)
       super(client, session, 'janus.plugin.cm.rtpbroadcast')
     end
-
   end
 end

data/lib/janus_gateway/plugin/rtpbroadcast/mountpoint.rb

@@ -1,6 +1,10 @@
 module JanusGateway::Plugin
-
   class Rtpbroadcast::Mountpoint < JanusGateway::Resource
+    # @return [JanusGateway::Resource::Plugin]
+    attr_reader :plugin
+
+    # @return [Hash, NilClass]
+    attr_reader :data
 
     # @param [JanusGateway::Client] client
     # @param [JanusGateway::Plugin::Rtpbroadcast] plugin
@@ -14,12 +18,12 @@ module JanusGateway::Plugin
 
       @streams = streams || [
         {
-          :audio => 'yes',
-          :video => 'yes',
-          :audiopt => 111,
-          :audiortpmap => 'opus/48000/2',
-          :videopt => 100,
-          :videortpmap => 'VP8/90000'
+          audio: 'yes',
+          video: 'yes',
+          audiopt: 111,
+          audiortpmap: 'opus/48000/2',
+          videopt: 100,
+          videortpmap: 'VP8/90000'
         }
       ]
 
@@ -31,19 +35,17 @@ module JanusGateway::Plugin
       promise = Concurrent::Promise.new
 
       client.send_transaction(
-        {
-          :janus => 'message',
-          :session_id => plugin.session.id,
-          :handle_id => plugin.id,
-          :body => {
-            :request => 'create',
-            :id => id,
-            :name => id,
-            :description => id,
-            :recorded => true,
-            :streams => @streams,
-            :channel_data => @channel_data
-          }
+        janus: 'message',
+        session_id: plugin.session.id,
+        handle_id: plugin.id,
+        body: {
+          request: 'create',
+          id: id,
+          name: id,
+          description: id,
+          recorded: true,
+          streams: @streams,
+          channel_data: @channel_data
         }
       ).then do |data|
         plugindata = data['plugindata']['data']
@@ -85,20 +87,10 @@ module JanusGateway::Plugin
       plugin.session
     end
 
-    # @return [JanusGateway::Resource::Plugin]
-    def plugin
-      @plugin
-    end
-
-    # @return [Hash, NilClass]
-    def data
-      @data
-    end
-
     private
 
     def _on_error(error)
-      self.emit :error, error
+      emit :error, error
     end
 
     def _on_created(data)
@@ -108,11 +100,11 @@ module JanusGateway::Plugin
         destroy
       end
 
-      self.emit :create
+      emit :create
     end
 
     def _on_destroyed
-      self.emit :destroy
+      emit :destroy
     end
   end
 end

data/lib/janus_gateway/resource.rb

@@ -1,9 +1,14 @@
 module JanusGateway
-
   class Resource
-
     include Events::Emitter
 
+    # @return [String, NilClass]
+    attr_reader :id
+
+    # @return [JanusGateway::Client]
+    attr_reader :client
+
+    # @return [String]
     attr_accessor :id
 
     # @param [JanusGateway::Client] client
@@ -13,25 +18,14 @@ module JanusGateway
       @id = id
     end
 
-    # @return [String, NilClass]
-    def id
-      @id
-    end
-
-    # @return [JanusGateway::Client]
-    def client
-      @client
-    end
-
     # @return [Concurrent::Promise]
     def create
-      raise("`#{__method__}` is not implemented for `#{self.class.name}`")
+      fail("`#{__method__}` is not implemented for `#{self.class.name}`")
     end
 
     # @return [Concurrent::Promise]
     def destroy
-      raise("`#{__method__}` is not implemented for `#{self.class.name}`")
+      fail("`#{__method__}` is not implemented for `#{self.class.name}`")
     end
-
   end
 end

data/lib/janus_gateway/resource/plugin.rb

@@ -1,6 +1,10 @@
 module JanusGateway
-
   class Resource::Plugin < Resource
+    # @return [JanusGateway::Resource::Session]
+    attr_reader :session
+
+    # @return [String]
+    attr_reader :name
 
     # @param [JanusGateway::Client] client
     # @param [JanusGateway::Resource::Session] session
@@ -12,21 +16,14 @@ module JanusGateway
       super(client)
     end
 
-    # @return [String]
-    def name
-      @name
-    end
-
     # @return [Concurrent::Promise]
     def create
       promise = Concurrent::Promise.new
 
       client.send_transaction(
-        {
-          :janus => 'attach',
-          :plugin => name,
-          :session_id => @session.id
-        }
+        janus: 'attach',
+        plugin: name,
+        session_id: @session.id
       ).then do |*args|
         _on_created(*args)
 
@@ -47,26 +44,20 @@ module JanusGateway
       promise
     end
 
-    # @return [JanusGateway::Resource::Session]
-    def session
-      @session
-    end
-
     private
 
     def _on_created(data)
       @id = data['data']['id']
 
-      session.on :destroy do |data|
+      session.on :destroy do |_data|
         destroy
       end
 
-      self.emit :create
+      emit :create
     end
 
     def _on_destroyed
-      self.emit :destroy
+      emit :destroy
     end
-
   end
 end

data/lib/janus_gateway/resource/session.rb

@@ -1,7 +1,5 @@
 module JanusGateway
-
   class Resource::Session < Resource
-
     # @param [JanusGateway::Client] client
     def initialize(client)
       @heartbeat_thread = nil
@@ -14,9 +12,7 @@ module JanusGateway
       promise = Concurrent::Promise.new
 
       client.send_transaction(
-        {
-          :janus => 'create'
-        }
+        janus: 'create'
       ).then do |*args|
         _on_created(*args)
         heartbeat
@@ -34,11 +30,9 @@ module JanusGateway
       promise = Concurrent::Promise.new
 
       client.send_transaction(
-        {
-          :janus => 'destroy',
-          :session_id => id
-        }
-      ).then do |*args|
+        janus: 'destroy',
+        session_id: id
+      ).then do |*_args|
         _on_destroyed
 
         promise.set(self).execute
@@ -55,16 +49,14 @@ module JanusGateway
 
       @heartbeat_thread = Thread.new do
         sleep_time = 5
-        while true do
+        loop do
           sleep(sleep_time)
           client.send_transaction(
-            {
-              :janus => 'keepalive',
-              :session_id => id
-            }
-          ).then do |*args|
+            janus: 'keepalive',
+            session_id: id
+          ).then do |*_args|
             sleep_time = 30
-          end.rescue do |error|
+          end.rescue do |_error|
             sleep_time = 1
           end
         end
@@ -77,27 +69,26 @@ module JanusGateway
     def _on_created(data)
       @id = data['data']['id']
 
-      client.on :message do |data|
-        if data['janus'] == 'timeout' and data['session_id'] == id
+      client.on :message do |message|
+        if message['janus'] == 'timeout' && message['session_id'] == id
           send(:_on_destroyed)
         end
       end
 
       client.on :close do
-        self.emit :destroy
+        emit :destroy
       end
 
       client.on :error do
-        self.emit :destroy
+        emit :destroy
       end
 
-      self.emit :create
+      emit :create
     end
 
     def _on_destroyed
       @heartbeat_thread.exit unless @heartbeat_thread.nil?
-      self.emit :destroy
+      emit :destroy
     end
-
   end
 end

data/lib/janus_gateway/transport.rb

@@ -1,35 +1,33 @@
 module JanusGateway
-
   class Transport
-
     include Events::Emitter
 
     def run
-      raise("`#{__method__}` is not implemented for `#{self.class.name}`")
+      fail("`#{__method__}` is not implemented for `#{self.class.name}`")
     end
 
     def connect
-      raise("`#{__method__}` is not implemented for `#{self.class.name}`")
+      fail("`#{__method__}` is not implemented for `#{self.class.name}`")
     end
 
     def disconnect
-      raise("`#{__method__}` is not implemented for `#{self.class.name}`")
+      fail("`#{__method__}` is not implemented for `#{self.class.name}`")
     end
 
     # @param [Hash] data
-    def send(data)
-      raise("`#{__method__}` is not implemented for `#{self.class.name}`")
+    def send(_data)
+      fail("`#{__method__}` is not implemented for `#{self.class.name}`")
     end
 
     # @param [Hash] data
     # @return [Concurrent::Promise]
-    def send_transaction(data)
-      raise("`#{__method__}` is not implemented for `#{self.class.name}`")
+    def send_transaction(_data)
+      fail("`#{__method__}` is not implemented for `#{self.class.name}`")
     end
 
     # @return [TrueClass, FalseClass]
-    def is_connected?
-      raise("`#{__method__}` is not implemented for `#{self.class.name}`")
+    def connected?
+      fail("`#{__method__}` is not implemented for `#{self.class.name}`")
     end
 
     # @return [String]
@@ -40,6 +38,5 @@ module JanusGateway
       end
       transaction_id
     end
-
   end
 end

data/lib/janus_gateway/transport/websocket.rb

@@ -2,9 +2,7 @@ require 'eventmachine'
 require 'faye/websocket'
 
 module JanusGateway
-
   class Transport::WebSocket < Transport
-
     attr_reader :transaction_queue
 
     # @param [String] url
@@ -13,23 +11,23 @@ module JanusGateway
       @url = url
       @protocol = protocol
       @client = nil
-      @transaction_queue = Hash.new
+      @transaction_queue = {}
     end
 
     def run
       EventMachine.run do
-        EM.error_handler { |e| raise(e) }
+        EM.error_handler { |e| fail(e) }
         connect
       end
     end
 
     def connect
-      raise('WebSocket client already exists!') unless @client.nil?
+      fail('WebSocket client already exists!') unless @client.nil?
 
       @client = _create_client(@url, @protocol)
 
       client.on :open do
-        self.emit :open
+        emit :open
       end
 
       client.on :message do |event|
@@ -41,7 +39,7 @@ module JanusGateway
         unless transaction_id.nil?
           promise = transaction_list[transaction_id]
           unless promise.nil?
-            if ['success', 'ack'].include?(data['janus'])
+            if %w(success ack).include?(data['janus'])
               promise.set(data).execute
             else
               error_data = data['error']
@@ -51,11 +49,11 @@ module JanusGateway
           end
         end
 
-        self.emit :message, data
+        emit :message, data
       end
 
       client.on :close do
-        self.emit :close
+        emit :close
       end
     end
 
@@ -81,8 +79,14 @@ module JanusGateway
         promise.fail(error).execute
       end
 
-      promise.then { @transaction_queue.remove(transaction); thread.exit }
-      promise.rescue { @transaction_queue.remove(transaction); thread.exit }
+      promise.then do
+        @transaction_queue.remove(transaction)
+        thread.exit
+      end
+      promise.rescue do
+        @transaction_queue.remove(transaction)
+        thread.exit
+      end
 
       promise
     end
@@ -92,14 +96,12 @@ module JanusGateway
     end
 
     # @return [TrueClass, FalseClass]
-    def is_connected?
-      !client.nil? and (client.ready_state == Faye::WebSocket::API::OPEN)
+    def connected?
+      !client.nil? && (client.ready_state == Faye::WebSocket::API::OPEN)
     end
 
     # @return [Faye::WebSocket::Client, NilClass]
-    def client
-      @client
-    end
+    attr_reader :client
 
     private
 
@@ -114,7 +116,5 @@ module JanusGateway
     def _transaction_timeout
       30
     end
-
   end
-
 end

data/lib/janus_gateway/version.rb

@@ -1,3 +1,3 @@
 module JanusGateway
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: janus_gateway
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Cargo Media
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-29 00:00:00.000000000 Z
+date: 2015-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye-websocket
@@ -97,6 +97,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.35'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.35'
 description: janus-gateway API client
 email: tech@cargomedia.ch
 executables: []
@@ -136,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: janus-gateway client