workarea-core 3.5.12 → 3.5.17

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

@@ -16,7 +16,9 @@ namespace :workarea do
     task admin: :environment do
       setup
       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?
@@ -36,8 +38,10 @@ namespace :workarea do
       setup
       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.
@@ -83,7 +87,9 @@ namespace :workarea do
       setup
       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(Workarea.config.bulk_index_batch_size) do |help_article|
         Workarea::Search::Help.new(help_article).save

data/lib/workarea/configuration.rb

@@ -1297,6 +1297,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/configuration/administrable_options.rb

@@ -1,7 +1,7 @@
 module Workarea
   module Configuration
     class AdministrableOptions < ActiveSupport::InheritableOptions
-      def method_missing(name, *args)
+      def [](name)
         static_config = super
         return static_config if static_config.present? || static_config.to_s == 'false'
         return static_config unless check_fieldsets?(name)
@@ -9,10 +9,6 @@ module Workarea
         Configuration::Admin.instance.send(name)
       end
 
-      def respond_to_missing?(name, include_private)
-        true
-      end
-
       private
 
       def check_fieldsets?(name)

data/lib/workarea/core.rb

@@ -146,6 +146,7 @@ require 'workarea/ext/mongoid/find_ordered'
 require 'workarea/ext/mongoid/embedded_children'
 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'
@@ -221,6 +222,7 @@ require 'workarea/mail_interceptor'
 require 'workarea/visit'
 require 'workarea/warnings'
 require 'workarea/latest_version'
+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 = 5
-    PATCH = 12
+    PATCH = 17
     PRE   = nil
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')
 

data/test/generators/workarea/install_generator_test.rb

@@ -81,5 +81,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/models/workarea/data_file/import_test.rb

@@ -132,6 +132,46 @@ module Workarea
         refute(import.error?)
         assert(import.successful?)
       end
+
+      def test_csv_embedded_changes_for_release
+        release = create_release
+        product = create_product(
+          name: 'Foo',
+          variants: [{ sku: '1', name: 'Bar' }, { sku: '2', name: 'Baz' }]
+        )
+        product.name = 'Foo Changed'
+        product.variants.first.name = 'Bar Changed'
+
+        import = create_import(
+          model_type: product.class.name,
+          file: create_tempfile(Csv.new.serialize(product), extension: 'csv'),
+          file_type: 'csv',
+          release_id: release.id
+        )
+
+        assert_equal('csv', import.file_type)
+        assert_nothing_raised { import.process! }
+
+        product.reload
+        assert_equal('Foo', product.name)
+        assert_equal('Bar', product.variants.first.name)
+        assert_equal('Baz', product.variants.second.name)
+
+        Release.with_current(release) do
+          product.reload
+          assert_equal('Foo Changed', product.name)
+          assert_equal('Bar Changed', product.variants.first.name)
+          assert_equal('Baz', product.variants.second.name)
+        end
+
+        import.reload
+        assert_equal(2, import.total)
+        assert_equal(2, import.succeeded)
+        assert_equal(0, import.failed)
+        assert(import.complete?)
+        refute(import.error?)
+        assert(import.successful?)
+      end
     end
   end
 end

data/test/models/workarea/releasable_test.rb

@@ -375,6 +375,19 @@ module Workarea
       in_release = model.in_release(nil)
       assert_equal('Foo', in_release.name)
       refute_equal(in_release.object_id, model.object_id)
+
+      Mongoid::QueryCache.cache do
+        cached = Foo.find(model.id) # a find to ensure it's in the cache table
+        cached.name = 'Bar' # so the cache table's instance has a change
+
+        in_release = model.in_release(nil)
+        assert_equal('Foo', in_release.name)
+        refute_equal(in_release.object_id, model.object_id)
+        refute_equal(cached.object_id, model.object_id)
+      end
+
+    ensure
+      Mongoid::QueryCache.clear_cache
     end
 
     def test_skip_changeset

data/test/models/workarea/search/storefront/category_query_test.rb

@@ -75,6 +75,17 @@ module Workarea
             assert_equal([@category.id.to_s], CategoryQuery.find_by_product(@product))
           end
         end
