workarea-core 3.5.8 → 3.5.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c2fa2d437187cdfa6f9630002c94d5822cc51f5befb62060e6fd219203d4285
-  data.tar.gz: 2a9bb9faea3d1d1ed34cbf48938fcee9d1d2673ebcd3acf1cc976fda0370acd5
+  metadata.gz: b15a5824ab2746ddff9941773fefcaec1829d2a721a65893b3dac3a2fc7aad8a
+  data.tar.gz: 90b49ae058315ad91c7427c0b94c39a86016ed1898bb44d4bad99c9377053d53
 SHA512:
-  metadata.gz: 71f63a2c7b0d0824a173279e01c17ddcc10ea4ef7fb2a232874cd54198a867b5fb6cc3735673d7fe41223f1815e28fdc3794d820d25a74eea03d7f381b4e47eb
-  data.tar.gz: fc5503c7cb0ee41b481c04cf3682b002e019e095c4a6a1e27c9279a40c78012c3712312e82e5c8c2878c5be680aca7137acb9d706af71bf6cf95c54c4112ec52
+  metadata.gz: 7ee0b818334a756cbeceacf3be95347e8fa0d46090c0fd3729073c67a04e4c2e17530adc50e772e3bc4f759fdc5d62d7d775e5e2cb0281a5541e063d82fe7526
+  data.tar.gz: bd4eb10892770ef2b332a25203f54e703940cec8d45fce3f13a3316636b4ec3c78c0ce4088e504845e7f017ebf75eaa8a0036251f37ed9207d90f3fe6a86be5e

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

@@ -47,13 +47,13 @@ module Workarea
       {
         placed_at: 1,
         reminded_at: 1,
+        fraud_suspected_at: 1,
         checkout_started_at: 1,
         email: 1,
-        "items[0]._id": 1,
-        fraud_suspected_at: 1
+        "items[0]._id": 1
       },
       {
-        name: 'abandoned_order_email_index',
+        name: 'abandoned_order_email_with_fraud_index_v2',
         background: true
       }
     )

data/app/models/workarea/releasable.rb

@@ -72,7 +72,9 @@ module Workarea
         release.preview.changesets_for(self).each { |cs| cs.apply_to(result) }
         result
       else
-        Release.with_current(release) { self.class.find(id) }
+        Release.with_current(release) do
+          Mongoid::QueryCache.uncached { self.class.find(id) }
+        end
       end
     end
 

data/app/models/workarea/release/changeset.rb

@@ -18,6 +18,7 @@ module Workarea
       index({ 'document_path.type' => 1, 'document_path.document_id' => 1 })
       index('changeset.product_ids' => 1)
       index('original.product_ids' => 1)
+      index('releasable_type' => 1, 'releasable_id' => 1)
 
       # Finds changeset by whether the passed document is in the document
       # path of the changeset. Useful for showing embedded changes in the

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

@@ -21,7 +21,7 @@ module Workarea
         end
 
         def keywords
-          super + model.promo_codes
+          super + Array.wrap(model.try(:promo_codes))
         end
 
         def facets

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

@@ -82,6 +82,14 @@ module Workarea
         @changesets ||= Array.wrap(model.try(:changesets_with_children))
       end
 
+      def releases
+        changesets
+          .uniq(&:release)
+          .reject { |cs| cs.release.blank? }
+          .flat_map { |cs| [cs.release] + cs.release.scheduled_after }
+          .uniq
+      end
+
       def as_document
         Release.with_current(release_id) do
           {
@@ -91,7 +99,7 @@ module Workarea
             active: active,
             active_segment_ids: active_segment_ids,
             release_id: release_id,
-            changeset_release_ids: changesets.map(&:release_id),
+            changeset_release_ids: releases.map(&: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,12 +122,21 @@ module Workarea
           ProductPrimaryImageUrl.new(model).path
         end
 
-        # Override to include release changesets for pricing, featured products, etc.
+        # All {Releasable}s that could affect the product's Elasticsearch document
+        # should add their changesets to this method.
+        #
+        # @example Add to the changesets affecting a product in a decorator
+        #   def changesets
+        #     super.merge(SomeReleasable.for_product(product.id).changesets_with_children)
+        #   end
         #
         # @return [Mongoid::Criteria]
         #
         def changesets
-          @product_changesets ||= ProductReleases.new(model).changesets
+          criteria = model.changesets_with_children
+          pricing.each { |ps| criteria.merge!(ps.changesets_with_children) }
+          criteria.merge!(FeaturedProducts.changesets(model.id))
+          criteria.includes(:release)
         end
 
         private

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/product_releases.rb

@@ -1,4 +1,10 @@
 module Workarea
+  #
+  # TODO remove in v3.6
+  #
+  # This is no longer used, this logic was moved into the search models to allow
+  # it to be used for any model (not just products).
+  #
   class ProductReleases
     attr_reader :product
 

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,26 @@ module Workarea
       uri = URI.parse(request_url)
       url = "#{uri.scheme}://#{uri.host}"
       url += ":#{uri.port}" unless uri.port.in? [80, 443]
+      id = "direct_upload_#{url}"
 
-      redis_key = "cors_#{url.optionize}"
-      return if Workarea.redis.get(redis_key) == 'true'
+      response = begin
+        Workarea.s3.get_bucket_cors(Configuration::S3.bucket)
+      rescue Excon::Error::NotFound
+        Excon::Response.new(body: { 'CORSConfiguration' => [] })
+      end
 
-      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/index_category_changes.rb

@@ -4,16 +4,29 @@ module Workarea
     include Sidekiq::CallbacksWorker
 
     sidekiq_options(
-      enqueue_on: { Catalog::Category => [:save, :save_release_changes], with: -> { [changes] } },
+      enqueue_on: {
+        Catalog::Category => [:save, :save_release_changes],
+        with: -> { [changes, Release.current.present?] }
+      },
       ignore_if: -> { changes['product_ids'].blank? },
       lock: :until_executing,
       query_cache: true
     )
 
-    def perform(changes)
+    def perform(changes, for_release = false)
       return unless changes['product_ids'].present?
 
-      ids = require_index_ids(*changes['product_ids'])
+      ids = if for_release
+        # This is a shortcut because if you're resorting products within a release,
+        # the `changes` hash doesn't reflect the repositioning within the release,
+        # only the difference between what's live and what's in the release.
+        #
+        # Reindexing all of them is a shortcut to having to manually build a diff
+        # between the changesets in the possible affected releases.
+        changes['product_ids'].flatten.uniq
+      else
+        require_index_ids(*changes['product_ids'])
+      end
 
       if ids.size > max_count
         ids.each { |id| IndexProduct.perform_async(id) }