ruby_rabbitmq_janus 2.7.2.pre.320 → 2.7.2.pre.322

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc50ee1b1b5ce39634a85050510221684d78a68cfb08947ae5e51ba60a492e3e
-  data.tar.gz: 3e95da4477afa9df8370611da6f25bae324770924d5a843727f0ad1b2af42e64
+  metadata.gz: 38a584eadb729b97490abc2a5112886e14f4c5fa21ea3b9641411666c7f5c6ff
+  data.tar.gz: 93ad2a7f89b20edd383cb55097e98a060185268ad4b5564452c3679496a0f0c4
 SHA512:
-  metadata.gz: 1ec90884318b4edc421e7dd6bdf7de960001024f5f3179e09ac16787bb5ff6255165a644de050fd6ca90debf65cbea8c5295fa104a4a926084aa2b9db55915e6
-  data.tar.gz: 7af37d040a30723f419c992252d554f39ce85f19cfda389a1f652156422af9751706df12f9f92b49d8e5120a70c5b5fb5a31834731c5bc81be025c7e79cf806b
+  metadata.gz: 46aa8f7efdf93c442f5b350f28765d1041e6c4288f6ccd65ae85afe32a0f477b2c7fe9fc765e2f7a487b0efd381e53716d7be810543f962254223cd3297c835f
+  data.tar.gz: 2276a53735d1691dc3b54232ccacb4fd06d7f9760d788611cd19a2376316a64ae5af0f39b3594d674c020383765ad7cd15ea0f129892b3d1cca2f451109c29d7

data/README.md

@@ -150,7 +150,7 @@ require 'ruby_rabbitmq_janus'
 actions = RubyRabbitmqJanus::ActionEvents.new.action
 
 # Initialize a thread for listen public queue and send class to thread
-RubyRabbitmqJanus::Janus::Concurrencies::Event.instance.run(@actions)
+RubyRabbitmqJanus::Janus::Concurrencies::Event.new.run(@actions)
 ```
 
 ## Upgrade

data/config/default.md

@@ -42,6 +42,7 @@ gem:
   environment: 'development'
   orm: 'mongoid'
   response_path: 'spec/supports/rrj/responses'
+  process: 1
 ```
 
 ## Customize

data/config/default.yml

@@ -78,3 +78,5 @@ gem:
   orm: 'mongoid'
   # Read response json for RSpec
   response_path: 'spec/supports/rrj/responses'
+  # Number ofprocess read public queue
+  process: 1

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

@@ -72,6 +72,6 @@ Settings.reload!
             # If you don't want listen a standard queue, comment this block and
             # "require 'actions'" also
             act = RubyRabbitmqJanus::ActionEvents.new.actions
-            RubyRabbitmqJanus::Janus::Concurrencies::Event.instance.run(&act)
+            RubyRabbitmqJanus::Janus::Concurrencies::Event.new.run(&act)
           end
         end

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

@@ -4,12 +4,13 @@
 
 # Fields for JanusInstance model
 class CreateRubyRabbitmqJanusTables < ActiveRecord::Migration[5.0]
+  # Change for model JanusInstance
   def change
     create_table :janus_instances, id: false, force: true do |table|
       table.string :id, null: false
+      table.string :name
       table.integer :session, limit: 8
       table.boolean :enable
-      table.integer :thread, limit: 8
     end
   end
 end

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

@@ -5,6 +5,7 @@
 module RubyRabbitmqJanus
   module Errors
     module Rabbit
+      # Error class for all Event
       class Event < BaseRabbit
         def initialize(message, level = :fatal)
           super("[Connect] #{message}", level)
@@ -12,6 +13,7 @@ module RubyRabbitmqJanus
       end
 
       module BaseEvent
+        # Error class for Rabbit BaseEvent
         class Initialize < RubyRabbitmqJanus::Errors::Rabbit::Event
           def initialize
             super 'Error in intializer BaseEvent'

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

@@ -18,11 +18,9 @@ require 'rrj/errors/rabbit/propertie'
 require 'rrj/errors/rabbit/listener/base'
 require 'rrj/errors/rabbit/listener/from'
 require 'rrj/errors/rabbit/listener/from_admin'
-require 'rrj/errors/rabbit/listener/janus_instance'
 
 require 'rrj/errors/rabbit/publisher/base'
 require 'rrj/errors/rabbit/publisher/admin'
 require 'rrj/errors/rabbit/publisher/exclusive'
