stretchy 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02cee68659326cb0fcbb36e25b584efd846149cc
-  data.tar.gz: 4af82a79df5998f4bf7beface88f4467425fd86a
+  metadata.gz: 124aff086e4d044125b18f641bce3e440a3bec66
+  data.tar.gz: ee1b4ddda1669c13c7c17a9189fd1cda072f77b6
 SHA512:
-  metadata.gz: 432060e10838aa8438d545ff402214d9b4048d5848f1dbefde4d0a4fff4be366b51dfe52642d02628b61462679c0a7ee513035acd9dd2cd6c5604cb2ac1b64ec
-  data.tar.gz: 98a4e9114c0b8a99687773994ab45bbc32a07621cb48a7cb41f6e132e0d3dc975211ed091a99a686739efee9010742219ede298b3d0402da75a92e353f718e90
+  metadata.gz: 7a4375aca6e56a4755a693b3d346f945fe6d7aebe819064cbbeeb7e80e66588645ab17be24f8ed88b1ca89738d8eb6f9755cf2f79ccd35c9a60c8a862fd160e3
+  data.tar.gz: dac8575ff96c77ea601051da8fb08489c19c3b17245deed2ff6be48ed58fd2ad9054848025c52a43980a7112ac3277ad604c73ae0f1b1904a6d7eedab42d0715

data/lib/stretchy/boosts/base.rb

@@ -1,10 +1,13 @@
+require 'stretchy/utils/contract'
+
 module Stretchy
   module Boosts
     class Base
 
       include Stretchy::Utils::Contract
 
-      DEFAULT_WEIGHT = 1.2
+      DEFAULT_WEIGHT    = 1.2
+      DEFAULT_DECAY_FN  = :gauss
 
       def initialize
         raise "Override this in subclass"

data/lib/stretchy/boosts/field_decay_boost.rb

@@ -0,0 +1,47 @@
+require 'stretchy/boosts/base'
+require 'stretchy/types/geo_point'
+
+module Stretchy
+  module Boosts
+    class FieldDecayBoost < Base
+
+      attr_reader :field, :origin, :scale, :offset, :decay, :decay_amount, :weight
+
+      contract field: {type: :field, required: true},
+              origin: {required: true, type: [Numeric, Time, Date, Stretchy::Types::GeoPoint]},
+               scale: {required: true},
+               decay: {type: Numeric},
+                type: {type: :decay}
+
+      def initialize(options = {})
+        @field        = options[:field]
+        @origin       = options[:origin]
+        @scale        = options[:scale]
+        
+        @offset       = options[:offset]
+        @type         = options[:type]    || DEFAULT_DECAY_FN
+        @weight       = options[:weight]  || DEFAULT_WEIGHT
+        @decay        = options[:decay]
+        
+        validate!
+      end
+
+      def to_search
+        json = {
+          origin: @origin,
+          scale: @scale,
+        }
+        json[:offset] = @offset  if @offset
+        json[:decay]  = @decay   if @decay
+
+        {
+          @type => {
+            @field => json
+          },
+          weight: @weight
+        }
+      end
+
+    end
+  end
+end

data/lib/stretchy/boosts/filter_boost.rb

@@ -1,3 +1,6 @@
+require 'stretchy/boosts/base'
+require 'stretchy/filters/base'
+
 module Stretchy
   module Boosts
     class FilterBoost < Base

data/lib/stretchy/boosts/random_boost.rb

@@ -1,3 +1,5 @@
+require 'stretchy/boosts/base'
+
 module Stretchy
   module Boosts
     class RandomBoost < Base

data/lib/stretchy/builders/match_builder.rb

@@ -2,21 +2,25 @@ module Stretchy
   module Builders
     class MatchBuilder
 
-      attr_accessor :matches, :antimatches
+      attr_accessor :matches, :antimatches, :shouldmatches, :shouldnotmatches
 
       def initialize
-        @matches      = Hash.new { [] }
-        @antimatches  = Hash.new { [] }
+        @matches          = Hash.new { [] }
+        @antimatches      = Hash.new { [] }
+        @shouldmatches    = Hash.new { [] }
+        @shouldnotmatches = Hash.new { [] }
       end
 
       def any?
