estella 2.0.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 005678de72fb7aef97a46d6cbc64d198ea6104cb
-  data.tar.gz: d9dae12511d40cd83781a63946e0bf00c500165b
+  metadata.gz: 9f1958b160694e75e7771648c51db035971f5977
+  data.tar.gz: a178684df8dbcfdfbc73464aaac3c40cbdaf9611
 SHA512:
-  metadata.gz: da680ba976b1deb2ccc3a88185caaf3a95e36e0523da8fe9f29ddd1a085e33f56ede8a2deef3b7d48bf3386828c88fd37f26428f1cf36876bce4e69691a1f785
-  data.tar.gz: c2bd518ae2d407d72cdc78e130b63873c2dee8889987e81e481395a54abb771e4ba514304aeb59361c8e5af2ef1fa6dbc7d8097ef9a0ea4581d4c942abda4e16
+  metadata.gz: 7664182130bd8c9016e7d6a606e733a7d88039c97167247b46d48a01ee18ebb01fe36a88a6aa1c55bd5c702727e31bff6eaa740151fa1aaac48d1fbea7b7b031
+  data.tar.gz: 75e4fcbb9b614af1b498d5d143b3cc0508d9801cbb248d6231e8455fff27a42e096be8b5794b799406d35e0a3a09138f246ad15f241a5dad16dd3a0eb535e5e1

data/.rubocop_todo.yml

@@ -1,30 +1,30 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2017-01-27 12:52:56 -0500 using RuboCop version 0.47.1.
+# on 2019-05-20 16:29:39 -0400 using RuboCop version 0.60.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 1
+# Offense count: 3
 Metrics/AbcSize:
   Max: 18
 
 # Offense count: 3
 # Configuration parameters: CountComments, ExcludedMethods.
+# ExcludedMethods: refine
 Metrics/BlockLength:
   Max: 134
 
-# Offense count: 30
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 135
-
 # Offense count: 1
 # Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 103
+
+# Offense count: 1
+# Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
-  Max: 13
+  Max: 12
 
 # Offense count: 3
 # Cop supports --auto-correct.
@@ -65,8 +65,14 @@ Style/MutableConstant:
 
 # Offense count: 2
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Configuration parameters: EnforcedStyle.
 # SupportedStyles: only_raise, only_fail, semantic
 Style/SignalException:
   Exclude:
     - 'lib/estella/parser.rb'
+
+# Offense count: 30
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 135

data/.travis.yml

@@ -6,14 +6,12 @@ before_script:
   - bundle exec danger
 
 env:
-  - ELASTICSEARCH=https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/2.4.5/elasticsearch-2.4.5.deb
-  - ELASTICSEARCH=https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-1.7.6.deb
+  - ELASTICSEARCH=https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.6.16.deb
 
 before_install:
   - gem update --system
   - gem update bundler
   - curl -O $ELASTICSEARCH && sudo dpkg -i --force-confnew elasticsearch-*.deb
-  - "echo 'script.inline: on' | sudo tee -a /etc/elasticsearch/elasticsearch.yml"
   - sudo /etc/init.d/elasticsearch start
   - until curl --silent -XGET --fail http://localhost:9200; do printf '.'; sleep 1; done
 

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Changelog
 
