stretchy 0.4.0 → 0.4.1

data/lib/stretchy/clauses/match_clause.rb

@@ -22,9 +22,9 @@ module Stretchy
       # @return [MatchClause] Temporary clause outside current state
       def self.tmp(options = {})
         if options.delete(:inverse)
-          self.new(Base.new).not(options)
+          self.new(Builders::ShellBuilder.new).not(options)
         else
-          self.new(Base.new, options)
+          self.new(Builders::ShellBuilder.new, options)
         end
       end
 
@@ -52,12 +52,8 @@ module Stretchy
       def initialize(base, opts_or_str = {}, options = {})
         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
@@ -136,9 +132,10 @@ module Stretchy
       # @return [Stretchy::Boosts::FilterBoost] boost containing these match parameters
       def to_boost(weight = nil)
         weight ||= Stretchy::Boosts::FilterBoost::DEFAULT_WEIGHT
+        
         Stretchy::Boosts::FilterBoost.new(
           filter: Stretchy::Filters::QueryFilter.new(
-            @match_builder.build
+            base.match_builder.to_query
           ),
           weight: weight
         )
@@ -154,22 +151,6 @@ module Stretchy
 
       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
@@ -182,7 +163,7 @@ module Stretchy
         end
 
         def add_param(field, param)
-          get_storage[field] += Array(param)
+          base.match_builder.add_matches(field, param, inverse: inverse?, should: should?)
         end
 
     end

data/lib/stretchy/clauses/where_clause.rb

@@ -32,9 +32,9 @@ module Stretchy
       # @return [WhereClause] A clause outside the main query context
       def self.tmp(options = {})
         if options.delete(:inverse)
-          self.new(Base.new).not(options)
+          self.new(Builders::ShellBuilder.new).not(options)
         else
-          self.new(Base.new, options)
+          self.new(Builders::ShellBuilder.new, options)
         end
       end
 
@@ -62,7 +62,7 @@ module Stretchy
       # 
       # @see http://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-range-filter.html Elastic Docs - Range Filter
       # 
-      def initialize(base, options = {})
+      def initialize(base = nil, options = {})
         super(base)
         add_params(options)
       end
@@ -98,7 +98,7 @@ module Stretchy
       #     exclusive: true
       #   )
       def range(field, options = {})
-        get_storage(:ranges)[field] = Stretchy::Types::Range.new(options)
+        base.where_builder.add_range(field, options.merge(inverse: inverse?, should: should?))
         self
       end
 
@@ -124,10 +124,9 @@ module Stretchy
       #     lng: 29.2
       #   )
       def geo(field, options = {})
-        get_storage(:geos)[field] = {
-          distance:  options[:distance],
-          geo_point: Stretchy::Types::GeoPoint.new(options)
-        }
+        distance = options[:distance]
+        opts = options.merge(inverse: inverse?, should: should?)
+        base.where_builder.add_geo(field, distance, opts)
         self
       end
 
@@ -198,54 +197,34 @@ module Stretchy
       def to_boost(weight = nil)
         weight ||= Stretchy::Boosts::FilterBoost::DEFAULT_WEIGHT
 
-        if @match_builder.any? && @where_builder.any?
+        if base.match_builder.any? && base.where_builder.any?
           Stretchy::Boosts::FilterBoost.new(
             filter: Stretchy::Filters::QueryFilter.new(
               Stretchy::Queries::FilteredQuery.new(
-                query:  @match_builder.build,
-                filter: @where_builder.build
+                query:  base.match_builder.to_query,
+                filter: base.where_builder.to_filter
               )
             ),
             weight: weight
           )
         
-        elsif @match_builder.any?
+        elsif base.match_builder.any?
           Stretchy::Boosts::FilterBoost.new(
             filter: Stretchy::Filters::QueryFilter.new(
-              @match_builder.build
+              base.match_builder.to_query
             ),
             weight: weight
           )
 
-        elsif @where_builder.any?
+        elsif base.where_builder.any?
           Stretchy::Boosts::FilterBoost.new(
-            filter: @where_builder.build,
+            filter: base.where_builder.to_filter,
             weight: weight
           )
         end
       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|
@@ -263,15 +242,17 @@ module Stretchy
 
         def add_param(field, param)
           case param
-          when nil
-            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)
+            base.match_builder.add_matches(field, param, 
+              inverse:  inverse?,
+              should:   should?,
+              or: true
+            )
           else
-            get_storage(:terms)[field] += Array(param)
+            base.where_builder.add_param(field, param,
+              inverse:  inverse?,
+              should:   should?
+            )
           end
         end
 

