workarea-core 3.4.44 → 3.5.0.beta.1

data/lib/workarea/configuration/administrable/definition.rb

@@ -0,0 +1,42 @@
+module Workarea
+  module Configuration
+    module Administrable
+      class Definition
+        attr_reader :fieldsets
+        delegate :field, to: :application_fieldset
+
+        def initialize
+          @fieldsets = SwappableList.new
+          @fieldsets.push(Fieldset.new('Application', namespaced: false))
+        end
+
+        def fieldset(name, override: false, namespaced: true, &block)
+          fieldset = Fieldset.new(name, namespaced: namespaced)
+          existing = find_fieldset(fieldset.id)
+
+          if override && existing.present?
+            @fieldsets.swap(existing, fieldset)
+            fieldset.instance_eval(&block) if block_given?
+          elsif existing.present?
+            existing.instance_eval(&block) if block_given?
+          else
+            @fieldsets.push(fieldset)
+            fieldset.instance_eval(&block) if block_given?
+          end
+        end
+
+        def application_fieldset
+          @application_fieldset ||= find_fieldset(:application)
+        end
+
+        def find_fieldset(id)
+          @fieldsets.detect { |fieldset| fieldset.id == id.to_sym }
+        end
+
+        def fields
+          @fieldsets.flat_map(&:fields)
+        end
+      end
+    end
+  end
+end

data/lib/workarea/configuration/administrable/field.rb

@@ -0,0 +1,79 @@
+module Workarea
+  module Configuration
+    module Administrable
+      class Field
+        class Invalid < StandardError; end
+
+        attr_reader :name, :type, :fieldset, :options
+        delegate :default, :description, :values_type, :encrypted, to: :options
+
+        def initialize(name, type:, fieldset: nil,  **options)
+          @name = name
+          @type = type.to_s.underscore.to_sym
+          @fieldset = fieldset
+          @options = OpenStruct.new(options)
+        end
+
+        def id
+          @id ||= (options.id || name.to_s.systemize).to_sym
+        end
+
+        def key
+          @key ||= fieldset&.namespaced? ? :"#{fieldset.id}_#{id}" : id
+        end
+
+        def type_class
+          Workarea.config.configurable_field_types[type]&.constantize
+        end
+
+        def values
+          return options.values unless options.values.respond_to?(:call)
+          options.values.call
+        end
+
+        def values_type_class
+          return unless type == :hash
+
+          values_type = options.values_type || :string
+          Workarea.config.configurable_field_types[values_type]&.constantize
+        end
+
+        def overridden?
+          Workarea.config.key?(key)
+        end
+
+        def encrypted?
+          !!encrypted
+        end
+
+        def validate!
+          validate_id
+          validate_type
+          self
+        end
+
+        def allow_blank?
+          !!@options.allow_blank
+        end
+
+        def merge!(options = {})
+          @options = OpenStruct.new(options.to_h.merge(options))
+        end
+
+        private
+
+        def validate_id
+          unless id.to_s.valid_method_name?
+            raise Invalid.new("configuration field '#{name}' does not have a valid id - #{id}.")
+          end
+        end
+
+        def validate_type
+          unless type_class.present?
+            raise Invalid.new("configuration field '#{name}' does not have a valid type - #{@type}.")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/workarea/configuration/administrable/fieldset.rb

@@ -0,0 +1,44 @@
+module Workarea
+  module Configuration
+    module Administrable
+      class Fieldset
+        attr_accessor :fields, :name
+
+        def initialize(name, namespaced: true)
+          @name = name
+          @namespaced = namespaced
+          @fields = SwappableList.new
+        end
+
+        def id
+          name.to_s.systemize.to_sym
+        end
+
+        def namespaced?
+          @namespaced
+        end
+
+        def field(name, type: nil, override: false, **options)
+          field = Field.new(name, fieldset: self, type: type, **options)
+          existing = find_field(field.id)
+
+          if existing.present? && override
+            @fields.swap(existing, field.validate!)
+          elsif existing.present?
+            existing.merge!(options)
+            existing.validate!
+          else
+            @fields.push(field.validate!)
+          end
+
+          return unless field.encrypted?
+          Rails.application.config.filter_parameters << field.key
+        end
+
+        def find_field(id)
+          @fields.detect { |field| field.id == id.to_sym }
+        end
+      end
+    end
+  end
+end

