workarea-core 3.5.7 → 3.5.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26dc982f98d5ae00a8d3299b322cd6eb897329888c169a7a035e0bafad3be1e8
-  data.tar.gz: f3b5ae6b3bddb68b0e3d5b5c303e565e69ff812e165371e35285cd3ce04d334e
+  metadata.gz: 07f92725a7deefad82f4df41734ec888981896e7ed23948b809da43495f3234c
+  data.tar.gz: be8b5ee9228c3c3c073f2e0456d2dcb60abb77bae48f904f75b608b6e5ce3fb3
 SHA512:
-  metadata.gz: 31ad3ba0206fb6c815e6af2d4af9b572dbefec26460adfa14191279f9bd8098c462eb21b61139a0003ba775ae0b6e65294745b312ba776cd44cb55931221d40f
-  data.tar.gz: 8ffe28be251fddeba16e2f4964ca716ea8f759d171154529414e3b826accc1a709acb15f0374916d4ff2260f64c21acdd1a44b71687bb93fadec4bc626e81e11
+  metadata.gz: 252398a30da73f5e643367f8c63628a7cbbd739d5ec7bf945ffa71d59065b7b7b60b22cf2a9867f96a0e7047136a4b7ff3bddb7e0943fd8c388c88458645d82b
+  data.tar.gz: 29fbc57881073fabc8294289477c1ff548f640c10dba07aa8c1409dd2757ff9b78c3ed34236efc22ee99c8c2c9e06006363eb2bb8ca7ba43fd422418e163084f

data/app/controllers/workarea/application_controller.rb

@@ -7,7 +7,6 @@ module Workarea
 
     protect_from_forgery
 
-    before_action :set_locale
     after_action :set_flash_header
 
     # Cache templates within the scope of a request for development
@@ -33,10 +32,6 @@ module Workarea
 
     private
 
-    def set_locale
-      I18n.locale = params[:locale] || I18n.default_locale
-    end
-
     def set_flash_header
       messages = flash.map { |k, v| [k, ERB::Util.h(v)] }
       response.headers['X-Flash-Messages'] = Hash[messages].to_json

data/app/controllers/workarea/authentication.rb

@@ -89,6 +89,12 @@ module Workarea
       else
         uri = URI.parse(params[:return_to])
 
+        if I18n.locale != I18n.default_locale
+          query_hash = Rack::Utils.parse_nested_query(uri.query)
+          query_hash['locale'] ||= I18n.locale
+          uri.query = query_hash.to_query
+        end
+
         if uri.fragment.present?
           "#{uri.request_uri}##{uri.fragment}"
         else

data/app/helpers/workarea/i18n_helper.rb

@@ -10,7 +10,7 @@ module Workarea
       result = ''
 
       params
-        .except(:utf8, :controller, :action)
+        .except(:utf8, :controller, :action, :locale)
         .each_pair { |key, value| result << hidden_field_tag(key, value, id: nil) }
 
       result.html_safe

data/app/middleware/workarea/application_middleware.rb

@@ -8,6 +8,7 @@ module Workarea
       request = Rack::Request.new(env)
       return @app.call(env) if request.path =~ /(jpe?g|png|ico|gif|css|js|svg)$/
 
+      set_locale(env, request)
       setup_environment(env, request)
       set_segment_request_headers(env)
       status, headers, body = @app.call(env)
@@ -16,6 +17,10 @@ module Workarea
       [status, headers, body]
     end
 
+    def set_locale(env, request)
+      I18n.locale = locale_from_request(env, request) || I18n.default_locale
+    end
+
     def setup_environment(env, request)
       env['workarea.visit'] = Visit.new(env)
       env['workarea.cache_varies'] = Cache::Varies.new(env['workarea.visit']).to_s
@@ -37,6 +42,19 @@ module Workarea
 
     private
 
+    def locale_from_request(env, request)
+      return request.params['locale'] if request.params['locale'].present?
+
+      env_with_method = env.merge(
+        method: request.params[Rack::MethodOverride::METHOD_OVERRIDE_PARAM_KEY].presence ||
+          request.request_method
+      )
+      Rails.application.routes.recognize_path(request.path, env_with_method)[:locale]
+
+    rescue ActionController::RoutingError
+      # Return nil since we can't get locale out of this request
+    end
+
     def normalize_segment_ids(visit)
       visit.applied_segments.map(&:id).sort.join(',')
     end

data/app/models/workarea/bulk_action/product_edit.rb

@@ -36,15 +36,15 @@ module Workarea
       end
 
       def apply_details!(product)
-        HashUpdate
-          .new(adds: add_details, removes: remove_details)
-          .apply(product.details)
+        product.details = HashUpdate
+          .new(original: product.details, adds: add_details, removes: remove_details)
+          .result
       end
 
       def apply_filters!(product)
-        HashUpdate
-          .new(adds: add_filters, removes: remove_filters)
-          .apply(product.filters)
+        product.filters = HashUpdate
+          .new(original: product.filters, adds: add_filters, removes: remove_filters)
+          .result
       end
 
       def apply_pricing!(product)

