eson-dsl 0.7.0 → 0.8.0

data/lib/eson/modules/query_plugin.rb

@@ -11,7 +11,7 @@ module Eson
 
     def call(*args)
       if query.respond_to?(:to_query_hash)
-        self.params = query.to_query_hash
+        self.parameters = query.to_query_hash
       end
 
       super(*args)
@@ -29,7 +29,9 @@ module Eson
       [protocol::Search,
        protocol::Count,
        protocol::DeleteByQuery,
-       protocol::Percolate]
+       protocol::Percolate,
+       protocol::Explain,
+       protocol::Validate]
     end
     
     def handle_block(&block)

data/lib/eson/search/and.rb

@@ -5,11 +5,7 @@ module Eson
       include FilterMethods
       include Filter
 
-      ##
-      # @macro and
-      #   @yield the block describing all subfilters
-      #   Generates a `$1` filter.
-      #   {include:file:eson-dsl/examples/filters/$1.rb}
+      # @!macro eson.filter
       short_name 'and'
 
       attr_accessor :options

data/lib/eson/search/base_query.rb

@@ -18,14 +18,11 @@ module Eson
         end
 
         if filters && !filters.empty?
-          hash = {
-            :query => {
-              :filtered => {
-                :query => hash[:query],
-                :filter => filters.to_query_hash
-              }
-            }
-          }
+          if filters.length > 1
+            hash[:filter] = {:and => filter.to_query_hash}
+          else
+            hash[:filter] = filter.to_query_hash
+          end
         end
 
         if facets.length > 0

data/lib/eson/search/bool.rb

@@ -4,11 +4,8 @@ module Eson
       include Filter
       include Query
       
-      # @macro bool
-      #   @yield the block containing all subqueries
-      #   Generates a `$1` filter or query, depending on context.
-      #   {include:file:eson-dsl/examples/filters/$1.rb}
-      #   {include:file:eson-dsl/examples/queries/$1.rb}
+      # @!macro eson.filter
+      # @!macro eson.query
       short_name :bool
 
       attr_accessor :options, :conditions

data/lib/eson/search/boosting.rb

@@ -4,10 +4,7 @@ module Eson
       include Query
 
       ##
-      # @macro eson.query
-      #   @yield the block describing all subqueries 
-      #   Generates a `$1` query.
-      #   {include:file:eson-dsl/examples/queries/$1.rb}
+      # @!macro eson.query
       short_name :boosting
 
       attr_accessor :options, :conditions

data/lib/eson/search/custom_boost_factor.rb

@@ -0,0 +1,19 @@
+module Eson
+  module Search
+    class CustomBoostFactor
+
+      include Queries
+      include Query
+
+      # @macro eson.query
+      short_name :custom_boost_factor
+
+      attr_accessor :options
+
+      def initialize(options = {})
+        self.options = options
+      end
+
+    end
+  end
+end

data/lib/eson/search/custom_filters_score.rb

@@ -0,0 +1,42 @@
+module Eson
+  module Search
+    class CustomFiltersScore
+      include Queries
+      include Query
+      
+      # @!macro eson.query
+      short_name :custom_filters_score
+
+      attr_accessor :options, :filters
+
+      def initialize(options = {})
+        self.options = options
+        self.filters = []
+      end
+
+      def filters(&block)
+        instance_exec(self, &block)
+      end
+
+      def filter(options, &block)
+        sub = SubQuery.new(args)
+        
+        @filters << [options, sub]
+        
+        sub.send(context, &block)
+      end
+
+      def to_query_hash
+        result = {}
+
+        result[:query] = queries.to_query_hash
+        result[:filters] = @filters.map do |options, filter|
+          {:filter => filter.to_query_hash}.merge!(options)
+        end
+
+        {name => result.merge(options)}
+      end
+
+    end
+  end
+end

data/lib/eson/search/date_histogram.rb

@@ -4,8 +4,6 @@ module Eson
 
       ##
       # @macro eson.facet
-      #   Generates a `$1` facet.
-      #   {include:file:eson-dsl/examples/facets/$1.rb}
       short_name :date_histogram
 
     end

data/lib/eson/search/facet.rb