-        @matches.any? || @antimatches.any?
+        @matches.any? || @antimatches.any? || @shouldmatches.any? || @shouldnotmatches.any?
       end
 
       def build
         return Stretchy::Queries::MatchAllQuery.new unless any?
 
-        if @matches.count > 1 || @antimatches.any?
+        if @matches.count > 1   || @antimatches.any? || 
+           @shouldmatches.any?  || @shouldnotmatches.any?
+          
           bool_query
         else
           field, strings = @matches.first
@@ -27,10 +31,22 @@ module Stretchy
       def bool_query
         Stretchy::Queries::BoolQuery.new(
           must:     to_queries(@matches),
-          must_not: to_queries(@antimatches)
+          must_not: to_queries(@antimatches),
+          should:   build_should
         )
       end
 
+      def build_should
+        if @shouldnotmatches.any?
+          Stretchy::Queries::BoolQuery.new(
+            must:     to_queries(@shouldmatches),
+            must_not: to_queries(@shouldnotmatches)
+          )
+        else
+          to_queries(@shouldmatches)
+        end
+      end
+
       private
 
         def to_queries(matches)

data/lib/stretchy/builders/where_builder.rb

@@ -2,19 +2,31 @@ module Stretchy
   module Builders
     class WhereBuilder
 
-      attr_accessor :terms, :antiterms, :exists, :empties, 
-                    :ranges, :antiranges, :geos, :antigeos
+      attr_accessor :terms,   :antiterms,   :shouldterms,   :shouldnotterms,
+                    :exists,  :antiexists,  :shouldexists,  :shouldnotexists,
+                    :ranges,  :antiranges,  :shouldranges,  :shouldnotranges,
+                    :geos,    :antigeos,    :shouldgeos,    :shouldnotgeos
 
       def initialize(options = {})
-        @terms        = Hash.new { [] }
-        @antiterms    = Hash.new { [] }
-        @ranges       = {}
-        @antiranges   = {}
-        @geos         = {}
-        @antigeos     = {}
-
-        @exists       = []
-        @empties      = []
+        @terms            = Hash.new { [] }
+        @antiterms        = Hash.new { [] }
+        @shouldterms      = Hash.new { [] }
+        @shouldnotterms   = Hash.new { [] }
+        
+        @ranges           = {}
+        @antiranges       = {}
+        @shouldranges     = {}
+        @shouldnotranges  = {}
+        
+        @geos             = {}
+        @antigeos         = {}
+        @shouldgeos       = {}
+        @shouldnotgeos    = {}
+
+        @exists           = []
+        @antiexists       = []
+        @shouldexists     = []
+        @shouldnotexists  = []
       end
 
       def build
@@ -34,32 +46,47 @@ module Stretchy
       end
 
       def must_nots?
-        @antiterms.any?   || @empties.any?    || 
+        @antiterms.any?   || @antiexists.any? || 
         @antiranges.any?  || @antigeos.any?
       end
 
+      def shoulds?
+        @shouldterms.any?       ||
+        @shouldranges.any?      ||
+        @shouldgeos.any?        ||
+        @shouldexists.any?
+      end
+
+      def should_nots?
+        @shouldnotterms.any?    ||
+        @shouldnotranges.any?   ||
+        @shouldnotgeos.any?     ||
+        @shouldnotexists.any?
+      end
+
       def use_bool?
-        musts? && must_nots?
+        (musts? && must_nots?) || shoulds? || should_nots?
       end
 
       def any?
-        musts? || must_nots?
+        musts? || must_nots? || shoulds? || should_nots?
       end
 
       def bool_filter
         Stretchy::Filters::BoolFilter.new(
           must: build_filters(
-            terms: @terms,
+            terms:  @terms,
             exists: @exists,
             ranges: @ranges,
-            geos: @geos
+            geos:   @geos
           ),
           must_not: build_filters(
-            terms: @antiterms,
-            exists: @empties,
+            terms:  @antiterms,
+            exists: @antiexists,
             ranges: @antiranges,
-            geos: @antigeos
-          )
+            geos:   @antigeos
+          ),
+          should: build_should
         )
       end
 
@@ -82,20 +109,63 @@ module Stretchy
       def not_filter
         filter = build_filters(
           terms:    @antiterms,
-          exists:   @empties,
+          exists:   @antiexists,
           ranges:   @antiranges,
           geos:     @antigeos
         )