data/lib/stretchy/errors/validation_error.rb

@@ -0,0 +1,17 @@
+module Stretchy
+  module Errors
+    class ValidationError < StandardError
+
+      def initialize(errors)
+        @errors = errors
+      end
+
+      def message
+        @errors.map do |key, err|
+          "Attribute #{key} violated rule #{err[:rule]}"
+        end.join("\n")
+      end
+
+    end
+  end
+end

data/lib/stretchy/errors.rb

@@ -1 +1 @@
-require 'stretchy/errors/contract_error.rb'
+require 'stretchy/errors/validation_error.rb'

data/lib/stretchy/filters/and_filter.rb

@@ -4,7 +4,11 @@ module Stretchy
   module Filters
     class AndFilter < Base
 
-      contract filters: {type: Stretchy::Filters::Base, array: true}
+      attribute :filters
+      validations do
+        rule :filters, :not_empty
+        rule :filters, type: {classes: Filters::Base, array: true}
+      end
 
       def initialize(*args)
         @filters = args.flatten

data/lib/stretchy/filters/base.rb

@@ -1,10 +1,10 @@
-require 'stretchy/utils/contract'
+require 'stretchy/utils/validation'
 
 module Stretchy
   module Filters
     class Base
 
-      include Stretchy::Utils::Contract
+      include Utils::Validation
 
       def initialize
         raise "Override this in subclass"

data/lib/stretchy/filters/bool_filter.rb

@@ -4,16 +4,22 @@ module Stretchy
   module Filters
     class BoolFilter < Base
 
-      contract must: {type: Base, array: true},
-           must_not: {type: Base, array: true},
-             should: {type: Base, array: true}
+      attribute :must, Array[Base]
+      attribute :must_not, Array[Base]
+      attribute :should, Array[Base]
+
+      validations do
+        rule :must,     type: {classes: Base, array: true}
+        rule :must_not, type: {classes: Base, array: true}
+        rule :should,   type: {classes: Base, array: true}
+      end
 
       def initialize(options = {})
         @must     = Array(options[:must])
         @must_not = Array(options[:must_not])
         @should   = Array(options[:should])
+        require_one!(:must, :must_not, :should)
         validate!
-        require_one(must: @must, must_not: @must_not, should: @should)
       end
 
       def to_search

data/lib/stretchy/filters/exists_filter.rb

@@ -4,7 +4,11 @@ module Stretchy
   module Filters
     class ExistsFilter < Base
 
-      contract field: {type: :field, required: true}
+      attribute :field
+
+      validations do
+        rule :field, :field
+      end
 
       # CAUTION: this will match empty strings
       # see http://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-exists-filter.html

data/lib/stretchy/filters/geo_filter.rb

@@ -5,14 +5,20 @@ module Stretchy
   module Filters
     class GeoFilter < Base
 
-      contract distance: {type: :distance, required: true},
-              geo_point: {type: Stretchy::Types::GeoPoint, required: true},
-                  field: {type: :field, required: true}
+      attribute :field
+      attribute :distance
+      attribute :geo_point
 
-      def initialize(options = {})
-        @field      = options[:field]
-        @distance   = options[:distance]
-        @geo_point  = options[:geo_point] || Stretchy::Types::GeoPoint.new(options)
+      validations do
+        rule :field,      :field
+        rule :geo_point,   type: {classes: Types::GeoPoint}
+        rule :distance,   :distance
+      end
+
+      def initialize(field, distance, geo_point)
+        @field      = field
+        @distance   = distance
+        @geo_point  = Types::GeoPoint.new(geo_point)
         validate!
       end
 

data/lib/stretchy/filters/not_filter.rb

@@ -4,9 +4,12 @@ module Stretchy
   module Filters
     class NotFilter < Base
 
-      attr_reader :filters
+      attribute :filters, Array[Base]
 
-      contract :filters, { type: Base, array: true, required: true }
+      validations do
+        rule :filters, type: { classes: Base, array: true }
+        rule :filters, :not_empty
+      end
 
       def initialize(*filters)
         @filters = Array(filters).flatten

data/lib/stretchy/filters/or_filter.rb

@@ -4,7 +4,10 @@ module Stretchy
   module Filters
     class OrFilter < Base
 
-      contract filters: {type: Base, array: true}
+      attribute :filters, Array[Base]
+      validations do
+        rule :filters, type: {classes: Base, array: true}
+      end
 
       def initialize(*args)
         @filters = args.flatten

data/lib/stretchy/filters/query_filter.rb