@@ -3,6 +3,7 @@ module Eson
     module Facet
       module ClassMethods
         def short_name(name)
+          name = name.to_sym
           define_method :name do
             name
           end
@@ -18,16 +19,20 @@ module Eson
         end
       end
       
-      attr_accessor :args
+      attr_accessor :args, :scope_name
       
       def param(name)
         args[name] || (raise "Parameter #{name} not given")
       end
       
       def scope(query, name)
-        raise "Cannot scope unless Query is a NestedQuery" unless Nested === query
-        query.options[:_scope] = name
-        self.options[:scope] = name
+        case query
+        when Nested, HasChild
+          query.options[:_scope] = name
+          self.scope_name = name
+        else
+          raise "Cannot scope unless Query is a Nested or HasChild Query"
+        end
       end
 
       def method_missing(name, arg)
@@ -36,4 +41,4 @@ module Eson
       end
     end
   end
-end
+end

data/lib/eson/search/facets.rb

@@ -13,6 +13,7 @@ module Eson
           h = {}
           self.each do |k,v|
             h[k] = v.to_query_hash
+            h[k][:scope] = v.scope_name if v.scope_name
           end
           h
         end
@@ -34,4 +35,4 @@ module Eson
       alias :facet :facets
     end
   end
-end
+end

data/lib/eson/search/field_based.rb

@@ -14,7 +14,7 @@ module Eson
 
       def to_query_hash
         if field
-          {name => field.to_query_hash}
+          field.to_query_hash
         else
           {name => options}
         end

data/lib/eson/search/filter.rb

@@ -3,6 +3,7 @@ module Eson
     module Filter
       module ClassMethods
         def short_name(name)
+          name = name.to_sym
           define_method :name do
             name
           end

data/lib/eson/search/filtered.rb

@@ -0,0 +1,15 @@
+module Eson
+  module Search
+    class Filtered
+      include Filters
+      include Queries
+
+      include Query
+
+      # @macro eson.query
+      short_name :filtered
+
+      attr_accessor :type
+    end
+  end
+end

data/lib/eson/search/geo_distance.rb

@@ -4,11 +4,8 @@ module Eson
       include Filter
       include Facet
 
-      # @macro geo_distance
-      #   @yield a block defining options
-      #   Generates a `$1` filter or facet, depending on context.
-      #   {include:file:eson-dsl/examples/filters/$1.rb}
-      #   {include:file:eson-dsl/examples/facets/$1.rb}
+      # @macro eson.filter
+      # @macro eson.facet
       short_name :geo_distance
 
       attr_accessor :field, :options

data/lib/eson/search/has_child.rb

@@ -6,10 +6,8 @@ module Eson
 
       include QueryGroup
 
-      # @macro has_child
-      #   Generates a `$1` filter or query, depending on context.
-      #   {include:file:eson-dsl/examples/filters/$1.rb}
-      #   {include:file:eson-dsl/examples/queries/$1.rb}
+      # @macro eson.filter
+      # @macro eson.facet
       short_name :has_child
 
       attr_accessor :options
@@ -26,4 +24,4 @@ module Eson
 
     end
   end
-end
+end

data/lib/eson/search/ids.rb

@@ -4,10 +4,8 @@ module Eson
       include Filter
       include Query
 
-      # @macro ids
-      #   Generates a `$1` filter or query, depending on context.
-      #   {include:file:eson-dsl/examples/filters/$1.rb}
-      #   {include:file:eson-dsl/examples/queries/$1.rb}
+      # @macro eson.filter
+      # @macro eson.query
       short_name :ids
 
       attr_accessor :options

data/lib/eson/search/indices.rb

@@ -0,0 +1,48 @@
+module Eson
+  module Search
+    class Indices
+      include Query
+
+      # @macro eson.query
+      short_name :indices
+
+      attr_accessor :indices, :no_match_val, :query_val
+
+      def initialize(*indices)
+        self.indices = indices
+      end
+
+      def query(&block)
+        self.query_val ||= SubQuery.new(args)
+        self.query_val.send(context, &Proc.new)
+      end
+
+      def no_match_query(no_match_val = nil)
+        if no_match_val
+          self.no_match_val = no_match_val
+        elsif block_given?
+          self.no_match_val ||= SubQuery.new(args)
+          self.no_match_val.send(context, &Proc.new)
+        end
+      end
+
+      def to_query_hash
+        options = {
+          :indices => indices,
+          :query => self.query_val.to_query_hash,
+        }
+
+        if no_match_val
+          if no_match_val.respond_to? :to_query_hash
+            no_match = no_match_val.to_query_hash
+          else
+            no_match = no_match_val
+          end
+          options.merge!(:no_match_query => no_match)
+        end
+  
+        { name => options }
+      end
+    end
+  end
+end

