ruby_rabbitmq_janus 2.0.0 → 2.1.0.pre.128

data/spec/rrj/tools/gem/rrj_log_spec.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'RubyRabbitmqJanus::Log', type: :tools, name: :log do
+  it 'Log instance is correctly loading' do
+    expect(RubyRabbitmqJanus::Tools::Log.instance).not_to be(nil)
+  end
+
+  it 'Default level log is INFO' do
+    # 0 = debug
+    # ...
+    # 5 = unknown
+    expect(RubyRabbitmqJanus::Tools::Log.instance.level).to eq(0)
+  end
+
+  let(:message) { '## test ##' }
+  let(:last_line) { IO.readlines('log/ruby-rabbitmq-janus.log')[-1..-1][0] }
+
+  context 'when write a message unknown' do
+    before { RubyRabbitmqJanus::Tools::Log.instance.unknown(message) }
+
+    it { expect(last_line).to include('A, [RubyRabbitmqJanus] ## test ##') }
+  end
+
+  context 'when write a message fatal' do
+    before { RubyRabbitmqJanus::Tools::Log.instance.fatal(message) }
+
+    it { expect(last_line).to include('F, [RubyRabbitmqJanus] ## test ##') }
+  end
+
+  context 'when write a message error' do
+    before { RubyRabbitmqJanus::Tools::Log.instance.error(message) }
+
+    it { expect(last_line).to include('E, [RubyRabbitmqJanus] ## test ##') }
+  end
+
+  context 'when write a message warn' do
+    before { RubyRabbitmqJanus::Tools::Log.instance.warn(message) }
+
+    it { expect(last_line).to include('W, [RubyRabbitmqJanus] ## test ##') }
+  end
+
+  context 'when write a message info' do
+    before { RubyRabbitmqJanus::Tools::Log.instance.info(message) }
+
+    it { expect(last_line).to include('I, [RubyRabbitmqJanus] ## test ##') }
+  end
+
+  context 'when write a message debug' do
+    before { RubyRabbitmqJanus::Tools::Log.instance.debug(message) }
+
+    it { expect(last_line).to include('D, [RubyRabbitmqJanus] ## test ##') }
+  end
+end

data/spec/spec_helper.rb

@@ -1,9 +1,11 @@
 # frozen_string_literal: true
 
 require 'bundler/setup'
-require 'ruby_rabbitmq_janus'
 require 'pry'
 require 'json-schema-rspec'
+require 'rails'
+require 'active_record'
+require 'ruby_rabbitmq_janus'
 
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
@@ -16,6 +18,25 @@ end
 end
 
 RSpec.configure do |config|
+  # Configure active record
+  # rubocop:disable Style/ColonMethodCall
+  # rubocop:disable Security/YAMLLoad
+  configuration = YAML::load(File.open('config/database.yml'))
+  # rubocop:enable Style/ColonMethodCall
+  # rubocop:enable Security/YAMLLoad
+
+  # Connect to database
+  ActiveRecord::Base.establish_connection(configuration)
+  config.before(:all) do
+    unless ActiveRecord::Base.connection.table_exists? 'janus_instances'
+      ActiveRecord::Base.connection.create_table(:janus_instances) do |table|
+        table.integer :instance
+        table.integer :session, limit: 8
+        table.boolean :enable
+      end
+    end
+  end
+
   config.expect_with :rspec do |c|
     c.syntax = :expect
   end
@@ -57,7 +78,7 @@ def singleton
   Singleton.__init__(RubyRabbitmqJanus::Tools::Log)
   Singleton.__init__(RubyRabbitmqJanus::Tools::Config)
   Singleton.__init__(RubyRabbitmqJanus::Tools::Requests)
-  Singleton.__init__(RubyRabbitmqJanus::Janus::Concurrencies::Keepalive)
+  Singleton.__init__(RubyRabbitmqJanus::Tools::Cluster)
 end
 
 def gateway
