workarea-core 3.5.8 → 3.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c2fa2d437187cdfa6f9630002c94d5822cc51f5befb62060e6fd219203d4285
-  data.tar.gz: 2a9bb9faea3d1d1ed34cbf48938fcee9d1d2673ebcd3acf1cc976fda0370acd5
+  metadata.gz: 277c3f21e9ad08940c1f72830fd89f066987b104d019cb45b670774dc31b91e2
+  data.tar.gz: a256669db5f584453ad3103365446f5cb885bfa55bae6b68240b07782775b8aa
 SHA512:
-  metadata.gz: 71f63a2c7b0d0824a173279e01c17ddcc10ea4ef7fb2a232874cd54198a867b5fb6cc3735673d7fe41223f1815e28fdc3794d820d25a74eea03d7f381b4e47eb
-  data.tar.gz: fc5503c7cb0ee41b481c04cf3682b002e019e095c4a6a1e27c9279a40c78012c3712312e82e5c8c2878c5be680aca7137acb9d706af71bf6cf95c54c4112ec52
+  metadata.gz: 97608d2f8240e4e21862d986599f8a6cbe4f5e461dc0bbb027203fff9d36b2d74f6477f27a9a652a893690146cfcaac3347bd0e263084f85af6438649d4a9c52
+  data.tar.gz: 2affa2d8c642e5f47f690d29ccf01629efaaa41f2963d1b16b9a02a3e690ceb57a22447f0e9ebbf7552973de4b817f6d6f80154a76cca01bc8065e6bfa5620ed

data/app/controllers/workarea/application_controller.rb

@@ -7,7 +7,6 @@ module Workarea
 
     protect_from_forgery
 
-    before_action :set_locale
     after_action :set_flash_header
 
     # Cache templates within the scope of a request for development
@@ -33,10 +32,6 @@ module Workarea
 
     private
 
-    def set_locale
-      I18n.locale = params[:locale] || I18n.default_locale
-    end
-
     def set_flash_header
       messages = flash.map { |k, v| [k, ERB::Util.h(v)] }
       response.headers['X-Flash-Messages'] = Hash[messages].to_json

data/app/controllers/workarea/authentication.rb

@@ -89,6 +89,12 @@ module Workarea
       else
         uri = URI.parse(params[:return_to])
 
+        if I18n.locale != I18n.default_locale
+          query_hash = Rack::Utils.parse_nested_query(uri.query)
+          query_hash['locale'] ||= I18n.locale
+          uri.query = query_hash.to_query
+        end
+
         if uri.fragment.present?
           "#{uri.request_uri}##{uri.fragment}"
         else

data/app/helpers/workarea/i18n_helper.rb

@@ -10,7 +10,7 @@ module Workarea
       result = ''
 
       params
-        .except(:utf8, :controller, :action)
+        .except(:utf8, :controller, :action, :locale)
         .each_pair { |key, value| result << hidden_field_tag(key, value, id: nil) }
 
       result.html_safe

data/app/middleware/workarea/application_middleware.rb

@@ -8,6 +8,7 @@ module Workarea
       request = Rack::Request.new(env)
       return @app.call(env) if request.path =~ /(jpe?g|png|ico|gif|css|js|svg)$/
 
+      set_locale(env, request)
       setup_environment(env, request)
       set_segment_request_headers(env)
       status, headers, body = @app.call(env)
@@ -16,6 +17,10 @@ module Workarea
       [status, headers, body]
     end
 
+    def set_locale(env, request)
+      I18n.locale = locale_from_request(env, request) || I18n.default_locale
+    end
+
     def setup_environment(env, request)
       env['workarea.visit'] = Visit.new(env)
       env['workarea.cache_varies'] = Cache::Varies.new(env['workarea.visit']).to_s
@@ -37,6 +42,19 @@ module Workarea
 
     private
 
+    def locale_from_request(env, request)
+      return request.params['locale'] if request.params['locale'].present?
+
+      env_with_method = env.merge(
+        method: request.params[Rack::MethodOverride::METHOD_OVERRIDE_PARAM_KEY].presence ||
+          request.request_method
+      )
+      Rails.application.routes.recognize_path(request.path, env_with_method)[:locale]
+
+    rescue ActionController::RoutingError
+      # Return nil since we can't get locale out of this request
+    end
+
     def normalize_segment_ids(visit)
       visit.applied_segments.map(&:id).sort.join(',')
     end

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

@@ -113,7 +113,7 @@ module Workarea
                 id: category.id,
                 release_id: 'live',
                 changeset_release_ids: changesets.map(&:release_id).uniq,
