qiita-elasticsearch 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a225c93fa93597ae9e657f831c78634f62e9711
-  data.tar.gz: ddb1511db2dfbab4acee9620923122be71cdfd23
+  metadata.gz: 2401f130b8898fe667da24ced430b7a6b27ebf3b
+  data.tar.gz: 9e8f3e9749b77ae32765f1c8837cb5ea796584da
 SHA512:
-  metadata.gz: 5c40b70ba9228a3bd8ae4b7fcdb6844855b9bf82ff5b5d64ca54af4d5b7a25d244abb915818b15a67ca1a33e0aa0a3c4572ffa24f60b7c0850ede6d43acab1a3
-  data.tar.gz: 083a96e045dc6aa7ca897a7b3bb03e6bdc7fe45f8f22ed08326cd07416bb2f64790067af47613bca271abc4f06be6327c1e0e6d15e6c5c0ec1b4ff24b3f42db3
+  metadata.gz: e560c3b18f170169dec4d93e3a3570ad02cbb95eec3f43540b010f92123729c4b26d74aa00490472b0728371280e9718645a8adabcebf97382755f93825f108a
+  data.tar.gz: e7bc6318e4a946680004adedffe1d294bb5e4fa090be530bd1ba36c5304a42b515b65dedc5db0ae557b029d7ac107cb8ad5c1ccf16184c7253a9153585d65b08

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.7.0
+- Support `is:coediting` query
+- Change default sort order with created-desc
+- Improve some filter options and Query methods
+
 ## 0.6.0
 - Change `Query#to_hash` behavior and support sort option
 

data/lib/qiita/elasticsearch/filterable_token.rb

@@ -3,13 +3,23 @@ require "qiita/elasticsearch/token"
 module Qiita
   module Elasticsearch
     class FilterableToken < Token
+      EDIT_PERMISSION_COEDITING = 2
+
       # @return [Hash]
       def to_hash
-        {
-          "term" => {
-            @field_name => proper_cased_term,
-          },
-        }
+        if field_name == "is" && term == "coediting"
+          {
+            "term" => {
+              "edit_permission" => EDIT_PERMISSION_COEDITING,
+            },
+          }
+        else
+          {
+            "term" => {
+              @field_name => proper_cased_term,
+            },
+          }
+        end
       end
     end
   end

data/lib/qiita/elasticsearch/query.rb

@@ -6,7 +6,7 @@ require "qiita/elasticsearch/tokenizer"
 module Qiita
   module Elasticsearch
     class Query
-      DEFAULT_SORT = ["_score"]
+      DEFAULT_SORT = [{ "created_at" => "desc" }, "_score"]
 
       # @param [Array<Qiita::Elasticsearch::Token>] tokens
       # @param [Hash] query_builder_options For building new query from this query
@@ -20,7 +20,11 @@ module Qiita
       # @return [Qiita::Elasticsearch::Query]
       # @example query.append_field_token(field_name: "tag", term: "Ruby")
       def append_field_token(field_name: nil, term: nil)
-        build_query([*@tokens, "#{field_name}:#{term}"].join(" "))
+        if has_field_token?(field_name: field_name, term: term)
+          self
+        else
+          build_query([*@tokens, "#{field_name}:#{term}"].join(" "))
+        end
       end
 
       # @param [String] field_name
@@ -30,7 +34,7 @@ module Qiita
       def delete_field_token(field_name: nil, term: nil)
         build_query(
           @tokens.reject do |token|
-            token.field_name == field_name && token.term == term
+            (field_name.nil? || token.field_name == field_name) && (term.nil? || token.term == term)
           end.join(" ")
         )
       end
@@ -40,7 +44,7 @@ module Qiita
       # @example query.has_field_token?(field_name: "tag", term: "Ruby")
       def has_field_token?(field_name: nil, term: nil)
         @tokens.any? do |token|
-          token.field_name == field_name && token.term == term
+          (field_name.nil? || token.field_name == field_name) && (term.nil? || token.term == term)
         end
       end
 
@@ -58,9 +62,9 @@ module Qiita
         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"]
+        when "related-desc"
           [{ "_score" => "desc" }]
         when "stocks-asc"
           [{ "stocks" => "asc" }, "_score"]

data/lib/qiita/elasticsearch/tokenizer.rb

@@ -12,6 +12,7 @@ module Qiita
       DEFAULT_FILTERABLE_FIELDS = []
       DEFAULT_HIERARCHAL_FIELDS = []
       DEFAULT_INT_FIELDS = []
+      EXTRA_FILTERABLE_FIELDS = ["is", "sort"]
 
       TOKEN_PATTERN = /
         (?<token_string>
@@ -76,7 +77,7 @@ module Qiita
       end
 
       def filterable_fields
-        @filterable_fields || DEFAULT_FILTERABLE_FIELDS
+        (@filterable_fields || DEFAULT_FILTERABLE_FIELDS) | EXTRA_FILTERABLE_FIELDS
       end
 
       def hierarchal_fields

data/lib/qiita/elasticsearch/version.rb

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

metadata

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