-require 'rrj/errors/rabbit/publisher/janus_instance'
 require 'rrj/errors/rabbit/publisher/keepalive'
 require 'rrj/errors/rabbit/publisher/non_exclusive'

data/lib/rrj/janus/responses/rspec.rb

@@ -14,46 +14,59 @@ module RubyRabbitmqJanus
                             "#{type.gsub('::', '_')}.json")
         end
 
+        # Read response json file
         def read
           JSON.parse(File.read(@json))
         end
 
+        # Create fake session number
         def session
           (rand * 1_000_000).to_i
         end
 
+        # Read plugindata field
         def plugin
           read['plugindata']
         end
 
+        # Read data to plugindata field
         def plugin_data
           read['plugindata']['data']
         end
 
+        # Read data dield
         def data
           read['data']
         end
 
+        # Read sdp
         def sdp
           read['jsep']
         end
 
+        # Read sessions field
         def sessions
           read['sessions']
         end
 
+        # Read info field
         def info
           read['info']
         end
 
+        # Read fake keys
         def keys
           [546_321_963, 546_321_966]
         end
 
+        # Read first Janusinstance in database
         def instance
           JanusInstance.first
         end
 
+        # Read fake status to instance
+        #
+        # @return [Boolean] Random value
         def enable
           [True, False].sample
         end

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

@@ -7,16 +7,21 @@ module RubyRabbitmqJanus
       class RSpec
         attr_reader :response
 
+        # Initialize fake object
         def initialize
           @response = nil
         end
 
+        # Fake method
         def connect; end
 
+        # Fake method
         def detach; end
 
+        # Fake method
         def detach_for_deleting; end
 
+        # Publish fake message
         def publish_message(type, _options)
           @response = Janus::Responses::RSpec.new(type)
         end

data/lib/rrj/models/active_record.rb

@@ -19,14 +19,18 @@ module RubyRabbitmqJanus
 
       # Update attributes to document
       #
-      # @param [Hash] List of attribute to update with this value
+      # @param attributes [Hash] List of attribute to update with this value
+      #
+      # @return [Hash] Current model
       def set(attributes)
         update_columns(attributes)
       end
 
       # Destroy data to column
       #
-      # @param [Array] List to attribute to delete in document
+      # @param attributes [Array] List to attribute to delete in document
+      #
+      # @return [Hash] Current model
       def unset(attributes)
         Hash[attributes.map { |key, _value| [key, nil] }]
       end

data/lib/rrj/process/event.rb

@@ -12,8 +12,6 @@ module RubyRabbitmqJanus
       #
       # @see file:/config/default.md For more information to config file used.
       class Event < Concurrency
-        include Singleton
-
         NAME_VAR = :publish
 
         def initialize

data/lib/rrj/process/event_admin.rb

@@ -12,8 +12,6 @@ module RubyRabbitmqJanus
       #
       # @see file:/config/default.md For more information to config file used.
       class EventAdmin < Concurrency
-        include Singleton
-
         NAME_VAR = :publish_adm
 
         def initialize

data/lib/rrj/rabbit/connect.rb

@@ -50,13 +50,6 @@ module RubyRabbitmqJanus
       rescue => exception
         raise Errors::Rabbit::Connect::Channel, exception
       end
-
-      # Create an channel
-      def channel_pool
-        @rabbit.create_channel(nil, 8)
-      rescue => exception
-        raise Errors::Rabbit::Connect::Channel, exception
-      end
     end
   end
 end

data/lib/rrj/rabbit/listener/base.rb

@@ -12,7 +12,7 @@ module RubyRabbitmqJanus
         # @param [String] rabbit Information connection to RabbitMQ server
         def initialize(rabbit)
           super()
-          @rabbit = rabbit.channel_pool
+          @rabbit = rabbit.channel
           subscribe_queue
         rescue
           raise Errors::Rabbit::Listener::Base::Initialize

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

@@ -78,4 +78,3 @@ require 'rrj/rabbit/publisher/exclusive'
 require 'rrj/rabbit/publisher/admin'
 require 'rrj/rabbit/publisher/keepalive'
 require 'rrj/rabbit/publisher/non_exclusive'
-require 'rrj/rabbit/publisher/janus_instance'

data/lib/rrj/rails.rb

@@ -2,6 +2,7 @@
 
 require 'rails'
 require 'action_view'
+require 'parallel'
 
 module RubyRabbitmqJanus
   # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
@@ -13,20 +14,23 @@ module RubyRabbitmqJanus
   class Rails < ::Rails::Engine
     config.after_initialize do
       Log.debug '[RRJ] After initializer'
