elasticquery 0.1.2 → 0.1.3

data/test/integration/queries_inheritence_test.rb

@@ -4,23 +4,31 @@ require "elasticquery"
 class TestQueriesInheritence < MiniTest::Test
   class MultipleFilteredQuery < Elasticquery::Base
     filtered do |params|
-      term :"category.id" => params[:category_id]
+      filters do
+        term :"category.id" => params[:category_id]
+      end
     end
 
     filtered do |params|
-      term :"author.name" => params[:author_name]
+      filters do
+        term :"author.name" => params[:author_name]
+      end
     end
   end
 
   class ParentPostQuery < Elasticquery::Base
     filtered do |params|
-      term :"category.id" => params[:category_id]
+      filters do
+        term :"category.id" => params[:category_id]
+      end
     end
   end
 
   class ChildPostQuery < ParentPostQuery
     filtered do |params|
-      term :"author.name" => params[:author_name]
+      filters do
+        term :"author.name" => params[:author_name]
+      end
     end
   end
 

data/test/integration/range_case_test.rb

@@ -4,8 +4,10 @@ require "elasticquery"
 class TestRangeCase < MiniTest::Test
   class HumanQuery < Elasticquery::Base
     filtered do |params|
-      range :year, lte: params[:max_year], gte: params[:min_year], execution: "fielddata"
-      range :revenue, lte: params[:max_revenue], gte: params[:min_revenue]
+      filters do
+        range :year, lte: params[:max_year], gte: params[:min_year], execution: "fielddata"
+        range :revenue, lte: params[:max_revenue], gte: params[:min_revenue]
+      end
     end
   end
 

data/test/integration/search_case_test.rb

@@ -4,23 +4,31 @@ require "elasticquery"
 class TestSearchQueryCase < MiniTest::Test
   class PostQuery < Elasticquery::Base
     filtered do |params|
-      term :"category" => params[:category]
-      search params[:search]
+      filters do
+        term :"category" => params[:category]
+      end
+      queries do
+        search params[:search]
+      end
     end
   end
 
   class PostOptionsQuery < Elasticquery::Base
     filtered do |params|
-      search params[:search],
-        fields: params[:fields],
-        operator: params[:operator],
-        type: "phrase"
+      queries do
+        search params[:search],
+          fields: params[:fields],
+          operator: params[:operator],
+          type: "phrase"
+      end
     end
   end
 
   class MultipleSearch < PostQuery
     filtered do |params|
-      search "look for"
+      queries do
+        search "look for"
+      end
     end
   end
 
@@ -30,7 +38,7 @@ class TestSearchQueryCase < MiniTest::Test
     expected_term = [{term: {category: "zoo"}}]
     assert_equal expected_term, actual[:query][:filtered][:filter][:and]
     expected_search = { query: "hello", fields: "_all", operator: "and", type: "best_fields"}
-    assert_equal expected_search, actual[:query][:filtered][:query][:multi_match]
+    assert_equal expected_search, actual[:query][:filtered][:query][:bool][:must][0][:multi_match]
   end
 
   def test_empty_search
@@ -43,12 +51,13 @@ class TestSearchQueryCase < MiniTest::Test
     params = {search: "hello", fields: %w(title body), operator: "or"}
     actual = PostOptionsQuery.new(params).build
     expected = {fields: %w(title body), operator: "or", type: "phrase", query: "hello"}
-    assert_equal expected, actual[:query][:filtered][:query][:multi_match]
+    assert_equal expected, actual[:query][:filtered][:query][:bool][:must][0][:multi_match]
   end
 
-  def test_multiple_search_use_last_search_declaration
+  def test_multiple_searches_should_be_combined
     params = {search: "hello"}
     actual = MultipleSearch.new(params).build
