liveqa 1.8.3 → 1.9.0

data/spec/lib/liveqa_spec.rb

@@ -7,9 +7,6 @@ describe LiveQA::Event do
   end
 
   describe '.track' do
-    let(:response) { double('LiveQA::Event', successful?: true) }
-    after { LiveQA.track('test', { user_id: 42, properties: { total: 10 }}, { no_ssl: true }) }
-
     let(:expected_arg) {{
       user_id: 42,
       type:    'track',
@@ -30,20 +27,39 @@ describe LiveQA::Event do
         pid: kind_of(Numeric)
       },
     }}
+    let(:response) { double('LiveQA::Event', successful?: true) }
+
+    context 'async' do
+      let(:processor_mock) { double('Processor', enqueue: true) }
+      before do
+        allow(LiveQA).to receive(:processor).and_return(processor_mock)
+        LiveQA.track('test', { user_id: 42, properties: { total: 10 }}, no_ssl: true, space_name: 'test')
+      end
+
+      it { expect(processor_mock).to have_received(:enqueue).with(action: 'events:create', payload: hash_including(expected_arg), options: { space_name: 'test' }) }
+    end
+
+    context 'without async' do
+      before do
+        LiveQA.configurations.async = false
+        allow(LiveQA::Event).to receive(:create).and_return(response)
+        LiveQA.track('test', { user_id: 42, properties: { total: 10 }}, no_ssl: true, space_name: 'test')
+      end
 
-    it { expect(LiveQA::Event).to receive(:create).with(hash_including(expected_arg), { no_ssl: true }).and_return(response) }
+      it { expect(LiveQA::Event).to have_received(:create).with(hash_including(expected_arg), { no_ssl: true, space_name: 'test' }) }
+    end
 
     context 'not enabled' do
-      before { LiveQA.configurations.enabled = false }
+      before do
+        LiveQA.configurations.enabled = false
+        LiveQA.track('test', { user_id: 42, properties: { total: 10 }}, no_ssl: true, space_name: 'test')
+      end
 
       it { expect(LiveQA::Event).to_not receive(:create) }
     end
   end
 
   describe '.identify' do
-    let(:response) { double('LiveQA::Event', successful?: true) }
-    after { LiveQA.identify(42, { tracker_id: 'xx', properties: { name: 'John Doe' }}, { no_ssl: true }) }
-
     let(:expected_arg) {{
       tracker_id: 'xx',
       properties: {
@@ -64,20 +80,39 @@ describe LiveQA::Event do
         pid: kind_of(Numeric)
       },
     }}
+    let(:response) { double('LiveQA::Event', successful?: true) }
+
+    context 'async' do
+      let(:processor_mock) { double('Processor', enqueue: true) }
+      before do
+        allow(LiveQA).to receive(:processor).and_return(processor_mock)
+        LiveQA.identify(42, { tracker_id: 'xx', properties: { name: 'John Doe' }}, no_ssl: true, space_name: 'test')
+      end
+
+      it { expect(processor_mock).to have_received(:enqueue).with(action: 'events:create', payload: hash_including(expected_arg), options: { space_name: 'test' }) }
+    end
 
-    it { expect(LiveQA::Event).to receive(:create).with(hash_including(expected_arg), { no_ssl: true }).and_return(response) }
+    context 'without async' do
+      before do
+        LiveQA.configurations.async = false
+        allow(LiveQA::Event).to receive(:create).and_return(response)
+        LiveQA.identify(42, { tracker_id: 'xx', properties: { name: 'John Doe' }}, no_ssl: true, space_name: 'test')
+      end
+
+      it { expect(LiveQA::Event).to have_received(:create).with(hash_including(expected_arg), { no_ssl: true, space_name: 'test' }) }
+    end
 
     context 'not enabled' do
