esse 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc6a554b787bfb51e5568bd590790171cc88ad8c5ce432e1de2c3ef68a5d1def
-  data.tar.gz: cac82a25d6e8dd6dad3667a734d58be098f4b7020db76472359f7bdb4fe2067c
+  metadata.gz: 9fc6f63594da661b35bc22ab0c83655ded02b8ebe2e20ec5612a0927934156e9
+  data.tar.gz: c46f9a70e262d40a9c60c7ce72be3e3b816d18c536f6e3fe770bd06c06c5f57b
 SHA512:
-  metadata.gz: f26afad34715ed37cec3f1d1cad11ca6e05d2921a6f31884d9ea9f1136ef239ba7661e29796c37abf69ea19aa5f5407884cf88b108bbfa211e5639e371d492ed
-  data.tar.gz: 13b1921d85723d3c33bacc54c7bcf95885a196c3a62c095a5ea3be5a5d5061b8cd4eb8fbb1bdbf1bb91c141ed4457f9a1baab5ec121dd7e4f4dc1c1c423277d2
+  metadata.gz: 8525a1ba74d9452163e87e1acf1bf621654f2bb8b9a7811e6eca94fc452c47f9255808b2c45be701112be085f8d3176243a685fcfb6647a8e9845699a727911d
+  data.tar.gz: 3d0be64e631a47c07758341b34fc86eedffd76bbd12c4734016d9303c256d9c8470929fc564bdace28bb21f072e44d0193cbee06e8e808675a695b46aac92c38

data/lib/esse/index/settings.rb

@@ -4,29 +4,21 @@ module Esse
   # https://github.com/elastic/elasticsearch-ruby/blob/master/elasticsearch-api/lib/elasticsearch/api/actions/indices/put_settings.rb
   class Index
     module ClassMethods
-      # Elasticsearch supports passing index.* related settings directly in the body of the request.
-      # We are moving it to the index key to make it more explicit and to be the source-of-truth when merging settings.
-      # So the settings `{ number_of_shards: 1 }` will be transformed to `{ index: { number_of_shards: 1 } }`
-      INDEX_SIMPLIFIED_SETTINGS = %i[
-        number_of_shards
-        number_of_replicas
-        refresh_interval
-        mapping
-      ].freeze
+      # Backwards-compatible alias. The canonical list now lives on
+      # +Esse::IndexSetting::INDEX_SIMPLIFIED_SETTINGS+ so that the merge
+      # logic and the simplified-key promotion stay in sync.
+      INDEX_SIMPLIFIED_SETTINGS = Esse::IndexSetting::INDEX_SIMPLIFIED_SETTINGS
 
       def settings_hash(settings: nil)
-        hash = setting.body
-        values = (hash.key?(Esse::SETTING_ROOT_KEY) ? hash[Esse::SETTING_ROOT_KEY] : hash)
-        values = HashUtils.explode_keys(values)
-        if settings.is_a?(Hash)
-          values = HashUtils.deep_merge(values, HashUtils.explode_keys(settings))
-        end
-        INDEX_SIMPLIFIED_SETTINGS.each do |key|
-          next unless values.key?(key)
-          value = values.delete(key)
-          next if value.nil?
+        # Normalize each side (global vs local) separately before merging so
+        # a flat global key (e.g. top-level :number_of_shards) cannot clobber
+        # an explicit nested local value (e.g. :index => { :number_of_shards => 8 }).
+        global = Esse::IndexSetting.normalize(setting.globals)
+        local = Esse::IndexSetting.normalize(setting.to_h)
+        values = HashUtils.deep_merge(global, local)
 
-          (values[:index] ||= {}).merge!(key => value)
+        if settings.is_a?(Hash)
+          values = HashUtils.deep_merge(values, Esse::IndexSetting.normalize(settings))
         end
 
         if values[:index].is_a?(Hash)

data/lib/esse/index_setting.rb

@@ -3,6 +3,17 @@
 module Esse
   # https://www.elastic.co/guide/en/elasticsearch/reference/1.7/indices.html
   class IndexSetting
+    # Top-level keys that Elasticsearch/OpenSearch accept either flat or nested
+    # under `index:`. We always promote them to the nested form so that values
+    # from different sources (cluster globals vs per-index template) merge
+    # predictably regardless of which form each side was authored in.
+    INDEX_SIMPLIFIED_SETTINGS = %i[
+      number_of_shards
+      number_of_replicas
+      refresh_interval
+      mapping
+    ].freeze
+
     # @param [Hash] options
     # @option options [Proc] :globals  A proc that will be called to load global settings
     # @option options [Array] :paths   A list of paths to load settings from
@@ -35,6 +46,38 @@ module Esse
       HashUtils.deep_merge(global, local)
     end
 
+    # Returns the raw (unsymbolized) global settings as supplied by the
+    # +globals+ proc. Public so that callers like
+    # +Esse::Index.settings_hash+ can normalize it independently before
+    # merging it with the local template — preventing a flat global value
+    # from clobbering a nested local value once both are merged.
+    def globals
+      @globals.call || {}
+    end
+
+    # Normalize a settings hash by:
+    #   * symbolizing keys
+    #   * stripping the `:settings` root if present
+    #   * exploding dotted keys ('index.number_of_replicas' -> { index: { number_of_replicas: ... } })
+    #   * promoting simplified flat keys (number_of_shards, etc.) into the
+    #     nested `:index` form, preserving any value already present under
+    #     `:index` (we never overwrite an explicit nested setting with a
+    #     flat value from the same source).
+    def self.normalize(hash)
+      values = HashUtils.deep_transform_keys(hash || {}, &:to_sym)
+      values = values[Esse::SETTING_ROOT_KEY] if values.key?(Esse::SETTING_ROOT_KEY)
+      values = HashUtils.explode_keys(values)
+      INDEX_SIMPLIFIED_SETTINGS.each do |key|
+        next unless values.key?(key)
+        value = values.delete(key)
+        next if value.nil?
+
+        values[:index] ||= {}
+        values[:index][key] = value unless values[:index].key?(key)
+      end
+      values
+    end
+
     protected
 
     def from_template

data/lib/esse/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Esse
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: esse
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Marcos G. Zimmermann
 autorequire:
 bindir: exec
 cert_chain: []
-date: 2026-03-18 00:00:00.000000000 Z
+date: 2026-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json