liveqa 1.9.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e2af9cc4ebfb7e97a8330c769db5ffb49989ec9
-  data.tar.gz: 4261ba5bbe8cbebd535f876fe9f8762e460286cf
+  metadata.gz: 0cf621fc23d38f66505dc4983cff2e0c6fcf26b5
+  data.tar.gz: bdf797cb4b4934154630b44ad2efb05ef01cb14e
 SHA512:
-  metadata.gz: 0f5fc2bd622bdf4e98573f3205ced2fce4ae9b569e398ab28633654cffaf2a3c1e2532c63da9f8352bcc74482d787fd6958104d0c02d52afe83baf3596374595
-  data.tar.gz: 7e2fccdb0c9a117a852989f3ab3e7744b958a0f31f3014cff519614492b3d3cdc862956e375ef6f715c747908170674708ca034a2b578d41201b3c9034f84a91
+  metadata.gz: af70e6014944593db250372db0f2941654d1bdb33d5814ba2b419dcca048625ea46ed707bc02cb45ee1d98c208aa5b6ae798f757dd1bd93cd7b63143c6091615
+  data.tar.gz: b34ea34441bd718e033b2220d68670266efb4f073e850d8f8c1af765b672459873f17531653e975395f01182df2676fcbe423eb5ba4984960841cb6c6ee6bb55

data/lib/liveqa/processor/async.rb

@@ -4,12 +4,14 @@ module LiveQA
 
       def initialize
         @max_queue_size = 10_000
-        @queue = Queue.new
-        @worker = Worker.new(@queue)
-        @worker_mutex = Mutex.new
+        @queue = Concurrent::Array.new
+        @worker = Worker.new(@queue, executor)
 
         at_exit do
-          @worker_thread && @worker_thread[:should_exit] = true
+          unless worker_running?
+            executor.shutdown
+            executor.wait_for_termination
+          end
         end
       end
 
@@ -22,25 +24,19 @@ module LiveQA
         true
       end
 
-      def flush
-        while !@queue.empty? || @worker.is_requesting?
-          ensure_worker_running
-          sleep(0.1)
-        end
-      end
-
       private
 
+      def executor
+        @executor ||= Concurrent.global_io_executor
+      end
+
       def ensure_worker_running
         return if worker_running?
-        @worker_mutex.synchronize do
-          return if worker_running?
-          @worker_thread = Thread.new { @worker.run }
-        end
+        @worker_thread = Concurrent::Future.execute { @worker.run }
       end
 
       def worker_running?
-        @worker_thread && @worker_thread.alive?
+        @worker_thread && @worker_thread.incomplete?
       end
 
     end

data/lib/liveqa/processor/worker.rb

@@ -5,17 +5,18 @@ module LiveQA
       DEFAULT_WAIT_TIME = 2
 
       attr_reader :queue
-      attr_reader :lock
       attr_reader :batches
+      attr_reader :executor
 
-      def initialize(queue)
+      def initialize(queue, executor)
         @queue = queue
-        @lock = Mutex.new
         @batches = []
+
+        @executor = executor
       end
 
       def run
-        until Thread.current[:should_exit]
+        while running?
           return if queue.empty? && batches.empty?
 
           sleep(DEFAULT_WAIT_TIME) if queue.empty?
@@ -28,11 +29,14 @@ module LiveQA
 
       private
 
+      def running?
+        return true if !queue.empty? || !batches.empty?
+        executor.running?
+      end
+
       def create_new_batch
         batch = Batch.new
-        lock.synchronize do
-          batch << queue.pop until batch.full? || queue.empty?
-        end
+        batch << queue.pop until batch.full? || queue.empty?
         batches.push(batch)
       end
 

data/lib/liveqa/version.rb

@@ -1,3 +1,3 @@
 module LiveQA # :nodoc:
-  VERSION = '1.9.0'.freeze
+  VERSION = '1.9.1'.freeze
 end

data/lib/liveqa.rb

@@ -6,6 +6,7 @@ require 'json'
 require 'time'
 require 'cgi'
 require 'logger'
+require 'concurrent'
 
 # Base
 require 'liveqa/version'

data/liveqa.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.platform      = Gem::Platform::RUBY
   s.authors       = ['LiveQA']
   s.email         = ['support@liveqa.io']
-  s.homepage      = 'https://github.com/arkes/liveqa-ruby'
+  s.homepage      = 'https://github.com/LiveQA/liveqa-ruby'
   s.summary       = 'LiveQA ruby integration'
   s.description   = 'LiveQA ruby integration'
 
@@ -18,6 +18,8 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- spec/*`.split("\n")
 
+  s.add_dependency 'concurrent-ruby', '~> 1.0.5'
+
   s.add_development_dependency 'faker', '~> 1.8.4'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'rake', '>= 0.9.0'

data/spec/lib/liveqa/processor/worker_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe LiveQA::Processor::Worker do
   let(:queue) { Queue.new }
-  let(:worker) { LiveQA::Processor::Worker.new(queue) }
+  let(:worker) { LiveQA::Processor::Worker.new(queue, Concurrent.global_io_executor) }
 
   context 'do nothing' do
     before do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: liveqa
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
 platform: ruby
 authors:
 - LiveQA
@@ -10,6 +10,20 @@ bindir: bin
 cert_chain: []
 date: 2018-07-31 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
@@ -151,7 +165,7 @@ files:
 - spec/lib/liveqa_spec.rb
 - spec/spec_helper.rb
 - spec/support/rack_app.rb
-homepage: https://github.com/arkes/liveqa-ruby
+homepage: https://github.com/LiveQA/liveqa-ruby
 licenses:
 - MIT
 metadata: {}