-                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')
@@ -130,7 +130,7 @@ module Workarea
                 document = {
                   id: "#{category.id}-#{changeset.release_id}",
                   release_id: changeset.release_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/product_entries.rb

@@ -17,15 +17,17 @@ module Workarea
       end
 
       def live_entries
-        @live_entries ||= @products.flat_map do |product|
-          index_entries_for(product.without_release)
+        @live_entries ||= @products.reduce([]) do |memo, product|
+          memo + Array.wrap(index_entries_for(product.without_release))
         end
       end
 
       def release_entries
-        @release_entries ||= @products.flat_map do |product|
-          ProductReleases.new(product).releases.map do |release|
-            index_entries_for(product.in_release(release))
+        @release_entries ||= @products.reduce([]) do |results, product|
+          releases = ProductReleases.new(product).releases
+
+          results + releases.reduce([]) do |memo, release|
+            memo + Array.wrap(index_entries_for(product.in_release(release)))
           end
         end
       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

@@ -15,8 +15,9 @@ module Workarea
         return if products.blank?
         products = Array.wrap(products)
 
-        documents = Search::ProductEntries.new(products).map(&:as_bulk_document)
-        Search::Storefront.bulk(documents)
+        Search::Storefront.bulk do
+          Search::ProductEntries.new(products).map(&:as_bulk_document)
+        end
 
         Catalog::Product.in(id: products.map(&:id)).set(last_indexed_at: Time.current)
       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/synchronize_user_metrics.rb

@@ -19,8 +19,18 @@ module Workarea
 
     def perform(id)
       user = User.find(id)
-      metrics = Metrics::User.find_or_create_by(id: user.email)
-      metrics.set(admin: user.admin?, tags: user.tags)
+
+      Metrics::User.collection.update_one(
+        { _id: user.email },
+        {
+          '$set' => {
+            admin: user.admin?,
+            tags: user.tags,
+            updated_at: Time.current.utc
+          }
+        },
+        upsert: true
+      )
     end
   end
 end

data/lib/workarea/cache.rb

@@ -70,7 +70,7 @@ module Workarea
       end
 
       def to_s
-        @to_s ||= @varies.map { |v| visit.instance_exec(&v).to_s }.join(':')
+        @to_s ||= ([I18n.locale] + @varies.map { |v| visit.instance_exec(&v).to_s }).join(':')
       end
     end
   end

data/lib/workarea/core.rb

@@ -131,6 +131,7 @@ require 'workarea/ext/freedom_patches/dragonfly_callable_url_host'
 require 'workarea/ext/freedom_patches/active_support_duration'
 require 'workarea/ext/freedom_patches/premailer'
 require 'workarea/ext/freedom_patches/referer_parser'
+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/geolocation.rb

@@ -57,15 +57,7 @@ module Workarea
     end
 
     def names
-      @names ||= [
-        postal_code,
-        city,
-        region,
-        subdivision&.name,
-        country&.alpha2,
-        country&.alpha3,
-        country&.name
-      ].reject(&:blank?)
+      @names ||= [postal_code, city, subdivision&.name, country&.name].reject(&:blank?)
     end
 
     private

data/lib/workarea/version.rb

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

data/test/helpers/workarea/i18n_helper_test.rb

@@ -7,12 +7,14 @@ module Workarea
       params[:controller] = 'controller'
       params[:action] = 'action'
       params[:foo] = 'bar'
+      params[:locale] = 'es'
 
       assert_includes(switch_locale_fields, 'foo')
       assert_includes(switch_locale_fields, 'bar')
       refute_includes(switch_locale_fields, 'utf8')
       refute_includes(switch_locale_fields, 'controller')
       refute_includes(switch_locale_fields, 'action')
+      refute_includes(switch_locale_fields, 'locale')
     end
   end
 end

data/test/integration/workarea/authentication_test.rb

@@ -185,5 +185,15 @@ module Workarea
       get '/test_logout'
       refute(cookies[:email].present?)
     end
+
+    def test_ensures_locale_passthrough_for_return_to
+      set_locales(available: [:en, :es], default: :en, current: :en)
+
+      get '/login_required', params: { locale: 'es', return_to: '/blah?foo=bar' }
+      get '/test_login', params: { user_id: @user.id }
+      assert(response.redirect?)
+      assert_match('locale=es', response.location)
+      assert_match('foo=bar', response.location)
+    end
   end
 end

data/test/integration/workarea/cache_varies_integration_test.rb

@@ -25,6 +25,10 @@ module Workarea
         render plain: session[:foo].presence || 'nil'
       end
 
+      def varies
+        render plain: request.env['workarea.cache_varies']
+      end
+
       def current_user
         nil
       end
@@ -34,6 +38,11 @@ module Workarea
       Rails.application.routes.prepend do
         post 'cache_varies_test_set_session', to: 'workarea/cache_varies_integration_test/caching#set_session'
         get 'cache_varies_test_foo', to: 'workarea/cache_varies_integration_test/caching#foo'
+
+        scope '(:locale)', constraints: Workarea::I18n.routes_constraint do
+          get 'cache_varies_test_varies', to: 'workarea/cache_varies_integration_test/caching#varies'
+          patch 'cache_varies_test_varies', to: 'workarea/cache_varies_integration_test/caching#varies'
+        end
       end
 
       Rails.application.reload_routes!
@@ -74,5 +83,27 @@ module Workarea
       assert_equal('baz', response.body)
       assert_equal('fresh', response.headers['X-Rack-Cache'])
     end
+
+    def test_varies_includes_locale
+      set_locales(available: [:en, :es], default: :en, current: :en)
+
+      get '/cache_varies_test_varies'
+      assert_includes(response.body, 'en')
+
+      get '/cache_varies_test_varies', params: { locale: 'es' }
+      assert_includes(response.body, 'es')
+
+      get '/es/cache_varies_test_varies'
+      assert_includes(response.body, 'es')
+
+      patch '/cache_varies_test_varies'
+      assert_includes(response.body, 'en')
+
+      patch '/cache_varies_test_varies', params: { locale: 'es' }
+      assert_includes(response.body, 'es')
+
+      patch '/es/cache_varies_test_varies'
+      assert_includes(response.body, 'es')
+    end
   end
 end

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

@@ -94,10 +94,10 @@ module Workarea
         'HTTP_GEOIP_POSTAL_CODE' => '19106'
       )
 
-      assert_includes(location.names, 'US')
-      assert_includes(location.names, 'USA')
+      refute_includes(location.names, 'US')
+      refute_includes(location.names, 'USA')
       assert_includes(location.names, 'United States of America')
-      assert_includes(location.names, 'PA')
+      refute_includes(location.names, 'PA')
       assert_includes(location.names, 'Pennsylvania')
       assert_includes(location.names, 'Philadelphia')
       assert_includes(location.names, '19106')

data/test/models/workarea/segment/rules/geolocation_test.rb

@@ -7,12 +7,15 @@ module Workarea
         def test_qualifies?
           refute(Geolocation.new.qualifies?(create_visit))
 
-          visit = create_visit('HTTP_GEOIP_REGION' => 'PA')
+          visit = create_visit(
+            'HTTP_GEOIP_REGION' => 'PA',
+            'HTTP_GEOIP_CITY_COUNTRY_CODE' => 'US'
+          )
           refute(Geolocation.new(locations: %w(NJ)).qualifies?(visit))
-          assert(Geolocation.new(locations: %w(pa)).qualifies?(visit))
-          assert(Geolocation.new(locations: %w(PA)).qualifies?(visit))
-          assert(Geolocation.new(locations: %w(NJ PA)).qualifies?(visit))
-          refute(Geolocation.new(locations: %w(NJ NY)).qualifies?(visit))
+          assert(Geolocation.new(locations: %w(us-pa)).qualifies?(visit))
+          assert(Geolocation.new(locations: %w(US-PA)).qualifies?(visit))
+          assert(Geolocation.new(locations: %w(US-NJ US-pa)).qualifies?(visit))
+          refute(Geolocation.new(locations: %w(US-NJ US-NY)).qualifies?(visit))
 
           visit = create_visit(
             'HTTP_GEOIP_REGION' => 'PA',
@@ -26,14 +29,13 @@ module Workarea
           assert(Geolocation.new(locations: %w(Philadelphia)).qualifies?(visit))
           assert(Geolocation.new(locations: %w(Philadelphia US)).qualifies?(visit))
           refute(Geolocation.new(locations: %w(Harrisburg)).qualifies?(visit))
-          refute(Geolocation.new(locations: %w(Harrisburg PA)).qualifies?(visit))
+          refute(Geolocation.new(locations: %w(Harrisburg US-PA)).qualifies?(visit))
           assert(Geolocation.new(locations: %w(Philadelphia Harrisburg)).qualifies?(visit))
           refute(Geolocation.new(locations: %w(Pittsburgh Harrisburg)).qualifies?(visit))
 
           visit = create_visit('HTTP_GEOIP_CITY_COUNTRY_CODE' => 'US')
           refute(Geolocation.new(locations: %w(CA)).qualifies?(visit))
           assert(Geolocation.new(locations: %w(US)).qualifies?(visit))
-          assert(Geolocation.new(locations: %w(USA)).qualifies?(visit))
           assert(Geolocation.new(locations: ['United States of America']).qualifies?(visit))
           assert(Geolocation.new(locations: %w(Philadelphia US)).qualifies?(visit))
           assert(Geolocation.new(locations: %w(US CA)).qualifies?(visit))

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_entries_test.rb

@@ -36,6 +36,17 @@ module Workarea
         assert_equal(release.id, results.first.release_id)
         refute_equal(product.object_id, results.first.model.object_id)
       end
+
+      def test_entry_flattening
+        products = Array.new(2) { create_product }
+        release = create_release
+        release.as_current { products.first.update!(name: 'Bar') }
+
+        instance = ProductEntries.new(products)
+        instance.stubs(:index_entries_for).returns([:foo, :bar])
+
+        assert_equal([:foo, :bar, :foo, :bar, :foo, :bar], instance.entries)
+      end
     end
   end
 end

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

@@ -425,6 +425,19 @@ module Workarea
           assert_equal([product], ProductSearch.new(q: '*').results.pluck(:model))
         end
       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.5.8
+  version: 3.5.9
 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
@@ -1920,6 +1920,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/premailer.rb
@@ -2081,6 +2082,7 @@ files:
 - 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/money_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