workarea-core 3.5.4 → 3.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8490f36459db38d3440f85a679bbc51aec0fe302563068a715fc51e78e130ab0
-  data.tar.gz: ba46602137e05b884f87a0169a75a896b9e7c7cb2601ce25130fac421dbd5a27
+  metadata.gz: d47e5bfba5ae31a8628b66da9818d40cc49adb0e3428b0449bddb3a414bc0efc
+  data.tar.gz: 4336935901cbd99fedf36de8e62ee3d1f842b143bed0d79e0b253be3419c97c2
 SHA512:
-  metadata.gz: c4188e1edfb091422a9a871dfcd4819d7732e110bf45262d00c59ef532ebce574a64b8ab0e2c097c9a1442432de90b11dbf6acb3d419ca8b9e43da4e46e4b726
-  data.tar.gz: 24700c5024b1bbde51a34eca0108ddf71a2caa8cf8edaed22fd5041a51a109b5e7854f8c7a323b103b20ee99536f5b67fb697cdcb1685d50a09d13ff47134cae
+  metadata.gz: 22c46296fa0ad6e75263909fe7793134219c05122077f2d6d58a1f4a493e425861f7051bbbb5684984bb34f7f0c9f80151fd44c9e8eb7b79868ccd2a8304a576
+  data.tar.gz: 11bea33230c8001e5d2f8841729b065600bd89d6faa22be3d5cf5183dfe4e065739cce4b52f664f3edacbe010ed5ddd87c78ef0d32bafdfe4de90d7638dff272

data/app/models/workarea/content/block.rb

@@ -96,7 +96,7 @@ module Workarea
       # @return [Workarea::Content::BlockType]
       #
       def type
-        Workarea.config.content_block_types.detect { |bt| bt.id == type_id }
+        Configuration::ContentBlocks.types.detect { |bt| bt.id == type_id }
       end
 
       def type=(value)

data/app/models/workarea/content/block_draft.rb

@@ -25,7 +25,7 @@ module Workarea
 
       def block_type
         return unless type_id.present?
-        Workarea.config.content_block_types.detect { |bt| bt.id == type_id.to_sym }
+        Configuration::ContentBlocks.types.detect { |bt| bt.id == type_id.to_sym }
       end
 
       def typecast_data!

data/app/models/workarea/content/block_type.rb

@@ -19,7 +19,7 @@ module Workarea
       # @return [Workarea::Content::BlockType, nil]
       #
       def self.find(id)
-        Workarea.config.content_block_types.detect { |bt| bt.id == id }
+        Configuration::ContentBlocks.types.detect { |bt| bt.id == id }
       end
 
       def initialize(name)

data/app/models/workarea/content/block_type_definition.rb

@@ -12,7 +12,7 @@ module Workarea
           existing.instance_eval(&block) if block_given?
         else
           block_type.instance_eval(&block) if block_given?
-          Workarea.config.content_block_types.push(block_type)
+          Configuration::ContentBlocks.types.push(block_type)
         end
       end
     end

data/app/models/workarea/content/preset.rb

@@ -59,7 +59,7 @@ module Workarea
       # @return [Workarea::Content::BlockType]
       #
       def type
-        Workarea.config.content_block_types.detect { |bt| bt.id == type_id }
+        Configuration::ContentBlocks.types.detect { |bt| bt.id == type_id }
       end
     end
   end

data/app/models/workarea/segment/rules/traffic_referrer.rb

@@ -13,11 +13,11 @@ module Workarea
         end
 
         def medium_match?(referrer)
-          medium.to_s.strip.casecmp?(referrer.medium)
+          medium.present? && medium.to_s.strip.casecmp?(referrer.medium.to_s)
         end
 
         def source_match?(referrer)
-          source.any? { |s| s.strip.casecmp?(referrer.source) }
+          source.any? { |s| s.present? && s.to_s.strip.casecmp?(referrer.source.to_s) }
         end
 
         def url_match?(referrer)

data/app/models/workarea/segmentable.rb

@@ -73,7 +73,7 @@ module Workarea
       # If loaded with `.only` this might be missing
       return if attribute_missing?(:active_segment_ids)
 
-      CurrentSegments.has_segmented_content! if active_segment_ids.any?
+      CurrentSegments.has_segmented_content! if active_segment_ids.present?
     end
   end
 end

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/configuration/content_blocks.rb

@@ -3,6 +3,14 @@ module Workarea
     module ContentBlocks
       extend self
 
+      def types
+        @types ||= []
+      end
+
+      def types=(values)
+        @types = values
+      end
+
       def building_blocks
         @building_blocks ||= []
       end
@@ -11,6 +19,14 @@ module Workarea
         building_blocks.each do |block|
           Content::BlockTypeDefinition.define(&block)
         end
+
+        # TODO remove in v3.6, this exists to help with a backwards incompatible
+        # patch to fix copying of Workarea.config in multisite.
+        Workarea.config.content_block_types = types
+        Workarea.deprecation.deprecate_methods(
+          AdministrableOptions,
+          content_block_types: 'use Configuration::ContentBlocks.types instead'
+        )
       end
     end
   end

data/lib/workarea/version.rb

@@ -2,7 +2,7 @@ module Workarea
   module VERSION
     MAJOR = 3
     MINOR = 5
-    PATCH = 4
+    PATCH = 5
     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/models/workarea/content/block_name_test.rb

@@ -5,7 +5,7 @@ module Workarea
     class BlockNameTest < TestCase
       def test_not_erroring_for_configured_blocks
         assert_nothing_raised do
-          Workarea.config.content_block_types.each do |type|
+          Configuration::ContentBlocks.types.each do |type|
             block = Block.new(type: type, data: type.defaults)
             BlockName.new(block).to_s
           end
@@ -13,7 +13,7 @@ module Workarea
       end
 
       def test_name_is_human_readable
-        Workarea.config.content_block_types.each do |type|
+        Configuration::ContentBlocks.types.each do |type|
           block = Block.new(type: type, data: type.defaults)
           name = BlockName.new(block).to_s
 

data/test/models/workarea/content/block_type_definition_test.rb

@@ -7,12 +7,12 @@ module Workarea
       teardown :restore_config
 
       def reset_config
-        @current = Workarea.config.content_block_types
-        Workarea.config.content_block_types = []
+        @current = Configuration::ContentBlocks.types
+        Configuration::ContentBlocks.types = []
       end
 
       def restore_config
-        Workarea.config.content_block_types = @current
+        Configuration::ContentBlocks.types = @current
       end
 
       def test_constructs_a_list_of_blocks_based_on_the_dsl
@@ -39,8 +39,8 @@ module Workarea
           end
         end
 
-        assert_equal(2, Workarea.config.content_block_types.length)
-        results = Workarea.config.content_block_types
+        assert_equal(2, Configuration::ContentBlocks.types.length)
+        results = Configuration::ContentBlocks.types
 
         assert_equal('Foo', results.first.name)
         assert_equal('workarea/admin/content_block_types/custom_foo_icon', results.first.icon)
@@ -122,7 +122,7 @@ module Workarea
           end
         end
 
-        result = Workarea.config.content_block_types.first
+        result = Configuration::ContentBlocks.types.first
 
         assert_equal('Foo', result.name)
         assert_equal(5, result.fieldsets.length)

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.5.4
+  version: 3.5.5
 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
@@ -896,22 +896,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
@@ -2718,7 +2718,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