+### 5.0.0
+
+* [#29](https://github.com/artsy/estella/pull/29): Support Elasticsearch 5.x - [@izakp](https://github.com/izakp).
+
 ### 2.0.0
 
 * [#25](https://github.com/artsy/estella/pull/25): Support ElasticSearch 1.5.x - [@dblock](https://github.com/dblock).

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', '~> 2.0'
+  gem.add_runtime_dependency 'elasticsearch-model', '~> 5.0'
 
   gem.add_development_dependency 'activerecord'
   gem.add_development_dependency 'rake', '~> 11.0'

data/lib/estella/analysis.rb

@@ -18,6 +18,9 @@ module Estella
     NGRAM_ANALYZER =
       { type: 'custom', tokenizer: 'standard_tokenizer', filter: %w[lowercase asciifolding front_ngram_filter] }
 
+    EMAIL_ANALYZER =
+      { type: 'custom', tokenizer: 'uax_url_email', filter: %w[lowercase stop] }
+
     DEFAULT_ANALYSIS = {
       tokenizer: {
         standard_tokenizer: { type: 'standard' }
@@ -30,15 +33,17 @@ module Estella
         snowball_analyzer: SNOWBALL_ANALYZER,
         shingle_analyzer: SHINGLE_ANALYZER,
         ngram_analyzer: NGRAM_ANALYZER,
+        email_analyzer: EMAIL_ANALYZER,
         search_analyzer: DEFAULT_ANALYZER
       }
     }
 
     DEFAULT_FIELDS = {
-      default: { type: 'string', analyzer: 'default_analyzer' },
-      snowball: { type: 'string', analyzer: 'snowball_analyzer' },
-      shingle: { type: 'string', analyzer: 'shingle_analyzer' },
-      ngram: { type: 'string', analyzer: 'ngram_analyzer', search_analyzer: 'search_analyzer' }
+      default: { type: 'text', analyzer: 'default_analyzer' },
+      snowball: { type: 'text', analyzer: 'snowball_analyzer' },
+      shingle: { type: 'text', analyzer: 'shingle_analyzer' },
+      ngram: { type: 'text', analyzer: 'ngram_analyzer', search_analyzer: 'search_analyzer' },
+      email: { type: 'text', analyzer: 'email_analyzer' }
     }
 
     DEFAULT_FIELD_FACTORS = {
@@ -46,7 +51,8 @@ module Estella
       ngram: 10,
       snowball: 3,
       shingle: 2,
-      search: 2
+      search: 2,
+      email: 2
     }
 
     FULLTEXT_ANALYSIS = DEFAULT_FIELDS.keys

data/lib/estella/parser.rb

@@ -18,7 +18,8 @@ module Estella
       using = opts[:using] || name
       analysis = opts[:analysis] & @model.default_analysis_fields.keys
       opts[:fields] ||= Hash[analysis.zip(@model.default_analysis_fields.values_at(*analysis))] if analysis
-
+      include_raw = opts.delete(:include_raw)
+      opts[:fields][:raw] = { type: 'keyword' } if include_raw
       @model.indexed_json.merge!(name => using)
       @model.indexed_fields.merge!(name => opts)
     end

data/lib/estella/query.rb

@@ -8,10 +8,7 @@ module Estella
       @params = params
       @query = {
         _source: false,
-        query: {},
-        filter: {
-          bool: { must: [], must_not: [] }
-        },
+        query: { bool: { must: [{ match_all: {} }], must_not: [], filter: [] } },
         aggregations: {}
       }
       add_query
@@ -21,14 +18,22 @@ module Estella
     end
 
     def must(filter)
-      query[:filter][:bool][:must] << filter
+      if query[:query][:function_score]
+        query[:query][:function_score][:query][:bool][:filter] << filter
+      else
+        query[:query][:bool][:filter] << filter
+      end
     end
 
     def exclude(filter)
-      query[:filter][:bool][:must_not] << filter
+      if query[:query][:function_score]
+        query[:query][:function_score][:query][:bool][:must_not] << filter
+      else
+        query[:query][:bool][:must_not] << filter
+      end
     end
 
-    def query_definition
+    def term_query_definition
       {
         multi_match: {
           type: 'most_fields',
@@ -50,18 +55,22 @@ module Estella
     end
 
     def add_query
-      if params[:term] && params[:indexed_fields]
-        add_term_query
-      else
-        query[:query] = { match_all: {} }
-      end
+      return unless params[:term] && params[:indexed_fields]
+
+      add_term_query
     end
 
     # fulltext search across all string fields
     def add_term_query
       query[:query] = {
         function_score: {
-          query: query_definition
+          query: {
+            bool: {
+              must: term_query_definition,
+              filter: [],
+              must_not: []
+            }
+          }
         }
       }
 
@@ -88,7 +97,7 @@ module Estella
     # boost them by factor if provided
     def term_search_fields
       params[:indexed_fields]
-        .select { |_, opts| opts[:type].to_s == 'string' }
+        .select { |_, opts| opts[:type].to_s == 'text' }
         .reject { |_, opts| opts[:analysis].nil? }
         .map do |field, opts|
           opts[:analysis].map do |analyzer|

data/lib/estella/searchable.rb

@@ -59,7 +59,7 @@ module Estella
       # indexes slug attribute by default
       def index_slug
         if defined? slug
-          indexed_fields.merge!(slug: { type: :string, index: :not_analyzed })
+          indexed_fields.merge!(slug: { type: :keyword })
           indexed_json.merge!(slug: :slug)
         end
       end
@@ -77,7 +77,7 @@ module Estella
         settings(settings) do
           mapping do
             indexed_fields.each do |name, opts|
-              indexes name, opts.except(:analysis, :using, :factor, :filter)
+              indexes name, opts.except(:analysis, :using, :factor, :filter, :include_raw)
             end
           end
         end

data/lib/estella/version.rb

@@ -1,3 +1,3 @@
 module Estella
-  VERSION = '2.0.0'
+  VERSION = '5.0.0'
 end

data/spec/searchable_spec.rb

@@ -18,8 +18,8 @@ describe Estella::Searchable, type: :model do
         end
 
         searchable do
-          field :title, type: :string, analysis: Estella::Analysis::FULLTEXT_ANALYSIS, factor: 1.0
-          field :keywords, type: :string, analysis: %i[default snowball], factor: 0.5
+          field :title, type: :text, analysis: Estella::Analysis::FULLTEXT_ANALYSIS, factor: 1.0
+          field :keywords, type: :text, analysis: %i[default snowball], factor: 0.5
           field :follows_count, type: :integer
           field :published, type: :boolean, filter: true
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: estella
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Anil Bawa-Cavia
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement