workarea-core 3.4.30 → 3.4.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a0f1a32a380e8018ce48fa9c609e9cb820ccc1292c053101b4954caca8ae458
-  data.tar.gz: e6f464bf2b5c443ba95403493f520e09fb8fda6457526486cf1084eabf2d6c7e
+  metadata.gz: 299de23bea1f758a6c81b220df516b433a75b8d68feed5317ed1bc83a2a4bac9
+  data.tar.gz: 826455dd3ea5fe721feb372936ac4a6b169ae7c3256ce98cee94f1b3c1fd19ff
 SHA512:
-  metadata.gz: 7959dc6060731296d8234a2d056955443f035f89b0d22ee61484bcba7751ec1198c0c040d4f30ab6f5359620f8b91e31523605a3ab0e7b13e12d48d5cbe32408
-  data.tar.gz: 9cd1dea7985c3c5893deea11f9d913b2457837d0f609ca3ae4d94db0af39840ea214625bf2b1f9747e60336f09fd4e0dc8960e5eee7dddaf544e2bd0adeb7339
+  metadata.gz: b612026e5219dbefac87be6a897a43cff75b2fa045d62af44ef9bac1d27ef658e5c8c38cc25526bb52898841ee3b71d43caf89450e641d1c60ef68b1c7d65fe5
+  data.tar.gz: 336720cc69f36b67ee3706d424df574e04459a55221aa6e04dec7c09b920d6763f5983d5aef7bfeb778535c8c5b288a4ea48e8c18eeeaff39017245e1ba9e5d5

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/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/lib/workarea/core.rb

@@ -126,6 +126,7 @@ 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/mongoid/list_field'
 require 'workarea/ext/mongoid/each_by'
 require 'workarea/ext/mongoid/except'

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

@@ -2,7 +2,7 @@ module Workarea
   module VERSION
     MAJOR = 3
     MINOR = 4
-    PATCH = 30
+    PATCH = 31
     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/product_search_test.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-core
 version: !ruby/object:Gem::Version
-  version: 3.4.30
+  version: 3.4.31
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-31 00:00:00.000000000 Z
+date: 2020-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -1856,6 +1856,7 @@ files:
 - lib/workarea/ext/freedom_patches/float.rb
 - lib/workarea/ext/freedom_patches/global_id.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
@@ -2006,6 +2007,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