workarea-core 3.4.30 → 3.4.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a0f1a32a380e8018ce48fa9c609e9cb820ccc1292c053101b4954caca8ae458
-  data.tar.gz: e6f464bf2b5c443ba95403493f520e09fb8fda6457526486cf1084eabf2d6c7e
+  metadata.gz: b8b3b13aaa5cdef9ff862caeccdd738d6f094d405f67ab2e65bb76534b0eb84f
+  data.tar.gz: 84ef70baa8f39380254e2c9e763a81e6643726a5103c6d0b33255b51720b81a4
 SHA512:
-  metadata.gz: 7959dc6060731296d8234a2d056955443f035f89b0d22ee61484bcba7751ec1198c0c040d4f30ab6f5359620f8b91e31523605a3ab0e7b13e12d48d5cbe32408
-  data.tar.gz: 9cd1dea7985c3c5893deea11f9d913b2457837d0f609ca3ae4d94db0af39840ea214625bf2b1f9747e60336f09fd4e0dc8960e5eee7dddaf544e2bd0adeb7339
+  metadata.gz: 5c308fb6e8617c7f4fc819a42be2b5ae99d442093506c8846c62a146d6a911786d937e8e07ccd1d149b57aff2409b414943868cc35ba8d1a9c190a935fefe0da
+  data.tar.gz: 7c740a240da58b656345c601741309ff2af41a5571c29d5162d20a122a91a14844967c1254edf1a992f4597fd1d560a8c72150236e2c4effcd465cee571eea8d

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/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/product/categories.rb

@@ -13,7 +13,7 @@ module Workarea
                 if category.product_rules.present?
                   document = {
                     id: category.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/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/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,30 @@ 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)
+      warn <<~eos
+        [DEPRECATION] `HashUpdate#apply` is deprecated and will be removed in
+        version 3.6.0. Please use `HashUpdate#result` instead.
+      eos
+      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

@@ -14,9 +14,10 @@ module Workarea
       def perform_by_models(products)
         return if products.blank?
 
-        documents = Search::ProductEntries.new(products).map(&:as_bulk_document)
+        Search::Storefront.bulk do
+          Search::ProductEntries.new(products).map(&:as_bulk_document)
+        end
 
-        Search::Storefront.bulk(documents)
         products.each { |p| p.set(last_indexed_at: Time.current) }
       end
     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/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/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

@@ -126,6 +126,8 @@ require 'workarea/ext/freedom_patches/country'
 require 'workarea/ext/freedom_patches/net_http_ssl_connection'
 require 'workarea/ext/freedom_patches/dragonfly_job_fetch_url'
 require 'workarea/ext/freedom_patches/dragonfly_callable_url_host'
+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'
@@ -206,6 +208,7 @@ require 'workarea/cache'
 require 'workarea/scheduled_jobs'
 require 'workarea/string_id'
 require 'workarea/mail_interceptor'
+require 'workarea/queues_pauser'
 
 #
 # Engines

data/lib/workarea/core/engine.rb

@@ -118,13 +118,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/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/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 = 30
+    PATCH = 35
     PRE   = nil
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')

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/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.with_config do |config|
           config.per_page = 30

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

@@ -408,6 +408,22 @@ module Workarea
         assert(result[:raw].present?)
         assert_kind_of(Float, result[:raw]['_score'])
       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,28 @@ 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
+
+    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

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

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'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-core
 version: !ruby/object:Gem::Version
-  version: 3.4.30
+  version: 3.4.35
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-31 00:00:00.000000000 Z
+date: 2020-06-25 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
@@ -1855,7 +1855,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/routes_reloader.rb
@@ -1893,6 +1895,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
@@ -2006,6 +2009,7 @@ files:
 - test/lib/workarea/ext/freedom_patches/country_test.rb
 - 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/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