data/app/models/workarea/order.rb

@@ -53,7 +53,7 @@ module Workarea
         fraud_suspected_at: 1
       },
       {
-        name: 'abandoned_order_email_index',
+        name: 'abandoned_order_email_with_fraud_index',
         background: true
       }
     )

data/app/models/workarea/search/admin.rb

@@ -18,7 +18,17 @@ module Workarea
               aggs: {
                 type: {
                   terms: { field: 'facets.type', size: Workarea.config.jump_to_type_limit },
-                  aggs: { top: { top_hits: { size: Workarea.config.jump_to_results_per_type } } }
+                  aggs: {
+                    top: {
+                      top_hits: {
+                        size: Workarea.config.jump_to_results_per_type,
+                        sort: [
+                          { _score: { order: 'desc' } },
+                          { updated_at: { order: 'desc' } }
+                        ]
+                      }
+                    }
+                  }
                 }
               }
             }

data/app/models/workarea/search/storefront.rb

@@ -78,6 +78,10 @@ module Workarea
         nil
       end
 
+      def changesets
+        @changesets ||= Array.wrap(model.try(:changesets_with_children))
+      end
+
       def as_document
         Release.with_current(release_id) do
           {
@@ -87,7 +91,7 @@ module Workarea
             active: active,
             active_segment_ids: active_segment_ids,
             release_id: release_id,
-            changeset_release_ids: Array.wrap(model.try(:changesets)).map(&:release_id),
+            changeset_release_ids: changesets.map(&:release_id),
             suggestion_content: suggestion_content,
             created_at: model.created_at,
             updated_at: model.updated_at,

data/app/models/workarea/search/storefront/category_query.rb

@@ -113,7 +113,7 @@ module Workarea
                 id: category.id,
                 release_id: 'live',
                 changeset_release_ids: changesets.map(&:release_id).uniq,
-                query: Categorization.new(rules: category.product_rules).query
+                query: Workarea::Search::Categorization.new(rules: category.product_rules).query
               }
 
               Storefront.current_index.save(document, type: 'category')
@@ -130,7 +130,7 @@ module Workarea
                 document = {
                   id: "#{category.id}-#{changeset.release_id}",
                   release_id: changeset.release_id,
-                  query: Categorization.new(rules: category.product_rules).query
+                  query: Workarea::Search::Categorization.new(rules: category.product_rules).query
                 }
 
                 Storefront.current_index.save(document, type: 'category')

data/app/models/workarea/search/storefront/product.rb

@@ -122,6 +122,14 @@ module Workarea
           ProductPrimaryImageUrl.new(model).path
         end
 
+        # Override to include release changesets for pricing, featured products, etc.
+        #
+        # @return [Mongoid::Criteria]
+        #
+        def changesets
+          @product_changesets ||= ProductReleases.new(model).changesets
+        end
+
         private
 
         def clean_for_keywords(value)

data/app/models/workarea/user/password_reset.rb

@@ -4,7 +4,7 @@ module Workarea
       include ApplicationDocument
       include UrlToken
 
