estella 7.0.1 → 7.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a5151c04f19b07be3fdbad365ace53fa98ff3e656ae93c88d0601ecc8fd1025
-  data.tar.gz: 8d98facfdab1abbfa74e204cfa3b9d3b1406d03e0991e410ef19c6264f21a58a
+  metadata.gz: 21078e646bc6690189e0959da6a41686910e095a926d6f64ec46f6a55fb0e49b
+  data.tar.gz: 9125479478089c65d458914f11b198b22bb15d99b4f6750f40a4f886f93437dc
 SHA512:
-  metadata.gz: 2cfa9184c385690fb88018d7f5ae67fcd8c736f551d2afbf456e9527bb699d4dd66f0d7cf8e94d143386b424630e266b0e805fc24abc1d350a515585ae592ff9
-  data.tar.gz: '084f9ca79e95c59ca88320ede69fc9c78747ca1881c1d98cd98cd784c0d5ab67d31ce47e47e7441168881b8a4e1a47b0bd08600461f3444b0f3b56ab612f3eef'
+  metadata.gz: 16fa7368541968ad686661f0b1326968a6749a414d6f73682b7d0442db827d11b7ed8bbef7131d53c9a01311123175eaafac0d5ba91f37601fabedbb76bd00a9
+  data.tar.gz: bff3b40524106d83b9e5b27ad1f452af2d4654ee91ec8d76477b282b114fe46296945ca3bbc0f001fe10d29bc24723b37db7fabab37d767e2a0c42ad21deda56

data/.circleci/config.yml

@@ -4,12 +4,18 @@ jobs:
   test:
     docker:
       - image: "cimg/ruby:<< parameters.ruby_version >>"
-      - image: docker.elastic.co/elasticsearch/elasticsearch:7.17.18
+      - image: "<< parameters.search_image >>"
         environment:
           - discovery.type: single-node
+          # the following are ignored by elasticsearch images
+          - DISABLE_SECURITY_PLUGIN: "true"
+          - DISABLE_INSTALL_DEMO_CONFIG: "true"
+          - OPENSEARCH_JAVA_OPTS: "-Xms512m -Xmx512m"
     parameters:
       ruby_version:
         type: string
+      search_image:
+        type: string
     steps:
       - checkout
       - run:
@@ -19,8 +25,8 @@ jobs:
           name: Print ruby version
           command: ruby -v
       - run:
-          name: Wait for ElasticSearch
-          command: dockerize -wait tcp://localhost:9200 -timeout 1m
+          name: Wait for search engine
+          command: dockerize -wait tcp://localhost:9200 -timeout 2m
       - run:
           name: Run test suite
           command: bundle exec rake
@@ -32,3 +38,6 @@ workflows:
           matrix:
             parameters:
               ruby_version: ["3.1"]
+              search_image:
+                - "docker.elastic.co/elasticsearch/elasticsearch:7.17.18"
+                - "opensearchproject/opensearch:3.3.0"

data/.github/workflows/run-conventional-commits-check.yml

@@ -0,0 +1,9 @@
+name: ☢️ Conventional Commits Check
+
+on:
+  pull_request:
+    types: [edited, opened, ready_for_review, reopened]
+
+jobs:
+  run-conventional-commits-check:
+    uses: artsy/duchamp/.github/workflows/conventional-commits-check.yml@main

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 ## Changelog
 
-### Next Release
+### v7.0.3
+
+* [#51](https://github.com/artsy/estella/pull/51): fix: pin elasticsearch client below 7.14 for OpenSearch compatibility, fix test-only index settings applying in all environments, run CI against OpenSearch 2.x/3.x - [@egdbear]
+
+### v7.0.2
+
+* [#45](https://github.com/artsy/estella/pull/45): chore: switch to a non deprecated ngram filter name - [@ovasdi]
 
 ### v7.0.1
 

data/estella.gemspec

@@ -16,6 +16,8 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency 'activemodel'
   gem.add_runtime_dependency 'activesupport'
+  # elasticsearch 7.14+ refuses to connect to non-Elastic servers (e.g. OpenSearch)
+  gem.add_runtime_dependency 'elasticsearch', '>= 7.0', '< 7.14'
   gem.add_runtime_dependency 'elasticsearch-model', '~> 7.0'
 
   gem.add_development_dependency 'activerecord'

data/lib/estella/analysis.rb

@@ -6,7 +6,7 @@ module Estella
     extend ActiveSupport::Concern
 
     FRONT_NGRAM_FILTER =
-      { type: 'edgeNGram', min_gram: 2, max_gram: 15, side: 'front' }
+      { type: 'edge_ngram', min_gram: 2, max_gram: 15, side: 'front' }
 
     DEFAULT_ANALYZER =
       { type: 'custom', tokenizer: 'standard_tokenizer', filter: %w[lowercase asciifolding] }
@@ -53,7 +53,7 @@ module Estella
 
     FULLTEXT_ANALYSIS = DEFAULT_FIELDS.keys
 
-    DEFAULT_SETTINGS = if defined? Rails && Rails.env == 'test'
+    DEFAULT_SETTINGS = if defined?(Rails) && Rails.env == 'test'
                          # Ensure no sharding in test env in order to enforce deterministic scores.
                          { analysis: DEFAULT_ANALYSIS, index: { number_of_shards: 1, number_of_replicas: 1 } }
                        else

data/lib/estella/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Estella
-  VERSION = '7.0.1'
+  VERSION = '7.0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: estella
 version: !ruby/object:Gem::Version
-  version: 7.0.1
+  version: 7.0.3
 platform: ruby
 authors:
 - Anil Bawa-Cavia
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-24 00:00:00.000000000 Z
+date: 2026-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -39,6 +39,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: elasticsearch
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.14'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.14'
 - !ruby/object:Gem::Dependency
   name: elasticsearch-model
   requirement: !ruby/object:Gem::Requirement
@@ -159,6 +179,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
+- ".github/workflows/run-conventional-commits-check.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -200,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.14
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Make your Ruby objects searchable with Elasticsearch.