eson-dsl 0.7.0 → 0.8.0

data/test/search/filters/and.rb

@@ -1,15 +1,11 @@
 {
   :query => {
-    :filtered => {
-      :query => {
-         :term => {:tag => "something"}
-      },
-      :filter => {
-        :and => [
-          { :range => { :post_date => {:from => "2010-03-01", :to => "2010-04-01"} } },
-          { :prefix => { "name.second" => "ba"} }
-        ]
-      }
-    }
+     :term => {:tag => "something"}
+  },
+  :filter => {
+    :and => [
+      { :range => { :post_date => {:from => "2010-03-01", :to => "2010-04-01"} } },
+      { :prefix => { "name.second" => "ba"} }
+    ]
   }
 }

data/test/search/filters/bool.json

@@ -1 +1 @@
-{"query":{"filtered":{"query":{"match_all":{}},"filter":{"bool":{"must":{"term":{"user":"kimchy"}},"must_not":{"range":{"age":{"from":10,"to":20}}},"should":[{"term":{"tag":"wow"}},{"term":{"tag":"elasticsearch"}}]}}}}}
+{"query":{"match_all":{}},"filter":{"bool":{"must":{"term":{"user":"kimchy"}},"must_not":{"range":{"age":{"from":10,"to":20}}},"should":[{"term":{"tag":"wow"}},{"term":{"tag":"elasticsearch"}}]}}}

data/test/search/filters/bool.rb