@@ -5,7 +5,11 @@ module Stretchy
   module Filters
     class QueryFilter < Base
 
-      contract :query, type: Stretchy::Queries::Base
+      attribute :query, Queries::Base
+
+      validations do
+        rule :query, type: {classes: Queries::Base}
+      end
 
       def initialize(query)
         @query = query

data/lib/stretchy/filters/range_filter.rb

@@ -5,12 +5,17 @@ module Stretchy
   module Filters
     class RangeFilter < Base
 
-      contract field: {type: :field, required: true},
-               range: {type: Stretchy::Types::Range, required: true}
+      attribute :field
+      attribute :range, Types::Range
 
-      def initialize(options = {})
-        @field = options[:field]
-        @range = options[:stretchy_range] || Stretchy::Types::Range.new(options)
+      validations do
+        rule :field, :field
+        rule :range, type: {classes: Types::Range}
+      end
+
+      def initialize(field, range_options)
+        @field = field
+        @range = Types::Range.new(range_options)
         validate!
       end
 

data/lib/stretchy/filters/terms_filter.rb

@@ -4,8 +4,14 @@ module Stretchy
   module Filters
     class TermsFilter < Base
 
-      contract field: {type: :field, required: true},
-               terms: {type: [Numeric, Time, String, Symbol], array: true,  required: true}
+      attribute :field
+      attribute :terms
+
+      validations do
+        rule :field, :field
+        rule :terms, type: {classes: [Numeric, Time, String, Symbol], array: true}
+        rule :terms, :not_empty
+      end
 
       def initialize(field, terms)
         @field = field

data/lib/stretchy/queries/base.rb

@@ -1,10 +1,10 @@
-require 'stretchy/utils/contract'
+require 'stretchy/utils/validation'
 
 module Stretchy
   module Queries
     class Base
 
-      include Stretchy::Utils::Contract
+      include Stretchy::Utils::Validation
 
       def initialize
         raise "Override this in subclass"

data/lib/stretchy/queries/bool_query.rb

@@ -4,10 +4,22 @@ module Stretchy
   module Queries
     class BoolQuery < Base
 
+      attribute :must,      Array
+      attribute :must_not,  Array
+      attribute :should,    Array
+
+      validations do
+        rule :must,     type: {classes: Base, array: true}
+        rule :must_not, type: {classes: Base, array: true}
+        rule :should,   type: {classes: Base, array: true}
+      end
+
       def initialize(options = {})
         @must       = Array(options[:must])
         @must_not   = Array(options[:must_not])
         @should     = Array(options[:should])
+        require_one! :must, :must_not, :should
+        validate!
       end
 
       def to_search

data/lib/stretchy/queries/filtered_query.rb

@@ -5,14 +5,19 @@ module Stretchy
   module Queries
     class FilteredQuery < Base
 
-      contract query: {type: Base},
-              filter: {type: Stretchy::Filters::Base}
+      attribute :query,  Base
+      attribute :filter, Filters::Base
+
+      validations do
+        rule :query, type: {classes: Base}
+        rule :filter, type: {classes: Filters::Base}
+      end
 
       def initialize(options = {})
         @query  = options[:query]
         @filter = options[:filter]
+        require_one! :query, :filter
         validate!
-        require_one(query: @query, filter: @filter)
       end
 
       def to_search

data/lib/stretchy/queries/function_score_query.rb

@@ -8,39 +8,38 @@ module Stretchy
       SCORE_MODES = %w(multiply sum avg first max min)
       BOOST_MODES = %w(multiply replace sum avg max min)
 
-      contract functions: {type: Stretchy::Boosts::Base, array: true},
-                   query: {type: Base},
-                  filter: {type: Stretchy::Filters::Base},
-              score_mode: {type: String, in: SCORE_MODES},
-              boost_mode: {type: String, in: BOOST_MODES},
-               min_score: {type: Numeric},
-               max_boost: {type: Numeric},
-                   boost: {type: Numeric}
+      attribute :functions, Array[Boosts::Base]
+      attribute :query,     Base
+      attribute :filter,    Filters::Base
+      attribute :score_mode
+      attribute :boost_mode
+      attribute :min_score
+      attribute :max_boost
+      attribute :boost
+
+      validations do
+        rule :functions,  type: {classes: Boosts::Base, array: true}
+        rule :query,      type: {classes: Base}
+        rule :filter,     type: {classes: Filters::Base}
+        rule :score_mode, inclusion: {in: SCORE_MODES}
+        rule :boost_mode, inclusion: {in: BOOST_MODES}
+        rule :min_score,  type: {classes: Numeric}
+        rule :max_boost,  type: {classes: Numeric}
+        rule :boost,      type: {classes: Numeric}
+      end
 
       def initialize(options = {})