-        filter = Stretchy::Filters::AndFilter.new(filter) if filter.count > 1
+        filter = Stretchy::Filters::OrFilter.new(filter) if filter.count > 1
         Stretchy::Filters::NotFilter.new(filter)
       end
 
+      def build_should
+        if shoulds? && should_nots?
+          Stretchy::Filters::BoolFilter.new(
+            must: build_filters(
+              terms:  @shouldterms,
+              exists: @shouldexists,
+              ranges: @shouldranges,
+              geos:   @shouldgeos
+            ),
+            must_not: build_filters(
+              terms:  @shouldnotterms,
+              exists: @shouldnotexists,
+              ranges: @shouldnotranges,
+              geos:   @shouldnotgeos
+            )
+          )
+        elsif should_nots?
+          filters = build_filters(
+            terms:  @shouldnotterms,
+            exists: @shouldnotexists,
+            ranges: @shouldnotranges,
+            geos:   @shouldnotgeos
+          )
+          if filters.count > 1
+            filters = Stretchy::Filters::OrFilter.new(filters) 
+          else
+            filters = filters.first
+          end
+          
+          Stretchy::Filters::NotFilter.new(filters)
+        else
+          filters = build_filters(
+            terms:  @shouldterms,
+            exists: @shouldexists,
+            ranges: @shouldranges,
+            geos:   @shouldgeos
+          )
+          filters = Stretchy::Filters::AndFilter.new(filters) if filters.count > 1
+          filters
+        end
+      end
+
       def build_filters(options = {})
         filters = []
-        terms   = Hash(options[:terms])
-        ranges  = Hash(options[:ranges])
-        geos    = Hash(options[:geos])
-        exists  = Array(options[:exists])
+        terms       = Hash(options[:terms])
+        ranges      = Hash(options[:ranges])
+        geos        = Hash(options[:geos])
+        near_fields = Hash(options[:near_fields])
+        exists      = Array(options[:exists])
         
         filters << Stretchy::Filters::TermsFilter.new(terms) if terms.any?
         
@@ -103,18 +173,15 @@ module Stretchy
           Stretchy::Filters::ExistsFilter.new(field)
         end
 
-        filters += ranges.map do |field, values|
-          Stretchy::Filters::RangeFilter.new(
-            field:  field,
-            min:    values[:min],
-            max:    values[:max]
-          )
+        filters += ranges.map do |field, value|
+          Stretchy::Filters::RangeFilter.new(field: field, stretchy_range: value)
         end
 
         filters += geos.map do |field, values|
           Stretchy::Filters::GeoFilter.new(
             field: field,
             distance: values[:distance],
+            geo_point: values[:geo_point],
             lat: values[:lat],
             lng: values[:lng]
           )

data/lib/stretchy/clauses/base.rb

@@ -10,9 +10,8 @@ module Stretchy
       attr_accessor :match_builder, :where_builder, :boost_builder, 
                     :aggregate_builder, :inverse, :type, :index_name
 
-      alias :inverse? :inverse
-
       delegate [:response, :results, :ids, :hits, :took, :shards, :total, :max_score] => :query_results
+      delegate [:range, :geo] => :where
 
       def initialize(base_or_opts = nil, options = {})
         if base_or_opts && !base_or_opts.is_a?(Hash)
@@ -70,6 +69,26 @@ module Stretchy
         BoostClause.new(self, options)
       end
 
+      def not(opts_or_string = {}, opts = {})
+        if opts_or_string.is_a?(Hash)
+          WhereClause.new(self, opts_or_string.merge(inverse: true))
+        else
+          MatchClause.new(self, opts_or_string, opts.merge(inverse: true))
+        end
+      end
+
+      def should(opts_or_string = {}, opts = {})
+        if opts_or_string.is_a?(Hash)
+          WhereClause.new(self, opts_or_string.merge(should: true))
+        else
+          MatchClause.new(self, opts_or_string, opts.merge(should: true))
+        end
+      end
+
+      def inverse?
+        !!@inverse
+      end
+
       def to_search
         return @to_search if @to_search
         
@@ -92,4 +111,4 @@ module Stretchy
 
     end
   end
-end
+end

data/lib/stretchy/clauses/boost_clause.rb

@@ -1,7 +1,13 @@
+require 'stretchy/clauses/base'
+
 module Stretchy
   module Clauses
     class BoostClause < Base
 
+      extend Forwardable
+
+      delegate [:geo, :range] => :where
+
       def initialize(base, options = {})
         super(base)
         @inverse = options.delete(:inverse)
@@ -15,6 +21,17 @@ module Stretchy
         BoostWhereClause.new(self, options)
       end
 
+      def near(options = {})
+        if options[:lat] || options[:latitude]  ||
+           options[:lng] || options[:longitude] || options[:lon]
+
+          options[:origin] = Stretchy::Types::GeoPoint.new(options)
+        end
+        @boost_builder.functions << Stretchy::Boosts::FieldDecayBoost.new(options)
+        self
+      end
+      alias :geo :near
+
       def random(*args)
         @boost_builder.functions << Stretchy::Boosts::RandomBoost.new(*args)
         self

data/lib/stretchy/clauses/boost_match_clause.rb

@@ -1,3 +1,5 @@
+require 'stretchy/clauses/boost_clause'
+
 module Stretchy
   module Clauses
     class BoostMatchClause < BoostClause

data/lib/stretchy/clauses/boost_where_clause.rb

@@ -1,3 +1,5 @@
+require 'stretchy/clauses/boost_clause'
+
 module Stretchy
   module Clauses
     class BoostWhereClause < BoostClause

data/lib/stretchy/clauses/match_clause.rb

@@ -1,3 +1,5 @@
+require 'stretchy/clauses/base'
+
 module Stretchy
   module Clauses
     class MatchClause < Base
@@ -10,15 +12,21 @@ module Stretchy
         super(base)
         if opts_or_str.is_a?(Hash)
           @inverse     = opts_or_str.delete(:inverse) || options.delete(:inverse)
+          @should      = opts_or_str.delete(:should)  || options.delete(:should)
           add_params(options.merge(opts_or_str))
         else
           @inverse     = options.delete(:inverse)
+          @should      = options.delete(:should)
           add_params(options.merge('_all' => opts_or_str))
         end
       end
 
       def not(opts_or_str = {}, options = {})
-        self.class.new(self, opts_or_str, options.merge(inverse: !@inverse))
+        self.class.new(self, opts_or_str, options.merge(inverse: true, should: should?))
+      end
+
+      def should(opts_or_str = {}, options = {})
+        self.class.new(self, opts_or_str, options.merge(should: true))
       end
 
       def to_boost(weight = nil)
@@ -31,8 +39,28 @@ module Stretchy
         )
       end
 
+      def should?
+        !!@should
+      end
+
       private
 
+        def get_storage
+          if inverse?
+            if should?
+              @match_builder.shouldnotmatches
+            else
+              @match_builder.antimatches
+            end
+          else
+            if should?
+              @match_builder.shouldmatches
+            else
+              @match_builder.matches
+            end
+          end
+        end
+
         def add_params(params = {})
           case params
           when Hash
@@ -45,11 +73,7 @@ module Stretchy
         end
 
         def add_param(field, param)
-          if inverse?
-            @match_builder.antimatches[field] += Array(param)
-          else
-            @match_builder.matches[field]     += Array(param)
-          end
+          get_storage[field] += Array(param)
         end
 
     end

data/lib/stretchy/clauses/where_clause.rb

@@ -1,3 +1,5 @@
+require 'stretchy/clauses/base'
+
 module Stretchy
   module Clauses
     class WhereClause < Base
@@ -9,32 +11,33 @@ module Stretchy
       def initialize(base, options = {})
         super(base)
         @inverse = options.delete(:inverse)
+        @should  = options.delete(:should)
         add_params(options)
       end
 
-      def range(field, options = {})
-        min = max = nil
-        
-        case options
-        when Hash
-          min   = options[:min]
-          max   = options[:max]
-          store = inverse? ? @where_builder.antiranges : @where_builder.ranges
-          store[field] = { min: min, max: max }
-        when Range
-          add_param(field, options)
-        end
+      def should?
+        !!@should
+      end
 
+      def range(field, options = {})
+        get_storage(:ranges)[field] = Stretchy::Types::Range.new(options)
         self
       end
 
       def geo(field, options = {})
-        add_geo(field, options)
+        get_storage(:geos)[field] = {
+          distance:  options[:distance],
+          geo_point: Stretchy::Types::GeoPoint.new(options)
+        }
         self
       end
 
       def not(options = {})
-        self.class.new(self, options.merge(inverse: !@inverse))
+        self.class.new(self, options.merge(inverse: true, should: should?))
+      end
+
+      def should(options = {})
+        self.class.new(self, options.merge(should: true))
       end
 
       def to_boost(weight = nil)
@@ -68,6 +71,26 @@ module Stretchy
       end
 
       private
+
+        def get_storage(builder_field, is_inverse = nil)
+          is_inverse = inverse? if is_inverse.nil?
+          field = builder_field.to_s
+          if inverse? || is_inverse
+            if should?
+              field = "shouldnot#{field}"
+            else
+              field = "anti#{field}"
+            end
+          else
+            field = "should#{field}" if should?
+          end
+          
+          if field =~ /match/
+            @match_builder.send(field)
+          else
+            @where_builder.send(field)
+          end
+        end
         
         def add_params(options = {})
           options.each do |field, param|
@@ -83,28 +106,16 @@ module Stretchy
           end
         end
 
-        def add_geo(field, options = {})
-          store = inverse? ? @where_builder.antigeos : @where_builder.geos
-          store[field] = options
-        end
-
         def add_param(field, param)
           case param
           when nil
-            store = inverse? ? @where_builder.exists : @where_builder.empties
-            store << field
+            get_storage(:exists, true) << field
           when String, Symbol
-            if inverse?
-              @match_builder.antimatches[field] += Array(param)
-            else
-              @match_builder.matches[field] += Array(param)
-            end
+            get_storage(:matches)[field] += Array(param)
           when Range
-            store = inverse? ? @where_builder.antiranges : @where_builder.ranges
-            store[field] = { min: param.min, max: param.max }
+            get_storage(:ranges)[field] = Stretchy::Types::Range.new(param)
           else
-            store = inverse? ? @where_builder.antiterms : @where_builder.terms
-            store[field] += Array(param)
+            get_storage(:terms)[field] += Array(param)
           end
         end
 

data/lib/stretchy/filters/and_filter.rb

@@ -1,3 +1,5 @@
+require 'stretchy/filters/base'
+
 module Stretchy
   module Filters
     class AndFilter < Base
@@ -5,11 +7,7 @@ module Stretchy
       contract filters: {type: Stretchy::Filters::Base, array: true}
 
       def initialize(*args)
-        if args.count == 1 && args.first.is_a?(Array)
-          @filters = args.first
-        else
-          @filters = args
-        end
+        @filters = args.flatten
         validate!
       end
 

data/lib/stretchy/filters/base.rb

@@ -1,3 +1,5 @@
+require 'stretchy/utils/contract'
+
 module Stretchy
   module Filters
     class Base
@@ -14,4 +16,4 @@ module Stretchy
 
     end
   end
-end
+end

data/lib/stretchy/filters/bool_filter.rb

@@ -1,3 +1,5 @@
+require 'stretchy/filters/base'
+
 module Stretchy
   module Filters
     class BoolFilter < Base

data/lib/stretchy/filters/exists_filter.rb

@@ -1,3 +1,5 @@
+require 'stretchy/filters/base'
+
 module Stretchy
   module Filters
     class ExistsFilter < Base

data/lib/stretchy/filters/geo_filter.rb

@@ -1,17 +1,18 @@
+require 'stretchy/filters/base'
+require 'stretchy/types/geo_point'
+
 module Stretchy
   module Filters
     class GeoFilter < Base
 
       contract distance: {type: :distance, required: true},
-                    lat: {type: :lat, required: true},
-                    lng: {type: :lng, required: true},
+              geo_point: {type: Stretchy::Types::GeoPoint, required: true},
                   field: {type: :field, required: true}
 
       def initialize(options = {})
-        @field    = options[:field]
-        @distance = options[:distance]
-        @lat      = options[:lat]
-        @lng      = options[:lng]
+        @field      = options[:field]
+        @distance   = options[:distance]
+        @geo_point  = options[:geo_point] || Stretchy::Types::GeoPoint.new(options)
         validate!
       end
 
@@ -19,10 +20,7 @@ module Stretchy
         {
           geo_distance: {
             distance: @distance,
-            @field => {
-              lat: @lat,
-              lon: @lng
-            }
+            @field => @geo_point.to_search
           }
         }
       end