-      require File.join(Dir.pwd,
-                        RubyRabbitmqJanus::Tools::Config.instance.listener_path)
-      require File.join(Dir.pwd,
-                        RubyRabbitmqJanus::Tools::Config.instance.listener_admin_path)
+      cfg = RubyRabbitmqJanus::Tools::Config.instance
+      number = cfg.public_queue_process
 
-      process = RubyRabbitmqJanus::Process::Concurrencies
+      require File.join(Dir.pwd, cfg.listener_path)
+      require File.join(Dir.pwd, cfg.listener_admin_path)
 
-      Log.info '[RRJ] Listen public queue in thread'
+      Log.debug "[RRJ] Create process : #{number}"
+      process = RubyRabbitmqJanus::Process::Concurrencies
       actions = RubyRabbitmqJanus::ActionEvents.new.actions
-      process::Event.instance.run(&actions)
-
-      Log.info '[RRJ] Listen admin queue in thread'
       admin_actions = RubyRabbitmqJanus::ActionAdminEvents.new.actions
-      process::EventAdmin.instance.run(&admin_actions)
+
+      Parallel.map([
+                     process::Event.new.run(&actions),
+                     process::EventAdmin.new.run(&admin_actions)
+                   ], in_processes: number) do |listener|
+        "Item: #{listener}, Worker: #{Parallel.worker_number}"
+      end
     end
   end
 end

data/lib/rrj/tools/bin/init.rb

@@ -2,4 +2,4 @@
 
 require 'rrj/rails'
 
-loop {}
+loop { sleep 1 }

data/lib/rrj/tools/gem/config/gem.rb

@@ -63,6 +63,11 @@ module RubyRabbitmqJanus
         @options['gem']['response_path'] || 'spec/responses'
       end
 
+      # @return [Integer] get number of thread created for listen public queues
+      def public_queue_process
+        @options['gem']['process'] || 1
+      end
+
       alias env environment
       alias orm object_relational_mapping
       alias pg program_name

data/lib/rrj/tools/gem/log.rb

@@ -20,6 +20,7 @@ module RubyRabbitmqJanus
     # RemoteSyslogger (for papertrail)
     # File
     module Logger
+      # Write basic information about this gem
       def self.start
         Log.info '### Start bin Ruby Rabbit Janus ###'
         Log.info "Program : #{RubyRabbitmqJanus::Tools::Config.instance.pg}"
@@ -27,6 +28,7 @@ module RubyRabbitmqJanus
         Log.debug "\r\n#{RubyRabbitmqJanus::BANNER}"
       end
 
+      # Configure logger used by RRJ
       def self.create
         @config = RubyRabbitmqJanus::Tools::Config.instance
 
@@ -36,6 +38,7 @@ module RubyRabbitmqJanus
         @log
       end
 
+      # Choose type logger used in application instance
       def self.initialize_logger
         case @config.log_type
         when :stdout  then logger_stdout
@@ -46,14 +49,18 @@ module RubyRabbitmqJanus
         end
       end
 
+      # Configure logger with output SDTOUT
       def self.logger_stdout
         ::Logger.new(STDOUT)
       end
 
+      # Configure logger with output file
+      # default : `log/ruby-rabbitmq-janus.log`
       def self.logger_file
         ::Logger.new(@config.log_option || 'log/ruby-rabbitmq-janus.log')
       end
 
+      # Configure logger with output PaperTrail service
       def self.logger_remote
         require 'remote_syslog_logger'
 
@@ -63,18 +70,22 @@ module RubyRabbitmqJanus
                                local_hostname: remote_hostname)
       end
 
+      # Read url for PaperTail and split for endpoint
       def self.remote_url
         @config.log_option.split(':').first
       end
 
+      # Read url for PaperTrail and split for port
       def self.remote_port
         @config.log_option.split('@').first.split(':').last
       end
 
+      # Read url for PaperTrail and split for name app
       def self.remote_program
         @config.log_option.split('@').last.split(':').first
       end
 
+      # Read url for PaperTrail and split for host
       def self.remote_hostname
         @config.log_option.split(':').last
       end

data/spec/config/initializer.rb

@@ -12,5 +12,5 @@ end
 
 # Initialize listener
 actions = EventTest.new.actions
-@event = RubyRabbitmqJanus::Process::Concurrencies::Event.instance
+@event = RubyRabbitmqJanus::Process::Concurrencies::Event.new
 @event.run(&actions)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_rabbitmq_janus
 version: !ruby/object:Gem::Version
