workarea-core 3.4.26 → 3.4.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 565180173a33822af9ccf9869c938b7a279aa4af98d302d5eb294ae92a64ddcd
-  data.tar.gz: 7e8a3f3affcb68255b2015abbc0215b07e074d4678f4ac5e949fd790f78a8497
+  metadata.gz: 4b85629d6e742d6d704d618e8467136a4d4b8fbb8bf6e5c9fba3a4fcd5b29f3c
+  data.tar.gz: 50316244efeff6bc792599bd4001e78e0a34778ea72f2b4360ff2b34e55b5dfb
 SHA512:
-  metadata.gz: 233b6a7ea863877f716e809c348c921155fbf868db0a462bbcc57fe540aebe0008f44dc1a58d9fface1d04deb5bc0450938c8f53941a393246e5b9fffc3373a7
-  data.tar.gz: db0b7774e57ef6c9f59e3c171c998a53400fc316500fd246ab1aadffc604bb473292edcc3371b7a06a42fa087a1bd5f0fddd50b8c974e50f55b7a48903116582
+  metadata.gz: 1384ce4d2f5d8e18ad3ffeec708f593ae86b871b2a92d84fab9fc3b758f8b7efe7cb99322730f432359eb1b11532a2ae7a38bb7230bc81faa16b1bc4fc55a43b
+  data.tar.gz: 63083fc48278f299668d9541ddd342689f14116a8158a3adf0d73644b8f23e9fdb091911cff97f59cd6b7f5009083e7c22ef65b5fc7d5da6bfd5e09c431a7079

data/app/services/workarea/direct_upload.rb

@@ -10,18 +10,17 @@ module Workarea
       redis_key = "cors_#{url.optionize}"
       return if Workarea.redis.get(redis_key) == 'true'
 
-      Workarea.s3.put_bucket_cors(
-        Configuration::S3.bucket,
-        'CORSConfiguration' => [
-          {
-            'ID' => "direct_upload_#{url}",
-            'AllowedMethod' => 'PUT',
-            'AllowedOrigin' => url,
-            'AllowedHeader' => '*'
-          }
-        ]
-      )
-
+      response = Workarea.s3.get_bucket_cors(Configuration::S3.bucket)
+      cors = response.data[:body]
+      cors['CORSConfiguration'] << {
+        'ID' => "direct_upload_#{url}",
+        'AllowedMethod' => 'PUT',
+        'AllowedOrigin' => url,
+        'AllowedHeader' => '*'
+      }
+      cors['CORSConfiguration'].uniq!
+
+      Workarea.s3.put_bucket_cors(Configuration::S3.bucket, cors)
       Workarea.redis.set(redis_key, 'true')
     end
 

data/app/workers/sidekiq/callbacks.rb

@@ -7,6 +7,54 @@ module Sidekiq
     class InvalidConfiguration < RuntimeError; end
 
     class << self
+      # The list of workers that perform Sidekiq callbacks. Used for checking
+      # whether one of them need to be fired off after a callback happens.
+      #
+      # @private
+      # @return [Array<Class>]
+      #
+      def workers
+        caching_classes? ? workers_list : workers_list.map(&:constantize)
+      end
+
+      # Add a {Class} to the list of workers to check when running callbacks.
+      #
+      # @private
+      # @param [Class] worker
+      #
+      def add_worker(klass)
+        if caching_classes?
+          workers_list << klass
+        elsif !workers_list.include?(klass.name)
+          workers_list << klass.name
+        end
+      end
+
+      # Whether Rails is caching classes, which matters when checking workers to
+      # run by comparing the worker's configuration with the model running the
+      # callback.
+      #
+      # When we aren't caching classes, we need to use the fully qualified
+      # constant name to decide since the classes could have been reloaded due
+      # to code changes.
+      #
+      # @return [Boolean]
+      #
+      def caching_classes?
+        ::Rails.application.config.cache_classes
+      end
+
+      # Convenience reference to the tracked list of workers in the Rails config
+      #
+      # @private
+      # @return [Array<String,Class>]
+      #
+      def workers_list
+        config = ::Rails.application.config
+        config.sidekiq_callbacks_workers = [] unless config.respond_to?(:sidekiq_callbacks_workers)
+        config.sidekiq_callbacks_workers
+      end
+
       # Permanently or temporarily enable callback workers. If
       # no workers are given, it will enable all callback
       # workers during the execution of the block or globally if no
@@ -148,7 +196,7 @@ module Sidekiq
       # finds a problem.
       #
       def assert_valid_config!
