qiita-elasticsearch 0.12.2 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0e8c3be6ee1a75216c518ded54d466262e988a5
-  data.tar.gz: 0f37da7110244b6ae1532998f0fffbf77aa6b075
+  metadata.gz: 679823f4145624653fd94e7765f6707ad1e225c8
+  data.tar.gz: 4710f39ec9aaabca981871c4f64e48b5c3621a9b
 SHA512:
-  metadata.gz: 4b75b6a88b6a1eb1f787513b3fc58eef95db5e612e24fc9753ab6a88063a43133a6ee8d874b1a151e26423c76b8e02424430cfe4b648b599f12976f821a25819
-  data.tar.gz: 48854b52b9f7d0028827725118dbd93af347059f2ecc47db3a9276efca60c052521a4465c52cb94498ed7f0bdd1ab0e72f600eba90d88bbf91b4a4dfff93e599
+  metadata.gz: 8ebc041790fb3001ab215b9ac6333bfe7f465b65616ed2175db49de74ba611ebb8f1b0fa275f65fe30faf030c96a82f3b454b9841095175c03be577a017a71a2
+  data.tar.gz: 20f4e0bb4bbda2e9a9b83938bec952e91a1bc3510c4663e7db4e746a6a5f7e6478ff8312a180a62fba8ca2065d3d260922ffcf10afc8398695ee629f306a2532

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.13.0
+- Improve `created:...` and `updated:` tokens
+
 ## 0.12.2
 - Change Query#sort_term behavior on unknown sort token
 

data/lib/qiita/elasticsearch/date_token.rb

@@ -21,6 +21,11 @@ module Qiita
         )?
       \z/x
 
+      FIELD_NAMES_TABLE = {
+        "created" => "created_at",
+        "updated" => "updated_at",
+      }
+
       attr_writer :time_zone
 
       # @return [Hash]
@@ -30,7 +35,7 @@ module Qiita
           if range_parameter
             {
               "range" => {
-                @field_name => {
+                converted_field_name => {
                   range_parameter => range_query,
                   "time_zone" => @time_zone,
                 }.reject do |key, value|
@@ -41,7 +46,7 @@ module Qiita
           else
             {
               "range" => {
-                @field_name => {
+                converted_field_name => {
                   "gte" => beginning_of_range.to_s,
                   "lt" => end_of_range.to_s,
                   "time_zone" => @time_zone,
@@ -71,6 +76,12 @@ module Qiita
           end
       end
 
+      # e.g. created:2000-01-01 -> created_at
+      # @return [String]
+      def converted_field_name
+        FIELD_NAMES_TABLE[@field_name] || @field_name
+      end
+
       def date_match
         @date_match ||= DATE_PATTERN.match(range_query || @term)
       end

data/lib/qiita/elasticsearch/tokenizer.rb

@@ -12,7 +12,8 @@ module Qiita
       DEFAULT_FILTERABLE_FIELDS = []
       DEFAULT_HIERARCHAL_FIELDS = []
       DEFAULT_INT_FIELDS = []
-      EXTRA_FILTERABLE_FIELDS = %w(is sort)
+      EXTRA_DATE_FIELDS = %w(created updated)
+      EXTRA_FILTERABLE_FIELDS = %w(created is sort updated)
 
       TOKEN_PATTERN = /
         (?<token_string>
@@ -69,7 +70,7 @@ module Qiita
       private
 
       def date_fields
-        @date_fields || DEFAULT_DATE_FIELDS
+        (@date_fields || DEFAULT_DATE_FIELDS) | EXTRA_DATE_FIELDS
       end
 
       def downcased_fields

data/lib/qiita/elasticsearch/version.rb

@@ -1,5 +1,5 @@
 module Qiita
   module Elasticsearch
-    VERSION = "0.12.2"
+    VERSION = "0.13.0"
   end
 end

metadata

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