workarea-core 3.5.9 → 3.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 277c3f21e9ad08940c1f72830fd89f066987b104d019cb45b670774dc31b91e2
-  data.tar.gz: a256669db5f584453ad3103365446f5cb885bfa55bae6b68240b07782775b8aa
+  metadata.gz: 6b38c044efaff914d6bbbeff43668f4bef87e963f08df785e1afc1b23acb69ec
+  data.tar.gz: '087f5d99ee26408269f723973c8199679b21ce894a66657f98457ebb16bfdf0f'
 SHA512:
-  metadata.gz: 97608d2f8240e4e21862d986599f8a6cbe4f5e461dc0bbb027203fff9d36b2d74f6477f27a9a652a893690146cfcaac3347bd0e263084f85af6438649d4a9c52
-  data.tar.gz: 2affa2d8c642e5f47f690d29ccf01629efaaa41f2963d1b16b9a02a3e690ceb57a22447f0e9ebbf7552973de4b817f6d6f80154a76cca01bc8065e6bfa5620ed
+  metadata.gz: b90cfa898d74c2111b43b5ccc5bbef7dba02393184e6f6e4830ba50407bc32217e8f7df3aef7b69c3e990a1e8a9c7c5a4b060b032fe109591ddb8666bda5567d
+  data.tar.gz: 903fb77fce3abe0e67b553734b3511c03b31a0bc8b9cb73bfd04a2bfbfd72605a5cd711f9e4e0b2d044acf2d0158b3b39dfb2f39fd1951a599afe1b3d20b7b71

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

@@ -5,13 +5,27 @@ 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)
+      Workarea.deprecation.deprecate_methods(self.class, apply: :result)
+      apply_to(hash)
+    end
+
+    private
+
+    def apply_to(hash)
       @adds.each do |tuple|
         key, value = *tuple
         hash[key] = self.class.parse_values(value)

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

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

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

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

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.config.per_page = 30
         assert_equal(0, Paginate.new(page: 1).from)

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

@@ -427,6 +427,9 @@ module Workarea
       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!
 

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-core
 version: !ruby/object:Gem::Version
-  version: 3.5.9
+  version: 3.5.10
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-15 00:00:00.000000000 Z
+date: 2020-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -1919,6 +1919,7 @@ 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