@@ -65,6 +86,7 @@ def gateway
   @gateway = RubyRabbitmqJanus::RRJ.new
   @response = nil
   @options = {}
+  find_instance
 end
 
 def gateway_admin
@@ -72,6 +94,7 @@ def gateway_admin
   @gateway = RubyRabbitmqJanus::RRJAdmin.new
   @response = nil
   @options = {}
+  find_instance
 end
 
 def gateway_event
@@ -79,6 +102,14 @@ def gateway_event
   @event = RubyRabbitmq::Janus::Concurencies::Event.instance
   @event.run(&actions)
   gateway
+  find_instance
+end
+
+def find_instance
+  ji = RubyRabbitmqJanus::Models::JanusInstance.first
+  @session = { 'session_id' => ji.session }
+  @instance = { 'instance' => ji.instance }
+  @session_instance = @session.merge(@instance)
 end
 
 # Test events response

data/spec/support/examples_config.rb

@@ -4,3 +4,13 @@ shared_examples 'constant is' do |type|
   it { expect(data).not_to be nil }
   it { expect(data).to be_kind_of(type) }
 end
+
+shared_examples 'type and default value' do |type, value|
+  it 'When type is correct' do
+    expect(method).to be_a(type)
+  end
+
+  it 'When default value is correct' do
+    expect(method).to eq(value)
+  end
+end

data/spec/support/examples_message.rb

@@ -4,10 +4,8 @@ shared_examples 'message is' do |type|
   it { expect(message).to be_kind_of(type) }
 end
 
-# rubocop:disable Style/MixinGrouping
 shared_examples 'message options keys is' do
   it do
     expect(message).to include(:routing_key, :correlation_id, :content_type)
   end
 end
-# rubocop:enable Style/MixinGrouping

data/spec/support/examples_request.rb

@@ -16,7 +16,7 @@ end
 
 shared_examples 'transaction should match json empty' do
   let(:message) do
-    @gateway.start_transaction(false) do |transaction|
+    @gateway.start_transaction(false, @session_instance) do |transaction|
       @response = transaction.publish_message(@type)
     end
   end
@@ -26,7 +26,7 @@ end
 
 shared_examples 'transaction should match json schema' do
   let(:message) do
-    @gateway.start_transaction do |transaction|
+    @gateway.start_transaction(true, @session_instance) do |transaction|
       @response = transaction.publish_message(@type)
     end
   end
@@ -36,7 +36,7 @@ end
 
 shared_examples 'transaction handle should match json schema' do
   let(:message) do
-    @gateway.start_transaction_handle do |transaction|
+    @gateway.start_transaction_handle(true, @session_instance) do |transaction|
       @response = transaction.publish_message(@type, @options)
     end
   end
@@ -46,7 +46,7 @@ end
 
 shared_examples 'transaction handle should match json empty' do
   let(:message) do
-    @gateway.start_transaction_handle(false) do |transaction|
+    @gateway.start_transaction_handle(false, @session_instance) do |transaction|
       @response = transaction.publish_message(@type, @options)
     end
   end

data/spec/support/schemas/config/config.json

