workarea-core 3.4.33 → 3.4.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9380a926427872b88a127eeca3d80b734d8679e297cd691a409b2125d181b210
-  data.tar.gz: 37b763327a0a0f7eec7d34b4f744eae59580a8717f1e0bac3b4fadc830c62f61
+  metadata.gz: 9ffbb2028cd43e91abbc3601126483073b55997738eba74759b902e353590b67
+  data.tar.gz: 70acccdddb99146faaf878e862bc8a1e2161f5c2a62a10cd0f3f1f5f97bc4b19
 SHA512:
-  metadata.gz: 6da8af3694f295513a48512a0fd51f2309c04f33b400461dfb90727c8d4b083a7e291e0e66edb69ae23ba9a55a4f8eb5351b34434da153ed915bada8ccdabe7d
-  data.tar.gz: f15b4a14d8e5a44f0acbc71c2c780731b0f9b3c3f07c8223e5aa15ba5d9ad48f8a779d81a10dd33b2561503fff5da37f7478ed3dedb7cfd6bfee5e6931b47a37
+  metadata.gz: fb66b15c9317d085e8dbd97262ddf4ae85ef31eb5cbb77b1bf6375f69b284a6ce439579c534b6ec05c337644b022e4b186e4f55c51cabf555a29c490f131bc8e
+  data.tar.gz: db47bf0b35f4f7f12a27b05759d242301e7b0b6779670d41fab803129fd391c9246ecc08f494314e3865c5f8190a636d6f1df521b3b31d545dec53c624c5a6dd

data/app/mailers/workarea/application_mailer.rb

@@ -7,7 +7,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/models/workarea/checkout.rb

@@ -158,10 +158,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/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/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/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/services/workarea/direct_upload.rb

@@ -8,7 +8,12 @@ module Workarea
       url += ":#{uri.port}" unless uri.port.in? [80, 443]
       id = "direct_upload_#{url}"
 
-      response = Workarea.s3.get_bucket_cors(Configuration::S3.bucket)
+      response = begin
+        Workarea.s3.get_bucket_cors(Configuration::S3.bucket)
+      rescue Excon::Error::NotFound
+        Excon::Response.new(body: { 'CORSConfiguration' => [] })
+      end
+
       cors = response.data[:body]
 
       unless cors['CORSConfiguration'].pluck('ID').include?(id)

data/config/locales/en.yml

@@ -97,6 +97,8 @@ en:
         under: 'Under %{price}'
     inventory_sku:
       name: "Inventory %{id}"
+    inquiry:
+      subjects: {}
     order:
       name: "Order %{id}"
       traffic_referrer:

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

@@ -63,6 +63,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,7 +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]
 

data/lib/tasks/search.rake

@@ -12,7 +12,9 @@ namespace :workarea do
       require 'sidekiq/testing/inline' unless ENV['INLINE'] == 'false'
       puts 'Indexing admin...'
 
-      Workarea::Search::Admin.reset_indexes!
+      Workarea::QueuesPauser.with_paused_queues do
+        Workarea::Search::Admin.reset_indexes!
+      end
 
       Mongoid.models.each do |klass|
         next unless Workarea::Search::Admin.for(klass.first).present?
@@ -32,8 +34,10 @@ namespace :workarea do
       require 'sidekiq/testing/inline' unless ENV['INLINE'] == 'false'
       puts 'Indexing storefront...'
 
-      Workarea::Search::Storefront.reset_indexes!
-      Workarea::Search::Storefront.ensure_dynamic_mappings
+      Workarea::QueuesPauser.with_paused_queues do
+        Workarea::Search::Storefront.reset_indexes!
+        Workarea::Search::Storefront.ensure_dynamic_mappings
+      end
 
       # This code finds all unique filters for products so we can index a sample
       # product for each to ensure the dynamic mappings get created.
@@ -79,7 +83,9 @@ namespace :workarea do
       require 'sidekiq/testing/inline' unless ENV['INLINE'] == 'false'
       puts 'Indexing help...'
 
-      Workarea::Search::Help.reset_indexes!
+      Workarea::QueuesPauser.with_paused_queues do
+        Workarea::Search::Help.reset_indexes!
+      end
 
       Workarea::Help::Article.all.each_by(100) do |help_article|
         Workarea::Search::Help.new(help_article).save

data/lib/workarea/configuration.rb

@@ -1289,6 +1289,17 @@ module Workarea
 
       # The number of results that will show per-type in the admin jump to
       config.jump_to_results_per_type = 5
+
+      # Attributes that will be sliced out of params and persisted on
+      # the credit card tender during checkout.
+      config.credit_card_attributes = %i[
+        month
+        year
+        saved_card_id
+        number
+        cvv
+        amount
+      ]
     end
   end
 end

data/lib/workarea/core.rb

@@ -139,6 +139,7 @@ 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'
 
 if Rails.env.development?
   require 'workarea/ext/freedom_patches/routes_reloader'
