qiita-elasticsearch 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f70a16904b46ae70d71fd2c397a78f8252c04c0
-  data.tar.gz: 0da3883804dfa7142399a83ad16aa2f70a65711d
+  metadata.gz: 2fabbdb6cb1e979825d0a26bd12111dd8f6976f2
+  data.tar.gz: e77f04f00822dbac45cc3c5d7efb0f0d8223b8dc
 SHA512:
-  metadata.gz: d75c39415180eeadec234d201bcbc9707780664595895d8afca43b0321ce111248dea3c809528c0aa9ef619735bf518335790d07e407e18716a69ed008ecedfc
-  data.tar.gz: 84bb7676429cd15af3b5efae5601a225120b24546b85b82439d7005be41dd51b1270771faa066a6096a357950be0a5050da69a9d6a31b6742cb11d2eafc08f68
+  metadata.gz: 67abae98b1f5068a3c9cca3e5c2b86aaebae7990e2580dc0025a5f89eefc50f88b567b0374d866232c072206ad6e646beebe4cb15f8f9ba7ea587ee628baa84f
+  data.tar.gz: d0de917ab45b6924416acfb777f9641b8a7a3de67b1b485276b28072905eea19e5b8b215f0e2f467904c2bcbaec3f163360a1991d3007257228a4b1eb3c7e106

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+## 0.1.1
+- Support hierarchal fields
+
+## 0.1.0
+- 1st Release

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

@@ -5,8 +5,10 @@ module Qiita
     module Nodes
       class BoolQueryNode
         # @param [Array<Qiita::Elasticsearch::Tokens>] tokens
+        # @param [Array<String>, nil] hierarchal_fields
         # @param [Array<String>, nil] matchable_fields
-        def initialize(tokens, matchable_fields: nil)
+        def initialize(tokens, hierarchal_fields: nil, matchable_fields: nil)
+          @hierarchal_fields = hierarchal_fields
           @matchable_fields = matchable_fields
           @tokens = tokens
         end
@@ -42,7 +44,11 @@ module Qiita
 
         def must_not_queries
           must_not_tokens.map do |token|
-            Nodes::TokenNode.new(token, matchable_fields: @matchable_fields).to_hash
+            Nodes::TokenNode.new(
+              token,
+              hierarchal_fields: @hierarchal_fields,
+              matchable_fields: @matchable_fields,
+            ).to_hash
           end
         end
 
@@ -51,12 +57,20 @@ module Qiita
         end
 
         def must_query
-          Nodes::TokenNode.new(must_tokens.first, matchable_fields: @matchable_fields).to_hash
+          Nodes::TokenNode.new(
+            must_tokens.first,
+            hierarchal_fields: @hierarchal_fields,
+            matchable_fields: @matchable_fields,
+          ).to_hash
         end
 
         def must_queries
           must_tokens.map do |token|
-            Nodes::TokenNode.new(token, matchable_fields: @matchable_fields).to_hash
+            Nodes::TokenNode.new(
+              token,
+              hierarchal_fields: @hierarchal_fields,
+              matchable_fields: @matchable_fields,
+            ).to_hash
           end
         end
 
@@ -65,12 +79,18 @@ module Qiita
         end
 
         def should_query
-          Nodes::TokenNode.new(should_tokens.first, matchable_fields: @matchable_fields).to_hash
+          Nodes::TokenNode.new(
+            should_tokens.first,
+            matchable_fields: @matchable_fields,
+          ).to_hash
         end
 
         def should_queries
           should_tokens.map do |token|
-            Nodes::TokenNode.new(token, matchable_fields: @matchable_fields).to_hash
+            Nodes::TokenNode.new(
+              token,
+              matchable_fields: @matchable_fields,
+            ).to_hash
           end
         end
 

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

@@ -2,25 +2,60 @@ module Qiita
   module Elasticsearch
     module Nodes
       class FilterQueryNode
+        DEFAULT_HIERARCHAL_FIELDS = []
+
         # @param [Qiita::Elasticsearch::Token] token
-        def initialize(token)
+        def initialize(token, hierarchal_fields: nil)
+          @hierarchal_fields = hierarchal_fields
           @token = token
         end
 
         # @return [Hash]
         def to_hash