@@ -55,11 +55,13 @@
       "type": "hash",
       "properties": {
         "plugins": { "type": "hash" },
-        "session": { "type": "hash" }
+        "session": { "type": "hash" },
+        "cluster": { "type": "hash" }
       },
       "required": [
         "session",
-        "plugins"
+        "plugins",
+        "cluster"
       ]
     },
     "gem": {

data/spec/support/schemas/config/rabbit_options.json

@@ -1,7 +1,7 @@
 {
   "type": "object",
   "properties": {
-    "routing_key": { "type": "string", "pattern": "to-janus" },
+    "routing_key": { "type": "string", "pattern": "to-janus-1" },
     "correlation_id": { "type": "string" },
     "content_type": { "type": "String", "pattern": "application/json" }
   },

data/spec/support/schemas/config/rabbit_options2.json

@@ -0,0 +1,13 @@
+{
+  "type": "object",
+  "properties": {
+    "routing_key": { "type": "string", "pattern": "to-janus-2" },
+    "correlation_id": { "type": "string" },
+    "content_type": { "type": "String", "pattern": "application/json" }
+  },
+  "required": [
+    "routing_key",
+    "correlation_id",
+    "content_type"
+  ]
+}

data/spec/support/schemas/config/rabbit_options_admin.json

@@ -1,7 +1,7 @@
 {
   "type": "object",
   "properties": {
-    "routing_key": { "type": "string", "pattern": "to-janus-admin" },
+    "routing_key": { "type": "string", "pattern": "to-janus-admin-1" },
     "correlation_id": { "type": "string" },
     "content_type": { "type": "String", "pattern": "application/json" }
   },

data/spec/support/schemas/config/rabbit_options_admin2.json

@@ -0,0 +1,13 @@
+{
+  "type": "object",
+  "properties": {
+    "routing_key": { "type": "string", "pattern": "to-janus-admin-2" },
+    "correlation_id": { "type": "string" },
+    "content_type": { "type": "String", "pattern": "application/json" }
+  },
+  "required": [
+    "routing_key",
+    "correlation_id",
+    "content_type"
+  ]
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_rabbitmq_janus
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0.pre.128
 platform: ruby
 authors:
 - VAILLANT Jeremy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-29 00:00:00.000000000 Z
+date: 2017-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -206,6 +206,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: bunny
   requirement: !ruby/object:Gem::Requirement
@@ -305,16 +347,45 @@ files:
 - lib/generators/ruby_rabbitmq_janus/default_request_generator.rb
 - 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/migration.rb
 - lib/rrj/admin.rb
+- lib/rrj/errors/base/admin.rb
+- lib/rrj/errors/base/base.rb
+- lib/rrj/errors/base/init.rb
+- lib/rrj/errors/base/task.rb
 - lib/rrj/errors/error.rb
-- lib/rrj/errors/init.rb
 - lib/rrj/errors/janus/janus.rb
-- lib/rrj/errors/janus/janus_message.rb
-- lib/rrj/errors/janus/janus_processus_keepalive.rb
-- lib/rrj/errors/janus/janus_response.rb
-- lib/rrj/errors/janus/janus_transaction.rb
+- lib/rrj/errors/janus/messages/admin.rb
+- lib/rrj/errors/janus/messages/message.rb
+- lib/rrj/errors/janus/messages/standard.rb
+- lib/rrj/errors/janus/processus/concurency.rb
+- lib/rrj/errors/janus/processus/event.rb
+- lib/rrj/errors/janus/processus/keepalive.rb
+- lib/rrj/errors/janus/responses/admin.rb
+- lib/rrj/errors/janus/responses/event.rb
+- lib/rrj/errors/janus/responses/response.rb
+- lib/rrj/errors/janus/responses/standard.rb
+- lib/rrj/errors/janus/transactions/admin.rb
+- lib/rrj/errors/janus/transactions/handle.rb
+- lib/rrj/errors/janus/transactions/session.rb
+- lib/rrj/errors/janus/transactions/transaction.rb
+- lib/rrj/errors/rabbit/connect.rb
+- lib/rrj/errors/rabbit/propertie.rb
+- lib/rrj/errors/rabbit/publish/admin.rb
+- lib/rrj/errors/rabbit/publish/base_publisher.rb
+- lib/rrj/errors/rabbit/publish/exclusive.rb
+- lib/rrj/errors/rabbit/publish/listener.rb
+- lib/rrj/errors/rabbit/publish/non_exclusive.rb
+- lib/rrj/errors/rabbit/publish/publisher.rb
 - lib/rrj/errors/rabbit/rabbit.rb
-- lib/rrj/errors/tools/config.rb
+- lib/rrj/errors/tools/gem/cluster.rb
+- lib/rrj/errors/tools/gem/config.rb
+- lib/rrj/errors/tools/gem/log.rb
+- lib/rrj/errors/tools/gem/option.rb
+- lib/rrj/errors/tools/gem/request.rb
+- lib/rrj/errors/tools/replaces/replace.rb
+- lib/rrj/errors/tools/replaces/type.rb
 - lib/rrj/errors/tools/tools.rb
 - lib/rrj/info.rb
 - lib/rrj/init.rb
@@ -333,6 +404,9 @@ files:
 - lib/rrj/janus/transactions/handle.rb
 - lib/rrj/janus/transactions/session.rb
 - lib/rrj/janus/transactions/transaction.rb
+- lib/rrj/models/active_record.rb
+- lib/rrj/models/concerns/janus_instance_concern.rb
+- lib/rrj/models/mongoid.rb
 - lib/rrj/rabbit/connect.rb
 - lib/rrj/rabbit/propertie.rb
 - lib/rrj/rabbit/publish/admin.rb
@@ -342,6 +416,9 @@ files:
 - lib/rrj/rabbit/publish/non_exclusive.rb
 - lib/rrj/rabbit/publish/publisher.rb
 - lib/rrj/rabbit/rabbit.rb
+- lib/rrj/railtie.rb
+- lib/rrj/task.rb
+- lib/rrj/tools/gem/cluster.rb
 - lib/rrj/tools/gem/config.rb
 - lib/rrj/tools/gem/log.rb
 - lib/rrj/tools/gem/option.rb
@@ -353,6 +430,7 @@ files:
 - lib/rrj/tools/replaces/type.rb
 - lib/rrj/tools/tools.rb
 - lib/ruby_rabbitmq_janus.rb
+- lib/tasks/delete_all_instance.rake
 - spec/request/admin/request_handle_info_spec.rb
 - spec/request/admin/request_handles_spec.rb
 - spec/request/admin/request_sessions_spec.rb
@@ -383,14 +461,15 @@ files:
 - spec/rrj/responses/responses_event_spec.rb
 - spec/rrj/responses/responses_response_spec.rb
 - spec/rrj/responses/responses_standard_spec.rb
-- spec/rrj/rrj_config_spec.rb
-- spec/rrj/rrj_log_spec.rb
 - spec/rrj/rrj_spec.rb
-- spec/rrj/tools/replace_admin_spec.rb
-- spec/rrj/tools/replace_handle_spec.rb
-- spec/rrj/tools/replace_session_spec.rb
-- spec/rrj/tools/replace_spec.rb
-- spec/rrj/tools/type_spec.rb
+- spec/rrj/tools/gem/rrj_cluster_spec.rb
+- spec/rrj/tools/gem/rrj_config_spec.rb
+- spec/rrj/tools/gem/rrj_log_spec.rb
+- spec/rrj/tools/replace/replace_admin_spec.rb
+- spec/rrj/tools/replace/replace_handle_spec.rb
+- spec/rrj/tools/replace/replace_session_spec.rb
+- spec/rrj/tools/replace/replace_spec.rb
+- spec/rrj/tools/replace/type_spec.rb
 - spec/spec_helper.rb
 - spec/support/aruba.rb
 - spec/support/examples_config.rb
@@ -399,7 +478,9 @@ files:
 - spec/support/examples_response.rb
 - spec/support/schemas/config/config.json
 - spec/support/schemas/config/rabbit_options.json
+- spec/support/schemas/config/rabbit_options2.json
 - spec/support/schemas/config/rabbit_options_admin.json
+- spec/support/schemas/config/rabbit_options_admin2.json
 - spec/support/schemas/request/admin/handle_info.json
 - spec/support/schemas/request/admin/handles.json
 - spec/support/schemas/request/admin/sessions.json
@@ -448,9 +529,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.8