qiita-elasticsearch 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f39699ec977541d65c4ee8418fb0f3421b7ea3b8
-  data.tar.gz: 050835abda85a07822f5b4d4dba83b8fcb9c3a7b
+  metadata.gz: 333733578e54d24085a56f2fd3fbfc1ab2f470f7
+  data.tar.gz: c9941d2326ff2b8b342b7376ce7ed1403a28ffe1
 SHA512:
-  metadata.gz: a7b6f0354481c6cc810467734c569c4e5d93bb86b2800421186d6d9ad306637ff37763598a36036c19c09cf62e2eeb2d39cc5e184519f67bed5cf3138dbc3fcd
-  data.tar.gz: 394fd0a5cd2acab4aefc683bbf938b1275fd434d9c1018eafe2f947975693164dc8f7ab65ca26986be86055a1e82cc973b25d93b78ea9f9c7149ee15fda6b6cf
+  metadata.gz: 913f66abcacb21fa9d4e4275b836932d2ff314fa60a434362aa40febe8b90dd33f554d8af6ac90aa5eec33eb7eb9d1f1db11064aa06f53f9faead14a4cfc505c
+  data.tar.gz: 52e29cda8406122a3b9d62be825f7e0e67e4367740894e8c08d49adbcf2d596909a53231acde2ab8881b62f3d0f9b4457de14a0e19d764974bd85b21e4b21163

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.8.0
+- Add is:project & is:article tokens
+
 ## 0.7.1
 - Take empty token query as any matcher
 

data/lib/qiita/elasticsearch/filterable_token.rb

@@ -7,12 +7,19 @@ module Qiita
 
       # @return [Hash]
       def to_hash
-        if field_name == "is" && term == "coediting"
+        case
+        when coediting?
           {
             "term" => {
               "edit_permission" => EDIT_PERMISSION_COEDITING,
             },
           }
+        when type?
+          {
+            "type" => {
+              "value" => type,
+            },
+          }
         else
           {
             "term" => {
@@ -21,6 +28,34 @@ module Qiita
           }
         end
       end
+
+      # @return [String] actual type name on Elasticsearch
+      def type
+        if article_type?
+          "team_item"
+        else
+          term
+        end
+      end
+
+      # @note Override
+      def type?
+        article_type? || project_type?
+      end
+
+      private
+
+      def article_type?
+        field_name == "is" && term == "article"
+      end
+
+      def coediting?
+        field_name == "is" && term == "coediting"
+      end
+
+      def project_type?
+        field_name == "is" && term == "project"
+      end
     end
   end
 end

data/lib/qiita/elasticsearch/query.rb

@@ -84,6 +84,11 @@ module Qiita
         @tokens.join(" ")
       end
 
+      # @return [String, nil] last positive type name in query string
+      def type
+        @tokens.select(&:type?).select(&:positive?).last.try(:type)
+      end
+
       # @param [String] field_name
       # @param [String] term
       # @return [Qiita::Elasticsearch::Query]

data/lib/qiita/elasticsearch/token.rb

@@ -1,7 +1,17 @@
 module Qiita
   module Elasticsearch
     class Token
-      attr_reader :field_name, :term
+      # @return [String, nil]
+      # @note `xxxxxxxxxxxx:yyyyyyyyyyy`
+      #        ^^^^^^^^^^^^
+      #         field_name
+      attr_reader :field_name
+
+      # @return [String]
+      # @note `xxxxxxxxxxxx:yyyyyyyyyyy`
+      #                     ^^^^^^^^^^^
+      #                        term
+      attr_reader :term
 
       # @param [true, false] downcased True if given term must be downcased on query representation
       # @param [String, nil] field_name Field name part
@@ -99,6 +109,12 @@ module Qiita
         @token_string.to_s
       end
 
+      # @note Override me if needed
+      # @return [true, false]
+      def type?
+        false
+      end
+
       private
 
       # @note Override me if needed

data/lib/qiita/elasticsearch/version.rb

@@ -1,5 +1,5 @@
 module Qiita
   module Elasticsearch
-    VERSION = "0.7.1"
+    VERSION = "0.8.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qiita-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-28 00:00:00.000000000 Z
+date: 2015-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport