stretchy 0.4.0 → 0.4.1

data/lib/stretchy/builders/where_builder.rb

@@ -2,194 +2,123 @@ module Stretchy
   module Builders
     class WhereBuilder
 
-      attr_accessor :terms,   :antiterms,   :shouldterms,   :shouldnotterms,
-                    :exists,  :antiexists,  :shouldexists,  :shouldnotexists,
-                    :ranges,  :antiranges,  :shouldranges,  :shouldnotranges,
-                    :geos,    :antigeos,    :shouldgeos,    :shouldnotgeos
+      extend Forwardable
 
-      def initialize(options = {})
-        @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
-        if use_bool?
-          bool_filter
-        elsif musts?
-          and_filter
-        elsif must_nots?
-          not_filter
-        else
-          nil
-        end
-      end
-
-      def musts?
-        @terms.any? || @exists.any? || @ranges.any? || @geos.any?
-      end
+      attr_accessor :must, :must_not, :should, :should_not
 
-      def must_nots?
-        @antiterms.any?   || @antiexists.any? || 
-        @antiranges.any?  || @antigeos.any?
+      def initialize(options = {})
+        @must         = FilterBuilder.new
+        @must_not     = FilterBuilder.new(inverse: true)
+        @should       = FilterBuilder.new(should:  true)
+        @should_not   = FilterBuilder.new(inverse: true, should: true)
       end
 
-      def shoulds?
-        @shouldterms.any?       ||
-        @shouldranges.any?      ||
-        @shouldgeos.any?        ||
-        @shouldexists.any?
+      def any?
+        must.any? || must_not.any? || should.any? || should_not.any?
       end
 
-      def should_nots?
-        @shouldnotterms.any?    ||
-        @shouldnotranges.any?   ||
-        @shouldnotgeos.any?     ||
-        @shouldnotexists.any?
+      def use_bool?
+        (must.any? && must_not.any?) || should.any? || should_not.any?
       end
 
-      def use_bool?
-        (musts? && must_nots?) || shoulds? || should_nots?
+      def add_param(field, param, options = {})
+        case param
+        when nil
+          builder_from_options(options.merge(inverse: !options[:inverse])).add_exists(field)
+        when ::Range, Types::Range
+          builder_from_options(options).add_range(field, param)
+        else
+          builder_from_options(options).add_terms(field, param)
+        end
       end
 
-      def any?
-        musts? || must_nots? || shoulds? || should_nots?
+      def add_geo(field, distance, options = {})
+        if options[:geo_point]
+          geo_point = Types::GeoPoint.new(options[:geo_point])
+        else
+          geo_point = Types::GeoPoint.new(options)
+        end
+        
+        builder_from_options(options).add_geo(field, distance, geo_point)
       end
 
-      def bool_filter
-        Stretchy::Filters::BoolFilter.new(
-          must: build_filters(
-            terms:  @terms,
-            exists: @exists,
-            ranges: @ranges,
-            geos:   @geos
-          ),
-          must_not: build_filters(
-            terms:  @antiterms,
-            exists: @antiexists,
-            ranges: @antiranges,
-            geos:   @antigeos
-          ),
-          should: build_should
-        )
+      def add_range(field, options = {})
+        builder_from_options(options).add_range(field, options)
       end
 
-      def and_filter
-        filter = nil
-        filters = build_filters(
-          terms:  @terms,
-          exists: @exists,
-          ranges: @ranges,
-          geos:   @geos
-        )
-        if filters.count > 1
-          filter = Stretchy::Filters::AndFilter.new(filters)
+      def to_filter
+        if use_bool?
+          bool_filter
+        elsif must.any?
+          and_filter
+        elsif must_not.any?
+          not_filter
         else
-          filter = filters.first
+          nil
         end
-        filter
       end
 
-      def not_filter
-        filter = build_filters(
-          terms:    @antiterms,
-          exists:   @antiexists,
-          ranges:   @antiranges,
-          geos:     @antigeos
-        )
-        filter = Stretchy::Filters::OrFilter.new(filter) if filter.count > 1
-        Stretchy::Filters::NotFilter.new(filter)
-      end
+      private
 
-      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) 
+        def builder_from_options(options = {})
+          return must unless options.is_a?(Hash)
+          if options[:inverse] && options[:should]
+            should_not
+          elsif options[:inverse]
+            must_not
+          elsif options[:should]
+            should
           else
-            filters = filters.first
+            must
           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])
-        near_fields = Hash(options[:near_fields])
-        exists      = Array(options[:exists])
-        
-        terms.each do |field, values|
-          filters << Stretchy::Filters::TermsFilter.new(field, values)
+        def bool_filter
+          Stretchy::Filters::BoolFilter.new(
+            must:     must.to_filters,
+            must_not: must_not.to_filters,
+            should:   build_should
+          )
         end
