qiita-elasticsearch 0.14.1 → 0.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e852197dfad43b0c2230341419e69f091f689ddd
-  data.tar.gz: 8ddb459eff2ee0089d157c11768f819f6e898705
+  metadata.gz: ae5f80e83a36a13265613558a8c0ac97e8723850
+  data.tar.gz: a2ec7213540de6dda2a2e5004cffa09bd5eccc68
 SHA512:
-  metadata.gz: 1ad2bf864ecf37539f5f0f9a0ce090783d2dc4def9b048d77225685b118d14708421cc394abf6e8979d9d8396f5ec770189b4d65e1e3165cdb089181139309fd
-  data.tar.gz: a20121e19b23be7149e2f473d403358b2448b29d076fdd2dcba23f5a30027e2bf75cdcac35db8e119ae9964053cec11e4b2812666b5a1f52f09a661fef035803
+  metadata.gz: fc9aa9b37c7bf0b96f95fdff0d985c4020cf15c510e4c0036496de00e40ad71c8d889c59d33f9605a3139a897a0dbc6a0d549612effac1cb2682212a285849b2
+  data.tar.gz: 4e95b016526f3144eb336fe04f8d4fc275aeecd992338ad863f4a6c677e4fbebef7b65c31b4d15eabab7eba59a822fb7f0181837b78c113e8f840737498c52df

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.14.2
+- Combine phrase and best_fields queries for unquoted matchable token
+
 ## 0.14.1
 - Nest match query with "query" property in must not
 

data/lib/qiita/elasticsearch/matchable_token.rb

@@ -3,27 +3,39 @@ require "qiita/elasticsearch/token"
 module Qiita
   module Elasticsearch
     class MatchableToken < Token
+      RELATIVE_BEST_FIELDS_QUERY_WEIGHT = 0.5
+
       attr_writer :matchable_fields
 
       # @return [Hash]
       def to_hash
-        if @matchable_fields.nil?
-          {
-            quoted? ? "match_phrase" : "match" => {
-              "_all" => @term,
-            }
-          }
+        if quoted?
+          build_multi_match_query(type: "phrase")
         else
-          hash = {
-            "multi_match" => {
-              "fields" => @matchable_fields,
-              "query" => @term,
+          {
+            "bool" => {
+              "should" => [
+                build_multi_match_query(type: "phrase"),
+                build_multi_match_query(type: "best_fields", boost: RELATIVE_BEST_FIELDS_QUERY_WEIGHT),
+              ],
             },
           }
-          hash["multi_match"]["type"] = "phrase" if quoted?
-          hash
         end
       end
+
+      private
+
+      # @return [Hash]
+      def build_multi_match_query(type: nil, boost: 1)
+        {
+          "multi_match" => {
+            "boost" => boost,
+            "fields" => @matchable_fields || ["_all"],
+            "query" => @term,
+            "type" => type,
+          },
+        }
+      end
     end
   end
 end

data/lib/qiita/elasticsearch/version.rb

@@ -1,5 +1,5 @@
 module Qiita
   module Elasticsearch
-    VERSION = "0.14.1"
+    VERSION = "0.14.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qiita-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.14.2
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-21 00:00:00.000000000 Z
+date: 2015-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Elasticsearch client helper for Qiita.