data/lib/workarea/configuration/administrable_options.rb

@@ -0,0 +1,24 @@
+module Workarea
+  module Configuration
+    class AdministrableOptions < ActiveSupport::InheritableOptions
+      def method_missing(name, *args)
+        static_config = super
+        return static_config if static_config.present? || static_config.to_s == 'false'
+        return static_config unless check_fieldsets?(name)
+
+        Configuration::Admin.instance.send(name)
+      end
+
+      def respond_to_missing?(name, include_private)
+        true
+      end
+
+      private
+
+      def check_fieldsets?(name)
+        ::Mongoid.clients.any? &&
+          Configuration::Admin.fields.keys.include?(name.to_s)
+      end
+    end
+  end
+end

data/lib/workarea/configuration/cache_store.rb

@@ -7,7 +7,9 @@ module Workarea
         if Rails.env.test?
           Rails.application.config.cache_store = :null_store
         elsif !Rails.env.development?
-          Rails.application.config.cache_store = :redis_store, Workarea::Configuration::Redis.cache.to_url
+          Rails.application.config.cache_store = :redis_cache_store, {
+            url: Workarea::Configuration::Redis.cache.to_url
+          }
 
           require 'redis-rack-cache'
           Rails.application.config.action_dispatch.rack_cache = {

data/lib/workarea/configuration/content_blocks.rb

@@ -0,0 +1,17 @@
+module Workarea
+  module Configuration
+    module ContentBlocks
+      extend self
+
+      def building_blocks
+        @building_blocks ||= []
+      end
+
+      def load
+        building_blocks.each do |block|
+          Content::BlockTypeDefinition.define(&block)
+        end
+      end
+    end
+  end
+end

data/lib/workarea/configuration/mongoid.rb

@@ -13,10 +13,7 @@ module Workarea
       end
 
       def indexes_enforced?
-        servers = ::Mongoid::Clients.default.cluster.servers
-        addresses = servers.map(&:address).map(&:to_s)
-
-        client = Mongo::Client.new(addresses, database: 'admin')
+        client = ::Mongoid::Clients.default.use('admin')
         result = client.command(getParameter: 1, notablescan: nil)
         client.close
 

data/lib/workarea/configuration/session.rb

@@ -0,0 +1,36 @@
+module Workarea
+  module Configuration
+    module Session
+      class NoExpirationConfigured < StandardError; end
+      extend self
+
+      def cookie_store?
+        return @cookie_store if defined?(@cookie_store)
+        @cookie_store = Rails.application.config.session_store == ActionDispatch::Session::CookieStore
+      end
+
+      def key
+        Rails.application.config.session_options[:key]
+      end
+
+      def ttl
+        Rails.application.config.session_options[:expire_after]
+      end
+
+      def validate!
+        if ttl.blank?
+          raise(
+            NoExpirationConfigured,
+            <<~eos
+
+              Problem:
+                Workarea requires a session expiration to be set. We recommend 30 minutes.
+              Solution:
+                Add `expire_after: 30.minutes` to your session configuration in `config/initializers/session_store.rb`
+            eos
+          )
+        end
+      end
+    end
+  end
+end

data/lib/workarea/configuration/sidekiq.rb

@@ -9,6 +9,7 @@ module Workarea
         require_dependency "#{Workarea::Core::Engine.root}/app/middleware/workarea/audit_log_client_middleware"
         require_dependency "#{Workarea::Core::Engine.root}/app/middleware/workarea/audit_log_server_middleware"
         require_dependency "#{Workarea::Core::Engine.root}/app/middleware/workarea/release_server_middleware"
+        require_dependency "#{Workarea::Core::Engine.root}/app/middleware/workarea/query_cache_middleware"
 
         unless manually_configured?
           ::Sidekiq.options.merge!(
@@ -34,6 +35,7 @@ module Workarea
         ::Sidekiq.configure_server do |config|
           config.server_middleware do |chain|
             chain.add I18nServerMiddleware
+            chain.add QueryCacheMiddleware
             chain.add AuditLogServerMiddleware
             chain.add ReleaseServerMiddleware
           end
@@ -96,7 +98,7 @@ module Workarea
 
       def queues
         ENV['WORKAREA_SIDEKIQ_QUEUES'].to_s.split(',').presence ||
-          %w(high default low mailers)
+          %w(releases high default low mailers)
       end
 
       def pool_size

data/lib/workarea/core.rb

@@ -92,6 +92,7 @@ require 'haml'
 require 'ejs'
 require 'jbuilder'
 require 'redcarpet'
+require 'tribute'
 require 'turbolinks'
 require 'csv'
 require 'icalendar'
@@ -106,6 +107,8 @@ require 'dragonfly/s3_data_store'
 require 'serviceworker-rails'
 require 'chartkick'
 require 'logstasher' if ENV['WORKAREA_LOGSTASH'] =~ /true/i
+require 'mongoid/encrypted'
+require 'browser'
 
 #
 # Extensions
@@ -126,21 +129,20 @@ require 'workarea/ext/freedom_patches/country'
 require 'workarea/ext/freedom_patches/net_http_ssl_connection'
 require 'workarea/ext/freedom_patches/dragonfly_job_fetch_url'
 require 'workarea/ext/freedom_patches/dragonfly_callable_url_host'
-require 'workarea/ext/freedom_patches/mongoid_localized_defaults'
-require 'workarea/ext/freedom_patches/i18n_js'
+require 'workarea/ext/freedom_patches/active_support_duration'
+require 'workarea/ext/freedom_patches/premailer'
 require 'workarea/ext/mongoid/list_field'
 require 'workarea/ext/mongoid/each_by'
 require 'workarea/ext/mongoid/except'
 require 'workarea/ext/mongoid/moped_bson'
 require 'workarea/ext/mongoid/timestamps_timeless'
 require 'workarea/ext/mongoid/error'
+require 'workarea/ext/mongoid/lookup_hash'
 require 'workarea/ext/active_shipping/workarea'
 require 'workarea/ext/mongoid/audit_log_entry.decorator'
 require 'workarea/ext/mongoid/find_ordered'
 require 'workarea/ext/sprockets/ruby_processor'
 require 'workarea/ext/jbuilder/jbuilder_append_partials'
-require 'workarea/ext/jbuilder/jbuilder_cache'
-require 'workarea/ext/referer_parser/parser.decorator'
 
 if Rails.env.development?
   require 'workarea/ext/freedom_patches/routes_reloader'
@@ -157,6 +159,10 @@ end
 #
 
 require 'workarea/configuration'
+require 'workarea/configuration/administrable/field'
+require 'workarea/configuration/administrable/fieldset'
+require 'workarea/configuration/administrable/definition'
+require 'workarea/configuration/administrable_options'
 require 'workarea/configuration/mongoid_client'
 require 'workarea/configuration/mongoid'
 require 'workarea/configuration/elasticsearch'
@@ -171,7 +177,8 @@ require 'workarea/configuration/action_mailer'
 require 'workarea/configuration/logstasher'
 require 'workarea/configuration/error_handling'
 require 'workarea/configuration/i18n'
-require 'workarea/configuration/headless_chrome'
+require 'workarea/configuration/session'
+require 'workarea/configuration/content_blocks'
 require 'workarea/elasticsearch/index'
 require 'workarea/elasticsearch/document'
 require 'workarea/elasticsearch/query_cache'
@@ -189,7 +196,6 @@ require 'workarea/plugin'
 require 'workarea/plugin/asset_appends_helper'
 require 'workarea/image_optim_processor'
 require 'workarea/url_token'
-require 'workarea/robots'
 require 'workarea/paged_array'
 require 'workarea/geolocation'
 require 'workarea/autoexpire_cache_redis'
@@ -210,17 +216,15 @@ require 'workarea/cache'
 require 'workarea/scheduled_jobs'
 require 'workarea/string_id'
 require 'workarea/mail_interceptor'
-require 'workarea/queues_pauser'
+require 'workarea/visit'
+require 'workarea/warnings'
 
 #
-# Engines
+# Core
 #
 #
 require 'workarea/version'
 require 'workarea/core/engine'
-require 'workarea/admin/engine'
-require 'workarea/storefront/engine'
-require 'workarea/testing/engine' if Rails.env.test?
 
 #
 # Testing

data/lib/workarea/core/engine.rb

@@ -49,9 +49,6 @@ module Workarea
         PingHomeBase.ping unless Rails.env.development? || Rails.env.test?
 
         if Rails.env.test?
-          # This is here to help transition a poorly named configuration
-          Configuration::HeadlessChrome.load
-
           # System tests can timeout without this, due to slow template resolution
           # if you have many plugins installed.
           ActionView::Resolver.caching = true
@@ -70,63 +67,11 @@ module Workarea
         Configuration::Mongoid.load unless Mongoid::Config.configured?
         Configuration::Dragonfly.load
         Configuration::LocalizedActiveFields.load
+        Configuration::ContentBlocks.load
 
         Workarea::ScheduledJobs.clean
-
-        if Rails.application.config.time_zone == 'UTC'
-          warn <<~eos
-**************************************************
-⛔️ WARNING: Rails.application.config.time_zone is set to UTC, which you \
-probably don't want.
-As of Workarea 3.2, we use that value as the standard \
-timezone for the admin side of the application.
-We recommend setting this to the timezone of the retailer. Contact them to \
-find their preference.
-**************************************************
-          eos
-        end
-
-        auto_redirect = 'Workarea::Search::StorefrontSearch::ProductAutoRedirect'
-        if Workarea.config.storefront_search_middleware.include?(auto_redirect)
-          warn <<~eos
-DEPRECATION WARNING: #{auto_redirect} is deprecated and will be removed in Workarea 3.3. \
-Remove it from Workarea.config.storefront_search_middleware.
-          eos
-        end
-
-        if (!Rails.env.test? &&
-            !Workarea.config.skip_service_connections &&
-            Configuration::Mongoid.indexes_enforced?)
-          warn <<~eos
-**************************************************
-⛔️ WARNING: MongoDB is configured with notablescan.
-
-This means that MongoDB won't run queries that require a collection scan and will return an error.
-Workarea turns this on for running tests to assert that queries have indexes, and turns it off at the end of the test run.
-Since you're not running in the test environment and this is turned on, it might mean the test process was killed, preventing Workarea from turning it off.
-
-To turn this off, start the mongo shell and run this command:
-db.getSiblingDB("admin").runCommand( { setParameter: 1, notablescan: 0 } )
-**************************************************
-          eos
-        end
-
-        if !Rails.env.test? && !Rails.env.development? &&
-             Dragonfly.app(:workarea).datastore.is_a?(Dragonfly::FileDataStore)
-
-          warn <<~eos
-**************************************************
-⛔️ WARNING: Dragonfly is configured to use the filesystem.
-
-This means all Dragonfly assets (assets, product images, etc.) will be stored
-locally and not accessible to all servers within your environment.
-
-We recommend using S3 when running in a live environment by setting
-WORKAREA_S3_REGION and WORKAREA_S3_BUCKET_NAME in your environment variables,
-and setting `Workarea.config.asset_store = :s3` in an initializer.
-**************************************************
-          eos
-        end
+        Workarea::Warnings.check
+        Configuration::Session.validate!
       end
     end
   end