eagle_search 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e21ce462612e7c5a124aa8781336ebba2c89edc
-  data.tar.gz: 48b7434bd94a89894b021d1382c249e27cd5bafc
+  metadata.gz: 82100c3686ba2e322eab5ac86fb4a23c873461bf
+  data.tar.gz: 88ab75d5c91d735f651f3e60ba862a3e71001ffa
 SHA512:
-  metadata.gz: 45a6fc3434a82ae76d15a18b92582c5d56dabd9a3bda886c4fb8d82c8a0080de7a084f278235c3d8a85ce871dad2a061f3d1119f440f0732a943d5891b962b0b
-  data.tar.gz: 33b30abb5aec2dc362e68a8663eed49dd1b02c2bd5e948aad9f185517ac489a8a61462d19a6f68cae7fa23395a8214798244e1662947f4409c65532ed90cd103
+  metadata.gz: 55d7926ec810c5139670e3bc9ea83b11e1fbae69ff42a653b6e0513c5cbeb751f10df6cf47e7bba79c03dad240eaa4118620c68b8b8677481b9998db3ca22020
+  data.tar.gz: a78979c0e9f6c4bd2afa383e47e87e6dd978c12cb15252c0a4f3d5f24cb5116406083bd94644127507c030b6b707c273a1c3ae24c26fe0a02c6a85df090a6ec9

data/lib/eagle_search/field.rb

@@ -18,12 +18,27 @@ module EagleSearch
           else
             mapping[:index] = "analyzed"
             mapping[:analyzer] = index_settings[:language] || "english"
+
             mapping[:fields] = {
               shingle: {
                 type: "string",
                 analyzer: "eagle_search_shingle_analyzer"
+              },
+              autocomplete: {
+                type: "string",
+                index_analyzer: "eagle_search_autocomplete_analyzer",
+                search_analyzer: index_settings[:language] || "english"
               }
             }
+
+            mapping[:fields].merge!(
+              {
+                synonym: {
+                  type: "string",
+                  analyzer: "eagle_search_synonym_analyzer"
+                }
+              }
+            ) if @index.has_synonyms?
           end
         end
       end

data/lib/eagle_search/index.rb

@@ -78,6 +78,10 @@ module EagleSearch
       end
     end
 
+    def has_synonyms?
+      @settings[:synonyms]
+    end
+
     private
     def body
       body = {
@@ -92,13 +96,18 @@ module EagleSearch
     end
 
     def analysis_settings
-      {
+      default_analysis = {
         filter: {
           eagle_search_shingle_filter: {
             type: "shingle",
             min_shingle_size: 2,
             max_shingle_size: 2,
             output_unigrams: false
+          },
+          eagle_search_autocomplete_filter: {
+            type: "edge_ngram",
+            min_gram: 1,
+            max_gram: 20
           }
         },
         analyzer: {
@@ -109,9 +118,46 @@ module EagleSearch
               "lowercase",
               "eagle_search_shingle_filter"
             ]
+          },
+          eagle_search_autocomplete_analyzer: {
+            tokenizer: "standard",
+            filter: ["lowercase", "eagle_search_autocomplete_filter"]
           }
         }
       }
+      merge_synonyms!(default_analysis)
+      default_analysis
+    end
+
+    def merge_synonyms!(default_analysis)
+      if has_synonyms?
+        default_analysis[:filter]["eagle_search_synonym_filter"] = {}
+        default_analysis[:analyzer].merge!(
+          {
+            eagle_search_synonym_analyzer: {
+              tokenizer: "standard",
+              filter: ["lowercase", "eagle_search_synonym_filter"]
+            }
+          }
+        )
+
+        default_analysis[:filter]["eagle_search_synonym_filter"].merge!(
+          synonym_payload(@settings[:synonyms])
+        )
+      end
+    end
+
+    def synonym_payload(synonyms)
+      if synonyms.is_a?(Array)
+        {
+          type: "synonym",
+          synonyms: synonyms
+        }
+      else
+        {
+          type: "synonym"
+        }.merge(synonyms)
+      end
     end
 
     def klass

data/lib/eagle_search/interpreter.rb

@@ -32,9 +32,33 @@ module EagleSearch
       #size
       payload.merge!({ size: @options[:per_page] }) if @options[:per_page]
 
+      #highlight
+      if @options[:highlight] && @options[:highlight][:fields]
+        highlight = {
+          fields: {}
+        }
+        @options[:highlight][:fields].each do |field|
+          highlight[:fields][field] = {}
+        end
+
+        if @options[:highlight][:tags]
+          highlight[:pre_tags] = @options[:highlight][:tags]
+          highlight[:post_tags] = @options[:highlight][:tags].map { |tag| tag.gsub(/</, "</")}
+        end
+
+        payload.merge!(highlight: highlight)
+      end
+
       payload
     end
 
+    {
+      highlight: {
+        fields: [:a, :b, :c],
+        tags: ["<xpto>"]
+      }
+    }
+
     private
     def query_payload
       if @options[:custom_query]

data/lib/eagle_search/interpreter/query.rb

@@ -64,8 +64,32 @@ module EagleSearch
         match_queries << {
           match: {
             "#{ field_name }.shingle" => {
+              query: @query
+            }
+          }
+        }
+
+        match_queries << {
+          match: {
+            "#{ field_name }.synonym" => {
+              query: @query
+            }
+          }
+        } if @index.has_synonyms?
+
+        match_queries << {
+          match: {
+            "#{ field_name }.autocomplete" => {
+              query: @query
+            }
+          }
+        } if @options[:autocomplete].nil? || @options[:autocomplete]
+
+        match_queries << {
+          match: {
+            "#{ field_name }" => {
               query: @query,
-              boost: 3
+              fuzziness: "AUTO"
             }
           }
         }
@@ -81,7 +105,7 @@ module EagleSearch
     end
 
     def build_term_queries
-      return unless not_analyzed_properties
+      return if not_analyzed_properties.empty?
 
       term_queries = []
       not_analyzed_properties.keys.each do |field_name|
@@ -89,7 +113,7 @@ module EagleSearch
           term: {
             field_name => {
               value: @query,
-              boost: 5
+              boost: 3
             }
           }
         }
@@ -102,7 +126,7 @@ module EagleSearch
       }
 
       if @query_payload[:bool]
-        @query_payload[:bool][:should][1][:bool][:should] << payload
+        @query_payload[:bool][:should] << payload
       else
         @query_payload = payload
       end

data/lib/eagle_search/response.rb

@@ -26,6 +26,9 @@ module EagleSearch
     end
 
     def hits
+      @response["hits"]["hits"].each_with_index do |h, index|
+        @response["hits"]["hits"][index]["highlight"] = Hash[h["highlight"].map { |field, value| [field, value.first] }] if @response["hits"]["hits"][index]["highlight"]
+      end if @response["hits"]["hits"]
       @response["hits"]["hits"]
     end
 

data/lib/eagle_search/version.rb

@@ -1,3 +1,3 @@
 module EagleSearch
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eagle_search
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Igor Belo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-30 00:00:00.000000000 Z
+date: 2015-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch