workarea-core 3.5.13 → 3.5.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b15a5824ab2746ddff9941773fefcaec1829d2a721a65893b3dac3a2fc7aad8a
-  data.tar.gz: 90b49ae058315ad91c7427c0b94c39a86016ed1898bb44d4bad99c9377053d53
+  metadata.gz: 84d99f1dbf010e7d67b9dbc7785720bbed5cd17c22528dfe57e194dfbb660892
+  data.tar.gz: c5453a27cf96335ae9d35fe857ccc770a0412117579b37dc1cb84e9221cd6efe
 SHA512:
-  metadata.gz: 7ee0b818334a756cbeceacf3be95347e8fa0d46090c0fd3729073c67a04e4c2e17530adc50e772e3bc4f759fdc5d62d7d775e5e2cb0281a5541e063d82fe7526
-  data.tar.gz: bd4eb10892770ef2b332a25203f54e703940cec8d45fce3f13a3316636b4ec3c78c0ce4088e504845e7f017ebf75eaa8a0036251f37ed9207d90f3fe6a86be5e
+  metadata.gz: 4605fd9a72741e6cac8ab7a32d2408ba1b8f2bfb79ac875875461ab59fe660ffd5254e3b0eb69d5534222217de0ec2fc3d60351bee5e7575d93d2393fb8d9221
+  data.tar.gz: e2946da1f9618bc92f65ceca4281c426747f4c75d162b33e68a6fe629008507c43e07dcde39e12f871b2f0011225f40bfd5d9ecdc8d7f563586b90900f43c447

data/app/controllers/workarea/impersonation.rb

@@ -39,7 +39,8 @@ module Workarea
     end
 
     def current_impersonation
-      @current_impersonation ||= User.find(session[:user_id])
+      return @current_impersonation if defined?(@current_impersonation)
+      @current_impersonation = User.find(session[:user_id]) rescue nil
     end
 
     def admin_browse_as_guest

data/app/mailers/workarea/application_mailer.rb

@@ -8,7 +8,10 @@ module Workarea
     default from: -> (*) { Workarea.config.email_from }
 
     def default_url_options(options = {})
-      super.merge(host: Workarea.config.host)
+      # super isn't returning the configured options, so manually merge them in
+      super
+        .merge(Rails.application.config.action_mailer.default_url_options.to_h)
+        .merge(host: Workarea.config.host)
     end
   end
 end

data/app/middleware/workarea/application_middleware.rb

@@ -1,12 +1,15 @@
 module Workarea
   class ApplicationMiddleware
+    ASSET_REGEX = /(jpe?g|png|ico|gif|bmp|webp|tif?f|css|js|svg|otf|ttf|woff|woff2)$/
+
     def initialize(app)
       @app = app
     end
 
     def call(env)
       request = Rack::Request.new(env)
-      return @app.call(env) if request.path =~ /(jpe?g|png|ico|gif|css|js|svg)$/
+      env['workarea.asset_request'] = request.path =~ ASSET_REGEX
+      return @app.call(env) if env['workarea.asset_request']
 
       set_locale(env, request)
       setup_environment(env, request)
@@ -25,7 +28,7 @@ module Workarea
       env['workarea.visit'] = Visit.new(env)
       env['workarea.cache_varies'] = Cache::Varies.new(env['workarea.visit']).to_s
       env['rack-cache.cache_key'] = Cache::RackCacheKey
-      env['rack-cache.force-pass'] = env['workarea.visit'].admin?
+      env['rack-cache.force-pass'] = env['workarea.visit'].admin? && !env['workarea.asset_request']
     end
 
     def set_segment_request_headers(env)

data/app/models/workarea/checkout.rb

@@ -47,11 +47,7 @@ module Workarea
     def inventory
       @inventory ||= Inventory::Transaction.from_order(
         order.id,
-        order.items.inject({}) do |memo, item|
-          memo[item.sku] ||= 0
-          memo[item.sku] += item.quantity
-          memo
-        end
+        order.sku_quantities
       )
     end
 
@@ -158,10 +154,14 @@ module Workarea
     # Used in auto completing an order for a logged in user.
     #
     # @param [Hash] parameters for updating
-    # @return [self]
+    # @return [Boolean] whether the update was successful.
     #
     def update(params = {})
-      steps.each { |s| s.new(self).update(params) }
+      return true if params.blank?
+
+      steps.reduce(true) do |result, step|
+        result &= step.new(self).update(params)
+      end
     end
 
     # Whether this checkout needs any further information

data/app/models/workarea/data_file/csv.rb

@@ -17,7 +17,15 @@ module Workarea
           assign_attributes(root, attrs)
           assign_embedded_attributes(root, attrs)
 
-          if root.save || failed_new_record_ids.exclude?(id)
+          possibly_affected_models = root.embedded_children + [root]
+          was_successful = true
+
+          possibly_affected_models.each do |model|
+            meaningful_changes = model.changes.except('updated_at')
+            was_successful &= model.save if model.changed? && meaningful_changes.present?
+          end
+
+          if was_successful || failed_new_record_ids.exclude?(id)
             log(index, root)
           else
             operation.total += 1 # ensure line numbers remain consistent

data/app/models/workarea/inquiry.rb

@@ -15,7 +15,8 @@ module Workarea
     validate :subject_exists
 
     def full_subject
-      Workarea.config.inquiry_subjects[subject]
+      I18n.t('workarea.inquiry.subjects')[subject.optionize.to_sym].presence ||
+        Workarea.config.inquiry_subjects[subject]
     end
 
     private

data/app/models/workarea/inventory/sku.rb

@@ -142,11 +142,11 @@ module Workarea
       end
 
       def policy_class
-        "Workarea::Inventory::Policies::#{policy.classify}".constantize
+        "Workarea::Inventory::Policies::#{policy.camelize}".constantize
       rescue NameError
         raise(
           InvalidPolicy,
-          "Workarea::Inventory::Policies::#{policy.classify} must be a policy class"
+          "Workarea::Inventory::Policies::#{policy.camelize} must be a policy class"
         )
       end
 

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

@@ -110,14 +110,28 @@ module Workarea
       end
 
       def merge!(other)
-        %w(orders revenue discounts cancellations refund).each do |field|
-          self.send("#{field}=", send(field) + other.send(field))
-        end
-
-        self.first_order_at = [first_order_at, other.first_order_at].compact.min
-        self.last_order_at = [last_order_at, other.last_order_at].compact.max
-        self.average_order_value = average_order_value
-        save!
+        # To recalculate average_order_value
+        self.orders += other.orders
+        self.revenue += other.revenue
+
+        update = {
+          '$set' => {
+            average_order_value: average_order_value,
+            updated_at: Time.current.utc
+          },
+          '$inc' => {
+            orders: other.orders,
+            revenue: other.revenue,
+            discounts: other.discounts,
+            cancellations: other.cancellations,
+            refund: other.refund
+          }
+        }
+
+        update['$min'] = { first_order_at: other.first_order_at.utc } if other.first_order_at.present?
+        update['$max'] = { last_order_at: other.last_order_at.utc } if other.last_order_at.present?
+
+        self.class.collection.update_one({ _id: id }, update, upsert: true)
 
         self.class.save_affinity(
           id: id,
@@ -133,6 +147,8 @@ module Workarea
           category_ids: other.purchased.category_ids,
           search_ids: other.purchased.search_ids
         )
+
+        reload
       end
     end
   end

data/app/models/workarea/order.rb

@@ -375,6 +375,16 @@ module Workarea
       )
     end
 
+    # A hash with the quantity of each SKU in the order
+    #
+    # @return [Hash]
+    #
+    def sku_quantities
+      items.each_with_object(Hash.new(0)) do |item, quantities|
+        quantities[item.sku] += item.quantity
+      end
+    end
+
     private
 
     def item_count_limit

data/app/models/workarea/payment.rb

@@ -80,12 +80,7 @@ module Workarea
       build_credit_card unless credit_card
       credit_card.saved_card_id = nil
       credit_card.attributes = attrs.slice(
-        :month,
-        :year,
-        :saved_card_id,
-        :number,
-        :cvv,
-        :amount
+        *Workarea.config.credit_card_attributes
       )
       save
     end

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

@@ -144,7 +144,7 @@ module Workarea
             .where(releasable_type: ProductRule.name)
             .any_in(releasable_id: category.product_rules.map(&:id))
             .includes(:release)
-            .to_a
+            .select(&:release)
         end
       end
     end

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

@@ -11,6 +11,10 @@ module Workarea
       def self.available_sorts
         AdminSorting.available_sorts
       end
+
+      def default_admin_sort
+        [{ _score: :desc }, { updated_at: :desc }]
+      end
     end
   end
 end

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

@@ -16,7 +16,7 @@ module Workarea
       end
 
       def default_admin_sort
-        [{ _score: :desc },  { updated_at: :desc }]
+        [{ updated_at: :desc }, { _score: :desc }]
       end
 
       def user_selected_sort

data/app/services/workarea/index_release_schedule_previews.rb

@@ -0,0 +1,37 @@
+module Workarea
+  class IndexReleaseSchedulePreviews
+    attr_reader :release, :starts_at, :ends_at
+
+    def initialize(release: nil, starts_at: nil, ends_at: nil)
+      @release = release
+      @starts_at = starts_at
+      @ends_at = ends_at
+    end
+
+    def affected_releases
+      result = Release
+        .scheduled(after: starts_at, before: ends_at)
+        .includes(:changesets)
+        .to_a
+
+      result << release if release.present?
+      result.uniq
+    end
+
+    def affected_models
+      affected_releases.flat_map(&:changesets).flat_map(&:releasable).compact
+    end
+
+    def perform
+      affected_releases.each do |release|
+        affected_models.each do |releasable|
+          Search::Storefront.new(releasable.in_release(release)).destroy
+
+          # Different models have different indexing workers, running callbacks
+          # ensures the appropriate worker is triggered
+          releasable.run_callbacks(:save_release_changes)
+        end
+      end
+    end
+  end
+end

data/app/workers/workarea/index_release_schedule_change.rb

@@ -0,0 +1,32 @@
+module Workarea
+  class IndexReleaseScheduleChange
+    include Sidekiq::Worker
+    include Sidekiq::CallbacksWorker
+
+    sidekiq_options(
+      enqueue_on: {
+        Release => [:save, :destroy],
+        only_if: -> { publish_at_changed? || destroyed? },
+        with: -> { [id, publish_at_was, publish_at] }
+      },
+      queue: 'releases'
+    )
+
+    def perform(id, previous_publish_at, new_publish_at)
+      # When destroyed, changesets for the release ID will still exist and be used to update the index
+      rescheduled_release = Release.find_or_initialize_by(id: id)
+
+      earlier, later = if rescheduled_release.persisted? && previous_publish_at.present? && new_publish_at.present?
+        [previous_publish_at, new_publish_at].sort
+      elsif previous_publish_at.present?
+        [previous_publish_at, nil]
+      else
+        [new_publish_at, nil]
+      end
+
+      IndexReleaseSchedulePreviews
+        .new(release: rescheduled_release, starts_at: earlier, ends_at: later)
+        .perform
+    end
+  end
+end

data/app/workers/workarea/publish_release.rb

@@ -8,6 +8,7 @@ module Workarea
       system_user = User.find_system_user!(release.name, 'Release')
 
       Mongoid::AuditLog.record(system_user) { release.publish! }
+      IndexReleaseSchedulePreviews.new(release: release).perform
 
     rescue Mongoid::Errors::DocumentNotFound
       # Doesn't matter, release has been removed

data/config/initializers/00_configuration.rb

@@ -156,14 +156,15 @@ Workarea::Configuration.define_fields do
   end
 
   fieldset 'Communication', namespaced: false do
+
     field 'Email From',
       type: :string,
-      default: 'noreply@example.com',
+      default: -> { "#{Workarea.config.site_name} <noreply@#{Workarea.config.host}>" },
       description: 'The email address used as the sender of system emails'
 
     field 'Email To',
       type: :string,
-      default: 'customerservice@example.com',
+      default: -> { "#{Workarea.config.site_name} <customerservice@#{Workarea.config.host}>" },
       description: 'The email address that receives user generated emails, e.g. contact us inquiries'
 
     field 'Inquiry Subjects',

data/config/locales/en.yml

@@ -102,6 +102,8 @@ en:
       name: "Fulfillment SKU %{id}"
     inventory_sku:
       name: "Inventory %{id}"
+    inquiry:
+      subjects: {}
     order:
       name: "Order %{id}"
       traffic_referrer:

data/lib/generators/workarea/install/install_generator.rb

@@ -55,6 +55,19 @@ module Workarea
       remove_file 'public/favicon.ico'
     end
 