-      belongs_to :user, class_name: 'Workarea::User'
+      belongs_to :user, class_name: 'Workarea::User', index: true
 
       index(
         { created_at: 1 },
@@ -14,6 +14,8 @@ module Workarea
       def self.setup!(email)
         user = User.find_by_email(email)
         return nil unless user
+
+        where(user_id: user.id).destroy_all
         create!(user: user)
       end
 

data/app/queries/workarea/search/pagination.rb

@@ -7,7 +7,10 @@ module Workarea
       end
 
       def per_page
-        params[:per_page].presence || Workarea.config.per_page
+        return Workarea.config.per_page if params[:per_page].blank?
+
+        tmp = params[:per_page].to_i
+        tmp > 0 ? tmp : Workarea.config.per_page
       end
 
       def size

data/app/queries/workarea/search/product_entries.rb

@@ -17,15 +17,17 @@ module Workarea
       end
 
       def live_entries
-        @live_entries ||= @products.flat_map do |product|
-          index_entries_for(product.without_release)
+        @live_entries ||= @products.reduce([]) do |memo, product|
+          memo + Array.wrap(index_entries_for(product.without_release))
         end
       end
 
       def release_entries
-        @release_entries ||= @products.flat_map do |product|
-          ProductReleases.new(product).releases.map do |release|
-            index_entries_for(product.in_release(release))
+        @release_entries ||= @products.reduce([]) do |results, product|
+          releases = ProductReleases.new(product).releases
+
+          results + releases.reduce([]) do |memo, release|
+            memo + Array.wrap(index_entries_for(product.in_release(release)))
           end
         end
       end

data/app/queries/workarea/search/storefront_search.rb

@@ -4,7 +4,7 @@ module Workarea
       attr_reader :params
 
       def initialize(params)
-        @params = params
+        @params = params.with_indifferent_access.except(:per_page)
         @used_middleware = []
       end
 

data/app/services/workarea/direct_upload.rb

@@ -6,22 +6,21 @@ module Workarea
       uri = URI.parse(request_url)
       url = "#{uri.scheme}://#{uri.host}"
       url += ":#{uri.port}" unless uri.port.in? [80, 443]
-
-      redis_key = "cors_#{url.optionize}"
-      return if Workarea.redis.get(redis_key) == 'true'
+      id = "direct_upload_#{url}"
 
       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')
+
+      unless cors['CORSConfiguration'].pluck('ID').include?(id)
+        cors['CORSConfiguration'] << {
+          'ID' => id,
+          'AllowedMethod' => 'PUT',
+          'AllowedOrigin' => url,
+          'AllowedHeader' => '*'
+        }
+
+        Workarea.s3.put_bucket_cors(Configuration::S3.bucket, cors)
+      end
     end
 
     attr_reader :type, :filename

data/app/services/workarea/hash_update.rb

@@ -5,13 +5,27 @@ module Workarea
       parsed.map(&:to_s).map(&:strip).reject(&:blank?) if parsed.present?
     end
 
-    def initialize(adds: [], updates: [], removes: [])
+    def initialize(original: {}, adds: [], updates: [], removes: [])
+      @original = original
       @adds = Array(adds).flatten.each_slice(2).to_a
       @updates = Array(updates).flatten.each_slice(2).to_a
       @removes = Array(removes).flatten
     end
 
+    def result
+      apply_to(@original.deep_dup)
+    end
+
+    # TODO v3.6 remove this method, doesn't work when the field is localized
+    # @deprecated
     def apply(hash)
+      Workarea.deprecation.deprecate_methods(self.class, apply: :result)
+      apply_to(hash)
+    end
+
+    private
+
+    def apply_to(hash)
       @adds.each do |tuple|
         key, value = *tuple
         hash[key] = self.class.parse_values(value)

data/app/workers/workarea/bulk_index_admin.rb

@@ -13,7 +13,7 @@ module Workarea
 
       def perform_by_models(models)
         return if models.empty?
-        Workarea::Search::Admin.bulk(documents_for(models))
+        Workarea::Search::Admin.bulk { documents_for(models) }
       end
 
       private

data/app/workers/workarea/bulk_index_products.rb

@@ -15,8 +15,9 @@ module Workarea
         return if products.blank?
         products = Array.wrap(products)
 
-        documents = Search::ProductEntries.new(products).map(&:as_bulk_document)
-        Search::Storefront.bulk(documents)
+        Search::Storefront.bulk do
+          Search::ProductEntries.new(products).map(&:as_bulk_document)
+        end
 
         Catalog::Product.in(id: products.map(&:id)).set(last_indexed_at: Time.current)
       end

data/app/workers/workarea/bulk_index_searches.rb

@@ -18,11 +18,11 @@ module Workarea
       end
 
       def perform_by_models(searches)
-        documents = searches.map do |model|
-          Search::Storefront::Search.new(model).as_bulk_document
+        Search::Storefront.bulk do
+          searches.map do |model|
+            Search::Storefront::Search.new(model).as_bulk_document
+          end
         end
-
-        Search::Storefront.bulk(documents)
       end
     end
 

data/app/workers/workarea/process_import.rb

@@ -17,11 +17,11 @@ module Workarea
       import.process!
 
     ensure
-      if import.error?
+      if import&.error?
         Admin::DataFileMailer.import_error(id).deliver_now
-      elsif import.failure?
+      elsif import&.failure?
         Admin::DataFileMailer.import_failure(id).deliver_now
-      else
+      elsif import.present?
         Admin::DataFileMailer.import(id).deliver_now
       end
     end

data/app/workers/workarea/synchronize_user_metrics.rb

@@ -19,8 +19,18 @@ module Workarea
 
     def perform(id)
       user = User.find(id)
-      metrics = Metrics::User.find_or_create_by(id: user.email)
-      metrics.set(admin: user.admin?, tags: user.tags)
+
+      Metrics::User.collection.update_one(
+        { _id: user.email },
+        {
+          '$set' => {
+            admin: user.admin?,
+            tags: user.tags,
+            updated_at: Time.current.utc
+          }
+        },
+        upsert: true
+      )
     end
   end
 end

data/config/initializers/15_endpoint_monitoring.rb

@@ -3,7 +3,8 @@
 #
 Easymon::Repository.add(
   'mongodb',
-  Workarea::Monitoring::MongoidCheck.new
+  Workarea::Monitoring::MongoidCheck.new,
+  :critical
 )
 
 #
@@ -11,7 +12,8 @@ Easymon::Repository.add(
 #
 Easymon::Repository.add(
   'elasticsearch',
-  Workarea::Monitoring::ElasticsearchCheck.new
+  Workarea::Monitoring::ElasticsearchCheck.new,
+  :critical
 )
 
 #
@@ -21,7 +23,8 @@ Easymon::Repository.add(
   "redis",
   Easymon::RedisCheck.new(
     Workarea::Configuration::Redis.persistent.to_h
-  )
+  ),
+  :critical
 )
 
 #

data/lib/workarea/cache.rb

@@ -70,7 +70,7 @@ module Workarea
       end
 
       def to_s
-        @to_s ||= @varies.map { |v| visit.instance_exec(&v).to_s }.join(':')
+        @to_s ||= ([I18n.locale] + @varies.map { |v| visit.instance_exec(&v).to_s }).join(':')
       end
     end
   end

data/lib/workarea/changelog.rake

@@ -67,7 +67,7 @@ namespace :workarea do
           message << "    #{line.strip}"
         end
       end
-      message << "    #{entry[:author]}\n"
+      message << "\n    #{entry[:author]}\n"
     end
 
     # ensure and append to changelog

data/lib/workarea/core.rb

@@ -131,6 +131,8 @@ require 'workarea/ext/freedom_patches/dragonfly_callable_url_host'
 require 'workarea/ext/freedom_patches/active_support_duration'
 require 'workarea/ext/freedom_patches/premailer'
 require 'workarea/ext/freedom_patches/referer_parser'
+require 'workarea/ext/freedom_patches/mongoid_localized_defaults'
+require 'workarea/ext/freedom_patches/i18n_js'
 require 'workarea/ext/mongoid/list_field'
 require 'workarea/ext/mongoid/each_by'
 require 'workarea/ext/mongoid/except'

data/lib/workarea/core/engine.rb

@@ -72,6 +72,13 @@ module Workarea
         Workarea::Warnings.check
         Configuration::Session.validate!
       end
+
+      config.to_prepare do
+        # For some reason, app/workers/workarea/bulk_index_products.rb doesn't
+        # get autoloaded. Without this, admin actions like updating product
+        # attributes raises a {NameError} "uninitialized constant BulkIndexProducts".
+        require_dependency 'workarea/bulk_index_products'
+      end
     end
   end
 end

data/lib/workarea/elasticsearch/document.rb

@@ -44,22 +44,27 @@ module Workarea
 
         def save(document, options = {})
           options = options.merge(type: type)
-          I18n.for_each_locale { current_index.save(document, options) }
+          current_index.save(document, options)
         end
 
-        def bulk(documents, options = {})
+        def bulk(documents = [], options = {})
           options = options.merge(type: type)
-          I18n.for_each_locale { current_index.bulk(documents, options) }
+
+          if block_given?
+            I18n.for_each_locale { current_index.bulk(Array.wrap(yield), options) }
+          else
+            current_index.bulk(documents, options)
+          end
         end
 
         def update(document, options = {})
           options = options.merge(type: type)
-          I18n.for_each_locale { current_index.update(document, options) }
+          current_index.update(document, options)
         end
 
         def delete(id, options = {})
           options = options.merge(type: type)
-          I18n.for_each_locale { current_index.delete(id, options) }
+          current_index.delete(id, options)
         end
 
         def count(query = nil, options = {})
@@ -97,12 +102,14 @@ module Workarea
       end
 
       def save(options = {})
-        document = as_document.merge(Serializer.serialize(model))
-        self.class.save(document, options)
+        I18n.for_each_locale do
+          document = as_document.merge(Serializer.serialize(model))
+          self.class.save(document, options)
+        end
       end
 
       def destroy(options = {})
-        self.class.delete(id, options)
+        I18n.for_each_locale { self.class.delete(id, options) }
       end
     end
   end

data/lib/workarea/ext/freedom_patches/i18n_js.rb

@@ -0,0 +1,27 @@
+module I18n
+  module JS
+    class FallbackLocales
+      # i18n-js uses just the second part of this check out-of-the-box. This
+      # causes the I18n fallbacks to get autoloaded without the developer
+      # knowing.
+      #
+      # This surfaces in tests. System or integration tests will do this check
+      # for compiling assets, then I18n fallbacks get autoloaded. So this shows
+      # as some tests not having fallbacks if they run before one of those tests
+      # or magically having fallbacks if they run after one of those types of
+      # tests.
+      #
+      # Adding the `respond_to?` check doesn't cause autoload, but will return
+      # `true` if fallbacks are enabled. Retain the original check because we
+      # want the current I18n::JS backend to be checked, once fallbacks are
+      # `require`d `I18n.respond_to?(:fallbacks)` will always return `true`.
+      #
+      # See also: https://github.com/fnando/i18n-js/blob/master/lib/i18n/js/fallback_locales.rb#L49-L58
+      #
+      def using_i18n_fallbacks_module?
+        I18n.respond_to?(:fallbacks) &&
+          I18n::JS.backend.class.included_modules.include?(I18n::Backend::Fallbacks)
+      end
+    end
+  end
+end

data/lib/workarea/ext/freedom_patches/mongoid_localized_defaults.rb

@@ -0,0 +1,25 @@
+module Mongoid
+  module Fields
+    module LocalizedDefaults
+      def create_accessors(name, meth, options = {})
+        super
+
+        if options[:localize]
+          field = fields[name]
+
+          define_method meth do |*args|
+            result = super(*args)
+            return result unless result.nil?
+
+            default_name = field.send(:default_name)
+            return send(default_name) if respond_to?(default_name)
+
+            field.default_val
+          end
+        end
+      end
+    end
+
+    ClassMethods.prepend(LocalizedDefaults)
+  end
+end

data/lib/workarea/geolocation.rb

@@ -57,15 +57,7 @@ module Workarea
     end
 
     def names
-      @names ||= [
-        postal_code,
-        city,
-        region,
-        subdivision&.name,
-        country&.alpha2,
-        country&.alpha3,
-        country&.name
-      ].reject(&:blank?)
+      @names ||= [postal_code, city, subdivision&.name, country&.name].reject(&:blank?)
     end
 
     private

data/lib/workarea/version.rb

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

data/lib/workarea/visit.rb

@@ -38,7 +38,10 @@ module Workarea
     end
 
     def current_email
-      cookies.signed[:email]
+      # For performance, prefer to use the cookie. The fallback to looking it up
+      # by user is a failsafe against a blank email cookie (e.g. from a raised
+      # error or poor application coding).
+      cookies.signed[:email].presence || (email_from_user_id if logged_in?)
     end
 
     def metrics
@@ -91,5 +94,9 @@ module Workarea
     def blank_metrics
       @blank_metrics ||= Metrics::User.new
     end
+
+    def email_from_user_id
+      User.find(session[:user_id]).email rescue nil
+    end
   end
 end

data/lib/workarea/warnings.rb

@@ -51,13 +51,12 @@ db.getSiblingDB("admin").runCommand( { setParameter: 1, notablescan: 0 } )
 **************************************************
 ⛔️ WARNING: Dragonfly is configured to use the filesystem.
 
-This means all dragonfly assets (assets, product images, etc.) will be stored
+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.
-Workarea will automatically configure Dragonfly to use S3 if those values
-are present.
+WORKAREA_S3_REGION and WORKAREA_S3_BUCKET_NAME in your environment variables,
+and setting `Workarea.config.asset_store = :s3` in an initializer.
 **************************************************
         eos
       end

data/test/helpers/workarea/i18n_helper_test.rb

@@ -7,12 +7,14 @@ module Workarea
       params[:controller] = 'controller'
       params[:action] = 'action'
       params[:foo] = 'bar'
+      params[:locale] = 'es'
 
       assert_includes(switch_locale_fields, 'foo')
       assert_includes(switch_locale_fields, 'bar')
       refute_includes(switch_locale_fields, 'utf8')
       refute_includes(switch_locale_fields, 'controller')
       refute_includes(switch_locale_fields, 'action')
+      refute_includes(switch_locale_fields, 'locale')
     end
   end
 end

data/test/integration/workarea/authentication_test.rb

@@ -185,5 +185,15 @@ module Workarea
       get '/test_logout'
       refute(cookies[:email].present?)
     end
+
+    def test_ensures_locale_passthrough_for_return_to
+      set_locales(available: [:en, :es], default: :en, current: :en)
+
+      get '/login_required', params: { locale: 'es', return_to: '/blah?foo=bar' }
+      get '/test_login', params: { user_id: @user.id }
+      assert(response.redirect?)
+      assert_match('locale=es', response.location)
+      assert_match('foo=bar', response.location)
+    end
   end
 end

data/test/integration/workarea/cache_varies_integration_test.rb

@@ -25,6 +25,10 @@ module Workarea
         render plain: session[:foo].presence || 'nil'
       end
 
+      def varies
+        render plain: request.env['workarea.cache_varies']
+      end
+
       def current_user
         nil
       end
@@ -34,6 +38,11 @@ module Workarea
       Rails.application.routes.prepend do
         post 'cache_varies_test_set_session', to: 'workarea/cache_varies_integration_test/caching#set_session'
         get 'cache_varies_test_foo', to: 'workarea/cache_varies_integration_test/caching#foo'
+
+        scope '(:locale)', constraints: Workarea::I18n.routes_constraint do
+          get 'cache_varies_test_varies', to: 'workarea/cache_varies_integration_test/caching#varies'
+          patch 'cache_varies_test_varies', to: 'workarea/cache_varies_integration_test/caching#varies'
+        end
       end
 
       Rails.application.reload_routes!
@@ -74,5 +83,27 @@ module Workarea
       assert_equal('baz', response.body)
       assert_equal('fresh', response.headers['X-Rack-Cache'])
     end
+
+    def test_varies_includes_locale
+      set_locales(available: [:en, :es], default: :en, current: :en)
+
+      get '/cache_varies_test_varies'
+      assert_includes(response.body, 'en')
+
+      get '/cache_varies_test_varies', params: { locale: 'es' }
+      assert_includes(response.body, 'es')
+
+      get '/es/cache_varies_test_varies'
+      assert_includes(response.body, 'es')
+
+      patch '/cache_varies_test_varies'
+      assert_includes(response.body, 'en')
+
+      patch '/cache_varies_test_varies', params: { locale: 'es' }
+      assert_includes(response.body, 'es')
+
+      patch '/es/cache_varies_test_varies'
+      assert_includes(response.body, 'es')
+    end
   end
 end

data/test/integration/workarea/monitoring_integration_test.rb

@@ -3,27 +3,32 @@ require 'test_helper'
 module Workarea
   class MonitoringIntegrationTest < Workarea::IntegrationTest
     def test_monitors_the_mongodb_status
-      get workarea.easymon_path('mongodb')
+      get workarea.easymon_path + '/mongodb'
       assert_includes(response.body, 'Up')
     end
 
     def test_monitors_the_redis_status
-      get workarea.easymon_path('redis')
+      get workarea.easymon_path + '/redis'
       assert_includes(response.body, 'Up')
     end
 
     def test_monitors_the_elasticsearch_status
-      get workarea.easymon_path('elasticsearch')
+      get workarea.easymon_path + '/elasticsearch'
       assert_includes(response.body, 'Up')
     end
 
     def test_monitors_the_sidekiq_queue_status
-      get workarea.easymon_path('sidekiq-queue')
+      get workarea.easymon_path + '/sidekiq-queue'
       assert_includes(response.body, 'Low')
     end
 
     def test_monitors_for_load_balancing
-      get workarea.easymon_path('load-balancing')
+      get workarea.easymon_path + '/load-balancing'
+      assert_includes(response.body, 'Up')
+    end
+
+    def test_critical_endpoint
+      get workarea.easymon_path + "/critical"
       assert_includes(response.body, 'Up')
     end
   end

data/test/lib/workarea/elasticsearch/document_test.rb

@@ -67,6 +67,26 @@ module Workarea
         assert_equal({ 'id' => '1' }, results.first['_source'])
       end
 
+      def test_bulk_with_block
+        set_locales(available: [:en, :es], default: :en, current: :en)
+        Foo.bulk { { id: I18n.locale.to_s, bulk_action: 'index' } }
+
+        find_results = -> do
+          Foo
+            .current_index
+            .search({ query: { match_all: {} } }, type: 'foo')
+            .dig('hits', 'hits')
+        end
+
+        I18n.locale = :en
+        assert(1, Foo.count)
+        assert_equal({ 'id' => 'en' }, find_results.call.first['_source'])
+
+        I18n.locale = :es
+        assert(1, Foo.count)
+        assert_equal({ 'id' => 'es' }, find_results.call.first['_source'])
+      end
+
       def test_update
         Foo.save(id: '1')
         Foo.update(id: '1', foo: 'bar')

data/test/lib/workarea/ext/freedom_patches/mongoid_localized_defaults_test.rb

@@ -0,0 +1,25 @@
+require 'test_helper'
+
+module Workarea
+  class MongoidLocalizedDefaultsTest < TestCase
+    class Foo
+      include Mongoid::Document
+
+      field :name, type: String, default: -> { 'foo' }, localize: true
+      field :config, type: Hash, default: { foo: 'bar' }, localize: true
+    end
+
+    def test_localized_defaults
+      set_locales(available: [:en, :es], default: :en, current: :en)
+
+      instance = Foo.new
+      assert_equal('foo', instance.name)
+      assert_equal({ foo: 'bar' }, instance.config)
+
+      I18n.locale = :es
+
+      assert_equal('foo', instance.name)
+      assert_equal({ foo: 'bar' }, instance.config)
+    end
+  end
+end

data/test/lib/workarea/geolocation_test.rb

@@ -94,10 +94,10 @@ module Workarea
         'HTTP_GEOIP_POSTAL_CODE' => '19106'
       )
 