-        
-        filters += exists.map do |field|
-          Stretchy::Filters::ExistsFilter.new(field)
+
+        def and_filter
+          filter = nil
+          filters = must.to_filters
+          if filters.count > 1
+            filter = Stretchy::Filters::AndFilter.new(filters)
+          else
+            filter = filters.first
+          end
+          filter
         end
 
-        filters += ranges.map do |field, value|
-          Stretchy::Filters::RangeFilter.new(field: field, stretchy_range: value)
+        def not_filter
+          filter = must_not.to_filters
+          filter = Stretchy::Filters::OrFilter.new(filter) if filter.count > 1
+          Stretchy::Filters::NotFilter.new(filter)
         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]
-          )
+        def build_should
+          if should.any? && should_not.any?
+            Stretchy::Filters::BoolFilter.new(
+              must:     should.to_filters,
+              must_not: should_not.to_filters
+            )
+          elsif should_not.any?
+            filters = should_not.to_filters
+            if filters.count > 1
+              filters = Stretchy::Filters::OrFilter.new(filters) 
+            else
+              filters = filters.first
+            end
+            
+            Stretchy::Filters::NotFilter.new(filters)
+          else
+            filters = should.to_filters
+            filters = Stretchy::Filters::AndFilter.new(filters) if filters.count > 1
+            filters
+          end
         end
-        filters
       end
-    end
   end
 end

data/lib/stretchy/builders.rb

@@ -1,3 +1,6 @@
+require 'stretchy/builders/shell_builder'
+require 'stretchy/builders/filter_builder'
+require 'stretchy/builders/query_builder'
 require 'stretchy/builders/boost_builder'
 require 'stretchy/builders/match_builder'
 require 'stretchy/builders/where_builder'

data/lib/stretchy/clauses/base.rb

@@ -16,11 +16,7 @@ module Stretchy
 
       extend Forwardable
 
-      DEFAULT_LIMIT   = 30
-      DEFAULT_OFFSET  = 0
-
-      attr_accessor :match_builder, :where_builder, :boost_builder, 
-                    :aggregate_builder, :inverse, :type, :index_name
+      attr_reader :base
 
       delegate [:request, :response, :results, :ids, :hits, 
                 :took, :shards, :total, :max_score, :total_pages] => :query_results
@@ -39,33 +35,16 @@ module Stretchy
       #   @option base_or_opts [String] :index        The Elastic index to query
       #   @option base_or_opts [String] :type         The Lucene type to query on
       #   @option base_or_opts [true, false] :inverse Whether we are in a `not` context
-      def initialize(base_or_opts = nil, options = {})
-        if base_or_opts && !base_or_opts.is_a?(Hash)
-          base                = base_or_opts
-          @index_name         = base.index_name
-          @type               = base.type
-          @match_builder      = base.match_builder
-          @where_builder      = base.where_builder
-          @boost_builder      = base.boost_builder
-          @aggregate_builder  = base.aggregate_builder
-          @inverse            = options[:inverse]
-          @limit              = base.get_limit
-          @offset             = base.get_offset
-          @explain            = base.get_explain
-          @fields             = base.get_fields
+      def initialize(base = nil, options = {})
+        if base.is_a?(Builders::ShellBuilder)
+          @base = base
+        elsif base.nil?
+          @base = Builders::ShellBuilder.new
         else
-          options = Hash(base_or_opts).merge(options)
-          @index_name         = options[:index] || Stretchy.index_name
-          @type               = options[:type]
-          @match_builder      = Stretchy::Builders::MatchBuilder.new
-          @where_builder      = Stretchy::Builders::WhereBuilder.new
-          @boost_builder      = Stretchy::Builders::BoostBuilder.new
-          @aggregate_builder  = {}
-          @inverse            = options[:inverse]
-          @limit              = DEFAULT_LIMIT
-          @offset             = DEFAULT_OFFSET
-          @fields             = nil
+          @base = Builders::ShellBuilder.new(base)
         end
+        @base.index ||= options[:index] || Stretchy.index_name
+        @base.type    = options[:type]  if options[:type]
       end
 
       # 
@@ -78,7 +57,7 @@ module Stretchy
       # 
       # @return [self]
       def limit(num)
-        @limit = num
+        base.limit = num
         self
       end
 
@@ -87,7 +66,7 @@ module Stretchy
       # 
       # @return [Integer] Value of `@limit`
       def get_limit
-        @limit
+        base.limit
       end
       alias :limit_value :get_limit
 
@@ -101,7 +80,7 @@ module Stretchy
       # 
       # @return [self]
       def offset(num)
-        @offset = num
+        base.offset = num
         self
       end
       alias :per_page :offset
@@ -111,7 +90,7 @@ module Stretchy
       # 
       # @return [Integer] Offset for query
       def get_offset
-        @offset
+        base.offset
       end
 
       # 
