es-query-builder 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b7061462ef887c110a7362d082ecab6170d8800
-  data.tar.gz: 273dc7a2f14404b05e8bf8b573fb1f4af62650be
+  metadata.gz: 0edb42d41140c53d656101210a9d63faa5266a9e
+  data.tar.gz: 09fe5cc414ec2cc73c22b53248fc7c6b91b9d8e4
 SHA512:
-  metadata.gz: 19b39d4e940467281be485a915fa4333f808d903c0dac03d69206570a603f0b592b02e0950357b6cefb90f4229a62bc63ab884adae1394961e615aad981350a5
-  data.tar.gz: 36d828651c879de1cdfb76b59bbdc4de8772372c72845acd7fcfb8929a44ecbb3d1c6f4b824553d038cc75f26c432f96bda09bb2e589f2d3594a65eaf115f994
+  metadata.gz: 450f93cd9daf96706d47c7df13d581f9bb236912d8bbfc1e1e3f19025df1ff3e46d3e734e274b5785c7f8860e8f67b05c26b40acc96ebbe8d754b654557b40a7
+  data.tar.gz: 4d5d93a631b33bbdd549e5abfa424d15fa1c8b9fbdd149bad8446a956c0cc88a872539f96bfcb561251bcb99ae5e8b486501fbb65c161b143dd012f7065cacbd

data/.coverrails.yml

@@ -0,0 +1 @@
+service_name: travis-ci

data/Gemfile

@@ -2,3 +2,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in es-query-builder.gemspec
 gemspec
+
+group :test do
+  gem 'coveralls', require: false
+end

data/README.md

@@ -1,12 +1,14 @@
-[![Build Status](https://travis-ci.org/increments/es-query-builder.svg?branch=master)](https://travis-ci.org/increments/es-query-builder)
+# EsQueryBuilder
 
-NAME
-====
+[![Build Status](https://travis-ci.org/increments/es-query-builder.svg?branch=master)](https://travis-ci.org/increments/es-query-builder) [![Code Climate](https://codeclimate.com/github/increments/es-query-builder/badges/gpa.svg)](https://codeclimate.com/github/increments/es-query-builder) [![Coverage Status](https://coveralls.io/repos/increments/es-query-builder/badge.svg)](https://coveralls.io/r/increments/es-query-builder) [![Dependency Status](https://gemnasium.com/increments/es-query-builder.svg)](https://gemnasium.com/increments/es-query-builder)
 
-`EsQueryBuilder` - A query builder for Elasticsearch in Ruby.
+A query builder for Elasticsearch in Ruby.
 
-SYNOPSIS
-========
+## Usage
+
+```rb
+gem 'es-query-builder'
+```
 
 ```ruby
 builder = EsQueryBuilder.new(
@@ -39,23 +41,10 @@ client.search({
 # => #<Hash>
 ```
 
-DESCRIPTION
-===========
+## Description
 
 `EsQueryBuilder` converts a query string into a corresponding hash object for [elasticsearch-ruby](https://github.com/elasticsearch/elasticsearch-ruby).
 
 Elasticsearch supports [query_string query](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html) dsl which is very useful to use internally, but too powerful to use as public interface. Allowing anonymous users to use the dsl may cause not only performance problems but also security risks if your index includes secret types.
 
 This gem accepts the query_string-query-dsl-like string and converts the string into a query object using other query dsls. At the same time it sanitizes fields in the query.
-
-INSTALLATION
-============
-
-```bash
-gem install es-query-builder
-```
-
-LICENSE
-=======
-
-This software is licensed under [MIT license](https://github.com/increments/es-query-builder/tree/master/LICENSE.txt).

data/lib/es-query-builder/parser.rb

@@ -12,8 +12,8 @@ class EsQueryBuilder
   class Parser
     # Public: Construct the parser object.
     #
-    # query_fields     - An Array of Strings for specifing allowed quering
-    #                    types (default: []).
+    # all_query_fields - A String or an Array of Strings for searching usual
+    #                    query terms (default: '_all').
     # hierarchy_fields - An Array of Strings which treats the trailing slash
     #                    character as a hierarchy (default: []).
     #
@@ -236,30 +236,24 @@ class EsQueryBuilder
     #   create_bool_filters([...])
     #   # => [[{ term: { tag: 'foo' }}, { term: { tag: 'bar' }], [], []]
     #
-    #   # When '-tag:foo'
-    #   create_bool_filters([...])
-    #   # => [[], [], [{ term: { tag: 'foo' } }]]
-    #
-    #   # Suppose @hierarchy_fields contains 'tag'
-    #
-    #   # When 'tag:foo/'
+    #   # When 'tag:foo'
     #   create_bool_filters([...])
     #   # => [[], [{ term: { tag: 'foo' } }, { prefix: { tag: 'foo/' } }], []]
     #
-    #   # When '-tag:foo/'
+    #   # When '-tag:foo'
     #   create_bool_filters([...])
-    #   # => [[], [], [{ prefix: { tag: 'foo/' } }, { term: { tag: 'foo' } }]]
+    #   # => [[], [], [{ term: { tag: 'foo' } }, { prefix: { tag: 'foo/' } }]]
     #
     # Returns an Array consists of must, should and must_not filters arrays.
     def create_bool_filters(filter_tokens)
       must, should, must_not = [], [], []
       filter_tokens.each do |token|
         token.term.split.each do |term|
-          if @hierarchy_fields.include?(token.field) && term.end_with?('/')
+          if @hierarchy_fields.include?(token.field)
             cond = token.minus? ? must_not : should
-            cond << { prefix: { token.field => term.downcase } }
+            cond << { prefix: { token.field => term.downcase + '/' } }
             # Exactly matches to the tag.
-            cond << { term: { token.field => term[0...-1].downcase } }
+            cond << { term: { token.field => term.downcase } }
           else
             cond = token.minus? ? must_not : must
             cond << { term: { token.field => term.downcase } }

data/lib/es-query-builder/version.rb

@@ -1,3 +1,3 @@
 class EsQueryBuilder
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/spec/es_query_builder_spec.rb

@@ -510,6 +510,40 @@ describe EsQueryBuilder do
           end
         end
       end
+
+      context 'and it is constructed with filter_fields and hierarchy_fields' do
+        let(:param) do
+          { filter_fields: [hierarchy_field],
+            hierarchy_fields: [hierarchy_field] }
+        end
+
+        let(:hierarchy_field) do
+          'hierarchy_field'
+        end
+
+        let(:query_string) do
+          "#{hierarchy_field}:#{term}"
+        end
+
+        it 'returns both slash-ending-prefix and term filters' do
+          should eq(
+            filtered: {
+              query: {
+                match_all: {},
+              },
+              filter: {
+                bool: {
+                  should: [
+                    { prefix: { hierarchy_field => term + '/' } },
+                    { term: { hierarchy_field => term } }
+                  ],
+                  _cache: true
+                }
+              }
+            }
+          )
+        end
+      end
     end
 
     context 'when term queries are given' do

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require 'coveralls'
+Coveralls.wear!
+
 require 'es-query-builder'
 
 RSpec.configure do |config|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: es-query-builder
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Yuku Takahashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-03 00:00:00.000000000 Z
+date: 2015-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -59,6 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".coverrails.yml"
 - ".gitignore"
 - ".travis.yml"
 - CHANGELOG.md