qiita-elasticsearch 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ac89f9676b05d247337d139e417cb55d449152c
-  data.tar.gz: 44965231890460369545280221bedb008090743a
+  metadata.gz: 0a225c93fa93597ae9e657f831c78634f62e9711
+  data.tar.gz: ddb1511db2dfbab4acee9620923122be71cdfd23
 SHA512:
-  metadata.gz: 0b507ea1cffce78984dd9e59a0d22b61727d1331a602f094b6731fe8784810495c3e65d09ffde4fce3c41dd9f747ed13087af9f400eefb677f8e8a8212eee030
-  data.tar.gz: 02286a98b45cfaca0f8bd6570d39faf5d3f21f68ca8b5cffa27a1430f00d7ec857ff25cf90032a68da59e6f48adc7c4a1285afa7505dd19e6127ae9b3c8d3119
+  metadata.gz: 5c40b70ba9228a3bd8ae4b7fcdb6844855b9bf82ff5b5d64ca54af4d5b7a25d244abb915818b15a67ca1a33e0aa0a3c4572ffa24f60b7c0850ede6d43acab1a3
+  data.tar.gz: 083a96e045dc6aa7ca897a7b3bb03e6bdc7fe45f8f22ed08326cd07416bb2f64790067af47613bca271abc4f06be6327c1e0e6d15e6c5c0ec1b4ff24b3f42db3

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.6.0
+- Change `Query#to_hash` behavior and support sort option
+
 ## 0.5.0
 - Change `QueryBuilder#build` to return `Query` object
 

data/lib/qiita/elasticsearch/nodes/or_separatable_node.rb

@@ -31,7 +31,7 @@ module Qiita
 
         # @return [Array<Array<Qiita::Elasticsearch::Token>>]
         def tokens_grouped_by_or_token
-          @tokens_grouped_by_or_token ||= @tokens.reject(&:ignorable?).each_with_object([[]]) do |token, groups|
+          @tokens_grouped_by_or_token ||= @tokens.select(&:query?).each_with_object([[]]) do |token, groups|
             if token.or?
               groups << []
             else

data/lib/qiita/elasticsearch/query.rb

@@ -1,3 +1,4 @@
+require "active_support/core_ext/object/try"
 require "qiita/elasticsearch/nodes/null_node"
 require "qiita/elasticsearch/nodes/or_separatable_node"
 require "qiita/elasticsearch/tokenizer"
@@ -5,6 +6,8 @@ require "qiita/elasticsearch/tokenizer"
 module Qiita
   module Elasticsearch
     class Query
+      DEFAULT_SORT = ["_score"]
+
       # @param [Array<Qiita::Elasticsearch::Token>] tokens
       # @param [Hash] query_builder_options For building new query from this query
       def initialize(tokens, query_builder_options = nil)
@@ -41,9 +44,8 @@ module Qiita
         end
       end
 
-      # @return [Hash]
-      # @example query.to_hash
-      def to_hash
+      # @return [Hash] query property for request body for Elasticsearch
+      def query
         if has_empty_tokens?
           Nodes::NullNode.new.to_hash
         else
@@ -51,6 +53,32 @@ module Qiita
         end
       end
 
+      # @return [Array] sort property for request body for Elasticsearch
+      def sort
+        case @tokens.select(&:sort?).last.try(:term)
+        when "created-asc"
+          [{ "created_at" => "asc" }, "_score"]
+        when "created-desc"
+          [{ "created_at" => "desc" }, "_score"]
+        when "related-asc"
+          [{ "_score" => "desc" }]
+        when "stocks-asc"
+          [{ "stocks" => "asc" }, "_score"]
+        when "stocks-desc"
+          [{ "stocks" => "desc" }, "_score"]
+        else
+          DEFAULT_SORT
+        end
+      end
+
+      # @return [Hash] request body for Elasticsearch
+      def to_hash
+        {
+          "query" => query,
+          "sort" => sort,
+        }
+      end
+
       # @return [String] query string generated from its tokens
       def to_s
         @tokens.join(" ")

data/lib/qiita/elasticsearch/token.rb

@@ -31,9 +31,9 @@ module Qiita
         !field_name.nil? || negative?
       end
 
-      # @return [true, false] True if this token is ignorable on building query (e.g. "-stocked:foo")
-      def ignorable?
-        negative? && !field_name.nil? && has_invalid_term?
+      # @return [true, false] True if this token is for query
+      def query?
+        !sort? && !ignorable?
       end
 
       def must?
@@ -82,6 +82,12 @@ module Qiita
         !!@quoted
       end
 
+      # @note Override me
+      # @return [true, false] True if this token is for sort order (e.g. "sort:created-asc")
+      def sort?
+        field_name == "sort"
+      end
+
       # @note Override me
       def to_hash
         fail NotImplementedError
@@ -100,6 +106,11 @@ module Qiita
       def has_invalid_term?
         false
       end
+
+      # @return [true, false] True if this token has no meaning
+      def ignorable?
+        negative? && !field_name.nil? && has_invalid_term?
+      end
     end
   end
 end

data/lib/qiita/elasticsearch/version.rb

@@ -1,5 +1,5 @@
 module Qiita
   module Elasticsearch
-    VERSION = "0.5.0"
+    VERSION = "0.6.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qiita-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Ryo Nakamura