data/lib/stretchy/filters/not_filter.rb

@@ -1,3 +1,5 @@
+require 'stretchy/filters/base'
+
 module Stretchy
   module Filters
     class NotFilter < Base

data/lib/stretchy/filters/or_filter.rb

@@ -0,0 +1,22 @@
+require 'stretchy/filters/base'
+
+module Stretchy
+  module Filters
+    class OrFilter < Base
+
+      contract filters: {type: Base, array: true}
+
+      def initialize(*args)
+        @filters = args.flatten
+        validate!
+      end
+
+      def to_search
+        {
+          or: @filters.map(&:to_search)
+        }
+      end
+
+    end
+  end
+end

data/lib/stretchy/filters/query_filter.rb

@@ -1,3 +1,6 @@
+require 'stretchy/filters/base'
+require 'stretchy/queries/base'
+
 module Stretchy
   module Filters
     class QueryFilter < Base

data/lib/stretchy/filters/range_filter.rb

@@ -1,26 +1,23 @@
+require 'stretchy/filters/base'
+require 'stretchy/types/range'
+
 module Stretchy
   module Filters
     class RangeFilter < Base
 
-      contract field: {type: :field},
-                 min: {type: [Numeric, Time]},
-                 max: {type: [Numeric, Time]}
+      contract field: {type: :field, required: true},
+               range: {type: Stretchy::Types::Range, required: true}
 
       def initialize(options = {})
         @field = options[:field]
-        @min   = options[:min]
-        @max   = options[:max]
+        @range = options[:stretchy_range] || Stretchy::Types::Range.new(options)
         validate!
-        require_one(min: @min, max: @max)
       end
 
       def to_search
-        range = {}
-        range[:gte] = @min if @min
-        range[:lte] = @max if @max
         {
           range: {
-            @field => range
+            @field => @range.to_search
           }
         }
       end

data/lib/stretchy/filters/terms_filter.rb

@@ -1,3 +1,5 @@
+require 'stretchy/filters/base'
+
 module Stretchy
   module Filters
     class TermsFilter < Base

data/lib/stretchy/queries/base.rb

@@ -1,3 +1,5 @@
+require 'stretchy/utils/contract'
+
 module Stretchy
   module Queries
     class Base
@@ -14,4 +16,4 @@ module Stretchy
 
     end
   end
-end
+end

data/lib/stretchy/queries/bool_query.rb

@@ -1,3 +1,5 @@
+require 'stretchy/queries/base'
+
 module Stretchy
   module Queries
     class BoolQuery < Base

data/lib/stretchy/queries/filtered_query.rb

@@ -1,3 +1,6 @@
+require 'stretchy/queries/base'
+require 'stretchy/filters/base'
+
 module Stretchy
   module Queries
     class FilteredQuery < Base

data/lib/stretchy/queries/function_score_query.rb

@@ -1,3 +1,6 @@
+require 'stretchy/queries/base'
+require 'stretchy/boosts/base'
+
 module Stretchy
   module Queries
     class FunctionScoreQuery < Base

data/lib/stretchy/queries/match_all_query.rb

@@ -1,3 +1,5 @@
+require 'stretchy/queries/base'
+
 module Stretchy
   module Queries
     class MatchAllQuery < Base

data/lib/stretchy/queries/match_query.rb

@@ -1,3 +1,5 @@
+require 'stretchy/queries/base'
+
 module Stretchy
   module Queries
     class MatchQuery < Base

data/lib/stretchy/results/base.rb

@@ -42,4 +42,6 @@ module Stretchy
 
     end
   end
-end
+end
+
+require 'stretchy/results/null_results'

data/lib/stretchy/results/null_results.rb

@@ -1,3 +1,5 @@
+require 'stretchy/results/base'
+
 module Stretchy
   module Results
     class NullResults < Base

data/lib/stretchy/types/base.rb

@@ -0,0 +1,19 @@
+require 'stretchy/utils/contract'
+
+module Stretchy
+  module Types
+    class Base
+
+      include Stretchy::Utils::Contract
+
+      def initialize
+        raise "Override this in subclass"
+      end
+
+      def to_search
+        raise "Override this in subclass"
+      end
+
+    end
+  end
+end

data/lib/stretchy/types/geo_point.rb

@@ -0,0 +1,30 @@
+require 'stretchy/types/base'
+
+module Stretchy
+  module Types
+    class GeoPoint < Base
+
+      attr_reader :lat, :lon
+
+      contract lat: { type: :lat, required: true },
+               lon: { type: :lng, required: true }
+
+
+      def initialize(options = {})
+        @lat = options[:lat] || options[:latitude]
+        @lon = options[:lng] || options[:lon] ||
+               options[:longitude]
+
+        validate!
+      end
+
+      def to_search
+        {
+          lat: @lat,
+          lon: @lon
+        }
+      end
+
+    end
+  end
+end

data/lib/stretchy/types/range.rb

@@ -0,0 +1,52 @@
+module Stretchy
+  module Types
+    class Range < Base
+
+      attr_reader :min, :max, :exclusive_min, :exclusive_max
+
+      contract    min: { type: [Numeric, Date, Time] },
+                  max: { type: [Numeric, Date, Time] },
+        exclusive_min: { in: [true, false] },
+        exclusive_max: { in: [true, false] }
+
+      def initialize(opts_or_range = {}, options = {})
+
+        case opts_or_range
+        when ::Range
+          @min = opts_or_range.min
+          @max = opts_or_range.max
+          @exclusive_min = !!(options[:exclusive_min] || options[:exclusive])
+          @exclusive_max = !!(options[:exclusive_max] || options[:exclusive])
+        when ::Hash
+          opts = options.merge(opts_or_range)
+          @min = opts[:min]
+          @max = opts[:max]
+          @exclusive_min = !!(opts[:exclusive_min] || opts[:exclusive])
+          @exclusive_max = !!(opts[:exclusive_max] || opts[:exclusive])
+        else
+          raise Stretchy::Errors::ContractError.new("Ranges must be a range or a hash - found #{options.class.name}")
+        end
+
+        require_one min: @min, max: @max
+        validate!
+      end
+
+      def to_search
+        json = {}
+        if @exclusive_min && @min
+          json[:gt] = @min
+        elsif @min
+          json[:gte] = @min
+        end
+
+        if @exclusive_max && @max
+          json[:lt] = @max
+        elsif @max
+          json[:lte] = @max
+        end
+        json
+      end
+
+    end
+  end
+end

data/lib/stretchy/utils/client_actions.rb

@@ -1,4 +1,3 @@
-require 'json'
 module Stretchy
   module Utils
     module ClientActions
@@ -18,6 +17,10 @@ module Stretchy
         client.cat.count(index: index_name).split(' ')[2].to_i
       end
 
+      def query(*args, &block)
+        Stretchy::Clauses::Base.new(*args, &block)
+      end
+
       def search(type:, body:, fields: nil)
         options = { index: index_name, type: type, body: body }
         options[:fields] = fields if fields.is_a?(Array)

data/lib/stretchy/utils/contract.rb

@@ -4,6 +4,7 @@ module Stretchy
 
       ASSERTIONS = [:type, :responds_to, :in, :matches, :required]
       DISTANCE_FORMAT = /^(\d+)(km|mi)$/
+      DECAY_FUNCTIONS = [:gauss, :linear, :exp]
 
       def self.included(base)
         base.send(:extend, ClassMethods)
@@ -31,7 +32,7 @@ module Stretchy
 
       def require_one(options = {})
         if options.values.all?{|v| self.class.is_empty?(v) }
-          raise Stretchy::Errors::ContractError.new("One of #{options.keys.join(', ')} must be present")
+          raise Stretchy::Errors::ContractError.new("One of #{options.keys.join(', ')} must be present, found: #{options}")
         end
       end
 
@@ -60,7 +61,7 @@ module Stretchy
 
         def assert_required(name, value, options)
           msg = "Expected to have param #{name}, but got nil"
-          fail_assertion(msg) if msg.nil?
+          fail_assertion(msg) if is_empty?(value)
         end
 
         def assert_type(name, value, options)
@@ -83,6 +84,9 @@ module Stretchy
 
             msg = "Expected #{name} to be a string, symbol, or number, but was blank"
             fail_assertion(msg) if value.is_a?(String) && value.empty?
+          when :decay
+            msg = "Expected #{name} to be one of #{DECAY_FUNCTIONS.join(', ')}, but got #{value}"
+            fail_assertion(msg) unless DECAY_FUNCTIONS.any?{|f| f == value || f.to_s == value }
           when Array
             msg = "Expected #{name} to be one of #{type.map{|t| t.name}}, but got #{value.class.name}"
             fail_assertion(msg) unless type.any?{|t| value.is_a?(t)}