+    def add_development_mailer_port
+      development_port = <<-CODE
+
+  config.action_mailer.default_url_options = { port: 3000 }
+      CODE
+
+      inject_into_file(
+        'config/environments/development.rb',
+        development_port,
+        before: /^end/
+      )
+    end
+
     private
 
     def app_name

data/lib/generators/workarea/install/templates/initializer.rb.erb

@@ -4,19 +4,7 @@ Workarea.configure do |config|
 
   config.host = {
     'test' => 'www.example.com',
-    'development' => 'localhost:3000',
+    'development' => 'localhost',
     'production' => 'www.<%= app_name.dasherize %>.com' # TODO
   }[Rails.env]
-
-  config.email_to = {
-    'test'        => "#{config.site_name} <customerservice@example.com>",
-    'development' => "#{config.site_name} <customerservice@<%= app_name %>.test>",
-    'production'  => "#{config.site_name} <customerservice@<%= app_name.dasherize %>.com>" # TODO
-  }[Rails.env]
-
-  config.email_from =  {
-    'test'        => "#{config.site_name} <noreply@example.com>",
-    'development' => "#{config.site_name} <noreply@<%= app_name %>.test",
-    'production'  => "#{config.site_name} <noreply@<%= app_name.dasherize %>.com>" # TODO
-  }[Rails.env]
 end

data/lib/tasks/cache.rake

@@ -1,40 +1,10 @@
+require 'workarea/tasks/cache'
+
 namespace :workarea do
   namespace :cache do
     desc 'Prime images cache'
     task prime_images: :environment do
-      include Rails.application.routes.url_helpers
-      include Workarea::Storefront::ProductsHelper
-      include Workarea::Core::Engine.routes.url_helpers
-
-      built_in_jobs = [:thumb, :gif, :jpg, :png, :strip, :convert, :optimized]
-
-      jobs = Dragonfly.app(:workarea).processor_methods.reject do |job|
-        built_in_jobs.include?(job)
-      end
-
-      Workarea::Catalog::Product.all.each_by(50) do |product|
-        product.images.each do |image|
-          jobs.each do |job|
-            url = URI.join(
-              "https://#{Workarea.config.host}",
-              dynamic_product_image_url(
-                image.product.slug,
-                image.option,
-                image.id,
-                job,
-                only_path: true
-              )
-            ).to_s
-
-            begin
-              `curl #{url}`
-              puts "Downloaded image #{url}"
-            rescue StandardError => e
-              puts e.inspect
-            end
-          end
-        end
-      end
+      Workarea::Tasks::Cache.prime_images
     end
   end
 end

data/lib/tasks/help.rake

@@ -1,11 +1,10 @@
+require 'workarea/tasks/help'
+
 namespace :workarea do
   desc 'Drop and recreate help articles (Warning: all current help will be deleted!)'
   task reload_help: :environment do
     puts 'Deleting help articles...'
-    Workarea::Help::Article.delete_all
-    Workarea::Help::Asset.delete_all
-
-    Workarea::HelpSeeds.new.perform
+    Workarea::Tasks::Help.reload
     Rake::Task['workarea:search_index:help'].invoke
   end
 
@@ -16,44 +15,6 @@ namespace :workarea do
   end
 
   task dump_help: :environment do
-    Workarea::Help::Article.all.each_by(50) do |article|
-      article_root = Rails.root.join(
-        'data',
-        'help',
-        article.category.systemize,
-        article.name.systemize
-      )
-
-      asset_path = article_root.join('assets')
-
-      FileUtils.mkdir_p(article_root)
-
-      if article.thumbnail.present?
-        article.thumbnail.to_file(article_root.join(article.thumbnail.name))
-      end
-
-      Workarea::Help::Asset.all.each_by(50) do |asset|
-        if article.summary.include?(asset.url) || article.body.include?(asset.url)
-          FileUtils.mkdir_p(asset_path)
-          asset.to_file(asset_path.join(asset.name))
-          reference = "<%= #{asset.name.split('.').first} %>"
-
-          article.summary.gsub!(asset.url, reference)
-          article.body.gsub!(asset.url, reference)
-        end
-      end
-
-      if article.summary.present?
-        File.open(article_root.join('summary.md'), 'w') do |file|
-          file.write(article.summary)
-        end
-      end
-
-      if article.body.present?
-        File.open(article_root.join('body.md'), 'w') do |file|
-          file.write(article.body)
-        end
-      end
-    end
+    Workarea::Tasks::Help.dump
   end
 end