@@ -121,8 +100,8 @@ module Stretchy
       # 
       # @return [self] Allows continuing the query chain
       def page(num, options = {})
-        @limit  = options[:limit] || options[:per_page] || @limit
-        @offset = [(num - 1), 0].max.ceil * @limit
+        base.limit  = options[:limit] || options[:per_page] || get_limit
+        base.offset = [(num - 1), 0].max.ceil * get_limit
         self
       end
 
@@ -131,7 +110,7 @@ module Stretchy
       # 
       # @return [Integer] (offset / limit).ceil
       def get_page
-        (@offset.to_f / @limit).ceil + 1
+        base.page
       end
       alias :current_page :get_page
 
@@ -150,8 +129,8 @@ module Stretchy
       # 
       # @return [self] Allows continuing the query chain
       def fields(*args)
-        @fields ||= []
-        @fields += args.flatten if args.any?
+        base.fields ||= []
+        base.fields += args.flatten if args.any?
         self
       end
 
@@ -160,7 +139,7 @@ module Stretchy
       # 
       # @return [Array] List of fields in the current query
       def get_fields
-        @fields
+        base.fields
       end
 
       # 
@@ -171,12 +150,12 @@ module Stretchy
       # 
       # @return [self] Allows continuing the query chain
       def explain
-        @explain = true
+        base.explain = true
         self
       end
 
       def get_explain
-        !!@explain
+        !!base.explain
       end
 
       # 
@@ -192,7 +171,7 @@ module Stretchy
       # 
       # @see http://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-match-query.html Elastic Docs - Match Query
       def match(options = {})
-        MatchClause.new(self, options)
+        MatchClause.new(base, options)
       end
       alias :fulltext :match
 
@@ -207,7 +186,7 @@ module Stretchy
       # 
       # @see  WhereClause#initialize
       def where(options = {})
-        WhereClause.new(self, options)
+        WhereClause.new(base, options)
       end
       alias :filter :where
 
@@ -227,7 +206,7 @@ module Stretchy
       # 
       # @see http://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-function-score-query.html Elastic Docs - Function Score Query
       def boost
-        BoostClause.new(self)
+        BoostClause.new(base)
       end
 
       # 
@@ -245,11 +224,11 @@ module Stretchy
       # 
       # @return [Base] A {WhereClause}, or a {MatchClause} if only a string 
       #   is given (ie, doing a full-text search across the whole document)
-      def not(opts_or_string = {}, opts = {})
+      def not(opts_or_string = {})
         if opts_or_string.is_a?(Hash)
-          WhereClause.new(self).not(opts_or_string)
+          WhereClause.new(base).not(opts_or_string)
         else
-          MatchClause.new(self).not(opts_or_string)
+          MatchClause.new(base).not(opts_or_string)
         end
       end
 
@@ -271,11 +250,11 @@ module Stretchy
       # @see http://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-bool-query.html Elastic Docs - Bool Query
       # 
       # @see http://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-bool-filter.html Elastic Docs - Bool Filter
-      def should(opts_or_string = {}, opts = {})
+      def should(opts_or_string = {})
         if opts_or_string.is_a?(Hash)
-          WhereClause.new(self).should(opts_or_string)
+          WhereClause.new(base).should(opts_or_string)
         else
-          MatchClause.new(self).should(opts_or_string)
+          MatchClause.new(base).should(opts_or_string)
         end
       end
 
@@ -286,13 +265,13 @@ module Stretchy
       # 
       # @return [self] Allows continuing the query chain
       def aggregations(opts = {})
-        @aggregate_builder = @aggregate_builder.merge(opts)
+        base.aggregate_builder = base.aggregate_builder.merge(opts)
         self
       end
       alias :aggs :aggregations
 
       def get_aggregations
-        @aggregate_builder
+        base.aggregate_builder
       end
       alias :get_aggs :get_aggregations
 
@@ -304,30 +283,6 @@ module Stretchy
         !!@inverse
       end
 
-      # 
-      # Compiles the internal representation of your filters,
-      # full-text queries, and boosts into the JSON to be 
-      # passed to Elastic. If you want to know exactly what
-      # your query generated, you can call this method.
-      # 
-      # @return [Hash] the query hash to be compiled to json 
-      #   and sent to Elastic
-      def to_search
-        return @to_search if @to_search
-        
-        @to_search = if @where_builder.any?
-          Stretchy::Queries::FilteredQuery.new(
-            query:  @match_builder.build,
-            filter: @where_builder.build
-          )
-        else
-          @match_builder.build
-        end
-
-        @to_search = @boost_builder.build(@to_search) if @boost_builder.any?
-        @to_search = @to_search.to_search
-      end
-
       # 
       # The Results object for this query, which handles
       # sending the search request and providing convienent