data/lib/stretchy/version.rb

@@ -1,3 +1,3 @@
 module Stretchy
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/stretchy.rb

@@ -4,28 +4,10 @@ require 'forwardable'
 require 'excon'
 require 'elasticsearch'
 
-require 'stretchy/utils/contract'
-require 'stretchy/utils/configuration'
-require 'stretchy/utils/client_actions'
-require 'stretchy/boosts/base'
-require 'stretchy/filters/base'
-require 'stretchy/queries/base'
-require 'stretchy/clauses/base'
-require 'stretchy/results/base'
-
-grep_require = ->(matches){
-  Dir[File.join(File.dirname(__FILE__), 'stretchy', '**', '*.rb')].each do |path|
-    require path if path =~ matches
-  end
-}
-
-grep_require.call(/utils/)
-grep_require.call(/base/)
-grep_require.call(/(?!utils|base)/)
-
 module Stretchy
+end
 
-  extend Utils::Configuration
-  extend Utils::ClientActions
+Gem.find_files('stretchy/**/*.rb').reject{|f| f =~ /spec/ }.each {|f| require f }
 
-end
+Stretchy.send(:extend, Stretchy::Utils::Configuration)
+Stretchy.send(:extend, Stretchy::Utils::ClientActions)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stretchy
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - agius
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-05-01 00:00:00.000000000 Z
+date: 2015-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch
@@ -138,8 +138,8 @@ files:
 - bin/setup
 - lib/stretchy.rb
 - lib/stretchy/boosts/base.rb
+- lib/stretchy/boosts/field_decay_boost.rb
 - lib/stretchy/boosts/filter_boost.rb
-- lib/stretchy/boosts/geo_boost.rb
 - lib/stretchy/boosts/random_boost.rb
 - lib/stretchy/builders/boost_builder.rb
 - lib/stretchy/builders/match_builder.rb
@@ -157,6 +157,7 @@ files:
 - lib/stretchy/filters/exists_filter.rb
 - lib/stretchy/filters/geo_filter.rb
 - lib/stretchy/filters/not_filter.rb
+- lib/stretchy/filters/or_filter.rb
 - lib/stretchy/filters/query_filter.rb
 - lib/stretchy/filters/range_filter.rb
 - lib/stretchy/filters/terms_filter.rb
@@ -168,6 +169,9 @@ files:
 - lib/stretchy/queries/match_query.rb
 - lib/stretchy/results/base.rb
 - lib/stretchy/results/null_results.rb
+- lib/stretchy/types/base.rb
+- lib/stretchy/types/geo_point.rb
+- lib/stretchy/types/range.rb
 - lib/stretchy/utils/client_actions.rb
 - lib/stretchy/utils/configuration.rb
 - lib/stretchy/utils/contract.rb

data/lib/stretchy/boosts/geo_boost.rb

@@ -1,46 +0,0 @@
-module Stretchy
-  module Boosts
-    class GeoBoost < Base
-
-      DEFAULTS = {
-        field: 'coords',
-        offset: '10km',
-        scale: '50km',
-        decay: 0.75,
-        weight: 1.2
-      }.freeze
-
-      contract offset: {type: :distance},
-                scale: {type: :distance},
-                decay: {type: Numeric},
-               weight: {type: Numeric},
-                  lat: {type: :lat},
-                  lng: {type: :lng}
-
-      def initialize(options = {})
-        @field  = options[:field]   || DEFAULTS[:field]
-        @offset = options[:offset]  || DEFAULTS[:offset]
-        @scale  = options[:scale]   || DEFAULTS[:scale]
-        @decay  = options[:decay]   || DEFAULTS[:decay]
-        @weight = options[:weight]  || DEFAULTS[:weight]
-        @lat    = options[:lat]
-        @lng    = options[:lng]
-        validate!
-      end
-
-      def to_search
-        {
-          gauss: {
-            @field => {
-              origin: { lat: @lat, lon: @lng },
-              offset: @offset,
-              scale: @scale,
-              decay: @decay
-            }
-          },
-          weight: @weight
-        }
-      end
-    end
-  end
-end