-      before { LiveQA.configurations.enabled = false }
+      before do
+        LiveQA.configurations.enabled = false
+        LiveQA.identify(42, { tracker_id: 'xx', properties: { name: 'John Doe' }}, no_ssl: true, space_name: 'test')
+      end
 
       it { expect(LiveQA::Event).to_not receive(:create) }
     end
   end
 
   describe '.set_group' do
-    let(:response) { double('LiveQA::Group', successful?: true) }
-    after { LiveQA.set_group(42, { properties: { name: 'John Group' }}, { no_ssl: true }) }
-
     let(:expected_arg) {{
       properties: {
         name: 'John Group'
@@ -86,20 +121,39 @@ describe LiveQA::Event do
       timestamp: kind_of(String),
       session_tracker_id: kind_of(String),
     }}
+    let(:response) { double('LiveQA::Group', successful?: true) }
+
+    context 'async' do
+      let(:processor_mock) { double('Processor', enqueue: true) }
+      before do
+        allow(LiveQA).to receive(:processor).and_return(processor_mock)
+        LiveQA.set_group(42, { properties: { name: 'John Group' }}, no_ssl: true, space_name: 'test')
+      end
 
-    it { expect(LiveQA::Group).to receive(:update).with(42, expected_arg, { no_ssl: true }).and_return(response) }
+      it { expect(processor_mock).to have_received(:enqueue).with(action: 'groups:update', id: 42, payload: hash_including(expected_arg), options: { space_name: 'test' }) }
+    end
+
+    context 'without async' do
+      before do
+        LiveQA.configurations.async = false
+        allow(LiveQA::Group).to receive(:update).and_return(response)
+        LiveQA.set_group(42, { properties: { name: 'John Group' }}, no_ssl: true, space_name: 'test')
+      end
+
+      it { expect(LiveQA::Group).to have_received(:update).with(42, hash_including(expected_arg), { no_ssl: true, space_name: 'test' }) }
+    end
 
     context 'not enabled' do
-      before { LiveQA.configurations.enabled = false }
+      before do
+        LiveQA.configurations.enabled = false
+        LiveQA.set_group(42, { properties: { name: 'John Group' }}, no_ssl: true, space_name: 'test')
+      end
 
       it { expect(LiveQA::Group).to_not receive(:update) }
     end
   end
 
   describe '.set_identity' do
-    let(:response) { double('LiveQA::Identity', successful?: true) }
-    after { LiveQA.set_identity(42, { properties: { name: 'John Doe' }}, { no_ssl: true }) }
-
     let(:expected_arg) {{
       properties: {
         name: 'John Doe'
@@ -108,37 +162,78 @@ describe LiveQA::Event do
       timestamp: kind_of(String),
       session_tracker_id: kind_of(String),
     }}
+    let(:response) { double('LiveQA::Identity', successful?: true) }
 
-    it { expect(LiveQA::Identity).to receive(:update).with(42, expected_arg, { no_ssl: true }).and_return(response) }
+    context 'async' do
+      let(:processor_mock) { double('Processor', enqueue: true) }
+      before do
+        allow(LiveQA).to receive(:processor).and_return(processor_mock)
+        LiveQA.set_identity(42, { properties: { name: 'John Doe' }}, no_ssl: true, space_name: 'test')
+      end
+
+      it { expect(processor_mock).to have_received(:enqueue).with(action: 'identities:update', id: 42, payload: hash_including(expected_arg), options: { space_name: 'test' }) }
+    end
+
+    context 'without async' do
+      before do
+        LiveQA.configurations.async = false
+        allow(LiveQA::Identity).to receive(:update).and_return(response)
+        LiveQA.set_identity(42, { properties: { name: 'John Doe' }}, no_ssl: true, space_name: 'test')
+      end
+
+      it { expect(LiveQA::Identity).to have_received(:update).with(42, hash_including(expected_arg), { no_ssl: true, space_name: 'test' }) }
+    end
 
     context 'not enabled' do
-      before { LiveQA.configurations.enabled = false }
+      before do
+        LiveQA.configurations.enabled = false
+        LiveQA.set_identity(42, { properties: { name: 'John Doe' }}, no_ssl: true, space_name: 'test')
+      end
 
       it { expect(LiveQA::Identity).to_not receive(:update) }
     end
   end
 
   describe '.watch' do
+    let(:expected_arg) {{
+      template_flow: 'My Flow',
+      expected_times: 42,
+      message_id: kind_of(String),
+      timestamp: kind_of(String),
+      session_tracker_id: kind_of(String),
+    }}
     let(:response) { double('LiveQA::Identity', successful?: true) }
 
+    context 'async' do
+      let(:processor_mock) { double('Processor', enqueue: true) }
+      before do
+        allow(LiveQA).to receive(:processor).and_return(processor_mock)
+        LiveQA.watch('My Flow', { expected_times: 42 }, no_ssl: true, space_name: 'test')
+      end
 
-    context 'with session' do
-      after { LiveQA.watch('My Flow', { expected_times: 42 }, { no_ssl: true }) }
+      it { expect(processor_mock).to have_received(:enqueue).with(action: 'watchers:create', payload: hash_including(expected_arg), options: { space_name: 'test' }) }
+    end
 
-      let(:expected_arg) {{
-        template_flow: 'My Flow',
-        expected_times: 42,
-        message_id: kind_of(String),
-        timestamp: kind_of(String),
-        session_tracker_id: kind_of(String),
-      }}
+    context 'without async' do
+      before do
+        LiveQA.configurations.async = false
+        allow(LiveQA::Watcher).to receive(:create).and_return(response)
+        LiveQA.watch('My Flow', { expected_times: 42 }, no_ssl: true, space_name: 'test')
+      end
 
-      it { expect(LiveQA::Watcher).to receive(:create).with(expected_arg, { no_ssl: true }).and_return(response) }
+      it { expect(LiveQA::Watcher).to have_received(:create).with(hash_including(expected_arg), { no_ssl: true, space_name: 'test' }) }
     end
 
-    context 'with session' do
-      after { LiveQA.watch('My Flow', { expected_times: 42, without_session: true }, { no_ssl: true }) }
+    context 'not enabled' do
+      before do
+        LiveQA.configurations.enabled = false
+        LiveQA.watch('My Flow', { expected_times: 42 }, no_ssl: true, space_name: 'test')
+      end
 
+      it { expect(LiveQA::Watcher).to_not receive(:create) }
+    end
+
+    context 'without session' do
       let(:expected_arg) {{
         template_flow: 'My Flow',
         expected_times: 42,
@@ -146,15 +241,13 @@ describe LiveQA::Event do
         timestamp: kind_of(String),
       }}
 
-      it { expect(LiveQA::Watcher).to receive(:create).with(expected_arg, { no_ssl: true }).and_return(response) }
-    end
-
-    context 'not enabled' do
-      after { LiveQA.watch('My Flow', { expected_times: 42 }, { no_ssl: true }) }
-
-      before { LiveQA.configurations.enabled = false }
+      let(:processor_mock) { double('Processor', enqueue: true) }
+      before do
+        allow(LiveQA).to receive(:processor).and_return(processor_mock)
+        LiveQA.watch('My Flow', { expected_times: 42, without_session: true }, no_ssl: true, space_name: 'test')
+      end
 
-      it { expect(LiveQA::Watcher).to_not receive(:create) }
+      it { expect(processor_mock).to have_received(:enqueue).with(action: 'watchers:create', payload: hash_including(expected_arg), options: { space_name: 'test' }) }
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: liveqa
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.9.0
 platform: ruby
 authors:
 - LiveQA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-02 00:00:00.000000000 Z
+date: 2018-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faker
@@ -25,33 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.8.4
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: 0.58.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: 0.58.2
 description: LiveQA ruby integration
 email:
 - support@liveqa.io
@@ -94,17 +94,18 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- LICENCE
 - README.md
 - Rakefile
 - lib/liveqa.rb
 - lib/liveqa/api_operation/delete.rb
 - lib/liveqa/api_operation/save.rb
 - lib/liveqa/api_resource.rb
-- lib/liveqa/async_handlers/base.rb
-- lib/liveqa/async_handlers/sidekiq.rb
+- lib/liveqa/batch.rb
 - lib/liveqa/config.rb
 - lib/liveqa/errors.rb
 - lib/liveqa/event.rb
+- lib/liveqa/formated_logger.rb
 - lib/liveqa/group.rb
 - lib/liveqa/identity.rb
 - lib/liveqa/library_name.rb
@@ -118,6 +119,9 @@ files:
 - lib/liveqa/plugins/sidekiq/client_middleware.rb
 - lib/liveqa/plugins/sidekiq/load.rb
 - lib/liveqa/plugins/sidekiq/server_middleware.rb
+- lib/liveqa/processor/async.rb
+- lib/liveqa/processor/batch.rb
+- lib/liveqa/processor/worker.rb
 - lib/liveqa/request.rb
 - lib/liveqa/store.rb
 - lib/liveqa/util.rb
@@ -125,10 +129,10 @@ files:
 - lib/liveqa/watcher.rb
 - liveqa.gemspec
 - spec/lib/liveqa/api_resource_spec.rb
-- spec/lib/liveqa/async_handlers/base_spec.rb
-- spec/lib/liveqa/async_handlers/sidekiq_spec.rb
+- spec/lib/liveqa/batch_spec.rb
 - spec/lib/liveqa/config_spec.rb
 - spec/lib/liveqa/event_spec.rb
+- spec/lib/liveqa/formated_logger_spec.rb
 - spec/lib/liveqa/group_spec.rb
 - spec/lib/liveqa/identity_spec.rb
 - spec/lib/liveqa/liveqa_object_spec.rb
@@ -138,6 +142,9 @@ files:
 - spec/lib/liveqa/plugins/rails/middleware_data_spec.rb
 - spec/lib/liveqa/plugins/sidekiq/client_middleware_spec.rb
 - spec/lib/liveqa/plugins/sidekiq/server_middleware_spec.rb
+- spec/lib/liveqa/processor/async_spec.rb
+- spec/lib/liveqa/processor/batch_spec.rb
+- spec/lib/liveqa/processor/worker_spec.rb
 - spec/lib/liveqa/store_spec.rb
 - spec/lib/liveqa/util_spec.rb
 - spec/lib/liveqa/watcher_spec.rb
@@ -170,10 +177,10 @@ specification_version: 4
 summary: LiveQA ruby integration
 test_files:
 - spec/lib/liveqa/api_resource_spec.rb
-- spec/lib/liveqa/async_handlers/base_spec.rb
-- spec/lib/liveqa/async_handlers/sidekiq_spec.rb
+- spec/lib/liveqa/batch_spec.rb
 - spec/lib/liveqa/config_spec.rb
 - spec/lib/liveqa/event_spec.rb
+- spec/lib/liveqa/formated_logger_spec.rb
 - spec/lib/liveqa/group_spec.rb
 - spec/lib/liveqa/identity_spec.rb
 - spec/lib/liveqa/liveqa_object_spec.rb
@@ -183,6 +190,9 @@ test_files:
 - spec/lib/liveqa/plugins/rails/middleware_data_spec.rb
 - spec/lib/liveqa/plugins/sidekiq/client_middleware_spec.rb
 - spec/lib/liveqa/plugins/sidekiq/server_middleware_spec.rb
+- spec/lib/liveqa/processor/async_spec.rb
+- spec/lib/liveqa/processor/batch_spec.rb
+- spec/lib/liveqa/processor/worker_spec.rb
 - spec/lib/liveqa/store_spec.rb
 - spec/lib/liveqa/util_spec.rb
 - spec/lib/liveqa/watcher_spec.rb

data/lib/liveqa/async_handlers/base.rb

@@ -1,15 +0,0 @@
-module LiveQA
-  module AsyncHandlers
-    class Base
-
-      def enqueue(*)
-        raise LiveQA::MissingImplementation, 'Method \'enqueue\' need to be implemented in a subclass'
-      end
-
-      def execute(args)
-        Object.const_get(args[0]).send(args[1].to_sym, *args[2..-1])
-      end
-
-    end
-  end
-end

data/lib/liveqa/async_handlers/sidekiq.rb

@@ -1,33 +0,0 @@
-require 'sidekiq'
-
-module LiveQA
-  module AsyncHandlers
-    class Sidekiq < Base
-      include ::Sidekiq::Worker
-
-      OPTIONS = {
-        'queue' => 'liveqa',
-        'class' => self
-      }.freeze
-
-      attr_reader :options
-
-      def initialize(options = {})
-        @options = OPTIONS.merge(
-          Util.deep_stringify_key(options)
-        )
-      end
-
-      def enqueue(*args)
-        ::Sidekiq::Client.push(
-          options.merge('args' => args)
-        )
-      end
-
-      def perform(*args)
-        execute(args)
-      end
-
-    end
-  end
-end

data/spec/lib/liveqa/async_handlers/base_spec.rb

@@ -1,29 +0,0 @@
-require 'spec_helper'
-
-describe LiveQA::AsyncHandlers::Base do
-  subject(:base) { LiveQA::AsyncHandlers::Base.new }
-
-  describe '#enqueue' do
-    subject(:enqueue) { base.enqueue('Event', 'create', test: true) }
-
-    it { expect { enqueue }.to raise_error(LiveQA::MissingImplementation) }
-  end
-
-  describe 'execute' do
-    context 'default params' do
-      let(:params) { ['LiveQA::Event', 'create', { test: true }] }
-
-      after { base.execute(params) }
-
-      it { expect(LiveQA::Event).to receive(:create).with({ test: true }) }
-    end
-
-    context 'more params params' do
-      let(:params) { ['LiveQA::Group', 'update', 42, { test: true }, { no_ssl: true }] }
-
-      after { base.execute(params) }
-
-      it { expect(LiveQA::Group).to receive(:update).with(42, { test: true }, { no_ssl: true }) }
-    end
-  end
-end

data/spec/lib/liveqa/async_handlers/sidekiq_spec.rb

@@ -1,40 +0,0 @@
-require 'spec_helper'
-require 'liveqa/async_handlers/sidekiq'
-
-describe LiveQA::AsyncHandlers::Sidekiq do
-  let(:params) {{}}
-  subject(:sidekiq) { LiveQA::AsyncHandlers::Sidekiq.new(params) }
-
-  describe '#initialize' do
-    it { expect(sidekiq.options['queue']).to eq('liveqa') }
-    it { expect(sidekiq.options['class']).to eq(LiveQA::AsyncHandlers::Sidekiq) }
-
-    context 'with options' do
-      let(:params) {{
-        queue: 'default'
-      }}
-
-      it { expect(sidekiq.options['queue']).to eq('default') }
-    end
-  end
-
-  describe '#enqueue' do
-    after { sidekiq.enqueue('Event', 'create', test: true) }
-
-    let(:expected_params) {{
-      'queue' => 'liveqa',
-      'class' => LiveQA::AsyncHandlers::Sidekiq,
-      'args' => ['Event', 'create', { test: true }]
-    }}
-
-    it { expect(::Sidekiq::Client).to receive(:push).with(expected_params) }
-  end
-
-  describe 'perform' do
-    let(:expected_params) { ['LiveQA::Event', 'create', { test: true }] }
-
-    after { sidekiq.perform(*expected_params) }
-
-    it { expect(sidekiq).to receive(:execute).with(expected_params) }
-  end
-end