ruby_rabbitmq_janus 1.1.10 → 1.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e43decf663e6b315b6bfa75620e9bc85023a0812
-  data.tar.gz: 67843fec8156528f645869d2628661fc419cf8f7
+  metadata.gz: b9b61ef4e2646b0657f82798b2e62194be6530d9
+  data.tar.gz: 82a2f520d758ece417619ec8c799bafd383d0391
 SHA512:
-  metadata.gz: e4e212150e1e13db4a301f6b432938a061d82f29753086499343c6692ee0a9935ef4b56815304fb6f3e8cc6750ecefc437c0d3004d7a0e0506a895212832458a
-  data.tar.gz: 6ad38904fda8373e035c4520924e28630088e59be4c36d4dfe00a8870cc65c0d22589c153b00e37c31cbf78e5beb6d5460e8f2c365cba5e11ccf2302cf9e4d32
+  metadata.gz: 6ed0c4205fed937d45a2150cb464ef58262449687da7be2b30b4c5801b8a65c0ccb1fa42f835e099d45464ea1d411ebfa062eed5c731c7aecbea5eb2531f8510
+  data.tar.gz: 500d380c18b876f8f24489f723f1dd726c3a34c40dec3fd1e51646a1c195c243d41110cd0cf4590311d98042f37a1b75b0a6bc0e377ccee4331d0e2631f6e770

data/lib/rrj/info.rb

@@ -3,7 +3,7 @@
 # Define constant to gem.
 module RubyRabbitmqJanus
   # Define version to gem
-  VERSION = '1.1.10'
+  VERSION = '1.1.11'
 
   # Define a summary description to gem
   SUMMARY = 'Ruby RabbitMQ Janus'

data/lib/rrj/init.rb

@@ -81,9 +81,8 @@ module RubyRabbitmqJanus
     # @return [RubyRabbitmqJanus::Janus::Responses::Standard]
     # Give an object response to janus server
     def message_admin(type, options = {})
-      Janus::Transactions::Admin.new(@session).connect do
-        Janus::Messages::Admin.new(type,
-                                   options.merge!('session_id' => @session))
+      Janus::Transactions::Admin.new(use_current_session?(options)).connect do
+        Janus::Messages::Admin.new(type, options)
       end
     end
 

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

@@ -11,6 +11,7 @@ module RubyRabbitmqJanus
         def initialize(request, options = {})
           @request = request
           @opts = options
+          @type = Tools::Type.new(@request)
           Tools::Log.instance.debug "Element to replace : #{@opts}"
         end
 
@@ -28,7 +29,7 @@ module RubyRabbitmqJanus
 
         private
 
-        attr_reader :request, :opts
+        attr_reader :request, :opts, :type
 
         # Replace basic elements
         def replace_classic
@@ -48,7 +49,7 @@ module RubyRabbitmqJanus
 
         # Read option session and replace in request
         def replace_session
-          @request['session_id'] = @opts['session_id']
+          @request['session_id'] = @type.convert('session_id', @opts)
         rescue => message
           Tools::Log.instance.warn "Error session replace : #{message}"
         end

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

@@ -18,7 +18,7 @@ module RubyRabbitmqJanus
 
         # Replace handle integer
         def replace_handle
-          request['handle_id'] = opts['handle_id']
+          request['handle_id'] = type.convert('handle_id', opts)
         rescue => message
           Tools::Log.instance.warn "Error handle replace : #{message}"
         end

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

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module RubyRabbitmqJanus
+  module Tools
+    # Class for converting elemnts given by apps to this gem an type conform
+    # to request sending
+    class Type
+      # Initalize an object for cast a type to data given by app
+      def initialize(request)
+        @request = request
+        @data = nil
+      end
+
+      # Return an data with a type corresponding to string in request
+      def convert(key, option)
+        @data = option[key]
+        case @request[key]
+        when '<string>' then convert_to_type_string
+        when '<number>' then convert_to_type_number
+        end
+      end
+
+      private
+
+      # Convert a data to String type
+      def convert_to_type_string
+        @data.to_s
+      end
+
+      # Convert a data to Integer type
+      def convert_to_type_number
+        @data.to_i
+      end
+    end
+  end
+end

data/lib/rrj/tools/tools.rb

@@ -4,6 +4,7 @@ require 'rrj/tools/log'
 require 'rrj/tools/env'
 require 'rrj/tools/config'
 require 'rrj/tools/requests'
+require 'rrj/tools/replaces/type'
 require 'rrj/tools/replaces/replace'
 
 module RubyRabbitmqJanus

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_rabbitmq_janus
 version: !ruby/object:Gem::Version
-  version: 1.1.10
+  version: 1.1.11
 platform: ruby
 authors:
 - VAILLANT Jeremy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-02 00:00:00.000000000 Z
+date: 2016-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -365,6 +365,7 @@ files:
 - lib/rrj/tools/replaces/admin.rb
 - lib/rrj/tools/replaces/replace.rb
 - lib/rrj/tools/replaces/standard.rb
+- lib/rrj/tools/replaces/type.rb
 - lib/rrj/tools/requests.rb
 - lib/rrj/tools/tools.rb
 - lib/ruby_rabbitmq_janus.rb