estella 6.0.0 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b616691d2c247c0b09e6c67bd936340fea759ab989f1a2db9b63287897821ba
-  data.tar.gz: b4abf1411c00475005ae3b136625b8cd2e4d497c8bbdef0b483b6a94e40d64ec
+  metadata.gz: d9d4bb9a6de7a94bdb5387ba3a75e14f1018dd335e10602aca51375eac4bdbb6
+  data.tar.gz: e66b62c6b09fc373017299954b05dc402f9475d9ad507e573912eaae3cc72339
 SHA512:
-  metadata.gz: c4301d442ff5a32e5ff3a78fc1fbd6fb0ce6196e0ebd47ef503a9ed07988080cd09c6c7fbfc2f906ec53a6429dedd1733b72e0389a6ac813289eafeb7bbb1888
-  data.tar.gz: 7fc7d4293552a2437282d50682fba461254ee82343dcbf2ce96f992c09f6ecfbcd25592899bf688fa2e1f8b3381b888d43a2fd108f090026a1e340ad782e7869
+  metadata.gz: 411b917c23df28896f0271907fa26a8c994913e570d3354a1442c11d506bc81627f0190964b3f3be8720259609789010f44711d78d4f6a01b5d1a300fcf3b9e8
+  data.tar.gz: 7800b28b9761e32d43f77cb0b04915ae33c1eca8ff44b2c72361b6a6302bc3e3573d2872af906a563b8e73964c68cad37d5f14cd78509461ae096021976b92cd

data/.circleci/config.yml

@@ -4,7 +4,9 @@ jobs:
   test:
     docker:
       - image: "cimg/ruby:<< parameters.ruby_version >>"
-      - image: elasticsearch:6.8.23
+      - image: docker.elastic.co/elasticsearch/elasticsearch:7.17.18
+        environment:
+          - discovery.type: single-node
     parameters:
       ruby_version:
         type: string
@@ -29,4 +31,4 @@ workflows:
       - test:
           matrix:
             parameters:
-              ruby_version: ["2.7"]
+              ruby_version: ["3.1"]

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ### Next Release
 
+### v7.0.0
+
+* [#40](https://github.com/artsy/estella/pull/40): compatibility with elasticsearch v7 - [@joeyAghion]
+
 ### v6.0.0
 
 * [#38](https://github.com/artsy/estella/pull/38): Support Elasticsearch 6.x - [@mzikherman]

data/README.md

@@ -9,7 +9,7 @@ Builds on [elasticsearch-model](https://github.com/elastic/elasticsearch-rails/t
 
 ## Compatibility
 
-This library is compatible with [Elasticsearch 1.5.x, 2.x](https://www.elastic.co/products/elasticsearch) when using versions `2.0.0` and earlier.  It is compatible with Elasticsearch 5.x via version `5.0.0` or installing directly from the `main` branch of this repository. It works with many ORM/ODMs, including ActiveRecord and Mongoid.
+This library is compatible with [Elasticsearch 1.5.x, 2.x](https://www.elastic.co/products/elasticsearch) when using versions `2.0.0` and earlier.  It is compatible with Elasticsearch 6.x via version `6.0.0`. It is compatible with Elasticsearch 7.x via version `7.0.0` or installing directly from the `main` branch of this repository. It works with many ORM/ODMs, including ActiveRecord and Mongoid.
 
 ## Dependencies
 

data/estella.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency 'activemodel'
   gem.add_runtime_dependency 'activesupport'
-  gem.add_runtime_dependency 'elasticsearch-model', '~> 6.0'
+  gem.add_runtime_dependency 'elasticsearch-model', '~> 7.0'
 
   gem.add_development_dependency 'activerecord'
   gem.add_development_dependency 'pry'

data/lib/estella/helpers.rb

@@ -63,7 +63,7 @@ module Estella
 
       def bulk_index(batch_of_ids)
         create_index! unless index_exists?
-        __elasticsearch__.client.bulk index: index_name, type: document_type, body: batch_to_bulk(batch_of_ids)
+        __elasticsearch__.client.bulk index: index_name, body: batch_to_bulk(batch_of_ids)
       end
 
       # @return true if the index exists
@@ -98,7 +98,7 @@ module Estella
       end
 
       def es_delete_document(id)
-        __elasticsearch__.client.delete type: document_type, id: id, index: index_name
+        __elasticsearch__.client.delete id: id, index: index_name
       end
     end
   end

data/lib/estella/version.rb

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

data/spec/searchable_spec.rb

@@ -20,8 +20,6 @@ describe Estella::Searchable, type: :model do
           'foo'
         end
 
-        document_type 'searchable_model'
-
         searchable do
           field :title, type: :text, analysis: Estella::Analysis::FULLTEXT_ANALYSIS, factor: 1.0
           field :keywords, type: :text, analysis: %i[default snowball], factor: 0.5
@@ -80,7 +78,7 @@ describe Estella::Searchable, type: :model do
     it 'indexes slug field by default' do
       SearchableModel.create(title: 'liapunov', slug: 'liapunov')
       SearchableModel.refresh_index!
-      expect(SearchableModel.mappings.to_hash[:searchable_model][:properties].key?(:slug)).to eq true
+      expect(SearchableModel.mappings.to_hash[:properties].key?(:slug)).to eq true
     end
     it 'supports boolean filters' do
       liapunov = SearchableModel.create(title: 'liapunov', published: true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: estella
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 7.0.0
 platform: ruby
 authors:
 - Anil Bawa-Cavia
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-27 00:00:00.000000000 Z
+date: 2024-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -200,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.5.6
 signing_key:
 specification_version: 4
 summary: Make your Ruby objects searchable with Elasticsearch.