-          {
-            "filtered" => {
-              "filter" => {
-                "term" => {
-                  @token.field_name => @token.term,
+          if has_hierarchal_token?
+            {
+              "filtered" => {
+                "filter" => {
+                  "bool" => {
+                    "should" => [
+                      "prefix" => {
+                        @token.field_name => @token.term + "/",
+                      },
+                      "term" => {
+                        @token.field_name => @token.term,
+                      },
+                    ],
+                  },
+                },
+                "query" => {
+                  "match_all" => {},
                 },
               },
-              "query" => {
-                "match_all" => {},
+            }
+          else
+            {
+              "filtered" => {
+                "filter" => {
+                  "term" => {
+                    @token.field_name => @token.term,
+                  },
+                },
+                "query" => {
+                  "match_all" => {},
+                },
               },
-            },
-          }
+            }
+          end
+        end
+
+        private
+
+        def has_hierarchal_token?
+          hierarchal_fields.include?(@token.field_name)
+        end
+
+        def hierarchal_fields
+          @hierarchal_fields || DEFAULT_HIERARCHAL_FIELDS
         end
       end
     end

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

@@ -6,8 +6,10 @@ module Qiita
     module Nodes
       class OrSeparatableNode
         # @param [Array<Qiita::Elasticsearch::Tokens>] tokens
+        # @param [Array<String>, nil] hierarchal_fields
         # @param [Array<String>, nil] matchable_fields
-        def initialize(tokens, matchable_fields: nil)
+        def initialize(tokens, hierarchal_fields: nil, matchable_fields: nil)
+          @hierarchal_fields = hierarchal_fields
           @matchable_fields = matchable_fields
           @tokens = tokens
         end
@@ -19,6 +21,7 @@ module Qiita
           when 1
             Nodes::BoolQueryNode.new(
               tokens_grouped_by_or_token.first,
+              hierarchal_fields: @hierarchal_fields,
               matchable_fields: @matchable_fields,
             ).to_hash
           else
@@ -27,6 +30,7 @@ module Qiita
                 "should" => tokens_grouped_by_or_token.map do |tokens|
                   Nodes::BoolQueryNode.new(
                     tokens,
+                    hierarchal_fields: @hierarchal_fields,
                     matchable_fields: @matchable_fields,
                   ).to_hash
                 end,

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

@@ -6,15 +6,17 @@ module Qiita
     module Nodes
       class TokenNode
         # @param [Qiita::Elasticsearch::Token] token
+        # @param [Array<String>, nil] hierarchal_fields
         # @param [Array<String>, nil] matchable_fields
-        def initialize(token, matchable_fields: nil)
+        def initialize(token, hierarchal_fields: nil, matchable_fields: nil)
+          @hierarchal_fields = hierarchal_fields
           @matchable_fields = matchable_fields
           @token = token
         end
 
         def to_hash
           if @token.field_name
-            FilterQueryNode.new(@token).to_hash
+            FilterQueryNode.new(@token, hierarchal_fields: @hierarchal_fields).to_hash
           else
             MatchQueryNode.new(@token, matchable_fields: @matchable_fields).to_hash
           end

data/lib/qiita/elasticsearch/query_builder.rb

@@ -5,11 +5,13 @@ require "qiita/elasticsearch/parser"
 module Qiita
   module Elasticsearch
     class QueryBuilder
-      # @param [Array<String>, nil] matchable_fields
       # @param [Array<String>, nil] filterable_fields
-      def initialize(matchable_fields: nil, filterable_fields: nil)
-        @matchable_fields = matchable_fields
+      # @param [Array<String>, nil] hierarchal_fields
+      # @param [Array<String>, nil] matchable_fields
+      def initialize(hierarchal_fields: nil, filterable_fields: nil, matchable_fields: nil)
+        @hierarchal_fields = hierarchal_fields
         @filterable_fields = filterable_fields
+        @matchable_fields = matchable_fields
       end
 
       # @param [String] query_string Raw query string
@@ -21,6 +23,7 @@ module Qiita
         else
           Nodes::OrSeparatableNode.new(
             tokens,
+            hierarchal_fields: @hierarchal_fields,
             matchable_fields: @matchable_fields,
           ).to_hash
         end

data/lib/qiita/elasticsearch/version.rb

@@ -1,5 +1,5 @@
 module Qiita
   module Elasticsearch
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qiita-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Ryo Nakamura
@@ -91,6 +91,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md