stretchy 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a7be2bbcc9690d42a0a9ca01601b4936b52dcf2
-  data.tar.gz: a53b3d3201f42f90f807324ec96b6d1049a4037c
+  metadata.gz: ea071c20b4f06728acea83eb37c8860235929310
+  data.tar.gz: 288665ba972b8c684e8a48ef1b7fd5d22761864a
 SHA512:
-  metadata.gz: 1171e1dfe7ce1255a911bdd471d6c40aab58b1fa90ba88016d4dff49d0e463effcf9b1194d7e9470d3186e40905ffc7aca941c32a1c45458231aa2376c6993b1
-  data.tar.gz: 731cd339625a1a8ffbd398066d751a5424831f5f210eed1dd6ecd152cc27e93424042c8ad7da7d851858899c2b4cb05093382e1a41885dca4e3981949daee182
+  metadata.gz: b46df2375ccceabc416f34bd71d51f7340d00395b63d2107a030dfc0f5fe951f0b696029ada4101ff3a65ac85210b4c95bbca78452e8d1fc32f944a76dd88f69
+  data.tar.gz: 8df428f03c7bb2b559fca8b1f522ef8e125ebadf830bf3ea7d327edae9b52eb4a7f2b6b092af3dbf75a6133694d8d12653792df0e21cf235212ce31b585cacf1

data/lib/stretchy/boosts/field_decay_boost.rb

@@ -27,10 +27,12 @@ module Stretchy
       end
 
       def to_search
-        json = {
-          origin: @origin,
-          scale: @scale,
-        }
+        json = {scale: @scale}
+        if @origin.is_a?(Stretchy::Types::Base)
+          json[:origin] = @origin.to_search
+        else
+          json[:origin] = @origin
+        end
         json[:offset] = @offset  if @offset
         json[:decay]  = @decay   if @decay
 

data/lib/stretchy/builders/match_builder.rb

@@ -2,13 +2,23 @@ module Stretchy
   module Builders
     class MatchBuilder
 
-      attr_accessor :matches, :antimatches, :shouldmatches, :shouldnotmatches
+      attr_accessor :matches,           :matchops, 
+                    :antimatches,       :antimatchops,
+                    :shouldmatches,     :shouldmatchops,
+                    :shouldnotmatches,  :shouldnotmatchops
 
       def initialize
-        @matches          = Hash.new { [] }
-        @antimatches      = Hash.new { [] }
-        @shouldmatches    = Hash.new { [] }
-        @shouldnotmatches = Hash.new { [] }
+        @matches           = Hash.new { [] }
+        @matchops          = Hash.new { 'and' }
+        
+        @antimatches       = Hash.new { [] }
+        @antimatchops      = Hash.new { 'and' }
+        
+        @shouldmatches     = Hash.new { [] }
+        @shouldmatchops    = Hash.new { 'and' }
+        
+        @shouldnotmatches  = Hash.new { [] }
+        @shouldnotmatchops = Hash.new { 'and' }
       end
 
       def any?
@@ -23,15 +33,14 @@ module Stretchy
           
           bool_query
         else
-          field, strings = @matches.first
-          Stretchy::Queries::MatchQuery.new(field: field, string: strings.join(' '))
+          to_queries(@matches, @matchops).first
         end
       end
 
       def bool_query
         Stretchy::Queries::BoolQuery.new(
-          must:     to_queries(@matches),
-          must_not: to_queries(@antimatches),
+          must:     to_queries(@matches, @matchops),
+          must_not: to_queries(@antimatches, @antimatchops),
           should:   build_should
         )
       end
@@ -39,19 +48,23 @@ module Stretchy
       def build_should
         if @shouldnotmatches.any?
           Stretchy::Queries::BoolQuery.new(
-            must:     to_queries(@shouldmatches),
-            must_not: to_queries(@shouldnotmatches)
+            must:     to_queries(@shouldmatches, @shouldmatchops),
+            must_not: to_queries(@shouldnotmatches, @shouldnotmatchops)
           )
         else
-          to_queries(@shouldmatches)
+          to_queries(@shouldmatches, @shouldmatchops)
         end
       end
 
       private
 
-        def to_queries(matches)
+        def to_queries(matches, operators)
           matches.map do |field, strings|
-            Stretchy::Queries::MatchQuery.new(field: field, string: strings.join(' '))
+            Stretchy::Queries::MatchQuery.new(
+              field:    field,
+              string:   strings.join(' '),
+              operator: operators[field]
+            )
           end
         end
 

data/lib/stretchy/builders/where_builder.rb

@@ -167,7 +167,9 @@ module Stretchy
         near_fields = Hash(options[:near_fields])
         exists      = Array(options[:exists])
         