-      assert_includes(location.names, 'US')
-      assert_includes(location.names, 'USA')
+      refute_includes(location.names, 'US')
+      refute_includes(location.names, 'USA')
       assert_includes(location.names, 'United States of America')
-      assert_includes(location.names, 'PA')
+      refute_includes(location.names, 'PA')
       assert_includes(location.names, 'Pennsylvania')
       assert_includes(location.names, 'Philadelphia')
       assert_includes(location.names, '19106')

data/test/models/workarea/search/storefront_test.rb

@@ -10,6 +10,21 @@ module Workarea
         model.update!(active: true)
         assert(Storefront.new(model).active[:now])
       end
+
+      def test_changesets
+        category = create_category(
+          name: 'Foo',
+          product_rules: [{ name: 'search', operator: 'equals', value: 'foo' }]
+        )
+        assert_empty(Storefront.new(category).changesets)
+
+        release = create_release
+        release.as_current { category.update!(name: 'Bar') }
+        assert_equal(1, Storefront.new(category).changesets.size)
+
+        release.as_current { category.product_rules.first.update!(value: 'bar') }
+        assert_equal(2, Storefront.new(category).changesets.size)
+      end
     end
   end
 end

data/test/models/workarea/segment/rules/geolocation_test.rb

@@ -7,12 +7,15 @@ module Workarea
         def test_qualifies?
           refute(Geolocation.new.qualifies?(create_visit))
 
-          visit = create_visit('HTTP_GEOIP_REGION' => 'PA')
+          visit = create_visit(
+            'HTTP_GEOIP_REGION' => 'PA',
+            'HTTP_GEOIP_CITY_COUNTRY_CODE' => 'US'
+          )
           refute(Geolocation.new(locations: %w(NJ)).qualifies?(visit))
-          assert(Geolocation.new(locations: %w(pa)).qualifies?(visit))
-          assert(Geolocation.new(locations: %w(PA)).qualifies?(visit))
-          assert(Geolocation.new(locations: %w(NJ PA)).qualifies?(visit))
-          refute(Geolocation.new(locations: %w(NJ NY)).qualifies?(visit))
+          assert(Geolocation.new(locations: %w(us-pa)).qualifies?(visit))
+          assert(Geolocation.new(locations: %w(US-PA)).qualifies?(visit))
+          assert(Geolocation.new(locations: %w(US-NJ US-pa)).qualifies?(visit))
+          refute(Geolocation.new(locations: %w(US-NJ US-NY)).qualifies?(visit))
 
           visit = create_visit(
             'HTTP_GEOIP_REGION' => 'PA',
@@ -26,14 +29,13 @@ module Workarea
           assert(Geolocation.new(locations: %w(Philadelphia)).qualifies?(visit))
           assert(Geolocation.new(locations: %w(Philadelphia US)).qualifies?(visit))
           refute(Geolocation.new(locations: %w(Harrisburg)).qualifies?(visit))
-          refute(Geolocation.new(locations: %w(Harrisburg PA)).qualifies?(visit))
+          refute(Geolocation.new(locations: %w(Harrisburg US-PA)).qualifies?(visit))
           assert(Geolocation.new(locations: %w(Philadelphia Harrisburg)).qualifies?(visit))
           refute(Geolocation.new(locations: %w(Pittsburgh Harrisburg)).qualifies?(visit))
 
           visit = create_visit('HTTP_GEOIP_CITY_COUNTRY_CODE' => 'US')
           refute(Geolocation.new(locations: %w(CA)).qualifies?(visit))
           assert(Geolocation.new(locations: %w(US)).qualifies?(visit))
-          assert(Geolocation.new(locations: %w(USA)).qualifies?(visit))
           assert(Geolocation.new(locations: ['United States of America']).qualifies?(visit))
           assert(Geolocation.new(locations: %w(Philadelphia US)).qualifies?(visit))
           assert(Geolocation.new(locations: %w(US CA)).qualifies?(visit))

data/test/models/workarea/user/password_reset_test.rb

@@ -4,14 +4,22 @@ module Workarea
   class User
     class PasswordResetTest < TestCase
       def user
-        @user ||= create_user
+        @user ||= create_user(email: 'one@workarea.com')
       end
 
       def test_setup!
-        PasswordReset.setup!(user.email)
+        2.times do
+          PasswordReset.setup!(user.email)
 
-        assert_equal(1, PasswordReset.count)
-        assert_equal(user.id, PasswordReset.first.user_id)
+          assert_equal(1, PasswordReset.count)
+          assert_equal(user.id, PasswordReset.first.user_id)
+        end
+
+        two = create_user(email: 'two@workarea.com')
+        PasswordReset.setup!('two@workarea.com')
+
+        assert_equal(2, PasswordReset.count)
+        assert_equal(two.id, PasswordReset.last.user_id)
       end
 
       def test_complete

data/test/queries/workarea/search/pagination_test.rb

@@ -19,6 +19,15 @@ module Workarea
         assert_equal(1, Paginate.new(page: 'asdf').page)
       end
 
+      def test_per_page
+        assert_equal(Workarea.config.per_page, Paginate.new.per_page)
+        assert_equal(2, Paginate.new(per_page: 2).per_page)
+        assert_equal(Workarea.config.per_page, Paginate.new(per_page: -1).per_page)
+        assert_equal(Workarea.config.per_page, Paginate.new(per_page: 0).per_page)
+        assert_equal(3, Paginate.new(per_page: '3').per_page)
+        assert_equal(Workarea.config.per_page, Paginate.new(per_page: 'asdf').per_page)
+      end
+
       def test_from
         Workarea.config.per_page = 30
         assert_equal(0, Paginate.new(page: 1).from)

data/test/queries/workarea/search/product_entries_test.rb

@@ -36,6 +36,17 @@ module Workarea
         assert_equal(release.id, results.first.release_id)
         refute_equal(product.object_id, results.first.model.object_id)
       end
+
+      def test_entry_flattening
+        products = Array.new(2) { create_product }
+        release = create_release
+        release.as_current { products.first.update!(name: 'Bar') }
+
+        instance = ProductEntries.new(products)
+        instance.stubs(:index_entries_for).returns([:foo, :bar])
+
+        assert_equal([:foo, :bar, :foo, :bar, :foo, :bar], instance.entries)
+      end
     end
   end
 end

data/test/queries/workarea/search/product_search_test.rb

@@ -410,6 +410,37 @@ module Workarea
         assert(result[:raw].present?)
         assert_kind_of(Float, result[:raw]['_score'])
       end
+
+      def test_previewing_releases
+        product = create_product(id: 'foo', variants: [{ sku: '1234', regular: 5 }])
+        pricing = Pricing::Sku.find('1234')
+        assert_equal([product], ProductSearch.new(q: '*').results.pluck(:model))
+
+        release = create_release
+        release.as_current { pricing.prices.first.update!(regular: 10) }
+        IndexProduct.perform(product.reload)
+
+        assert_equal([product], ProductSearch.new(q: '*').results.pluck(:model))
+        release.as_current do
+          assert_equal([product], ProductSearch.new(q: '*').results.pluck(:model))
+        end
+      end
+
+      def test_locale
+        # No simple way to run this test without fallbacks or localized fields
+        return unless Workarea.config.localized_active_fields
+
+        set_locales(available: [:en, :es], default: :en, current: :en)
+        Search::Storefront.reset_indexes!
+
+        product = create_product(active_translations: { 'en' => true, 'es' => false })
+
+        I18n.locale = :es
+        assert_equal([], ProductSearch.new(q: '*').results.pluck(:model))
+
+        I18n.locale = :en
+        assert_equal([product], ProductSearch.new(q: '*').results.pluck(:model))
+      end
     end
   end
 end

data/test/services/workarea/direct_upload_test.rb

@@ -108,11 +108,8 @@ 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'))
-      assert_equal('true', Workarea.redis.get('cors_http_localhost_3000'))
       assert(DirectUpload.ensure_cors!('https://example.com/admin/direct_uploads'))
-      assert_equal('true', Workarea.redis.get('cors_https_example_com'))
     end
 
     private

data/test/services/workarea/hash_update_test.rb

@@ -2,23 +2,23 @@ require 'test_helper'
 
 module Workarea
   class HashUpdateTest < TestCase
-    def test_apply
-      hash = { 'foo' => 'bar' }
+    def test_result
+      original = { 'foo' => 'bar' }
 
-      HashUpdate.new(adds: %w(key value)).apply(hash)
-      assert_equal(%w(value), hash['key'])
+      result = HashUpdate.new(original: original, adds: %w(key value)).result
+      assert_equal(%w(value), result['key'])
 
-      HashUpdate.new(updates: %w(foo baz)).apply(hash)
-      assert_equal(%w(baz), hash['foo'])
+      result = HashUpdate.new(original: original, updates: %w(foo baz)).result
+      assert_equal(%w(baz), result['foo'])
 
-      HashUpdate.new(removes: %w(foo)).apply(hash)
-      refute_includes(hash.keys, 'foo')
+      result = HashUpdate.new(original: original, removes: %w(foo)).result
+      refute_includes(result.keys, 'foo')
 
-      HashUpdate.new(adds: ['key', 'one, two ']).apply(hash)
-      assert_equal(%w(one two), hash['key'])
+      result = HashUpdate.new(original: original, adds: ['key', 'one, two ']).result
+      assert_equal(%w(one two), result['key'])
 
-      HashUpdate.new(updates: ['key', 'one,  two, three ']).apply(hash)
-      assert_equal(%w(one two three), hash['key'])
+      result = HashUpdate.new(original: original, updates: ['key', 'one,  two, three ']).result
+      assert_equal(%w(one two three), result['key'])
     end
   end
 end

data/test/workers/workarea/process_import_test.rb

@@ -53,5 +53,11 @@ module Workarea
         t('workarea.admin.data_file_mailer.import_failure.errors')
       )
     end