@@ -208,6 +209,7 @@ require 'workarea/cache'
 require 'workarea/scheduled_jobs'
 require 'workarea/string_id'
 require 'workarea/mail_interceptor'
+require 'workarea/queues_pauser'
 
 #
 # Engines

data/lib/workarea/ext/jbuilder/jbuilder_cache.rb

@@ -0,0 +1,29 @@
+decorate JbuilderTemplate, with: :workarea do
+  def _cache_fragment_for(*)
+    return yield if workarea_admin?
+
+    super
+  end
+
+  def _cache_key(*)
+    super.tap do |result|
+      result << workarea_cache_varies if workarea_cache_varies.present?
+    end
+  end
+
+  private
+
+  def workarea_admin?
+    @context&.controller&.current_user&.admin?
+  rescue ::RuntimeError
+    false
+  end
+
+  def workarea_cache_varies
+    workarea_request_env['workarea.cache_varies']
+  end
+
+  def workarea_request_env
+    @context.controller.request.env || {}
+  end
+end

data/lib/workarea/queues_pauser.rb

@@ -0,0 +1,26 @@
+module Workarea
+  module QueuesPauser
+    extend self
+
+    def pause_queues!
+      pauser = Sidekiq::Throttled::QueuesPauser.instance
+      queues.each { |queue| pauser.pause!(queue) }
+    end
+
+    def resume_queues!
+      pauser = Sidekiq::Throttled::QueuesPauser.instance
+      queues.each { |queue| pauser.resume!(queue) }
+    end
+
+    def with_paused_queues(&block)
+      pause_queues!
+      yield
+    ensure
+      resume_queues!
+    end
+
+    def queues
+      Configuration::Sidekiq.queues
+    end
+  end
+end

data/lib/workarea/version.rb

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

data/test/generators/workarea/install_generator_test.rb

@@ -88,5 +88,11 @@ module Workarea
     def test_favicon
       assert_no_file 'public/favicon.ico'
     end
+
+    def test_development_mailer_port
+      assert_file 'config/environments/development.rb' do |file|
+        assert_match(%(config.action_mailer.default_url_options = { port: 3000 }), file)
+      end
+    end
   end
 end

data/test/mailers/workarea/application_mailer_test.rb

@@ -21,5 +21,15 @@ module Workarea
         assert_equal([changed_email], changed_mail.from)
       end
     end
+
+    def test_default_url_options
+      @current_options = Rails.application.config.action_mailer.default_url_options.deep_dup
+      Rails.application.config.action_mailer.default_url_options = { port: 12345 }
+
+      assert_equal(12345, ApplicationMailer.new.default_url_options[:port])
+
+    ensure
+      Rails.application.config.action_mailer.default_url_options = @current_options
+    end
   end
 end

data/test/models/workarea/checkout_test.rb

@@ -51,6 +51,63 @@ module Workarea
       refute_equal(payment_id, checkout.payment.object_id)
     end
 
+    def test_update
+      create_shipping_service
+      checkout = Checkout.new(@order)
+
+      checkout.start_as(:guest)
+
+      refute(
+        checkout.update(
+          email: 'test@workarea.com',
+          shipping_address: {
+            last_name: 'Crouse',
+            street: '22 S. 3rd St.',
+            street_2: 'Second Floor',
+            city: 'Philadelphia',
+            region: 'PA',
+            postal_code: '19106',
+            country: 'US'
+          },
+          billing_address: {
+            first_name: 'Ben',
+            street: '22 S. 3rd St.',
+            street_2: 'Second Floor',
+            city: 'Philadelphia',
+            region: 'PA',
+            postal_code: '19106',
+            country: 'US'
+          }
+        )
+      )
+
+      assert(
+        checkout.update(
+          email: 'test@workarea.com',
+          shipping_address: {
+            first_name: 'Ben',
+            last_name: 'Crouse',
+            street: '22 S. 3rd St.',
+            street_2: 'Second Floor',
+            city: 'Philadelphia',
+            region: 'PA',
+            postal_code: '19106',
+            country: 'US'
+          },
+          billing_address: {
+            first_name: 'Ben',
+            last_name: 'Crouse',
+            street: '22 S. 3rd St.',
+            street_2: 'Second Floor',
+            city: 'Philadelphia',
+            region: 'PA',
+            postal_code: '19106',
+            country: 'US'
+          }
+        )
+      )
+    end
+
     def test_continue_as
       checkout = Checkout.new(@order)
       checkout.continue_as(@user)

data/test/services/workarea/direct_upload_test.rb

@@ -112,6 +112,26 @@ module Workarea
       assert(DirectUpload.ensure_cors!('https://example.com/admin/direct_uploads'))
     end
 