-        filters << Stretchy::Filters::TermsFilter.new(terms) if terms.any?
+        terms.each do |field, values|
+          filters << Stretchy::Filters::TermsFilter.new(field, values)
+        end
         
         filters += exists.map do |field|
           Stretchy::Filters::ExistsFilter.new(field)

data/lib/stretchy/clauses/base.rb

@@ -10,7 +10,8 @@ module Stretchy
       attr_accessor :match_builder, :where_builder, :boost_builder, 
                     :aggregate_builder, :inverse, :type, :index_name
 
-      delegate [:response, :results, :ids, :hits, :took, :shards, :total, :max_score] => :query_results
+      delegate [:request, :response, :results, :ids, :hits, 
+                :took, :shards, :total, :max_score] => :query_results
       delegate [:range, :geo] => :where
 
       def initialize(base_or_opts = nil, options = {})
@@ -60,10 +61,12 @@ module Stretchy
       def match(options = {})
         MatchClause.new(self, options)
       end
+      alias :fulltext :match
 
       def where(options = {})
         WhereClause.new(self, options)
       end
+      alias :filter :where
 
       def boost(options = {})
         BoostClause.new(self, options)
@@ -106,7 +109,7 @@ module Stretchy
       end
 
       def query_results
-        @query_results ||= Stretchy::Results::Base.new(to_search.merge(from: @limit, size: @offset), type: @type)
+        @query_results ||= Stretchy::Results::Base.new(self)
       end
 
     end

data/lib/stretchy/clauses/boost_clause.rb

@@ -16,10 +16,12 @@ module Stretchy
       def match(options = {})
         BoostMatchClause.new(self, options)
       end
+      alias :fulltext :match
 
       def where(options = {})
         BoostWhereClause.new(self, options)
       end
+      alias :filter :where
 
       def near(options = {})
         if options[:lat] || options[:latitude]  ||

data/lib/stretchy/clauses/boost_match_clause.rb

@@ -4,6 +4,8 @@ module Stretchy
   module Clauses
     class BoostMatchClause < BoostClause
 
+      delegate [:range, :geo] => :where
+
       def initialize(base, opts_or_string = {}, options = {})
         super(base)
         if opts_or_string.is_a?(Hash)
@@ -19,6 +21,14 @@ module Stretchy
         self.class.new(self, opts_or_string, options.merge(inverse: !inverse?))
       end
 
+      def where(*args)
+        WhereClause.new(self, *args)
+      end
+
+      def match(*args)
+        MatchClause.new(self, *args)
+      end
+
       private
 
         def match_function(options = {})

data/lib/stretchy/clauses/boost_where_clause.rb

@@ -10,14 +10,22 @@ module Stretchy
         self
       end
 
+      def where(*args)
+        WhereClause.new(self, *args)
+      end
+
+      def match(*args)
+        MatchClause.new(self, *args)
+      end
+
       def range(*args)
         where_function(:range, *args)
-        self
+        Base.new(self)
       end
 
       def geo(*args)
         where_function(:geo, *args)
-        self
+        Base.new(self)
       end
 
       private

data/lib/stretchy/clauses/where_clause.rb

@@ -112,6 +112,7 @@ module Stretchy
             get_storage(:exists, true) << field
           when String, Symbol
             get_storage(:matches)[field] += Array(param)
+            get_storage(:matchops)[field] = 'or'
           when Range
             get_storage(:ranges)[field] = Stretchy::Types::Range.new(param)
           else

data/lib/stretchy/filters/terms_filter.rb

@@ -5,27 +5,19 @@ module Stretchy
     class TermsFilter < Base
 
       contract field: {type: :field, required: true},
-              values: {type: Array,  required: true}
+               terms: {type: [Numeric, Time, String, Symbol], array: true,  required: true}
 
-      def initialize(field_or_opts = {}, terms = [])
-        if field_or_opts.is_a?(Hash)
-          @terms = field_or_opts
-        else
-          @terms = { field_or_opts => Array(terms) }
-        end
-        validate_terms!
-      end
-
-      def validate_terms!
-        exc = Stretchy::Errors::ContractError.new("Terms cannot be blank")
-        raise exc if @terms.none? || @terms.any? do |field, terms|
-          terms.none?
-        end
+      def initialize(field, terms)
+        @field = field
+        @terms = Array(terms)
+        validate!
       end
 
       def to_search
         {
-          terms: @terms
+          terms: {
+            @field => @terms
+          }
         }
       end
     end

data/lib/stretchy/version.rb

@@ -1,3 +1,3 @@
 module Stretchy
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stretchy
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - agius
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-05-11 00:00:00.000000000 Z
+date: 2015-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch