stretchy 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a8263c1321815880f552cd0526e9bdd5df59b46
-  data.tar.gz: 276a949c2c902bf1f860acfebdc943531ee27620
+  metadata.gz: fc1f47df9e733b26cbf7a600076991ef6c2fd740
+  data.tar.gz: f62cabd7fc16980276d70de66c90dba0d25fb03e
 SHA512:
-  metadata.gz: 686770d04b195057ecf51bca7c95e6c34f47b37c1ee5398dc5ceae20bf0a281d11f85a081372a10d6fda7e06f2d9003d16bcc0a05c6f6fa50c72df44dcc03ca9
-  data.tar.gz: 540bb5b13632defe17885490ce58fbd85941cbb774d1a58913f14bb253309bfd7d574aa3dc00deabbbae2eca243baec60d2b95575f2a5db5767d8c1e4f40febf
+  metadata.gz: 0642e6ceab6cb04e30aef51cfedefbc1ae4b49f49b387528f71425d7a72bd9bf21a0763f6e1968e95c4568cc9d9148a66f5565cc42b0e5802adfbf08d6c7d6e7
+  data.tar.gz: 33e7884e2d19d7dbc269258b21b3cb448b8174e055c0f88338ef786caad83efc38886be1386ec3d094b96b4fed584ab7754bb3f2d7c239fd7d8a838f13be9b35

data/lib/stretchy/api.rb

@@ -9,7 +9,7 @@ module Stretchy
     include Enumerable
     include Utils::Methods
 
-    attr_reader :collector, :opts, :root, :context
+    attr_reader :collector, :opts, :root, :body, :context
 
     delegate [
       :total,
@@ -30,6 +30,7 @@ module Stretchy
       @opts       = opts
       @collector  = AndCollector.new(opts[:nodes] || [], query: true)
       @root       = opts[:root]     || {}
+      @body       = opts[:body]     || {}
       @context    = opts[:context]  || {}
     end
 
@@ -77,16 +78,24 @@ module Stretchy
     end
 
     def aggs(params = {})
-      add_root aggs: params
+      add_body aggs: params
+    end
+
+    def highlight(params = {})
+      add_body highlight: params
     end
 
     def where(params = {})
-      add_params params, :filter, :context_nodes
+      subcontext = {filter: true}
+      subcontext[:nested] = params.delete(:nested) if params[:nested]
+      add_params params, subcontext, :context_nodes
     end
 
     def match(params = {})
       if params.is_a? Hash
-        add_params params, :query, :context_nodes
+        subcontext = {query: true}
+        subcontext[:nested] = true if params.delete(:nested)
+        add_params params, subcontext, :context_nodes
       else
         add_params Hash[_all: params], :query, :context_nodes
       end
@@ -159,12 +168,7 @@ module Stretchy
 
     def request
       @request ||= begin
-        base        = root.dup
-        sub         = {query: collector.as_json}
-        agg         = base.delete(:aggs) || {}
-        sub[:aggs]  = agg if agg.any?
-
-        base.merge(body: sub)
+        root.merge(body: body.merge(query: collector.as_json))
       end
     end
 
@@ -217,6 +221,7 @@ module Stretchy
         self.class.new(opts.merge(
           nodes: collector.nodes + Array(additional),
           root:  root,
+          body:  body,
           context: {}
         ))
       end
@@ -225,6 +230,16 @@ module Stretchy
         self.class.new(opts.merge(
           nodes:    collector.nodes,
           root:     root.merge(options),
+          body:     body,
+          context:  context
+        ))
+      end
+
+      def add_body(options = {})
+        self.class.new(opts.merge(
+          nodes:    collector.nodes,
+          root:     root,
+          body:     body.merge(options),
           context:  context
         ))
       end
@@ -233,6 +248,7 @@ module Stretchy
         self.class.new(opts.merge(
           nodes:   collector.nodes,
           root:    root,
+          body:    body,
           context: context.merge(args_to_context(*args))
         ))
       end

data/lib/stretchy/errors.rb

@@ -1,4 +1,6 @@
 module Stretchy
-  class InvalidParamsError < StandardError; end
-  class IndexDoesNotExistError < StandardError ; end
+  module Errors
+    class InvalidParamsError < StandardError; end
+    class IndexDoesNotExistError < StandardError ; end
+  end
 end

data/lib/stretchy/factory.rb

@@ -32,6 +32,14 @@ module Stretchy
       Utils.extract_options!(params, FUNCTION_SCORE_OPTIONS)
     end
 
+    def dotify_params(params, context)
+      if context[:nested]
+        Utils.nestify(params)
+      else
+        Utils.dotify(params)
+      end
+    end
+
     def raw_node(params, context)
       if context[:boost]
         raw_boost_node(params, context)
@@ -43,19 +51,21 @@ module Stretchy
     def raw_boost_node(params, context)
       boost_params       = extract_boost_params!(params)
       context[:fn_score] = extract_function_score_options!(params)
-      context[:boost]    ||= true
-      context[:filter]   ||= true
+      context[:boost]    = true
+      context[:filter]   = true
       json = context[:query] ? {query: params} : params
       Node.new(boost_params.merge(filter: json), context)
     end
 
     def context_nodes(params, context = default_context)
+      subparams = dotify_params(params, context)
+
       if context[:boost]
-        params_to_boost(params, context)
+        params_to_boost(subparams, context)
       elsif context[:query]
-        params_to_queries(params, context)
+        params_to_queries(subparams, context)
       else
-        params_to_filters(params, context)
+        params_to_filters(subparams, context)
       end
     end
 
@@ -81,11 +91,14 @@ module Stretchy
         case val
         when Array
           Node.new({match: {
-            field     => {query: val.join(' '),
-            :operator => :or
-          }}}, context)
+            field => {query: val.join(' '), :operator => :or}
+          }}, context)
         when Range
