umbra-rb 0.2.0 → 0.3.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12773099d5e69ca31d44d8751335f2dd7652c3d37626be3f7e69ba1048f2d8eb
-  data.tar.gz: 7d29a4d0c0bf0e7c715a88e8696e99b9c92e2eb590738edab34b62e334e900e6
+  metadata.gz: b78a47b9846524b89aa167c590d5f912fec5b15e3f257f131bec39717469cbc5
+  data.tar.gz: '0638dcec00b31af9ef1acb84969fef4dcab5cab1ad24453e52fea11491275655'
 SHA512:
-  metadata.gz: e7ba308273cf8ab2d97d12081e03449b220972b1f9759613f99507b956f29c6538ff3aa11c9e5fbced6326878fbb096393ab95fa2659c0b3410b835a94f2966d
-  data.tar.gz: a3e54eb44ff862456c5d474e38fd5058f358e5a36264bd65aaffed18861baa456a65259d890b069e40554d2bda7515e9d412e94d62d048b48671f2a1487cf0f6
+  metadata.gz: 38b6958b37872340e07ae3e0f0f18371ae2a7e27787a2521fe9eda8962f8f5e1c7355177677650e811b2e5ba5b1fefb2e228a56993c3a774147191e1df289fe8
+  data.tar.gz: 6255267c65a90494b301367ccd14645a3e4dc8c481115155fd6c60e94ce1f4ad64d4125b13de2b48d83e84132da1df3a2602689ff35a213f25df2c1dcea30566

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    umbra-rb (0.2.0)
+    umbra-rb (0.3.0.pre)
+      concurrent-ruby (~> 1.1)
       multi_json (~> 1.13)
       oj (~> 3.9)
       redis (~> 4.1)
@@ -10,57 +11,70 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.0)
-    carwow_rubocop (3.0.3)
-      rubocop (>= 0.68)
+    carwow_rubocop (3.2.1)
+      rubocop (>= 0.78)
       rubocop-performance
       rubocop-rspec
     coderay (1.1.2)
+    concurrent-ruby (1.1.5)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
     ethon (0.12.0)
       ffi (>= 1.3.0)
-    ffi (1.11.1)
-    jaro_winkler (1.5.3)
+    ffi (1.12.1)
+    hashdiff (1.0.0)
+    jaro_winkler (1.5.4)
     method_source (0.9.2)
-    multi_json (1.13.1)
-    oj (3.9.2)
-    parallel (1.17.0)
-    parser (2.6.4.1)
+    multi_json (1.14.1)
+    oj (3.10.1)
+    parallel (1.19.1)
+    parser (2.7.0.2)
       ast (~> 2.4.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
+    public_suffix (4.0.3)
+    rack (2.1.1)
     rainbow (3.0.0)
-    rake (10.5.0)
+    rake (13.0.1)
     redis (4.1.3)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.0)