-        Sidekiq::CallbacksWorker.workers.each do |worker|
+        Sidekiq::Callbacks.workers.each do |worker|
           if (worker.enqueue_on.values.flatten & [:find, 'find']).any?
             raise(
               InvalidConfiguration,
@@ -161,7 +209,7 @@ module Sidekiq
       private
 
       def set_workers(workers, action)
-        workers = Sidekiq::CallbacksWorker.workers if workers.blank?
+        workers = Sidekiq::Callbacks.workers if workers.blank?
 
         if !block_given?
           workers.each(&action)
@@ -197,7 +245,7 @@ module Sidekiq
     private
 
     def _enqueue_callback_workers(kind)
-      Sidekiq::CallbacksWorker.workers.select(&:enabled?).each do |worker|
+      Sidekiq::Callbacks.workers.select(&:enabled?).each do |worker|
         worker.callbacks.each do |klass, callbacks|
           if _perform_callback_worker?(klass, callbacks, kind, worker)
             args = worker.find_callback_args(self)
@@ -219,7 +267,7 @@ module Sidekiq
     end
 
     def _is_a_callback_type_match?(model_class)
-      return is_a?(model_class) if ::Rails.application.config.cache_classes
+      return is_a?(model_class) if Sidekiq::Callbacks.caching_classes?
 
       # This is a funny way of doing the same check as `is_a?`.
       #

data/app/workers/sidekiq/callbacks_worker.rb

@@ -4,15 +4,17 @@ module Sidekiq
   module CallbacksWorker
     extend ActiveSupport::Concern
 
-    mattr_accessor :workers
-    self.workers = []
-
     included do
       thread_cattr_accessor :enabled, :inlined
-      CallbacksWorker.workers << self
+      Sidekiq::Callbacks.add_worker(self)
     end
 
     class_methods do
+      # @deprecated TODO remove this in v3.6
+      def workers
+        Sidekiq::Callbacks.workers
+      end
+
       def enabled?
         enabled.nil? || !!enabled
       end

data/lib/workarea/version.rb

@@ -2,7 +2,7 @@ module Workarea
   module VERSION
     MAJOR = 3
     MINOR = 4
-    PATCH = 26
+    PATCH = 27
     PRE   = nil
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')

data/test/javascripts/form_submitting_controls_spec.js

@@ -1,3 +1,4 @@
+//= require workarea/core/modules/environment
 //= require workarea/core/modules/url
 //= require workarea/core/modules/form_submitting_controls
 

data/test/services/workarea/direct_upload_test.rb

@@ -47,6 +47,14 @@ module Workarea
     end
 
     def test_ensure_cors
+      response = mock('Excon::Response')
+      response.expects(:data)
+              .times(3)
+              .returns(body: { 'CORSConfiguration' => [] })
+      Workarea.s3.expects(:get_bucket_cors)
+                 .times(3)
+                 .with(Configuration::S3.bucket)
+                 .returns(response)
       Workarea.s3.expects(:put_bucket_cors).with(
         Configuration::S3.bucket,
         'CORSConfiguration' => [
@@ -61,6 +69,12 @@ module Workarea
       Workarea.s3.expects(:put_bucket_cors).with(
         Configuration::S3.bucket,
         'CORSConfiguration' => [
+          {
+            'ID' => "direct_upload_http://test.host",
+            'AllowedMethod' => 'PUT',
+            'AllowedOrigin' => 'http://test.host',
+            'AllowedHeader' => '*'
+          },
           {
             'ID' => "direct_upload_http://localhost:3000",
             'AllowedMethod' => 'PUT',
@@ -72,6 +86,18 @@ module Workarea
       Workarea.s3.expects(:put_bucket_cors).with(
         Configuration::S3.bucket,
         'CORSConfiguration' => [
+          {
+            'ID' => "direct_upload_http://test.host",
+            'AllowedMethod' => 'PUT',
+            'AllowedOrigin' => 'http://test.host',
+            'AllowedHeader' => '*'
+          },
+          {
+            'ID' => "direct_upload_http://localhost:3000",
+            'AllowedMethod' => 'PUT',
+            'AllowedOrigin' => 'http://localhost:3000',
+            'AllowedHeader' => '*'
+          },
           {
             'ID' => "direct_upload_https://example.com",
             'AllowedMethod' => 'PUT',
@@ -81,7 +107,6 @@ module Workarea
         ]
       ).returns(true)
 
-
       assert(DirectUpload.ensure_cors!('http://test.host/admin/content_assets'))
       assert_equal('true', Workarea.redis.get('cors_http_test_host'))
       assert(DirectUpload.ensure_cors!('http://localhost:3000/admin/content_assets'))

data/test/workers/sidekiq/callbacks_test.rb

@@ -133,6 +133,9 @@ module Sidekiq
       end
     end
 
+    class TestTrackingWorkerOne; end
+    class TestTrackingWorkerTwo; end
+
     setup :setup_sidekiq
     teardown :teardown_sidekiq
 
@@ -429,5 +432,24 @@ module Sidekiq
 
       assert(Worker.enabled?)
     end
+
+    def test_tracking_workers
+      current_workers = ::Rails.application.config.sidekiq_callbacks_workers
+      ::Rails.application.config.sidekiq_callbacks_workers = []
+
+      Sidekiq::Callbacks.add_worker(TestTrackingWorkerOne)
+      assert_includes(Sidekiq::Callbacks.workers, TestTrackingWorkerOne)
+
+      current_cache_classes = ::Rails.application.config.cache_classes
+      ::Rails.application.config.cache_classes = false
+      ::Rails.application.config.sidekiq_callbacks_workers = []
+
+      Sidekiq::Callbacks.add_worker(TestTrackingWorkerTwo)
+      assert_includes(Sidekiq::Callbacks.workers, TestTrackingWorkerTwo)
+
+    ensure
+      ::Rails.application.config.sidekiq_callbacks_workers = current_workers
+      ::Rails.application.config.cache_classes = current_cache_classes
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-core
 version: !ruby/object:Gem::Version
-  version: 3.4.26
+  version: 3.4.27
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-22 00:00:00.000000000 Z
+date: 2020-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -882,22 +882,22 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.10.3
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.10.1
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.10.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.10.3
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.10.1
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.10.3
 - !ruby/object:Gem::Dependency
   name: countries
   requirement: !ruby/object:Gem::Requirement
@@ -2609,7 +2609,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Core of the Workarea Commerce Platform