-          Node.new({range: {field => {gte: val.min, lte: val.max}}}, context)
+          Node.new({range: {
+            field => {gte: val.min, lte: val.max}
+          }}, context)
+        when Hash
+          nested(val, field, context)
         else
           Node.new({match: {field => val}}, context)
         end
@@ -99,12 +112,31 @@ module Stretchy
           Node.new({range: {field => {gte: val.min, lte: val.max}}}, context)
         when nil
           Node.new({missing: {field: field}}, context)
+        when Hash
+          nested(val, field, context)
         else
           Node.new({terms: {field => Array(val)}}, context)
         end
       end
     end
 
+    def nested(params, path, context = default_context)
+      type, json = if context[:query]
+        nodes = params_to_queries(params, context)
+        json  = AndCollector.new(nodes, context).json
+        [:query, json]
+      else
+        nodes = params_to_filters(params, context)
+        json  = AndCollector.new(nodes, context).filter_json
+        [:filter, json]
+      end
+
+      Node.new({nested: {
+        path:   path,
+        type => json
+      }}, context)
+    end
+
     # https://www.elastic.co/guide/en/elasticsearch/guide/current/proximity-relevance.html
     def fulltext_nodes_from_string(params, context = default_context)
       subcontext = context.merge(query: true)

data/lib/stretchy/utils.rb

@@ -17,8 +17,8 @@ module Stretchy
       # raises error if required parameters are missing
       def require_params!(method, params, *fields)
         raise Errors::InvalidParamsError.new(
-          "#{method} requires at least #{fields.join(' and ')} params",
-          "params found: #{params}"
+          "#{method} requires at least #{fields.join(' and ')} params, but " +
+          "found: #{params}"
         ) if fields.any? {|f| is_empty? params[f] }
 
         true
@@ -27,7 +27,7 @@ module Stretchy
       # generates a hash of specified options,
       # removing them from the original hash
       def extract_options!(params, list)
-        boost_params = Hash[list.map do |opt|
+        output = Hash[list.map do |opt|
           [opt, params.delete(opt)]
         end].keep_if {|k,v| !is_empty?(v)}
       end
@@ -39,7 +39,33 @@ module Stretchy
 
       # coerces ids to integers, unless they contain non-integers
       def coerce_id(id)
-        id =~ /\d+/ ? id.to_i : id
+        id =~ /^\d+$/ ? id.to_i : id
+      end
+
+      def dotify(hash, prefixes = [])
+        hash.reduce({}) do |memo, kv|
+          key, val    = kv
+          subprefixes = (prefixes + [key])
+          prefix      = subprefixes.join('.')
+          if val.is_a? Hash
+            memo.merge(dotify(val, subprefixes))
+          else
+            memo.merge(prefix => val)
+          end
+        end
+      end
+
+      def nestify(hash, prefixes = [])
+        hash.reduce({}) do |memo, kv|
+          key, val = kv
+          subprefixes = (prefixes + [key])
+          prefix = subprefixes.join('.')
+          if val.is_a? Hash
+            memo.merge(prefix => nestify(val, subprefixes))
+          else
+            memo.merge(prefix => val)
+          end
+        end
       end
     end
 

data/lib/stretchy/version.rb

@@ -1,3 +1,3 @@
 module Stretchy
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stretchy
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - agius
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-15 00:00:00.000000000 Z
+date: 2015-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch