stretchy 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c3818aa28e0d5d43fa9b1abc168571856081382
-  data.tar.gz: 31e8a84723d588e7b5e0ffff48c205bf9a96a514
+  metadata.gz: 1a8263c1321815880f552cd0526e9bdd5df59b46
+  data.tar.gz: 276a949c2c902bf1f860acfebdc943531ee27620
 SHA512:
-  metadata.gz: a43550179be297d7e581075223a43781cf24f23e9eca3f379256492186107154cdd76d398184efff9f3b1ac9c4ee11c37c4b576dd90c2c8e0aac0366172f06ec
-  data.tar.gz: 9cd2d2c2344b52bcf20cb4e852cc20514f48cc1bc80aca17a35b51a59370b5c74dd13edbb08e60a996c0a1672e304627a846020d4968169c5e58153acf7e8810
+  metadata.gz: 686770d04b195057ecf51bca7c95e6c34f47b37c1ee5398dc5ceae20bf0a281d11f85a081372a10d6fda7e06f2d9003d16bcc0a05c6f6fa50c72df44dcc03ca9
+  data.tar.gz: 540bb5b13632defe17885490ce58fbd85941cbb774d1a58913f14bb253309bfd7d574aa3dc00deabbbae2eca243baec60d2b95575f2a5db5767d8c1e4f40febf

data/lib/stretchy/and_collector.rb

@@ -42,13 +42,23 @@ module Stretchy
     end
 
     def filter_node
-      @filter_node ||= if query_nodes.any? || boost_nodes.any?
-        Node.new({query: filtered_query_node.json}, context)
+      @filter_node ||= if query_nodes.any?
+        if boost_nodes.any?
+          Node.new({query: function_score_node.json}, context)
+        elsif filter_nodes.any?
+          Node.new({query: filtered_query_node.json}, context)
+        else
+          Node.new({query: single_query_node.json}, context)
+        end
       else
         Node.new(compile_nodes(filter_nodes).json, context)
       end
     end
 
+    def filter_json
+      filter_node.json
+    end
+
     def filter_nodes
       @filter_nodes ||= begin
         node_arr = collect_nodes nodes do |n|

data/lib/stretchy/api.rb

@@ -9,7 +9,7 @@ module Stretchy
     include Enumerable
     include Utils::Methods
 
-    attr_reader :collector, :root, :context
+    attr_reader :collector, :opts, :root, :context
 
     delegate [
       :total,
@@ -26,10 +26,11 @@ module Stretchy
       :aggregations
     ] => :results_obj
 
-    def initialize(options = {})
-      @collector  = AndCollector.new(options[:nodes] || [], query: true)
-      @root       = options[:root]     || {}
-      @context    = options[:context]  || {}
+    def initialize(opts = {})
+      @opts       = opts
+      @collector  = AndCollector.new(opts[:nodes] || [], query: true)
+      @root       = opts[:root]     || {}
+      @context    = opts[:context]  || {}
     end
 
     def context?(*args)
@@ -213,23 +214,27 @@ module Stretchy
       end
 
       def add_nodes(additional)
-        self.class.new nodes: collector.nodes + Array(additional), root: root
+        self.class.new(opts.merge(
+          nodes: collector.nodes + Array(additional),
+          root:  root,
+          context: {}
+        ))
       end
 
       def add_root(options = {})
-        self.class.new(
+        self.class.new(opts.merge(
           nodes:    collector.nodes,
           root:     root.merge(options),
           context:  context
-        )
+        ))
       end
 
       def add_context(*args)
-        self.class.new(
+        self.class.new(opts.merge(
           nodes:   collector.nodes,
           root:    root,
           context: context.merge(args_to_context(*args))
-        )
+        ))
       end
 
   end

data/lib/stretchy/factory.rb

@@ -41,10 +41,12 @@ module Stretchy
     end
 
     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
-      Node.new(params, context)
+      json = context[:query] ? {query: params} : params
+      Node.new(boost_params.merge(filter: json), context)
     end
 
     def context_nodes(params, context = default_context)
@@ -76,8 +78,17 @@ module Stretchy
 
     def params_to_queries(params, context = default_context)
       params.map do |field, val|
-        val = val.join if val.is_a? Array
-        Node.new({match: {field => val}}, context)
+        case val
+        when Array
+          Node.new({match: {
+            field     => {query: val.join(' '),
+            :operator => :or
+          }}}, context)
+        when Range
+          Node.new({range: {field => {gte: val.min, lte: val.max}}}, context)
+        else
+          Node.new({match: {field => val}}, context)
+        end
       end
     end
 
@@ -85,20 +96,11 @@ module Stretchy
       params.map do |field, val|
         case val
         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 nil
-          Node.new(
-            {missing: {field: field}},
-            context
-          )
+          Node.new({missing: {field: field}}, context)
         else
-          Node.new(
-            {terms: {field => Array(val)}},
-            context
-          )
+          Node.new({terms: {field => Array(val)}}, context)
         end
       end
     end

data/lib/stretchy/scopes.rb

@@ -0,0 +1,30 @@
+module Stretchy
+  module Scopes
+
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      def stretchify(options = {})
+        @stretchy_options = options
+      end
+
+      def search(options = {})
+        stretchy_scope.new stretchy_options.merge(options)
+      end
+
+      def stretchy_options
+        Hash(@stretchy_options)
+      end
+
+      def stretchy_scope
+        @scopes_class ||= Class.new Stretchy::API
+      end
+
+      def stretch(name, block)
+        stretchy_scope.send(:define_method, name, &block)
+      end
+    end
+  end
+end

data/lib/stretchy/version.rb

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

data/lib/stretchy.rb

@@ -10,6 +10,7 @@ require 'stretchy/errors'
 require 'stretchy/factory'
 require 'stretchy/node'
 require 'stretchy/results'
+require 'stretchy/scopes'
 require 'stretchy/utils'
 require 'stretchy/version'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stretchy
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - agius
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-07 00:00:00.000000000 Z
+date: 2015-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch
@@ -160,6 +160,7 @@ files:
 - lib/stretchy/factory.rb
 - lib/stretchy/node.rb
 - lib/stretchy/results.rb
+- lib/stretchy/scopes.rb
 - lib/stretchy/utils.rb
 - lib/stretchy/version.rb
 - solano.yml