ruby_rabbitmq_janus 2.7.1 → 2.7.2.pre.284

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b13df014ce559c5a7a969efa9c0ab29afa380db71518831692b3613b0c8e55da
-  data.tar.gz: a69456304e5f8d214da498cb465655af40a23dad988cfe702c9281d83531af62
+  metadata.gz: fd2fc20cfe4b8b6b6ed2c6cf7cbb78c40f71f7c2055e8b1d4eb2561fcfcf9b66
+  data.tar.gz: edf8c880d0b7e21bb880d7244d2f6a0cf645ee57c2fd68ff1c8fcbe5bbbe567c
 SHA512:
-  metadata.gz: 73e4952dd2a8278100e50b07bb33fa6bfb4a3403d0eef2f59c2ec96fe16a976b801f0acb4782d0621b0fdb43ecdf90838ef2a00c01a8259d7fb5f1a60987428c
-  data.tar.gz: 57e03acba24cf9615011292edf8ffe1c8f994037bafee8bd5ae05f2c568c9366a72927101f9193e257e6adfe11ab892a95c1d8db72966c30e82ea8737d0cfa57
+  metadata.gz: 6337c0b68cb0fa09a475e4f0619dc964c52b03876b89275d18f7d55f670e6aaf6ecd86f78855d675f53185f7fa21c2022b810d62cddb3b936c4af19377883cdb
+  data.tar.gz: 2ff204e553fdea0d98d2119e616cba6ff4f1271c229f1af78e63e3f6d966a499a8f0ad0c38d712ee1de6ce75d949933953cea17b00cb0d269949b09ad46ceb62

data/config/default.md

@@ -40,7 +40,6 @@ gem:
     path: 'app/ruby_rabbitmq_janus'
   environment: 'development'
   orm: 'mongoid'
-  program_name: 'ruby_rabbitmq_janus'
   response_path: 'spec/supports/rrj/responses'
 ```
 

data/config/default.yml

@@ -75,7 +75,5 @@ gem:
   # Precise ORM used :
   # mongoid or active_record
   orm: 'mongoid'
-  # Define program name
-  program_name: 'ruby_rabbitmq_janus'
   # Read response json for RSpec
   response_path: 'spec/supports/rrj/responses'

data/lib/rrj/binary.rb

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-require 'rrj/models/concerns/janus_instance_callbacks'
-require 'rrj/models/concerns/janus_instance_methods'
-require 'rrj/models/concerns/janus_instance_validations'
-require "rrj/models/#{RubyRabbitmqJanus::Tools::Config.instance.orm}"
-
 module RubyRabbitmqJanus
   # :reek:InstanceVariableAssumption
 

data/lib/rrj/errors/error.rb

@@ -31,5 +31,6 @@ end
 
 require 'rrj/errors/base/base'
 require 'rrj/errors/janus/janus'
+require 'rrj/errors/process/concurency'
 require 'rrj/errors/tools/tools'
 require 'rrj/errors/rabbit/rabbit'

data/lib/rrj/errors/janus/janus.rb

@@ -16,8 +16,6 @@ module RubyRabbitmqJanus
   end
 end
 
-require 'rrj/errors/janus/processus/concurency'
-
 require 'rrj/errors/janus/messages/message'
 require 'rrj/errors/janus/messages/admin'
 require 'rrj/errors/janus/messages/standard'

data/lib/rrj/errors/{janus/processus → process}/concurency.rb

@@ -2,8 +2,8 @@
 
 module RubyRabbitmqJanus
   module Errors
-    module Janus
-      # Define a super class for all error in Janus::Concurency class
+    module Process
+      # Define a super class for all error in Process::Concurency class
       class BaseConcurency < RubyRabbitmqJanus::Errors::BaseJanus
         def initialize(message)
           super "[Concurency]#{message}", :fatal
@@ -11,8 +11,8 @@ module RubyRabbitmqJanus
       end
 
       module Concurency
-        # Error for Janus::Concurency#initialize
-        class Initializer < RubyRabbitmqJanus::Errors::Janus::BaseConcurency
+        # Error for Process::Concurency#initialize
+        class Initializer < RubyRabbitmqJanus::Errors::Process::BaseConcurency
           def initialize
             super 'Error initialize concurency class'
           end
@@ -22,5 +22,5 @@ module RubyRabbitmqJanus
   end
 end
 
-require 'rrj/errors/janus/processus/keepalive'
-require 'rrj/errors/janus/processus/event'
+require 'rrj/errors/process/keepalive'
+require 'rrj/errors/process/event'

data/lib/rrj/errors/process/event.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module RubyRabbitmqJanus
+  module Errors
+    module Process
+      # Define a super class for all error in Process::Concurency::Event class
+      class BaseEvent < RubyRabbitmqJanus::Errors::Process::BaseConcurency
+        def initialize(message)
+          super "[Event] #{message}"
+        end
+      end
+
+      module Event
+        # Error for Process::Concurency::Event#initialize
+        class Initializer < RubyRabbitmqJanus::Errors::Process::BaseEvent
+          def initializer
+            super 'Error Event initializer'
+          end
+        end
+
+        # Error for Process::Concurency::Event#run
+        class Run < RubyRabbitmqJanus::Errors::Process::BaseEvent
+          def initializer
+            super 'Error running block code'
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rrj/errors/{janus/processus → process}/keepalive/initializer.rb

@@ -4,7 +4,7 @@
 
 module RubyRabbitmqJanus
   module Errors
-    module Janus
+    module Process
       class BaseKeepaliveInitializer < BaseKeepalive
         def initialize(message)
           super "[Initializer] #{message}"
@@ -12,43 +12,43 @@ module RubyRabbitmqJanus
       end
 
       module KeepaliveInitializer
-        class Initializer < RubyRabbitmqJanus::Errors::Janus::BaseKeepaliveInitializer
+        class Initializer < RubyRabbitmqJanus::Errors::Process::BaseKeepaliveInitializer
           def initialize
             super 'Error keepalive initializer'
           end
         end
 
-        class ID2ref < RubyRabbitmqJanus::Errors::Janus::BaseKeepaliveInitializer
+        class ID2ref < RubyRabbitmqJanus::Errors::Process::BaseKeepaliveInitializer
           def initialize(thread_id)
             super "No thread with ID : #{thread_id}"
           end
         end
 
-        class Session < RubyRabbitmqJanus::Errors::Janus::BaseKeepaliveInitializer
+        class Session < RubyRabbitmqJanus::Errors::Process::BaseKeepaliveInitializer
           def initialize
             super 'Error return session number'
           end
         end
 
-        class Thread < RubyRabbitmqJanus::Errors::Janus::BaseKeepaliveInitializer
+        class Thread < RubyRabbitmqJanus::Errors::Process::BaseKeepaliveInitializer
           def initialize
             super 'Error for get Object Thread ID'
           end
         end
 
-        class ThreadStart < RubyRabbitmqJanus::Errors::Janus::BaseKeepaliveInitializer
+        class ThreadStart < RubyRabbitmqJanus::Errors::Process::BaseKeepaliveInitializer
           def initialize
             super 'Error for starting timer in thread'
           end
         end
 
-        class ThreadStop < RubyRabbitmqJanus::Errors::Janus::BaseKeepaliveInitializer
+        class ThreadStop < RubyRabbitmqJanus::Errors::Process::BaseKeepaliveInitializer
           def initialize
             super 'Error for stoping timer in thread'
           end
         end
 
-        class ThreadDelete < RubyRabbitmqJanus::Errors::Janus::BaseKeepaliveInitializer
+        class ThreadDelete < RubyRabbitmqJanus::Errors::Process::BaseKeepaliveInitializer
           def initialize
             super 'Error for destroy thread'
           end

data/lib/rrj/errors/{janus/processus → process}/keepalive/thread.rb

@@ -4,8 +4,8 @@
 
 module RubyRabbitmqJanus
   module Errors
-    module Janus
-      # Define a super class for all error in Janus::Concurency::Keepalive
+    module Process
+      # Define a super class for all error in Process::Concurency::Keepalive
       class BaseKeepaliveThread < BaseKeepalive
         def initialize(message)
           super "[Thread] #{message}"
@@ -13,37 +13,37 @@ module RubyRabbitmqJanus
       end
 
       module KeepaliveThread
-        class Initializer < RubyRabbitmqJanus::Errors::Janus::BaseKeepaliveThread
+        class Initializer < RubyRabbitmqJanus::Errors::Process::BaseKeepaliveThread
           def initialize
             super 'Error for initialize Keepalive Thread'
           end
         end
 
-        class InitializeJanusSession < RubyRabbitmqJanus::Errors::Janus::BaseKeepaliveThread
+        class InitializeJanusSession < RubyRabbitmqJanus::Errors::Process::BaseKeepaliveThread
           def initialize
             super 'Error when initialize message in keepalive thread'
           end
         end
 
-        class RestartSession < RubyRabbitmqJanus::Errors::Janus::BaseKeepaliveThread
+        class RestartSession < RubyRabbitmqJanus::Errors::Process::BaseKeepaliveThread
           def initialize
             super 'Error when restart session'
           end
         end
 
-        class Start < RubyRabbitmqJanus::Errors::Janus::BaseKeepaliveThread
+        class Start < RubyRabbitmqJanus::Errors::Process::BaseKeepaliveThread
           def initialize
             super 'Error when start a loop for sending keepalive message'
           end
         end
 
-        class Kill < RubyRabbitmqJanus::Errors::Janus::BaseKeepaliveThread
+        class Kill < RubyRabbitmqJanus::Errors::Process::BaseKeepaliveThread
           def initialize
             super 'Error when killing thread'
           end
         end
 
-        class InstanceIsDown < RubyRabbitmqJanus::Errors::Janus::BaseKeepaliveThread
+        class InstanceIsDown < RubyRabbitmqJanus::Errors::Process::BaseKeepaliveThread
           def initialize
             super 'Error when instance is down'
           end

data/lib/rrj/errors/{janus/processus → process}/keepalive/timer.rb

@@ -4,7 +4,7 @@
 
 module RubyRabbitmqJanus
   module Errors
-    module Janus
+    module Process
       class BaseKeepaliveTimer < BaseKeepalive
         def initialize(message)
           super "[Timer] #{message}"
@@ -12,31 +12,31 @@ module RubyRabbitmqJanus
       end
 
       module KeepaliveTimer
-        class Initializer < RubyRabbitmqJanus::Errors::Janus::BaseKeepaliveTimer
+        class Initializer < RubyRabbitmqJanus::Errors::Process::BaseKeepaliveTimer
           def initialize
             super 'Error for initialize Keepalive Timer'
           end
         end
 
-        class LoopKeepalive < RubyRabbitmqJanus::Errors::Janus::BaseKeepaliveTimer
+        class LoopKeepalive < RubyRabbitmqJanus::Errors::Process::BaseKeepaliveTimer
           def initialize
             super 'Loop for create timer in Keepalive Thread is failed'
           end
         end
 
-        class Session < RubyRabbitmqJanus::Errors::Janus::BaseKeepaliveTimer
+        class Session < RubyRabbitmqJanus::Errors::Process::BaseKeepaliveTimer
           def initialize
             super 'Timeout for get session number in keepalive request'
           end
         end
 
-        class StopTimer < RubyRabbitmqJanus::Errors::Janus::BaseKeepaliveTimer
+        class StopTimer < RubyRabbitmqJanus::Errors::Process::BaseKeepaliveTimer
           def initialize
             super 'Error when timer to Keepalive Thread stop'
           end
         end
 
-        class StartTimer < RubyRabbitmqJanus::Errors::Janus::BaseKeepaliveTimer
+        class StartTimer < RubyRabbitmqJanus::Errors::Process::BaseKeepaliveTimer
           def initialize
             super 'Error when timer to Keepalive Thread start'
           end

data/lib/rrj/errors/process/keepalive.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+# @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
+# @see RubyRabbitmqJanus::Janus::Keepalive Keepalive thread
+
+module RubyRabbitmqJanus
+  module Errors
+    module Process
+      # Define a super class for all error in Process::Concurency::Keepalive
+      class BaseKeepalive < RubyRabbitmqJanus::Errors::Process::BaseConcurency
+        def initialize(message)
+          super "[Keepalive]#{message}"
+        end
+      end
+    end
+  end
+end
+
+require 'rrj/errors/process/keepalive/initializer'
+require 'rrj/errors/process/keepalive/thread'
+require 'rrj/errors/process/keepalive/timer'

data/lib/rrj/info.rb

@@ -6,7 +6,7 @@
 # Define constant to gem.
 module RubyRabbitmqJanus
   # Define version to gem
-  VERSION = '2.7.1'
+  VERSION = '2.7.2'
 
   # Name to gem
   GEM_NAME = 'ruby_rabbitmq_janus'

data/lib/rrj/janus/janus.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'rrj/janus/processus/concurrency'
 require 'rrj/janus/messages/message'
 require 'rrj/janus/responses/response'
 require 'rrj/janus/transactions/transaction'

data/lib/rrj/models/active_record.rb

@@ -8,13 +8,15 @@ module RubyRabbitmqJanus
     #
     # Store instance information for MongoID database
     class JanusInstance < ::ActiveRecord::Base
-      include RubyRabbitmqJanus::Models::JanusInstanceCallbacks
-      include RubyRabbitmqJanus::Models::JanusInstanceMethods
-      include RubyRabbitmqJanus::Models::JanusInstanceValidations
+      include RubyRabbitmqJanus::Models::Instances
+      include RubyRabbitmqJanus::Models::Methods
+      include RubyRabbitmqJanus::Models::Callbacks
+      include RubyRabbitmqJanus::Models::Validations
 
       self.primary_key = :id
 
       alias_attribute :instance,        :id
+      alias_attribute :title,           :name
       alias_attribute :session_id,      :session
       alias_attribute :thread_id,       :thread
       alias_attribute :thread_id_adm,   :thread_adm

data/lib/rrj/models/concerns/{janus_instance_callbacks.rb → callbacks.rb}

@@ -4,19 +4,19 @@ module RubyRabbitmqJanus
   # Contains all model for this gem
   module Models
     # Configure callback for Janus Instance models
-    module JanusInstanceCallbacks
+    module Callbacks
       extend ActiveSupport::Concern
 
       # Create a session in Janus Instance
       def callback_create_after
-        ::Log.debug 'Callback AFTER_VALIDATION'
+        ::Log.debug '[JanusInstance] Callback AFTER_VALIDATION'
         create_a_session_in_janus_instance if enable
       end
 
       # Update a keepalive transaction in Janus Instance
       # Enable or Disable transaction
       def callback_update_after
-        ::Log.debug 'Callback AFTER_UPDATE'
+        ::Log.debug '[JanusInstance] Callback AFTER_UPDATE'
         if enable && enable_changed?
           create_a_session_in_janus_instance
         elsif !enable && enable_changed?
@@ -27,22 +27,31 @@ module RubyRabbitmqJanus
       # Destroy a session in Janus Instance
       # :reek:UtilityFunction
       def callback_destroy_after
-        ::Log.debug 'Callback AFTER_DESTROY'
+        ::Log.debug '[JanusInstance] Callback AFTER_DESTROY'
         # LCO: nothing to do, thread will close session and die
       end
 
       private
 
       def create_a_session_in_janus_instance
+        ::Log.debug '[JanusInstance] Create session'
         RubyRabbitmqJanus::Rabbit::Publisher::JanusInstance.new.publish(message)
       end
 
       def destroy_a_session_in_janus_instance
+        ::Log.debug '[JanusInstance] Destroy session'
         RubyRabbitmqJanus::Rabbit::Publisher::JanusInstance.new.publish(message)
+
+        ::Log.debug '[JanusInstance] Kill thread'
+        thread_object.kill if thread_object.alive?
+      end
+
+      def thread_object
+        ObjectSpace._id2ref(thread)
       end
 
       def keepalive_object
-        RubyRabbitmqJanus::Janus::Concurrencies::KeepaliveInitializer
+        RubyRabbitmqJanus::Process::Concurrencies::KeepaliveInitializer
       end
 
       def keepalive_object_new

data/lib/rrj/models/concerns/{janus_instance_methods.rb → instances.rb}

@@ -4,11 +4,11 @@
 
 module RubyRabbitmqJanus
   module Models
-    # Add method for JanusInstance model
-    module JanusInstanceMethods
+    # Add class methods for JanusInstance model
+    module Instances
       extend ActiveSupport::Concern
 
-      # Class methods for JanusInstance model
+      # Class methods for Janus Instance model
       module ClassMethods
         # Disable an instance
         def disable(session_id)
@@ -44,32 +44,6 @@ module RubyRabbitmqJanus
           JanusInstance.where(enable: false)
         end
       end
-
-      def create_keepalive
-        ::Log.info 'Create session'
-        janus_instance = keepalive_object_new
-        set(session: janus_instance.session, enable: true)
-      end
-
-      def stop_keepalive
-        ::Log.info 'Destroy session'
-        unset(%I[thread thread_adm session])
-        set(enable: false)
-      end
-
-      private
-
-      def search_initializer(options)
-        if File.basename($PROGRAM_NAME) == 'rake'
-          ::RRJ.start_transaction(options) do |transaction|
-            yield(transaction)
-          end
-        else
-          ::RRJ.start_transaction(true, options) do |transaction|
-            yield(transaction)
-          end
-        end
-      end
     end
   end
 end

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

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module RubyRabbitmqJanus
+  module Models
+    # Add method for Janus Instance model
+    module Methods
+      extend ActiveSupport::Concern
+
+      # Create thread keepalive
+      def create_keepalive
+        ::Log.info 'Create session'
+        janus_instance = keepalive_object_new
+        set(session: janus_instance.session, enable: true)
+      end
+
+      # Stop thread keepalive
+      def stop_keepalive
+        ::Log.info 'Destroy session'
+        unset(%I[thread thread_adm session])
+        set(enable: false)
+      end
+
+      # Start Janus instance
+      # @since 2.7.1
+      def start!
+        update(enable: true)
+      end
+
+      # Stop Janus instance
+      # @since 2.7.1
+      def stop!
+        update(enable: false)
+      end
+    end
+  end
+end

data/lib/rrj/models/concerns/{janus_instance_validations.rb → validations.rb}

@@ -2,8 +2,8 @@
 
 module RubyRabbitmqJanus
   module Models
-    # Configure validation for JanusInstance model
-    module JanusInstanceValidations
+    # Configure validation for Janus Instance model
+    module Validations
       extend ActiveSupport::Concern
 
       included do

data/lib/rrj/models/mongoid.rb

@@ -7,10 +7,12 @@ module RubyRabbitmqJanus
     # Store instance information for MongoID database
     class JanusInstance
       include Mongoid::Document
-      include RubyRabbitmqJanus::Models::JanusInstanceCallbacks
-      include RubyRabbitmqJanus::Models::JanusInstanceMethods
-      include RubyRabbitmqJanus::Models::JanusInstanceValidations
+      include RubyRabbitmqJanus::Models::Instances
+      include RubyRabbitmqJanus::Models::Methods
+      include RubyRabbitmqJanus::Models::Callbacks
+      include RubyRabbitmqJanus::Models::Validations
 
+      field :name,        type: String,  as: :title
       field :session,     type: Integer, as: :session_id
       field :enable,      type: Boolean
       field :thread,      type: Integer, as: :thread_id

data/lib/rrj/{janus/processus → process}/concurrency.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module RubyRabbitmqJanus
-  module Janus
-    # Modules for create autonomous processus
+  module Process
+    # Modules for create autonomous process
     module Concurrencies
       # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
       #
@@ -18,7 +18,7 @@ module RubyRabbitmqJanus
           @lock = Mutex.new
           @condition = ConditionVariable.new
         rescue
-          raise Errors::Janus::Concurencies::Initializer
+          raise Errors::Process::Concurencies::Initializer
         end
 
         private
@@ -40,6 +40,6 @@ module RubyRabbitmqJanus
   end
 end
 
-require 'rrj/janus/processus/keepalive/keepalive_initializer'
-require 'rrj/janus/processus/event'
-require 'rrj/janus/processus/event_admin'
+require 'rrj/process/keepalive/keepalive_initializer'
+require 'rrj/process/event'
+require 'rrj/process/event_admin'

data/lib/rrj/{janus/processus → process}/event.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module RubyRabbitmqJanus
-  module Janus
+  module Process
     module Concurrencies
       # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
 
@@ -20,7 +20,7 @@ module RubyRabbitmqJanus
           super
           @thread = Thread.new { initialize_thread }
         rescue
-          raise Errors::Janus::Event::Initializer
+          raise Errors::Process::Event::Initializer
         end
 
         # Create a thread for execute a block code in a thread
@@ -38,7 +38,7 @@ module RubyRabbitmqJanus
             end
           end
         rescue
-          raise Errors::Janus::Event::Run
+          raise Errors::Process::Event::Run
         end
 
         private

data/lib/rrj/{janus/processus → process}/event_admin.rb

@@ -3,7 +3,7 @@
 # :reek:InstanceVariableAssumption
 
 module RubyRabbitmqJanus
-  module Janus
+  module Process
     module Concurrencies
       # Manage admin message in queue public
       # Work In Progress

data/lib/rrj/{janus/processus → process}/keepalive/keepalive_initializer.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'rrj/janus/processus/keepalive/keepalive_timer'
-require 'rrj/janus/processus/keepalive/keepalive_message'
-require 'rrj/janus/processus/keepalive/keepalive_thread'
+require 'rrj/process/keepalive/keepalive_timer'
+require 'rrj/process/keepalive/keepalive_message'
+require 'rrj/process/keepalive/keepalive_thread'
 
 module RubyRabbitmqJanus
-  module Janus
+  module Process
     module Concurrencies
       # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
       #
@@ -19,14 +19,14 @@ module RubyRabbitmqJanus
           super()
           @thread = KeepaliveThread.new(instance, rabbit) { initialize_thread }
         rescue
-          raise Errors::Janus::KeepaliveInitializer::Initializer
+          raise Errors::Process::KeepaliveInitializer::Initializer
         end
 
         # Get thread with Ruby ID
         def self.thread(thread)
           ObjectSpace._id2ref(thread)
         rescue RangeError
-          raise Errors::Janus::KeepaliveInitializer::ID2Ref, thread
+          raise Errors::Process::KeepaliveInitializer::ID2Ref, thread
         end
 
         # Give a session Integer  his gem is instantiate.
@@ -45,7 +45,7 @@ module RubyRabbitmqJanus
             end
           end
         rescue
-          raise Errors::Janus::KeepaliveInitializer::Session
+          raise Errors::Process::KeepaliveInitializer::Session
         end
 
         # Ask Object ID to thread managing keepalive message
@@ -58,7 +58,7 @@ module RubyRabbitmqJanus
         def thread_id
           @thread.__id__
         rescue
-          raise Errors::Janus::KeepaliveInitializer::Thread
+          raise Errors::Process::KeepaliveInitializer::Thread
         end
 
         private

data/lib/rrj/{janus/processus → process}/keepalive/keepalive_message.rb

@@ -3,7 +3,7 @@
 # :reek:UtilityFunction
 
 module RubyRabbitmqJanus
-  module Janus
+  module Process
     module Concurrencies
       # Manage message used for keepalive thread
       #