@@ -335,7 +290,7 @@ module Stretchy
       # 
       # @return [Results::Base] The results returned from Elastic
       def query_results
-        @query_results ||= Stretchy::Results::Base.new(self)
+        @query_results ||= Stretchy::Results::Base.new(base)
       end
 
     end

data/lib/stretchy/clauses/boost_clause.rb

@@ -45,7 +45,7 @@ module Stretchy
       # 
       # @return [BoostMatchClause] query with boost match state
       def match(options = {})
-        BoostMatchClause.new(self, options)
+        BoostMatchClause.new(base, options)
       end
       alias :fulltext :match
 
@@ -60,7 +60,7 @@ module Stretchy
       # @return [BoostWhereClause] Query state with boost filters applied
       # 
       def where(options = {})
-        BoostWhereClause.new(self, options)
+        BoostWhereClause.new(base, options)
       end
       alias :filter :where
 
@@ -125,8 +125,8 @@ module Stretchy
 
           options[:origin] = Stretchy::Types::GeoPoint.new(options)
         end
-        @boost_builder.functions << Stretchy::Boosts::FieldDecayBoost.new(options)
-        Base.new(self)
+        base.boost_builder.functions << Stretchy::Boosts::FieldDecayBoost.new(options)
+        Base.new(base)
       end
       alias :geo :near
 
@@ -141,8 +141,8 @@ module Stretchy
       # 
       # @see http://www.elastic.co/guide/en/elasticsearch/guide/master/random-scoring.html Elastic Docs - Random Scoring
       def random(*args)
-        @boost_builder.functions << Stretchy::Boosts::RandomBoost.new(*args)
-        Base.new(self)
+        base.boost_builder.functions << Stretchy::Boosts::RandomBoost.new(*args)
+        Base.new(base)
       end
 
       # 
@@ -152,7 +152,7 @@ module Stretchy
       # 
       # @return [self] Boost context with overall boost applied
       def all(num)
-        @boost_builder.overall_boost = num
+        base.boost_builder.overall_boost = num
         self
       end
 
@@ -163,7 +163,7 @@ module Stretchy
       # 
       # @return [self] Boost context with maximum score applied
       def max(num)
-        @boost_builder.max_boost = num
+        base.boost_builder.max_boost = num
         self
       end
 
@@ -175,7 +175,7 @@ module Stretchy
       # 
       # @return [self] Boost context with score mode applied
       def score_mode(mode)
-        @boost_builder.score_mode = mode
+        base.boost_builder.score_mode = mode
         self
       end
 
@@ -187,7 +187,7 @@ module Stretchy
       # 
       # @return [self] Boost context with boost mode applied
       def boost_mode(mode)
-        @boost_builder.boost_mode = mode
+        base.boost_builder.boost_mode = mode
         self
       end
 

data/lib/stretchy/clauses/boost_match_clause.rb

@@ -72,7 +72,7 @@ module Stretchy
       # 
       # @return [WhereClause] Query with where clause applied
       def where(*args)
-        WhereClause.new(self, *args)
+        WhereClause.new(base, *args)
       end
 
       # 
@@ -89,7 +89,7 @@ module Stretchy
       # 
       # @return [MatchClause] Base context with match queries applied
       def match(*args)
-        MatchClause.new(self, *args)
+        MatchClause.new(base, *args)
       end
 
       private
@@ -98,7 +98,7 @@ module Stretchy
           weight = options.delete(:weight)
           clause = MatchClause.tmp(options)
           boost  = clause.to_boost(weight)
-          @boost_builder.functions << boost if boost
+          base.boost_builder.functions << boost if boost
         end
 
     end

data/lib/stretchy/clauses/boost_where_clause.rb

@@ -40,7 +40,7 @@ module Stretchy
       # 
       # @return [WhereClause] Query with where clause applied
       def where(*args)
-        WhereClause.new(self, *args)
+        WhereClause.new(base, *args)
       end
 
       # 
@@ -57,7 +57,7 @@ module Stretchy
       # 
       # @return [MatchClause] Base context with match queries applied
       def match(*args)
-        MatchClause.new(self, *args)
+        MatchClause.new(base, *args)
       end
 
       # 
@@ -73,7 +73,7 @@ module Stretchy
       # @return [Base] Query in base context with range boost applied
       def range(*args)
         where_function(:range, *args)
-        Base.new(self)
+        Base.new(base)
       end
 
       # 
@@ -93,7 +93,7 @@ module Stretchy
       # @return [Base] Query in base context with geo filter boost applied
       def geo(*args)
         where_function(:geo, *args)
-        Base.new(self)
+        Base.new(base)
       end
 
       private
@@ -115,7 +115,7 @@ module Stretchy
           end
           boost     = clause.to_boost(weight)
 
-          @boost_builder.functions << boost if boost
+          base.boost_builder.functions << boost if boost
         end
     end
   end