-  version: 2.7.2.pre.320
+  version: 2.7.2.pre.322
 platform: ruby
 authors:
 - VAILLANT Jeremy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-18 00:00:00.000000000 Z
+date: 2019-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -338,6 +338,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: parallel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.18'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.18'
 - !ruby/object:Gem::Dependency
   name: semaphore
   requirement: !ruby/object:Gem::Requirement
@@ -454,12 +468,10 @@ files:
 - lib/rrj/errors/rabbit/listener/base.rb
 - lib/rrj/errors/rabbit/listener/from.rb
 - lib/rrj/errors/rabbit/listener/from_admin.rb
-- lib/rrj/errors/rabbit/listener/janus_instance.rb
 - lib/rrj/errors/rabbit/propertie.rb
 - lib/rrj/errors/rabbit/publisher/admin.rb
 - lib/rrj/errors/rabbit/publisher/base.rb
 - lib/rrj/errors/rabbit/publisher/exclusive.rb
-- lib/rrj/errors/rabbit/publisher/janus_instance.rb
 - lib/rrj/errors/rabbit/publisher/keepalive.rb
 - lib/rrj/errors/rabbit/publisher/non_exclusive.rb
 - lib/rrj/errors/rabbit/rabbit.rb
@@ -479,7 +491,6 @@ files:
 - lib/rrj/janus/messages/standard.rb
 - lib/rrj/janus/responses/admin.rb
 - lib/rrj/janus/responses/event.rb
-- lib/rrj/janus/responses/janus_instance.rb
 - lib/rrj/janus/responses/response.rb
 - lib/rrj/janus/responses/rspec.rb
 - lib/rrj/janus/responses/standard.rb
@@ -504,7 +515,6 @@ files:
 - lib/rrj/rabbit/publisher/admin.rb
 - lib/rrj/rabbit/publisher/base.rb
 - lib/rrj/rabbit/publisher/exclusive.rb
-- lib/rrj/rabbit/publisher/janus_instance.rb
 - lib/rrj/rabbit/publisher/keepalive.rb
 - lib/rrj/rabbit/publisher/non_exclusive.rb
 - lib/rrj/rabbit/rabbit.rb

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

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module RubyRabbitmqJanus
-  module Errors
-    module Rabbit
-      module Listener
-        module JanusInstance
-          # Error class for listenern janusInstance
-          class ListenEvents < RubyRabbitmqJanus::Errors::Rabbit::Listener::BaseError
-            def initialize(error)
-              super "Error for listen events in RabbitMQ public queue, #{error}"
-            end
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-# :reek:IrresponsibleModule
-
-module RubyRabbitmqJanus
-  module Errors
-    module Rabbit
-      module Publisher
-        module JanusInstance
-          class Initialize < RubyRabbitmqJanus::Errors::Rabbit::Publisher::BasePublishExclusive
-            def initialize
-              super 'Error in initializer'
-            end
-          end
-
-          class Publish < RubyRabbitmqJanus::Errors::Rabbit::Publisher::BasePublisherAdmin
-            def initialize
-              super 'Error publish message in queue'
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/rrj/janus/responses/janus_instance.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-require 'rrj/janus/responses/response'
-
-module RubyRabbitmqJanus
-  module Janus
-    module Responses
-      # Janus Instanece response.
-      class JanusInstance < Response
-        def event
-          'JanusInstance update'
-        end
-
-        def id
-          request['id']
-        end
-
-        def instance
-          JanusInstance.find(id)
-        end
-
-        def enable
-          request['enable']
-        end
-      end
-    end
-  end
-end

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

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-module RubyRabbitmqJanus
-  module Rabbit
-    module Publisher
-      # Publisher to queue `janus-instance`
-      class JanusInstance
-        def initialize
-          @rabbit = RubyRabbitmqJanus::Rabbit::Connect.new
-        rescue
-          raise Errors::Rabbit::Publisher::JanusInstance::Initialize
-        end
-
-        def publish(data)
-          @rabbit.start
-          channel = @rabbit.channel
-          queue = channel.queue(Tools::Config.instance.queue_janus_instance)
-          channel.default_exchange.publish(data.to_json,
-                                           routing_key: queue.name)
-          @rabbit.close
-        rescue
-          raise Errors::Rabbit::Publisher::JanusInstance::Publish
-        end
-      end
-    end
-  end
-end