Merge pull request #10 from apolloio/prasad/i18n-core-ext

reproducing fix for i18n core ext
toptal · Apr 25, 2024 · 209de33 · 209de33
2 parents cb10905 + 3d6be5d
commit 209de33
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/lib/chewy.rb b/lib/chewy.rb
@@ -14,7 +14,7 @@
 require 'active_support/core_ext/object/inclusion'
 require 'active_support/core_ext/string/inflections'
 
-require 'i18n/core_ext/hash'
+require 'active_support/core_ext/hash'
 require 'chewy/backports/deep_dup' unless Object.respond_to?(:deep_dup)
 require 'singleton'
 require 'base64'

diff --git a/lib/chewy/index.rb b/lib/chewy/index.rb
@@ -236,7 +236,7 @@ def mappings_hash
             raise "Type mapping must have 1 entry: #{type_mapping}"
           end
 
-          fields = type_mapping.reduce[1][:properties]
+          fields = type_mapping.reduce(:merge)[1][:properties]
           fields.each do |field_name, field_settings|
             existing_field_settings = mappings[:properties][field_name]
             if existing_field_settings && existing_field_settings != field_settings

diff --git a/lib/chewy/rspec/update_index.rb b/lib/chewy/rspec/update_index.rb
@@ -1,4 +1,4 @@
-require 'i18n/core_ext/hash'
+require 'active_support/core_ext/hash'
 
 # Rspec matcher `update_index`
 # To use it - add `require 'chewy/rspec'` to the `spec_helper.rb`