-    assert_equal "look for", actual[:query][:filtered][:query][:multi_match][:query]
+    assert_equal "hello", actual[:query][:filtered][:query][:bool][:must][0][:multi_match][:query]
+    assert_equal "look for", actual[:query][:filtered][:query][:bool][:must][1][:multi_match][:query]
   end
 end

data/test/integration/term_case_test.rb

@@ -4,8 +4,10 @@ require "elasticquery"
 class TestTermCase < MiniTest::Test
   class PostQuery < Elasticquery::Base
     filtered do |params|
-      term :"category.id" => params[:category_id]
-      term :"author.name" => params[:author_name], _cache: false
+      filters do
+        term :"category.id" => params[:category_id]
+        term :"author.name" => params[:author_name], _cache: false
+      end
     end
   end
 

data/test/integration/terms_case_test.rb

@@ -0,0 +1,49 @@
+require "test_helper"
+require "elasticquery"
+
+class TestTermsCase < MiniTest::Test
+  class PostQuery < Elasticquery::Base
+    filtered do |params|
+      filters do
+        terms id: params[:id], name: params[:name]
+      end
+    end
+  end
+
+  class OverridedPostQuery < PostQuery
+    filtered do
+      filters do
+        term.not status: "pending"
+        where.not status: "waiting", status: params[:inactive_status]
+      end
+      queries do
+        search params[:q]
+      end
+    end
+  end
+
+  def test_individual_terms_filter
+    params = {id: 1, name: "name"}
+    actual = PostQuery.new(params).build
+    expected = [{terms: {id: 1, name: "name"}}]
+    assert_equal expected, actual[:query][:filtered][:filter][:and]
+  end
+
+  def test_with_other_rules
+    params = {id: 1, name: "name", inactive_status: "closed", q: "Hello"}
+    actual = OverridedPostQuery.new(params).build
+
+    expected_query = {multi_match: {fields: "_all", operator: "and", type: "best_fields", query: "Hello"}}
+    expected_filters = [{:terms=>{:id=>1, :name=>"name"}}, {:not=>{:filter=>{:term=>{:status=>"pending"}}}}, {:not=>{:filter=>{:terms=>{:status=>"closed"}}}}]
+
+    assert_equal expected_query, actual[:query][:filtered][:query][:bool][:must][0]
+    assert_equal expected_filters, actual[:query][:filtered][:filter][:and]
+  end
+
+  def test_empty_params_skipping
+    params = {id: 1}
+    actual = OverridedPostQuery.new(params).build
+    expected_filters = [{terms: {id: 1}}, {not: {filter: {term: {status: "pending"}}}}]
+    assert_equal expected_filters, actual[:query][:filtered][:filter][:and]
+  end
+end

data/test/queries/multi_match_test.rb

@@ -0,0 +1,49 @@
+require "test_helper"
+require "elasticquery/queries/multi_match"
+
+class TestMultiMatchQuery < MiniTest::Test
+
+  def test_default_values_of_filter
+    filter = Elasticquery::Queries::MultiMatch.new "hi"
+    assert_equal filter.to_hash, {multi_match: {fields: "_all", operator: "and", type: "best_fields", query: "hi"}}
+  end
+
+  def test_passed_parameters
+    assert_raises ArgumentError do
+      Elasticquery::Queries::MultiMatch.new
+    end
+  end
+
+  def test_empty_query_is_invalid
+    filter = Elasticquery::Queries::MultiMatch.new "  "
+    assert filter.invalid?
+  end
+
+  def test_default_query_should_be_valid
+    filter = Elasticquery::Queries::MultiMatch.new "hi"
+    assert filter.valid?
+  end
+
+  def test_query_fields_validation
+    filter = Elasticquery::Queries::MultiMatch.new "hi", fields: 42
+    refute filter.valid?
+    filter = Elasticquery::Queries::MultiMatch.new "hi", fields: %w(name body)
+    assert filter.valid?
+  end
+
+  def test_operator_validation
+    filter = Elasticquery::Queries::MultiMatch.new "hi", operator: "without"
+    refute filter.valid?
+    filter = Elasticquery::Queries::MultiMatch.new "hi", operator: "or"
+    assert filter.valid?
+  end
+
+  def test_types_validation
+    %w(most_fields cross_fields phrase pharse_prefix).each do |type|
+      filter = Elasticquery::Queries::MultiMatch.new "hi", type: type
+      assert filter.valid?
+    end
+    filter = Elasticquery::Queries::MultiMatch.new "hi", type: "random"
+    refute filter.valid?
+  end
+end