@@ -1,27 +1,22 @@
 {
-  :query =>
-  {
-    :filtered => {
-      :query => {:match_all => {}},
-      :filter => {
-        :bool => {
-          :must => {
-            :term => { "user" => "kimchy"}
-          },
-          :must_not => {
-            :range => {
-              :age => {
-                :from => 10,
-                :to => 20
-              }
-            }
-          },
-          :should => [
-            { :term => { "tag" => "wow" } },
-            { :term => { "tag" => "elasticsearch" } }
-          ]
+  :query => {:match_all => {}},
+  :filter => {
+    :bool => {
+      :must => {
+        :term => { "user" => "kimchy"}
+      },
+      :must_not => {
+        :range => {
+          :age => {
+            :from => 10,
+            :to => 20
+          }
         }
-      }
+      },
+      :should => [
+        { :term => { "tag" => "wow" } },
+        { :term => { "tag" => "elasticsearch" } }
+      ]
     }
   }
 }

data/test/search/filters/geo_bounding_box_hash.json

@@ -1 +1 @@
-{"query":{"filtered":{"query":{"match_all":{}},"filter":{"geo_bounding_box":{"location":{"top_left":{"lat":40.73,"lon":-74.1},"bottom_right":{"lat":40.717,"lon":-73.99}}}}}}}
+{"query":{"match_all":{}},"filter":{"geo_bounding_box":{"location":{"top_left":{"lat":40.73,"lon":-74.1},"bottom_right":{"lat":40.717,"lon":-73.99}}}}}

data/test/search/filters/geo_distance_hash.json

@@ -1 +1 @@
-{"query":{"filtered":{"query":{"match_all":{}},"filter":{"geo_distance":{"distance":"200km","location":{"lat":40,"lon":-70}}}}}}
+{"query":{"match_all":{}},"filter":{"geo_distance":{"distance":"200km","location":{"lat":40,"lon":-70}}}}

data/test/search/filters/geo_distance_range_hash.json

@@ -1 +1 @@
-{"query":{"filtered":{"query":{"match_all":{}},"filter":{"geo_distance_range":{"from":"200km","to":"400km","location":{"lat":40,"lon":-70}}}}}}
+{"query":{"match_all":{}},"filter":{"geo_distance_range":{"from":"200km","to":"400km","location":{"lat":40,"lon":-70}}}}

data/test/search/filters/geo_polygon_hash.json

@@ -1 +1 @@
-{"query":{"filtered":{"query":{"match_all":{}},"filter":{"geo_polygon":{"location":{"points":[{"lat":40,"lon":-70},{"lat":30,"lon":-80},{"lat":20,"lon":-90}]}}}}}}
+{"query":{"match_all":{}},"filter":{"geo_polygon":{"location":{"points":[{"lat":40,"lon":-70},{"lat":30,"lon":-80},{"lat":20,"lon":-90}]}}}}

data/test/search/filters/has_child.rb

@@ -1,14 +1,10 @@
-{ 
-  :query => {
-    :filtered => {
-      :query => {:match_all => { }},
-      :filter => {
-        :has_child => {
-          :type => :blog_tag,
-          :query => {
-            :term => { :tag => "something" }
-          }
-        }
+{
+  :query => {:match_all => { }},
+  :filter => {
+    :has_child => {
+      :type => :blog_tag,
+      :query => {
+        :term => { :tag => "something" }
       }
     }
   }

data/test/search/filters/ids.rb

@@ -1,14 +1,10 @@
-{:query => 
-  {
-    :filtered => {
-       :query => {
-         :match_all => { }
-       },
-       :filter => {
-         :ids => {
-           :type => "user", :values => [1,2,3,4,5,6,7]
-        }
-      }
+{
+  :query => {
+    :match_all => { }
+  },
+  :filter => {
+    :ids => {
+      :type => "user", :values => [1,2,3,4,5,6,7]
     }
   }
 }

data/test/search/filters/not.rb

@@ -1,15 +1,11 @@
 {
   :query => {
-    :filtered => {
-      :query => {
-         :term => {:tag => "something"}
-      },
+     :term => {:tag => "something"}
+  },
+  :filter => {
+    :not => {
       :filter => {
-        "not" => {
-          :filter => {
-            :term => { "name.first" => "Florian"}
-          }
-        }
+        :term => { "name.first" => "Florian"}
       }
     }
   }

data/test/search/filters/or.rb

@@ -1,15 +1,11 @@
 {
   :query => {
-    :filtered => {
-      :query => {
-         :term => {:tag => "something"}
-      },
-      :filter => {
-        :or => [
-          { :term => { "name.first" => "Felix"  } },
-          { :term => { "name.first" => "Florian"} }
-        ]
-      }
-    }
+     :term => {:tag => "something"}
+  },
+  :filter => {
+    :or => [
+      { :term => { "name.first" => "Felix"  } },
+      { :term => { "name.first" => "Florian"} }
+    ]
   }
 }

data/test/search/filters/range.rb

@@ -1,15 +1,10 @@
 {
-  :query => 
-  {
-    :filtered => {
-      :query => {:match_all => {}},
-      :filter => {
-        :range => {
-          :age => {
-            :from => 10,
-            :to => 20
-          }
-        }
+  :query => {:match_all => {}},
+  :filter => {
+    :range => {
+      :age => {
+        :from => 10,
+        :to => 20
       }
     }
   }

data/test/search/filters/type.json

@@ -1 +1 @@
-{"query":{"filtered":{"query":{"match_all":{}},"filter":{"type":{"value":"my_type"}}}}}
+{"query":{"match_all":{}},"filter":{"type":{"value":"my_type"}}}

data/test/search/filters/type.rb

@@ -1 +1 @@
-{:query => {:filtered => {:query => {:match_all => {}}, :filter => {:type => {:value => :my_type}}}}}
+{:query => {:match_all => {}}, :filter => {:type => {:value => :my_type}}}

data/test/search/filters_test.rb

@@ -75,7 +75,7 @@ context "Filter" do
   end
 
   context "#and filter" do
-    query_name "test/search/queries/and_filter"
+    query_name "test/search/filters/and"
 
     setup do
       example("filters/and")
@@ -83,7 +83,7 @@ context "Filter" do
   end
 
   context "#and filter using default" do
-     query_name "test/search/queries/and_filter"
+     query_name "test/search/filters/and"
 
      setup do
        example("filters/and_without_keyword")

data/test/search/queries/custom_boost_factor.json

@@ -0,0 +1,10 @@
+{
+    "query": {
+        "custom_boost_factor" : {
+            "boost_factor" : 5,
+            "query" : {
+                "term": {"tag": "wow"}
+            }
+        }
+    }
+}

data/test/search/queries/custom_filters_score.json

@@ -0,0 +1,21 @@
+{
+  "query":
+    {
+        "custom_filters_score" : {
+            "query" : {
+                "match_all" : {}
+            },
+            "filters" : [
+                {
+                    "filter" : { "range" : { "age" : {"from" : 0, "to" : 10} } },
+                    "boost" : 3
+                },
+                {
+                    "filter" : { "range" : { "age" : {"from" : 10, "to" : 20} } },
+                    "boost" : 2
+                }
+            ],
+            "score_mode" : "first"
+        }
+    }
+}

data/test/search/queries/filtered.rb

@@ -0,0 +1 @@
+{:query => {:filtered => {:query => {:match_all => {}}, :filter => {:prefix => {"name.second" => "ba"}}}}}

data/test/search/queries/filters_and_facets.json

@@ -1 +1 @@
-{"query":{"filtered":{"query":{"match_all":{}},"filter":{"range":{"age":{"from":10,"to":20}}}}},"facets":{"hist1":{"histogram":{"field":"age","interval":2}}}}
+{"query": {"match_all":{}},"filter":{"range":{"age":{"from":10,"to":20}}},"facets":{"hist1":{"histogram":{"field":"age","interval":2}}}}

data/test/search/queries/indices.json

@@ -0,0 +1,13 @@
+{
+  "query": {
+    "indices" : {
+      "indices" : ["index1", "index2"],
+      "query" : {
+          "term" : { "tag" : "wow" }
+      },
+      "no_match_query" : {
+          "term" : { "tag" : "kow" }
+      }
+    }
+  }
+}

data/test/search/queries/match.json

@@ -0,0 +1 @@
+{"query":{"match":{"message":{"type":"phrase_prefix","query":"this is a text"}}}}

data/test/search/queries/multi_match.json

@@ -0,0 +1,8 @@
+{
+  "query": {
+    "multi_match" : {
+      "query" : "this is a test",
+      "fields" : [ "subject", "message" ]
+    }
+  }
+}

data/test/search/query_test.rb

@@ -37,19 +37,21 @@ context "Queries" do
     end
   end
 
-  context "#prefix" do
-    query_name "test/search/queries/prefix"
+  unless ElasticSearch::Node.version > "0.19.4"
+    context "#prefix" do
+      query_name "test/search/queries/prefix"
 
-    setup do
-      example("queries/prefix")
+      setup do
+        example("queries/prefix")
+      end
     end
-  end
 
-  context "#prefix short style" do
-    query_name "test/search/queries/prefix_short"
+    context "#prefix short style" do
+      query_name "test/search/queries/prefix_short"
 
-    setup do
-      example("queries/prefix_short")
+      setup do
+        example("queries/prefix_short")
+      end
     end
   end
 
@@ -101,11 +103,23 @@ context "Queries" do
     end
   end
 
-  context "#text query" do
-    query_name "test/search/queries/text"
+  if ElasticSearch::Node.version < "0.20.0"
+    context "#text query" do
+      query_name "test/search/queries/text"
 
-    setup do
-      example("queries/text")
+      setup do
+        example("queries/text")
+      end
+    end
+  end
+  
+  if ElasticSearch::Node.version > "0.19.8"
+    context "#match query" do
+      query_name "test/search/queries/match"
+
+      setup do
+        example("queries/match")
+      end
     end
   end
 
@@ -117,7 +131,6 @@ context "Queries" do
     end
   end
 
-
   context "#boosting query" do
     query_name "test/search/queries/boosting"
 
@@ -253,7 +266,7 @@ context "Queries" do
     end
   end
 
-  context "query with filter and facets" do
+  context "with filter and facets" do
     query_name "test/search/queries/filters_and_facets"
 
     setup do
@@ -308,4 +321,46 @@ context "Queries" do
       example("queries/span_term")
     end
   end
+
+  if ElasticSearch::Node.version > "0.19.0"
+    context "multi_match query" do
+      query_name "test/search/queries/multi_match"
+
+      setup do
+        example("queries/multi_match")
+      end
+    end
+
+    context "indices query" do
+      query_name "test/search/queries/indices"
+
+      setup do
+        example("queries/indices")
+      end
+    end
+
+    context "custom_boost_factor query" do
+      query_name "test/search/queries/custom_boost_factor"
+
+      setup do
+        example("queries/custom_boost_factor")
+      end
+    end
+
+    context "custom_filters_score query" do
+      query_name "test/search/queries/custom_filters_score"
+
+      setup do
+        example("queries/custom_filters_score")
+      end
+    end
+    
+    context "filtered query" do
+      query_name "test/search/queries/filtered"
+
+      setup do
+        example("queries/filtered")
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eson-dsl
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-10 00:00:00.000000000 Z
+date: 2013-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch-node
@@ -35,9 +35,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE.md
+- MethodReference.md
 - README.md
 - Rakefile
-- TODO.md
 - eson-dsl.gemspec
 - examples/facets/date_histogram.rb
 - examples/facets/filter.rb
@@ -71,9 +71,13 @@ files:
 - examples/queries/boosting.rb
 - examples/queries/constant_score.rb
 - examples/queries/constant_score_with_filter.rb
+- examples/queries/custom_boost_factor.rb
+- examples/queries/custom_filters_score.rb
+- examples/queries/custom_filters_score_with_script.rb
 - examples/queries/custom_score.rb
 - examples/queries/dis_max.rb
 - examples/queries/field.rb
+- examples/queries/filtered.rb
 - examples/queries/filters_and_facets.rb
 - examples/queries/flt.rb
 - examples/queries/flt_field.rb
@@ -82,9 +86,12 @@ files:
 - examples/queries/has_child.rb
 - examples/queries/has_child_complex.rb
 - examples/queries/ids.rb
+- examples/queries/indices.rb
+- examples/queries/match.rb
 - examples/queries/match_all.rb
 - examples/queries/mlt.rb
 - examples/queries/mlt_field.rb
+- examples/queries/multi_match.rb
 - examples/queries/nested.rb
 - examples/queries/prefix.rb
 - examples/queries/prefix_short.rb
@@ -104,6 +111,7 @@ files:
 - examples/queries/top_children.rb
 - examples/queries/wildcard.rb
 - examples/queries/wildcard_short.rb
+- lib/compat.rb
 - lib/eson-dsl.rb
 - lib/eson/modules/query_plugin.rb
 - lib/eson/search/and.rb
@@ -111,6 +119,8 @@ files:
 - lib/eson/search/bool.rb
 - lib/eson/search/boosting.rb
 - lib/eson/search/constant_score.rb
+- lib/eson/search/custom_boost_factor.rb
+- lib/eson/search/custom_filters_score.rb
 - lib/eson/search/custom_score.rb
 - lib/eson/search/date_histogram.rb
 - lib/eson/search/dis_max.rb
@@ -121,6 +131,7 @@ files:
 - lib/eson/search/field_based.rb
 - lib/eson/search/filter.rb
 - lib/eson/search/filter_facet.rb
+- lib/eson/search/filtered.rb
 - lib/eson/search/filters.rb
 - lib/eson/search/fquery.rb
 - lib/eson/search/fuzzy.rb
@@ -133,10 +144,13 @@ files:
 - lib/eson/search/has_child.rb
 - lib/eson/search/histogram.rb
 - lib/eson/search/ids.rb
+- lib/eson/search/indices.rb
+- lib/eson/search/match.rb
 - lib/eson/search/match_all.rb
 - lib/eson/search/missing.rb
 - lib/eson/search/more_like_this.rb
 - lib/eson/search/more_like_this_field.rb
+- lib/eson/search/multi_match.rb
 - lib/eson/search/nested.rb
 - lib/eson/search/node.rb
 - lib/eson/search/not.rb
@@ -227,10 +241,13 @@ files:
 - test/search/queries/boosting.rb
 - test/search/queries/constant_score.rb
 - test/search/queries/constant_score_filter.rb
+- test/search/queries/custom_boost_factor.json
+- test/search/queries/custom_filters_score.json
 - test/search/queries/custom_score.documents
 - test/search/queries/custom_score.rb
 - test/search/queries/dis_max.rb
 - test/search/queries/field.rb
+- test/search/queries/filtered.rb
 - test/search/queries/filters_and_facets.documents
 - test/search/queries/filters_and_facets.json
 - test/search/queries/flt.rb
@@ -244,10 +261,13 @@ files:
 - test/search/queries/has_child_complex.blog_tag.mapping
 - test/search/queries/has_child_complex.rb
 - test/search/queries/ids.rb
+- test/search/queries/indices.json
+- test/search/queries/match.json
 - test/search/queries/match_all.rb
 - test/search/queries/mlt.json
 - test/search/queries/mlt.rb
 - test/search/queries/mlt_field.rb
+- test/search/queries/multi_match.json
 - test/search/queries/nested.json
 - test/search/queries/nested.mapping
 - test/search/queries/phrase_prefix.rb
@@ -285,18 +305,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4021414716358552886
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4021414716358552886
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.21
@@ -365,10 +379,13 @@ test_files:
 - test/search/queries/boosting.rb
 - test/search/queries/constant_score.rb
 - test/search/queries/constant_score_filter.rb
+- test/search/queries/custom_boost_factor.json
+- test/search/queries/custom_filters_score.json
 - test/search/queries/custom_score.documents
 - test/search/queries/custom_score.rb
 - test/search/queries/dis_max.rb
 - test/search/queries/field.rb
+- test/search/queries/filtered.rb
 - test/search/queries/filters_and_facets.documents
 - test/search/queries/filters_and_facets.json
 - test/search/queries/flt.rb
@@ -382,10 +399,13 @@ test_files:
 - test/search/queries/has_child_complex.blog_tag.mapping
 - test/search/queries/has_child_complex.rb
 - test/search/queries/ids.rb
+- test/search/queries/indices.json
+- test/search/queries/match.json
 - test/search/queries/match_all.rb
 - test/search/queries/mlt.json
 - test/search/queries/mlt.rb
 - test/search/queries/mlt_field.rb
+- test/search/queries/multi_match.json
 - test/search/queries/nested.json
 - test/search/queries/nested.mapping
 - test/search/queries/phrase_prefix.rb