data/lib/eson/search/match.rb

@@ -0,0 +1,10 @@
+module Eson
+  module Search
+    class Match < FieldBased
+      include Query
+
+      # @macro eson.query
+      short_name :match
+    end
+  end
+end

data/lib/eson/search/multi_match.rb

@@ -0,0 +1,21 @@
+module Eson
+  module Search
+    class MultiMatch
+      include Query
+
+      # @macro eson.query
+      short_name :multi_match
+
+      attr_accessor :options, :query
+
+      def initialize(query, options = {})
+        self.options = options
+        self.query = query
+      end
+
+      def to_query_hash
+        {:multi_match => {:query => query}.merge!(options)}
+      end
+    end
+  end
+end

data/lib/eson/search/prefix.rb

@@ -4,10 +4,8 @@ module Eson
       include Query
       include Filter
 
-      # @macro prefix
-      #   Generates a `$1` filter or query, depending on context.
-      #   {include:file:eson-dsl/examples/filters/$1.rb}
-      #   {include:file:eson-dsl/examples/queries/$1.rb}
+      # @macro eson.filter
+      # @macro eson.facet
       short_name :prefix
 
       def to_query_hash

data/lib/eson/search/query.rb

@@ -3,6 +3,7 @@ module Eson
     module Query
       module ClassMethods
         def short_name(name)
+          name = name.to_sym
           define_method :name do
             name
           end

data/lib/eson/search/term.rb

@@ -4,10 +4,8 @@ module Eson
       include Query
       include Filter
 
-      # @macro term
-      #   Generates a `$1` filter, query, depending on context.
-      #   {include:file:eson-dsl/examples/filters/$1.rb}
-      #   {include:file:eson-dsl/examples/queries/$1.rb}
+      # @macro eson.filter
+      # @macro eson.facet
       short_name :term
 
       def to_query_hash

data/lib/eson/search/terms.rb

@@ -5,11 +5,9 @@ module Eson
       include Filter
       include Facet
 
-      # @macro terms
-      #   Generates a `$1` filter, facet or  query, depending on context.
-      #   {include:file:eson-dsl/examples/filters/$1.rb}
-      #   {include:file:eson-dsl/examples/facet/$1.rb}
-      #   {include:file:eson-dsl/examples/queries/$1.rb}
+      # @macro eson.filter
+      # @macro eson.query
+      # @macro eson.facet
       short_name :terms
 
       attr_accessor :options, :field

data/lib/eson/search/top_children.rb

@@ -5,10 +5,8 @@ module Eson
       include Filter
       include QueryGroup
 
-      # @macro top_children
-      #   Generates a `$1` filter, query, depending on context.
-      #   {include:file:eson-dsl/examples/filters/$1.rb}
-      #   {include:file:eson-dsl/examples/queries/$1.rb}# @macro eson.query
+      # @macro eson.filter
+      # @macro eson.query
       short_name :top_children
 
       attr_accessor :options

data/test/search/facets/scoped.json

@@ -1 +1 @@
-{"query":{"nested":{"query":{"filtered":{"query":{"match_all":{}},"filter":{"range":{"age":{"from":10,"to":20}}}}},"path":"obj1","score_mode":"avg","_scope":"my_scope"}},"facets":{"hist1":{"histogram":{"field":"age","interval":2,"scope":"my_scope"}}}}
+{"query":{"nested":{"query":{"filtered":{"query":{"match_all":{}},"filter":{"range":{"age":{"from":10,"to":20}}}}},"path":"obj1","score_mode":"avg","_scope":"my_scope"}},"facets":{"hist1":{"histogram":{"field":"age","interval":2},"scope":"my_scope"}}}