+    def test_ensure_cors_with_no_existing_configuration
+      Workarea.s3.expects(:get_bucket_cors)
+                 .raises(Excon::Errors::NotFound.new('CORS configuration does not exist'))
+
+
+      Workarea.s3.expects(:put_bucket_cors).with(
+        Configuration::S3.bucket,
+        'CORSConfiguration' => [
+          {
+            'ID' => "direct_upload_http://test.host",
+            'AllowedMethod' => 'PUT',
+            'AllowedOrigin' => 'http://test.host',
+            'AllowedHeader' => '*'
+          }
+        ]
+      ).returns(true)
+
+      assert(DirectUpload.ensure_cors!('http://test.host/admin/content_assets'))
+    end
+
     private
 
     def upload_file

data/workarea-core.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'mongoid-tree', '~> 2.1.0'
   s.add_dependency 'mongoid-sample', '~> 0.1.0'
   s.add_dependency 'elasticsearch', '~> 5.0.1'
-  s.add_dependency 'kaminari', '~> 0.17.0'
+  s.add_dependency 'kaminari', '~> 1.2.1'
   s.add_dependency 'kaminari-mongoid', '~> 0.1.2'
   s.add_dependency 'activemerchant', '~> 1.52'
   s.add_dependency 'dragonfly', '~> 1.1.2'
@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'sidekiq-cron', '~> 0.6.3'
   s.add_dependency 'sidekiq-unique-jobs', '~> 6.0.6'
   s.add_dependency 'sidekiq-throttled', '~> 0.8.2'
-  s.add_dependency 'geocoder', '~> 1.4.4'
+  s.add_dependency 'geocoder', '~> 1.6.3'
   s.add_dependency 'redis-rails', '~> 5.0.0'
   s.add_dependency 'redis-rack-cache', '~> 2.2.0'
   s.add_dependency 'easymon', '~> 1.4.0'
@@ -65,7 +65,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'chart-horizontalbar-rails', '~> 1.0.4' # TODO remove v4
   s.add_dependency 'select2-rails', '~> 4.0.3'
   s.add_dependency 'wysihtml-rails', '~> 0.6.0.beta2'
-  s.add_dependency 'rack-attack', '~> 5.0.1'
+  s.add_dependency 'rack-attack', '~> 6.3.1'
   s.add_dependency 'jquery-livetype-rails', '~> 0.1.0' # TODO remove v4
   s.add_dependency 'redcarpet', '~> 3.4.0'
   s.add_dependency 'jquery-unique-clone-rails', '~> 1.0.0'
@@ -90,9 +90,9 @@ Gem::Specification.new do |s|
   s.add_dependency 'referer-parser', '~> 0.3.0'
   s.add_dependency 'serviceworker-rails', '~> 0.5.5'
   s.add_dependency 'logstasher', '~> 1.2.2'
-  s.add_dependency 'chartkick', '~> 3.3.0'
+  s.add_dependency 'chartkick', '~> 3.4.0'
   s.add_dependency 'puma', '>= 4.3.1'
-  s.add_dependency 'rack' , '>= 2.0.8'
+  s.add_dependency 'rack' , '>= 2.1.4'
 
   # HACK for vendoring active_shipping
   s.add_dependency 'active_utils', '~> 3.3.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-core
 version: !ruby/object:Gem::Version
-  version: 3.4.33
+  version: 3.4.38
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-26 00:00:00.000000000 Z
+date: 2020-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: kaminari-mongoid
   requirement: !ruby/object:Gem::Requirement
@@ -268,14 +268,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: 1.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: 1.6.3
 - !ruby/object:Gem::Dependency
   name: redis-rails
   requirement: !ruby/object:Gem::Requirement
@@ -730,14 +730,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 6.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 6.3.1
 - !ruby/object:Gem::Dependency
   name: jquery-livetype-rails
   requirement: !ruby/object:Gem::Requirement
@@ -1086,14 +1086,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
@@ -1114,14 +1114,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.8
+        version: 2.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.8
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: active_utils
   requirement: !ruby/object:Gem::Requirement
@@ -1864,6 +1864,7 @@ files:
 - lib/workarea/ext/freedom_patches/string.rb
 - lib/workarea/ext/freedom_patches/uri.rb
 - lib/workarea/ext/jbuilder/jbuilder_append_partials.rb
+- lib/workarea/ext/jbuilder/jbuilder_cache.rb
 - lib/workarea/ext/mongoid/audit_log_entry.decorator
 - lib/workarea/ext/mongoid/each_by.rb
 - lib/workarea/ext/mongoid/error.rb
@@ -1895,6 +1896,7 @@ files:
 - lib/workarea/ping_home_base.rb
 - lib/workarea/plugin.rb
 - lib/workarea/plugin/asset_appends_helper.rb
+- lib/workarea/queues_pauser.rb
 - lib/workarea/robots.rb
 - lib/workarea/routes_constraints/redirect.rb
 - lib/workarea/routes_constraints/super_admin.rb