+
+    def test_perform_with_missing_import
+      assert_raises Mongoid::Errors::DocumentNotFound do
+        ProcessImport.new.perform('foo')
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-core
 version: !ruby/object:Gem::Version
-  version: 3.5.7
+  version: 3.5.12
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-17 00:00:00.000000000 Z
+date: 2020-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -1919,7 +1919,9 @@ files:
 - lib/workarea/ext/freedom_patches/dragonfly_job_fetch_url.rb
 - lib/workarea/ext/freedom_patches/float.rb
 - lib/workarea/ext/freedom_patches/global_id.rb
+- lib/workarea/ext/freedom_patches/i18n_js.rb
 - lib/workarea/ext/freedom_patches/money.rb
+- lib/workarea/ext/freedom_patches/mongoid_localized_defaults.rb
 - lib/workarea/ext/freedom_patches/mongoid_simple_tags.rb
 - lib/workarea/ext/freedom_patches/net_http_ssl_connection.rb
 - lib/workarea/ext/freedom_patches/premailer.rb
@@ -2081,6 +2083,7 @@ files:
 - test/lib/workarea/ext/freedom_patches/dragonfly_callable_url_host_test.rb
 - test/lib/workarea/ext/freedom_patches/global_id_test.rb
 - test/lib/workarea/ext/freedom_patches/money_test.rb
+- test/lib/workarea/ext/freedom_patches/mongoid_localized_defaults_test.rb
 - test/lib/workarea/ext/freedom_patches/mongoid_simple_tags_test.rb
 - test/lib/workarea/ext/mongoid/audit_log_entry_test.rb
 - test/lib/workarea/ext/mongoid/each_by_test.rb
@@ -2718,7 +2721,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Core of the Workarea Commerce Platform