data/test/query_test.rb

@@ -16,64 +16,64 @@ class TestQuery < MiniTest::Test
     assert_equal({query: {filtered: {query: {match_all:{}}}}}, @query.to_hash)
   end
 
-  def test_default_query_should_be_matched_all
-    assert @query.match_all?
+  def test_push_query_should_combine_queries_by_bool_must_query
+    @rule.expect :valid?, true
     @rule.expect :to_hash, {a: 1}
-    @query << @rule
-    refute @query.match_all?
-  end
+    @query.push_query @rule
+    assert_equal({query: {filtered: {query: {bool: {must: [{a: 1}]}}}}}, @query.to_hash)
+
+    @rule.expect :valid?, true
+    @rule.expect :to_hash, {b: 1}
+    @query.push_query @rule
+    assert_equal({query: {filtered: {query: {bool: {must: [{a: 1}, {b: 1}]}}}}}, @query.to_hash)
 
-  def test_pushing_of_hash_to_new_query
-    @rule.expect :to_hash, {a: 2, b: 1}
-    @query << @rule
-    assert_equal({a:2, b: 1}, @query.to_hash)
+    assert_equal 2, @query.queries.size
+    assert @rule.verify
   end
 
-  def test_pushing_of_subquery_to_existing_one
-    @rule.expect :to_hash, {a: 2, b: 1}
-    @query << @rule
-    @rule.expect :to_hash, {a: 1}
-    @query << @rule
-    assert_equal({a:1, b: 1}, @query.to_hash)
+  def test_push_query_should_not_merge_if_query_is_invalid
+    @rule.expect :valid?, false
+    @query.push_query @rule
+    assert_equal(Elasticquery::Query::DEFAULT, @query.to_hash)
+
+    assert @rule.verify
   end
 
-  def test_push_filters_to_variable
-    @rule.expect :to_hash, {a: 2, b: 1}
-    @query << @rule
+  def test_push_filter_should_combine_filters_by_and_condition
+    @rule.expect :valid?, true
     @rule.expect :to_hash, {a: 1}
-    @query << @rule
+    @query.push_filter @rule
+    assert_equal({query: {filtered: {filter: {and: [{a: 1}]}}}}, @query.to_hash)
+
+    @rule.expect :valid?, true
+    @rule.expect :to_hash, {b: 1}
+    @query.push_filter @rule
+    assert_equal({query: {filtered: {filter: {and: [{a: 1}, {b: 1}]}}}}, @query.to_hash)
+
     assert_equal 2, @query.filters.size
+    assert @rule.verify
   end
 
-  def test_should_group_filters_in_array
-    @rule.expect :to_hash, query: {filtered: {filter: {and: [{term: {a: 1, _cache: true}}]}}}
-    @query << @rule
-    @rule.expect :to_hash, query: {filtered: {filter: {and: [{term: {c: 3}}]}}}
-    @query << @rule
-    @rule.expect :to_hash, query: {filtered: {filter: {and: [{range: {x: 3}}]}}}
-    @query << @rule
-    expected = {query: {filtered: {filter: {and: [{term: {a: 1, _cache: true}}, {term: {c: 3}}, {range: {x: 3}}]}}}}
-    assert_equal(expected, @query.to_hash)
-  end
+  def test_push_filter_should_not_merge_if_filter_is_invalid
+    @rule.expect :valid?, false
+    @query.push_filter @rule
+    assert_equal(Elasticquery::Query::DEFAULT, @query.to_hash)
 
-  def test_should_group_multiple_terms_conditions
-    @rule.expect :to_hash, query: {filtered: {filter: {and: [{terms: {a: %w(a b c)}}]}}}
-    @query << @rule
-    @rule.expect :to_hash, query: {filtered: {filter: {and: [{terms: {c: %w(x y z), execution: "bool"}}]}}}
-    @query << @rule
-    expected = {query: {filtered: {filter: {and: [{terms: {a: %w(a b c)}}, {terms: {c: %w(x y z), execution: "bool"}}]}}}}
-    assert_equal(expected, @query.to_hash)
+    assert @rule.verify
   end
-
   class Elasticquery::Query
     # query context
     def forty_two
       42
     end
   end
-  def test_merge_when_filters_is_lambda_uses_query_context
+
+  def test_merge_when_filters_is_lambda_uses_es_query_context
+    @rule.expect :valid?, true
     @rule.expect :to_hash, -> { {forty_two: forty_two} }
-    @query << @rule
-    assert_equal @query.to_hash, {forty_two: 42}
+    @query.push_filter @rule
+    assert_equal @query.to_hash, {query: {filtered: {filter: {and: [{forty_two: 42}]}}}}
+
+    assert @rule.verify
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticquery
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Sergey Kuchmistov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-15 00:00:00.000000000 Z
+date: 2015-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: deep_merge
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest-reporters
+  name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: elasticsearch-model
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -141,25 +127,34 @@ files:
 - lib/elasticquery.rb
 - lib/elasticquery/base.rb
 - lib/elasticquery/builder.rb
+- lib/elasticquery/es.rb
 - lib/elasticquery/filters/base.rb
+- lib/elasticquery/filters/exists.rb
 - lib/elasticquery/filters/not.rb
 - lib/elasticquery/filters/range.rb
-- lib/elasticquery/filters/search.rb
 - lib/elasticquery/filters/term.rb
+- lib/elasticquery/filters/terms.rb
+- lib/elasticquery/queries/base.rb
+- lib/elasticquery/queries/multi_match.rb
 - lib/elasticquery/query.rb
 - lib/elasticquery/version.rb
 - test/base_test.rb
 - test/builder_test.rb
+- test/es_test.rb
+- test/filters/exists_test.rb
 - test/filters/not_test.rb
 - test/filters/range_test.rb
-- test/filters/search_test.rb
 - test/filters/term_test.rb
+- test/filters/terms_test.rb
 - test/integration/chainable_call_test.rb
+- test/integration/exists_case_test.rb
 - test/integration/not_case_test.rb
 - test/integration/queries_inheritence_test.rb
 - test/integration/range_case_test.rb
 - test/integration/search_case_test.rb
 - test/integration/term_case_test.rb
+- test/integration/terms_case_test.rb
+- test/queries/multi_match_test.rb
 - test/query_test.rb
 - test/test_helper.rb
 homepage: https://github.com/caulfield/elasticquery
@@ -174,7 +169,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -182,23 +177,27 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Elasticsearch query builder.
 test_files:
 - test/base_test.rb
 - test/builder_test.rb
+- test/es_test.rb
+- test/filters/exists_test.rb
 - test/filters/not_test.rb
 - test/filters/range_test.rb
-- test/filters/search_test.rb
 - test/filters/term_test.rb
+- test/filters/terms_test.rb
 - test/integration/chainable_call_test.rb
+- test/integration/exists_case_test.rb
 - test/integration/not_case_test.rb
 - test/integration/queries_inheritence_test.rb
 - test/integration/range_case_test.rb
 - test/integration/search_case_test.rb
 - test/integration/term_case_test.rb
+- test/integration/terms_case_test.rb
+- test/queries/multi_match_test.rb
 - test/query_test.rb
 - test/test_helper.rb
-has_rdoc: