ruby_rabbitmq_janus 2.1.0.pre.130 → 2.1.0.pre.131

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6dcab86c33a7ccc36b9ddd7b6ff6eaeeaca17bb
-  data.tar.gz: ee1ec6fe44942afcd162d2d2cdcdaf7a73355ff7
+  metadata.gz: 811e021180e0a35a51ba2ff75163625140382e7d
+  data.tar.gz: b1f5f2ad5d3cd7ed34ada499fdb471d31956854c
 SHA512:
-  metadata.gz: 05be1135e7212d9ccd3acc9f204ef97d3772a56219a5f20c63d5bb4bed54e372de0a53971cc041c2aca898f8aeece1696f1fb70e6500cb90fa01fb2b630ffea6
-  data.tar.gz: ba128900894f71a0e405bdf5f63d2b1390e3d91f3baea2da347ab6c0975bd8185c17d826ef2de9cfeddb3fc3d932bd783200f460634755f1f97fa5e9a5eccffb
+  metadata.gz: e2fe3d01287875d2a843831ecad3a0286d553f8253aadc984c187d8953a43e0926c118d75a80c6ac3a801e08ca4ec02164639fc4297e8638cea9943489573e9e
+  data.tar.gz: 914cd24efdf27e8aaabf4a7b82c24a5b7779a8b1dc1da1569abca51da080178329d2cfa1f2c41c242e583b103b12cb8e820bf16f0ad669ebacca0bd9954d99d4

data/README.md

@@ -80,6 +80,12 @@ Or install it yourself as :
 gem install ruby_rabbitmq_janus
 ```
 
+Install basic configuration :
+
+```linux
+rails g ruby_rabbitmq_janus:install
+```
+
 ### Configuration
 
 If you want used a customize configuration see [ruby-rabbitmq-janus.yml](config/default.md)

data/lib/generators/ruby_rabbitmq_janus/configuration_generator.rb

@@ -8,22 +8,12 @@ module RubyRabbitmqJanus
       desc 'Generate a custom configuration file.'
 
       # Define root path for original file a copied
-      def self.source_root
-        root_path = File.realpath(root_path_gem)
-        @_rrj_source_root ||= File.join(root_path, 'config')
-      end
+      source_root File.expand_path('../../../config', __dir__)
 
       # Copy a default configuration in config folder to Rails app
       def copy_configuration
         template 'default.yml', 'config/ruby-rabbitmq-janus.yml'
       end
-
-      private
-
-      # Define a root path
-      def root_path_gem
-        File.join(File.dirname(__FILE__), '..', '..', '..')
-      end
     end
   end
 end

data/lib/generators/ruby_rabbitmq_janus/default_request_generator.rb

@@ -7,22 +7,12 @@ module RubyRabbitmqJanus
       desc 'Copy base request file sending to janus in application.'
 
       # Define root path for original file a copied
-      def self.source_root
-        root_path = File.realpath(root_path_gem)
-        @_rrj_source_root ||= File.join(root_path, 'config')
-      end
+      source_root File.expand_path('../../../config', __dir__)
 
       # Copy default request in Rails app
       def copy_default_request
         directory 'requests', 'config/requests'
       end
-
-      private
-
-      # Define a root path
-      def root_path_gem
-        File.join(File.dirname(__FILE__), '..', '..', '..')
-      end
     end
   end
 end

data/lib/generators/ruby_rabbitmq_janus/initializer_generator.rb

@@ -5,31 +5,12 @@ module RubyRabbitmqJanus
     # Create an class for generate a initializer
     class InitializerGenerator < Rails::Generators::Base
       desc 'Generate a initializer to this gem for rails application.'
-      INITIALIZER = <<-INIT
-  # frozen_string_literal: true
 
-  require 'actions'
-
-  # Initialize a gem and create an session with a keepalive
-  ::RRJ = RubyRabbitmqJanus::RRJ.new
-
-  # For admin management
-  # ::RRJ = RubyRabbitmqJanus::RRJAdmin.new
-
-  # This test disable this gems execution when you running an task with rake
-  unless File.basename($PROGRAM_NAME) == 'rake'
-    Rails.configuration.after_initialize do
-      # If you don't want listen a standard queue, comment this lines and
-      # "require 'actions'"
-      actions = RubyRabbitmqJanus::ActionEvents.new.actions
-      RubyRabbitmqJanus::Janus::Concurrencies::Event.instance.run(&actions)
-    end
-  end
-        INIT
+      source_root File.expand_path('../templates', __FILE__)
 
       # Create an initializer
       def copy_initializer
-        initializer 'ruby_rabbitmq_janus.rb', INITIALIZER
+        copy_file 'initializer.rb', 'config/initializers/ruby_rabbitmq_janus.rb'
       end
     end
   end

data/lib/generators/ruby_rabbitmq_janus/install_generator.rb

@@ -5,42 +5,21 @@ module RubyRabbitmqJanus
     # Create an class for generate a installing
     class InstallGenerator < Rails::Generators::Base
       desc 'Install RubyRabbitmqJanus in your Rails application'
-      ACTION_CLASS = <<-BASE
-  module RubyRabbitmqJanus
-    # Execute this code when janus return an events in standard queue
-    class ActionsEvents
-      # Default method using for sending a block of code
-      def actions
-        lambda do |reason, data|
-          Rails.logger.debug "Execute block code with reason : \#{reason}"
-          case reason
-          when event this case_events(data.to_hash)
-          end
-        end
-      end
-
-      private
 
-      def case_events(data)
-        Rails.logger.debug "Event : \#{data}"
-      end
-    end
-  end
-      BASE
       APPLICATION = <<-AUTOLOAD
   # Load RubyRabbitmqJanus actions events code blocks
   config.autoload_paths += Dir[Rails.root.join('app', 'ruby_rabbitmq_janus')]
       AUTOLOAD
 
-      # Generate initializer with default code
+      source_root File.expand_path('../templates', __FILE__)
+
+      # Generate files with default code
       def add_actions
         # Create an class
-        create_file 'app/ruby_rabbitmq_janus/actions.rb', ACTION_CLASS
+        template 'actions.rb', 'app/ruby_rabbitmq_janus/actions.rb'
 
         # Add to application.rb
-        application do
-          APPLICATION
-        end
+        application { APPLICATION }
 
         # Add initializer
         generate 'ruby_rabbitmq_janus:initializer'

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module RubyRabbitmqJanus
+  # Execute this code when janus return an events in standard queue
+  class ActionEvents
+    # Default method using for sending a block of code
+    def actions
+      lambda do |reason, data|
+        Rails.logger.debug "Execute block code with reason : #{reason}"
+        case reason
+        when event then case_events(data.to_hash)
+        end
+      end
+    end
+
+    private
+
+    def case_events(data)
+      Rails.logger.debug "Event : #{data}"
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+# This test disable this gems execution when you running an task with rake
+if File.basename($PROGRAM_NAME) == 'rake'
+  # Configure RRJ for rake task
+  ::RRJ = RubyRabbitmqJanus::RRJTask.new
+else
+  # Loading classes Actions to rails application
+  require 'actions'
+
+  # If you used gem config for manage your ENV variables uncomment this line
+  # @see https://rubygems.org/gems/config
+  # Settings.reload!
+
+  # Initialize gem and create a number of session by Janus instance.
+  ::RRJ = RubyRabbitmqJanus::RRJ.new
+
+  # Use this initializer if your application use 'Admin/Monitor API'
+  # @see https://janus.conf.meetecho.com/docs/admin.html
+  # ::RRJ = RubyRabbitmqJanus::RRJAdmin.new
+
+  # Send a block code to thread for manage event given by Janus in public queue
+  Rails.configuration.after_initialize do
+    # If you don't want listen a standard queue, comment this block and
+    # "require 'actions'" also
+    actions = RubyRabbitmqJanus::ActionEvents.new.actions
+    RubyRabbitmqJanus::Janus::Concurrencies::Event.instance.run(&actions)
+  end
+end

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

@@ -6,7 +6,7 @@ module RubyRabbitmqJanus
       # Define a super class for all errors in Janus::Transactions::Transaction
       class BaseTransaction < BaseJanus
         def initialize(message, level = :fatal)
-          super "[Transaction] #{message}", level
+          super "[Transaction]#{message}", level
         end
       end
 

data/lib/rrj/init.rb

@@ -39,6 +39,7 @@ module RubyRabbitmqJanus
     #   => #<RubyRabbitmqJanus::RRJ:0x007 @session=123>
     def initialize
       @option = Tools::Option.new
+      ObjectSpace.define_finalizer(self, RRJ.method(:delete).to_proc)
     rescue => error
       raise Errors::RRJ::InstanciateGem, error
     end
@@ -113,5 +114,14 @@ module RubyRabbitmqJanus
     private
 
     attr_reader :option
+
+    def self.delete(_id)
+      Tools::Cluster.instance.sessions.each do |janus_instance|
+        array_ji = "#{janus_instance.instance},#{janus_instance.session}"
+        `rake rrj:delete:one_instance[#{array_ji}]`
+      end
+    end
+
+    private_class_method :delete
   end
 end

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

@@ -17,7 +17,7 @@ module RubyRabbitmqJanus
           super(session)
           @exclusive = exclusive
         rescue
-          raise Errors::Janus::TransactionSession::Initialize
+          raise Errors::Janus::TransactionSessions::Initialize
         end
 
         # Opening a short transaction with rabbitmq and close when is ending
@@ -29,7 +29,7 @@ module RubyRabbitmqJanus
             yield
           end
         rescue
-          raise Errors::Janus::TransactionSession::Connect
+          raise Errors::Janus::TransactionSessions::Connect
         end
 
         def publish_message(type, options = {})
@@ -37,7 +37,7 @@ module RubyRabbitmqJanus
           response = read_response(publisher.publish(msg))
           Janus::Responses::Standard.new(response)
         rescue
-          raise Errors::Janus::TransactionSession::PublishMessage
+          raise Errors::Janus::TransactionSessions::PublishMessage
         end
 
         private

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

@@ -11,7 +11,7 @@ module RubyRabbitmqJanus
       # Send an action for destroying a session in Janus Gateway instance
       def destroy_before_action
         options = { 'session_id' => session, 'instance' => instance }
-        ::RRJ.start_transaction(options) do |transaction|
+        search_initializer(options) do |transaction|
           transaction.publish_message('base::destroy', options)
         end
       end
@@ -42,6 +42,20 @@ module RubyRabbitmqJanus
           nil
         end
       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/task.rb

@@ -36,7 +36,7 @@ module RubyRabbitmqJanus
       raise Errors::RRJ::StartTransaction.new(true, options)
     end
 
-    # Create a transaction betwwen apps and janus with a handle
+    # Create a transaction between apps and janus with a handle
     #
     # @since 2.1.0
     def start_transaction_handle(exclusive = true, options = {})

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

@@ -8,7 +8,7 @@ module RubyRabbitmqJanus
     class Cluster
       include Singleton
 
-      attr_reader :number, :enable
+      attr_reader :number, :enable, :sessions
 
       # Initalize object for managing each instance to Janus
       def initialize

data/lib/tasks/delete_all_instance.rake

@@ -1,12 +1,14 @@
 # frozen_string_literal: true
 
 namespace :rrj do
-  desc 'Delete all instances in database.'
-  task delete_instances: :environment do
-    @timelaps = Time.now.utc
+  namespace :delete do
+    desc 'Delete all instances in database and janus'
+    task all_instances: :environment do
+      timelaps = Time.now.utc
 
-    RubyRabbitmqJanus::Models::JanusInstance.destroy_all
+      RubyRabbitmqJanus::Models::JanusInstance.destroy_all
 
-    Rails.logger.info "Executed in #{Time.now.utc - @timelaps} ms"
+      Rails.logger.info "Executed in #{Time.now.utc - timelaps} ms"
+    end
   end
 end

data/lib/tasks/delete_one_instance.rake

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+namespace :rrj do
+  namespace :delete do
+    desc 'Delete one instance in database and janus'
+    task :one_instance, [:instance, :session] => :environment do |_task, args|
+      timelaps = Time.now.utc
+
+      Rails.logger.info \
+        "Delete instance #{args[:instance]} with session #{args[:session]}"
+
+      RubyRabbitmqJanus::Models::JanusInstance\
+        .find_by_session(args[:session]).destroy
+
+      Rails.logger.info "Executed in #{Time.now.utc - timelaps} ms"
+    end
+  end
+end

data/lib/tasks/delete_unless_instance.rake

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+namespace :rrj do
+  namespace :delete do
+    desc 'Delete all instances disable in database and janus'
+    task unless_instance: :environment do
+      timelaps = Time.now.utc
+
+      RubyRabbitmqJanus::Models::JanusInstance.find_by(enable: false).delete_all
+
+      Rails.logger.info "Executed in #{Time.now.utc - timelaps} ms"
+    end
+  end
+end

data/spec/rrj/models/active_record_spec.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe RubyRabbitmqJanus::Models::JanusInstance, type: :model,
+                                                   name: :janus_instance do
+  before do
+    Object.send(:remove_const, :Mongoid) if defined?(Mongoid)
+    require 'active_record' unless defined?(ActiveRecord::Core)
+  end
+
+  let(:model) { RubyRabbitmqJanus::Models::JanusInstance }
+
+  context 'active record model' do
+    it { expect(model.attribute_names).to include('id') }
+    it { expect(model.attribute_names).to include('instance') }
+    it { expect(model.attribute_names).to include('session') }
+    it { expect(model.attribute_names).to include('enable') }
+  end
+end

data/spec/rrj/models/mongoid_spec.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+# rubocop:disable Style/ConstantName
+
+require 'spec_helper'
+
+describe RubyRabbitmqJanus::Models::JanusInstance, type: :model,
+                                                   name: :janus_instance do
+  before do
+    ActiveRecord::Core = nil if defined?(ActiveRecord)
+    require 'mongoid' unless defined?(Mongoid)
+  end
+
+  context 'mongoid model' do
+    let(:model) { RubyRabbitmqJanus::Models::JanusInstance }
+
+    it { expect(model.attribute_names).to include('id') }
+    it { expect(model.attribute_names).to include('instance') }
+    it { expect(model.attribute_names).to include('session') }
+    it { expect(model.attribute_names).to include('enable') }
+  end
+
+  after do
+    Object.send(:remove_const, :Mongoid) if defined?(Mongoid)
+    require 'active_record' unless defined?(ActiveRecord)
+  end
+end
+# rubocop:enable Style/ConstantName

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_rabbitmq_janus
 version: !ruby/object:Gem::Version
-  version: 2.1.0.pre.130
+  version: 2.1.0.pre.131
 platform: ruby
 authors:
 - VAILLANT Jeremy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-07 00:00:00.000000000 Z
+date: 2017-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -248,6 +248,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: mongoid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: bunny
   requirement: !ruby/object:Gem::Requirement
@@ -348,6 +362,8 @@ files:
 - lib/generators/ruby_rabbitmq_janus/initializer_generator.rb
 - lib/generators/ruby_rabbitmq_janus/install_generator.rb
 - lib/generators/ruby_rabbitmq_janus/migration_generator.rb
+- lib/generators/ruby_rabbitmq_janus/templates/actions.rb
+- lib/generators/ruby_rabbitmq_janus/templates/initializer.rb
 - lib/generators/ruby_rabbitmq_janus/templates/migration.rb
 - lib/rrj/admin.rb
 - lib/rrj/errors/base/admin.rb
@@ -431,6 +447,8 @@ files:
 - lib/rrj/tools/tools.rb
 - lib/ruby_rabbitmq_janus.rb
 - lib/tasks/delete_all_instance.rake
+- lib/tasks/delete_one_instance.rake
+- lib/tasks/delete_unless_instance.rake
 - spec/request/admin/request_handle_info_spec.rb
 - spec/request/admin/request_handles_spec.rb
 - spec/request/admin/request_sessions_spec.rb
@@ -449,6 +467,8 @@ files:
 - spec/rrj/messages/messages_admin_spec.rb
 - spec/rrj/messages/messages_message_spec.rb
 - spec/rrj/messages/messages_standard_spec.rb
+- spec/rrj/models/active_record_spec.rb
+- spec/rrj/models/mongoid_spec.rb
 - spec/rrj/rabbit/connect_spec.rb
 - spec/rrj/rabbit/propertie_spec.rb
 - spec/rrj/rabbit/publish/admin_spec.rb