+
+        def test_deleted_releases
+          release = create_release
+          release.as_current do
+            @category.product_rules.first.update!(value: 'bar')
+          end
+
+          release.destroy
+          CategoryQuery.new(@category).update
+          assert_equal([@category.id.to_s], CategoryQuery.find_by_product(@product))
+        end
       end
     end
   end

data/test/models/workarea/search/storefront/product_releases_test.rb

@@ -0,0 +1,60 @@
+require 'test_helper'
+
+module Workarea
+  module Search
+    class Storefront
+      class ProductReleasesTest < TestCase
+        def test_product_changes
+          product = create_product(name: 'Foo')
+          release_one = create_release
+          release_one.as_current { product.update!(name: 'Bar') }
+
+          assert_equal([release_one], Product.new(product).releases)
+
+          release_one.update!(publish_at: 1.day.from_now)
+          release_two = create_release(publish_at: 3.days.from_now)
+          assert_equal([release_one, release_two], Product.new(product).releases)
+        end
+
+        def test_featured_product_changes
+          product = create_product
+          category = create_category
+
+          release_one = create_release
+          release_one.as_current { category.update!(product_ids: [product.id]) }
+          assert_equal([release_one], Product.new(product).releases)
+
+          release_one.update!(publish_at: 1.day.from_now)
+          release_two = create_release(publish_at: 3.days.from_now)
+          assert_equal([release_one, release_two], Product.new(product).releases)
+        end
+
+        def test_variant_changes
+          product = create_product(variants: [{ sku: 'SKU' }])
+          release = create_release
+          release.as_current { product.variants.first.update!(details: { color: 'Red' }) }
+          assert_equal([release], Product.new(product).releases)
+        end
+
+        def test_pricing_changes
+          product = create_product(variants: [{ sku: 'SKU' }])
+          pricing = Pricing::Sku.find('SKU')
+
+          release = create_release
+          release.as_current { pricing.prices.first.update!(regular: 10_000) }
+          assert_equal([release], Product.new(product).releases)
+        end
+
+        def test_changesets_with_missing_releases
+          product = create_product(name: 'Foo')
+          release = create_release
+          release.as_current { product.update!(name: 'Bar') }
+          release.delete
+
+          assert_nil(product.reload.changesets.first.release)
+          assert_equal([], Product.new(product).releases)
+        end
+      end
+    end
+  end
+end

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

@@ -25,6 +25,19 @@ module Workarea
         release.as_current { category.product_rules.first.update!(value: 'bar') }
         assert_equal(2, Storefront.new(category).changesets.size)
       end
+
+      def test_releases
+        category = create_category(name: 'Foo')
+        assert_empty(Storefront.new(category).as_document[:changeset_release_ids])
+
+        a = create_release(publish_at: 1.week.from_now)
+        a.as_current { category.update!(name: 'Bar') }
+        assert_equal([a.id], Storefront.new(category).as_document[:changeset_release_ids])
+
+        b = create_release(publish_at: 2.weeks.from_now)
+        assert_includes(Storefront.new(category).as_document[:changeset_release_ids], a.id)
+        assert_includes(Storefront.new(category).as_document[:changeset_release_ids], b.id)
+      end
     end
   end
 end

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

@@ -382,6 +382,29 @@ module Workarea
           refute_includes(result_ids, product_five.id)
         end
       end
+
+      def test_featured_product_changes_in_a_release
+        one = create_product
+        two = create_product
+        three = create_product(name: 'Foo', active: false)
+        category = create_category(product_ids: [one.id, two.id], product_rules: [])
+        release = create_release(publish_at: 1.week.from_now)
+
+        release.as_current do
+          three.update!(name: 'Bar', active: true, default_category_id: category.id)
+          category.update!(product_ids: [three.id, one.id, two.id])
+          search = CategoryBrowse.new(sort: %w(featured), category_ids: [category.id])
+          sorts = search.results.pluck(:raw).pluck('_source').pluck('sorts').pluck(category.id.to_s)
+          assert_equal([0, 1, 2], sorts)
+        end
+
+        release.as_current do
+          category.update!(product_ids: [one.id, two.id, three.id])
+          search = CategoryBrowse.new(sort: %w(featured), category_ids: [category.id])
+          sorts = search.results.pluck(:raw).pluck('_source').pluck('sorts').pluck(category.id.to_s)
+          assert_equal([0, 1, 2], sorts)
+        end
+      end
     end
   end
 end