+      rspec-support (~> 3.9.0)
+    rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
-    rubocop (0.74.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.0)
+    rubocop (0.79.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-performance (1.4.1)
+    rubocop-performance (1.5.2)
       rubocop (>= 0.71.0)
-    rubocop-rspec (1.35.0)
-      rubocop (>= 0.60.0)
+    rubocop-rspec (1.37.1)
+      rubocop (>= 0.68.1)
     ruby-progressbar (1.10.1)
+    safe_yaml (1.0.5)
     typhoeus (1.3.1)
       ethon (>= 0.9.0)
     unicode-display_width (1.6.0)
+    webmock (3.8.0)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
 
 PLATFORMS
   ruby
@@ -69,9 +83,11 @@ DEPENDENCIES
   bundler (~> 2.0)
   carwow_rubocop
   pry
-  rake (~> 10.0)
+  rack
+  rake (~> 13.0)
   rspec (~> 3.0)
   umbra-rb!
+  webmock (~> 3)
 
 BUNDLED WITH
    2.0.2

data/config.ru

@@ -0,0 +1,8 @@
+require 'rack'
+require 'rack/lobster'
+require 'umbra'
+
+Umbra.configure
+
+use Umbra::Middleware
+run Rack::Lobster.new

data/lib/umbra.rb

@@ -3,6 +3,7 @@
 require 'typhoeus'
 require 'redis'
 require 'multi_json'
+require 'concurrent'
 
 module Umbra
   autoload :Config, 'umbra/config'

data/lib/umbra/config.rb

@@ -4,7 +4,7 @@ module Umbra
 
     def self.default(&block)
       new(
-        publisher: Publisher,
+        publisher: Publisher.new,
         request_selector: RequestSelector,
         encoder: Encoder,
         error_handler: SuppressErrorHandler,

data/lib/umbra/publisher.rb

@@ -1,55 +1,30 @@
 module Umbra
-  class Publisher < SynchronousPublisher
-    MAX_QUEUE_SIZE = 100
-
-    class << self
-      def call(env, response)
-        start_once!
-
-        if @queue.size > MAX_QUEUE_SIZE
-          Umbra.logger.warn '[umbra] Publish queue at max - dropping items'
-          return
-        end
-
-        @queue.push(proc { super(env, response) })
-      end
-
-      private
-
-      # rubocop:disable Metrics/MethodLength
-      def start_once!
-        LOCK.synchronize do
-          return if @started == Process.pid
-
-          Umbra.logger.info '[umbra] Starting publishing thread'
-
-          @started = Process.pid
-          @queue = Queue.new
+  class Publisher
+    DEFAULT_MAX_QUEUE = 100
+    DEFAULT_MIN_THREADS = 1
+    DEFAULT_MAX_THREADS = 1
+
+    def initialize(**options)
+      @pool = Concurrent::CachedThreadPool.new(
+        min_threads: options.fetch(:min_threads, DEFAULT_MIN_THREADS),
+        max_threads: options.fetch(:max_thread, DEFAULT_MAX_THREADS),
+        max_queue: options.fetch(:max_queue, DEFAULT_MAX_QUEUE),
+        fallback_policy: :abort
+      )
+    end
 
-          worker_thread = Thread.new do
-            while (x = @queue.pop)
-              break if x == STOP
+    def call(env, response, encoder: Umbra.encoder, redis: Umbra.redis)
+      @pool << proc { call!(env, response, encoder: encoder, redis: redis) }
 
-              begin
-                x.call
-              rescue StandardError => e
-                Umbra.logger.warn '[umbra] Error in publishing thread'
-                Umbra.config.error_handler.call(e)
-              end
-            end
-          end
+      true
+    rescue Concurrent::RejectedExecutionError
+      Umbra.logger.warn '[umbra] Queue at max - dropping items'
 
-          at_exit do
-            @queue.push(STOP)
-            worker_thread.join
-          end
-        end
-      end
-      # rubocop:enable Metrics/MethodLength
+      false
     end
 
-    STOP = Object.new
-    LOCK = Mutex.new
-    private_constant :STOP, :LOCK
+    def call!(env, response, encoder: Umbra.encoder, redis: Umbra.redis)
+      redis.publish(Umbra::CHANNEL, encoder.call(env, response))
+    end
   end
 end

data/lib/umbra/request_builder.rb

@@ -21,9 +21,9 @@ module Umbra
 
       def headers(env)
         request(env)
-        .fetch('headers')
-        .merge(UMBRA_HEADERS)
-        .transform_keys { |key| key.split('_').drop(1).map(&:capitalize).join('-') }
+          .fetch('headers')
+          .merge(UMBRA_HEADERS)
+          .transform_keys { |key| key.split('_').drop(1).map(&:capitalize).join('-') }
       end
 
       def method(env)

data/lib/umbra/shadow_requester.rb

@@ -1,60 +1,34 @@
 module Umbra
   class ShadowRequester
+    attr_reader :queue, :count
+
     def initialize(count: 1, pool: 1, max_queue_size: 100)
       @count = count
-      @pool = pool
-      @queue = Queue.new
-      @stop = Object.new
-      @lock = Mutex.new
-      @max_queue_size = max_queue_size
+      @queue ||= Concurrent::CachedThreadPool.new(
+        min_threads: 1,
+        max_threads: pool,
+        max_queue: max_queue_size,
+        fallback_policy: :abort
+      )
     end
 
     def call(env)
-      start_worker!
-
-      if @queue.size > @max_queue_size
-        Umbra.logger.warn '[umbra] Shadowing queue at max - dropping items'
-        return
-      end
+      queue << proc { call!(env) }
 
-      request = RequestBuilder.call(env)
+      true
+    rescue Concurrent::RejectedExecutionError
+      Umbra.logger.warn '[umbra] Shadowing queue at max - dropping items'
 
-      @count.times { @queue.push(request) }
+      false
     end
 
-    private
-
-    # rubocop:disable Metrics/MethodLength
-    def start_worker!
-      @lock.synchronize do
-        return if @started
-
-        @started = true
-        Umbra.logger.info '[umbra] Starting shadowing threads...'
-
-        workers = (0...@pool).map do |thread_num|
-          Thread.new do
-            Umbra.logger.info "[umbra] shadow thread #{thread_num} waiting"
-
-            while (request = @queue.pop)
-              break if request == @stop
+    def call!(env)
+      hydra = Typhoeus::Hydra.new
+      request = RequestBuilder.call(env)
 
-              begin
-                request.run
-              rescue StandardError => e
-                Umbra.logger.warn "[umbra] error in shadow thread #{thread_num}"
-                Umbra.config.error_handler.call(e)
-              end
-            end
-          end
-        end
+      @count.times { hydra.queue(request) }
 
-        at_exit do
-          @pool.times { @queue.push(@stop) }
-          workers.map(&:join)
-        end
-      end
+      hydra.run
     end
-    # rubocop:enable Metrics/MethodLength
   end
 end

data/lib/umbra/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Umbra
-  VERSION = '0.2.0'
+  VERSION = '0.3.0.pre'
 end

data/umbra-rb.gemspec

@@ -28,9 +28,12 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'carwow_rubocop'
   spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rack'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'webmock', '~> 3'
 
+  spec.add_dependency 'concurrent-ruby', '~> 1.1'
   spec.add_dependency 'multi_json', '~> 1.13'
   spec.add_dependency 'oj', '~> 3.9'
   spec.add_dependency 'redis', '~> 4.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: umbra-rb
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0.pre
 platform: ruby
 authors:
 - carwow Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-07 00:00:00.000000000 Z
+date: 2020-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,20 +52,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +94,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -152,6 +194,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- config.ru
 - lib/umbra.rb
 - lib/umbra/config.rb
 - lib/umbra/encoder.rb
@@ -160,7 +203,6 @@ files:
 - lib/umbra/request_builder.rb
 - lib/umbra/shadow_requester.rb
 - lib/umbra/subscriber.rb
-- lib/umbra/synchronous_publisher.rb
 - lib/umbra/version.rb
 - umbra-rb.gemspec
 homepage: https://github.com/carwow/umbra
@@ -181,9 +223,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: []
 rubygems_version: 3.0.3
 signing_key: 

data/lib/umbra/synchronous_publisher.rb

@@ -1,7 +0,0 @@
-module Umbra
-  class SynchronousPublisher
-    def self.call(env, response, encoder: Umbra.encoder, redis: Umbra.redis)
-      redis.publish(Umbra::CHANNEL, encoder.call(env, response))
-    end
-  end
-end