-        @functions  = Array(options[:functions])
-        @query      = options[:query]
-        @filter     = options[:filter]
-        
-        self.class.attributes.map do |field|
-          instance_variable_set("@#{field}", options[field])
-        end
+        self.class.attribute_set.set(self, options) if options
+        set_default_attributes
+        require_only_one! :query, :filter
         validate!
-        validate_query_or_filter
-      end
-
-      def self.attributes
-        [:boost, :max_boost, :score_mode, :boost_mode, :min_score]
-      end
-
-      def validate_query_or_filter
-        if @query && @filter
-          raise Stretchy::Errors::ContractError.new "Cannot have both query and filter -- combine using a FilteredQuery"
-        end
       end
 
       def to_search
         json = {}
+        attributes.each do |field, value|
+          json[field] = value if value
+        end
         json[:functions]  = @functions.map(&:to_search)
         if @query
           json[:query]    = @query.to_search
@@ -50,12 +49,6 @@ module Stretchy
           json[:query]    = Stretchy::Queries::MatchAllQuery.new.to_search
         end
 
-        self.class.attributes.reduce(json) do |body, field|
-          ivar = instance_variable_get("@#{field}")
-          body[field] = ivar if ivar
-          body
-        end
-
         { function_score: json }
       end
     end

data/lib/stretchy/queries/match_query.rb

@@ -6,9 +6,16 @@ module Stretchy
 
       OPERATORS = ['and', 'or']
 
-      contract field: {type: :field},
-            operator: {type: String, in: OPERATORS},
-              string: {type: String}
+      attribute :field
+      attribute :string
+      attribute :operator
+
+      validations do
+        rule :field, :field
+        rule :operator, inclusion: {in: OPERATORS}
+        rule :string, type: {classes: String}
+        rule :string, :required
+      end
 
       def initialize(options = {})
         case options

data/lib/stretchy/results/base.rb

@@ -4,41 +4,27 @@ module Stretchy
 
       extend Forwardable
 
-      attr_reader :clause, :index_name
+      attr_reader :base, :index_name
 
-      delegate [:type, :current_page, :limit_value] => :clause
+      delegate [:type, :current_page, :fields, :offset, :limit,
+                :aggregations] => :base
 
-      def initialize(clause)
-        @clause     = clause
-        @index_name = clause.index_name || Stretchy.index_name
+      def initialize(base)
+        @base       = base
+        @index_name = base.index || Stretchy.index_name
       end
 
-      def limit
-        clause.get_limit
-      end
       alias :per_page :limit
       alias :limit_value :limit
 
-      def fields
-        clause.get_fields
-      end
-
-      def offset
-        clause.get_offset
-      end
-
-      def page
-        clause.get_page
-      end
-
       def total_pages
         [(total.to_f / limit).ceil, 1].max
       end
 
       def request
         return @request if @request
-        @request        = {query: clause.to_search}
-        @request[:aggs] = clause.get_aggregations if clause.get_aggregations.any?
+        @request        = {query: base.to_search}
+        @request[:aggs] = base.aggregate_builder if base.aggregate_builder.any?
         @request
       end
 
@@ -50,7 +36,7 @@ module Stretchy
           size: limit
         }
         params[:fields]  = fields   if fields
-        params[:explain] = true     if clause.get_explain
+        params[:explain] = true     if base.explain
         @response ||= Stretchy.search(params)
       end
 

data/lib/stretchy/types/base.rb

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

data/lib/stretchy/types/geo_point.rb

@@ -4,16 +4,25 @@ module Stretchy
   module Types
     class GeoPoint < Base
 
-      attr_reader :lat, :lon
+      attribute :lat
+      attribute :lon
 
-      contract lat: { type: :lat, required: true },
-               lon: { type: :lng, required: true }
+      validations do
+        rule :lat, :latitude
+        rule :lon, :longitude
+      end
 
+      attr_reader :lat, :lon
 
       def initialize(options = {})
-        @lat = options[:lat] || options[:latitude]
-        @lon = options[:lng] || options[:lon] ||
-               options[:longitude]
+        if options.is_a?(self.class)
+          @lat = options.lat
+          @lon = options.lon
+        else
+          @lat = options[:lat] || options[:latitude]
+          @lon = options[:lng] || options[:lon] ||
+                 options[:longitude]
+        end
 
         validate!
       end