stretchy-model 0.4.0 → 0.6.0

data/lib/stretchy/attributes/type/rank_features.rb

@@ -0,0 +1,24 @@
+module Stretchy::Attributes::Type
+  # Public: Defines a rank_features attribute for the model.
+  #
+  # A rank_features field can index numeric feature vectors, so that they can later be used to boost documents in queries with a rank_feature query.
+
+  # It is analogous to the rank_feature data type but is better suited when the list of features is sparse so that it wouldn’t be reasonable to add one field to the mappings for each of them.
+  # opts - The Hash options used to refine the attribute (default: {}):
+  #        :positive_score_impact - The Boolean indicating if features correlate positively with the score. If set to false, the score decreases with the value of the feature instead of increasing. Defaults to true.
+  #
+  # Examples
+  #
+  #   class MyModel < Stretchy::Record
+  #     attribute :negative_reviews, :rank_features, positive_score_impact: false
+  #   end
+  #
+  # Returns nothing.
+  class RankFeatures < Stretchy::Attributes::Type::Base
+    OPTIONS = [:positive_score_impact]
+
+    def type
+      :rank_features
+    end
+  end
+end

data/lib/stretchy/attributes/type/search_as_you_type.rb

@@ -0,0 +1,30 @@
+module Stretchy::Attributes::Type
+  # Public: Defines a search_as_you_type attribute for the model. This field type is optimized to provide out-of-the-box support for queries that serve an as-you-type completion use case.
+  #
+  # opts - The Hash options used to refine the attribute (default: {}):
+  #        :max_shingle_size - The Integer indicating the largest shingle size to create. Valid values are 2 to 4. Defaults to 3.
+  #        :analyzer - The String analyzer to be used for text fields, both at index-time and at search-time. Defaults to the default index analyzer, or the standard analyzer.
+  #        :index - The Boolean indicating if the field should be searchable. Defaults to true.
+  #        :index_options - The String indicating what information should be stored in the index, for search and highlighting purposes. Defaults to 'positions'.
+  #        :norms - The Boolean indicating if field-length should be taken into account when scoring queries. Defaults to true.
+  #        :store - The Boolean indicating if the field value should be stored and retrievable separately from the _source field. Defaults to false.
+  #        :search_analyzer - The String analyzer that should be used at search time on text fields. Defaults to the analyzer setting.
+  #        :search_quote_analyzer - The String analyzer that should be used at search time when a phrase is encountered. Defaults to the search_analyzer setting.
+  #        :similarity - The String indicating which scoring algorithm or similarity should be used. Defaults to 'BM25'.
+  #        :term_vector - The String indicating if term vectors should be stored for the field. Defaults to 'no'.
+  #
+  # Examples
+  #
+  #   class MyModel < Stretchy::Record
+  #     attribute :name, :search_as_you_type, max_shingle_size: 4
+  #   end
+  #
+  # Returns nothing.
+  class SearchAsYouType < Stretchy::Attributes::Type::Base
+    OPTIONS = [:max_shingle_size, :analyzer, :index, :index_options, :norms, :store, :search_analyzer, :search_quote_analyzer, :similarity, :term_vector]
+
+    def type
+      :search_as_you_type
+    end
+  end
+end

data/lib/stretchy/attributes/type/shape.rb

@@ -0,0 +1,24 @@
+module Stretchy::Attributes::Type
+  # Public: Defines a shape attribute for the model. This field type is used for complex shapes.
+  #
+  # opts - The Hash options used to refine the attribute (default: {}):
+  #        :orientation - The String indicating how to interpret vertex order for polygons / multipolygons. Can be 'right', 'ccw', 'counterclockwise', 'left', 'cw', 'clockwise'. Defaults to 'ccw'.
+  #        :ignore_malformed - The Boolean indicating if malformed GeoJSON or WKT shapes should be ignored. Defaults to false.
+  #        :ignore_z_value - The Boolean indicating if the z value of three dimension points should be ignored. Defaults to true.
+  #        :coerce - The Boolean indicating if unclosed linear rings in polygons will be automatically closed. Defaults to false.
+  #
+  # Examples
+  #
+  #   class MyModel < Stretchy::Record
+  #     attribute :boundary, :shape, orientation: 'cw'
+  #   end
+  #
+  # Returns nothing.
+  class Shape < Stretchy::Attributes::Type::Base
+    OPTIONS = [:orientation, :ignore_malformed, :ignore_z_value, :coerce]
+
+    def type
+      :shape
+    end
+  end
+end

data/lib/stretchy/attributes/type/sparse_vector.rb

@@ -0,0 +1,37 @@
+# 
+# attribute :ml, :sparse_vector
+# 
+# {
+#   "mappings": {
+#     "properties": {
+#       "ml.tokens": {
+#         "type": "sparse_vector"
+#       }
+#     }
+#   }
+# }
+#
+
+
+module Stretchy
+  module Attributes
+      module Type
+          class SparseVector < Stretchy::Attributes::Type::Base
+
+              def type
+                :sparse_vector
+              end
+
+              def mappings(name) 
+                  {
+                    properties: {
+                      "#{name}.tokens": {
+                          type: "sparse_vector"
+                      }
+                    }
+                }.as_json
+              end
+          end
+      end
+  end
+end

data/lib/stretchy/attributes/type/string.rb

@@ -0,0 +1,7 @@
+module Stretchy::Attributes::Type
+  class String < Stretchy::Attributes::Type::Text # :nodoc:
+    def type
+      :string
+    end
+  end
+end

data/lib/stretchy/attributes/type/text.rb

@@ -0,0 +1,51 @@
+module Stretchy::Attributes::Type
+    # Public: Defines a text attribute for the model. This field type is used for text strings.
+    #
+    # opts - The Hash options used to refine the attribute (default: {}):
+    #        :analyzer - The String analyzer to be used for the text field, both at index-time and at search-time. Defaults to the default index analyzer, or the standard analyzer.
+    #        :eager_global_ordinals - The Boolean indicating if global ordinals should be loaded eagerly on refresh. Defaults to false.
+    #        :fielddata - The Boolean indicating if the field can use in-memory fielddata for sorting, aggregations, or scripting. Defaults to false.
+    #        :fielddata_frequency_filter - The Hash of expert settings which allow to decide which values to load in memory when fielddata is enabled.
+    #        :fields - The Hash of multi-fields allow the same string value to be indexed in multiple ways for different purposes. By default, a 'keyword' field is added. Set to false to disable.
+    #        :index - The Boolean indicating if the field should be searchable. Defaults to true.
+    #        :index_options - The String indicating what information should be stored in the index, for search and highlighting purposes. Defaults to 'positions'.
+    #        :index_prefixes - The Hash indicating if term prefixes of between 2 and 5 characters are indexed into a separate field.
+    #        :index_phrases - The Boolean indicating if two-term word combinations (shingles) are indexed into a separate field. Defaults to false.
+    #        :norms - The Boolean indicating if field-length should be taken into account when scoring queries. Defaults to true.
+    #        :position_increment_gap - The Integer indicating the number of fake term position which should be inserted between each element of an array of strings. Defaults to 100.
+    #        :store - The Boolean indicating if the field value should be stored and retrievable separately from the _source field. Defaults to false.
+    #        :search_analyzer - The String analyzer that should be used at search time on the text field. Defaults to the analyzer setting.
+    #        :search_quote_analyzer - The String analyzer that should be used at search time when a phrase is encountered. Defaults to the search_analyzer setting.
+    #        :similarity - The String indicating which scoring algorithm or similarity should be used. Defaults to 'BM25'.
+    #        :term_vector - The String indicating if term vectors should be stored for the field. Defaults to 'no'.
+    #        :meta - The Hash of metadata about the field.
+    #
+    #
+    # Examples
+    #
+    #   class MyModel
+    #     include StretchyModel
+    #     attribute :description, :text, analyzer: 'english'
+    #   end
+    #
+    # Returns nothing.
+    class Text < Stretchy::Attributes::Type::Base
+      OPTIONS = [:analyzer, :eager_global_ordinals, :fielddata, :fielddata_frequency_filter, :fields, :index, :index_options, :index_prefixes, :index_phrases, :norms, :position_increment_gap, :store, :search_analyzer, :search_quote_analyzer, :similarity, :term_vector, :meta]
+  
+      def type
+        :text
+      end
+
+      def type_for_database
+        :text
+      end
+
+      def mappings(name)
+        options = {type: type_for_database}
+        OPTIONS.each { |option| options[option] = send(option) unless send(option).nil? }
+        options.delete(:fields) if fields == false
+        options[:fields] = {keyword: {type: :keyword, ignore_above: 256}} if fields.nil?
+        { name => options }.as_json
+      end
+    end
+  end

data/lib/stretchy/attributes/type/token_count.rb

@@ -0,0 +1,26 @@
+module Stretchy::Attributes::Type
+  # Public: Defines a token_count attribute for the model. This field type is used for counting the number of tokens in a string.
+  #
+  # opts - The Hash options used to refine the attribute (default: {}):
+  #        :analyzer - The String analyzer to be used to analyze the string value. Required.
+  #        :enable_position_increments - The Boolean indicating if position increments should be counted. Defaults to true.
+  #        :doc_values - The Boolean indicating if the field should be stored on disk in a column-stride fashion. Defaults to true.
+  #        :index - The Boolean indicating if the field should be searchable. Defaults to true.
+  #        :null_value - The Numeric value to be substituted for any explicit null values. Defaults to null.
+  #        :store - The Boolean indicating if the field value should be stored and retrievable separately from the _source field. Defaults to false.
+  #
+  # Examples
+  #
+  #   class MyModel < Stretchy::Record
+  #     attribute :description_token_count, :token_count, analyzer: 'standard'
+  #   end
+  #
+  # Returns nothing.
+  class TokenCount < Stretchy::Attributes::Type::Base
+    OPTIONS = [:analyzer, :enable_position_increments, :doc_values, :index, :null_value, :store]
+
+    def type
+      :token_count
+    end
+  end
+end

data/lib/stretchy/attributes/type/version.rb

@@ -0,0 +1,21 @@
+module Stretchy::Attributes::Type
+  # Public: Defines a version attribute for the model. This field type is used for software versions following the Semantic Versioning rules.
+  #
+  # opts - The Hash options used to refine the attribute (default: {}):
+  #        :meta - The Hash of metadata about the field.
+  #
+  # Examples
+  #
+  #   class MyModel < Stretchy::Record
+  #     attribute :software_version, :version
+  #   end
+  #
+  # Returns nothing.
+  class Version < Stretchy::Attributes::Type::Base
+    OPTIONS = [:meta]
+
+    def type
+      :version
+    end
+  end
+end

data/lib/stretchy/attributes/type/wildcard.rb

@@ -0,0 +1,35 @@
+module Stretchy::Attributes::Type
+  # Public: Defines a wildcard attribute for the model. This field type is a specialization of the keyword field, but it supports wildcard searches.
+  #
+  # opts - The Hash options used to refine the attribute (default: {}):
+  #        :doc_values - The Boolean indicating if the field should be stored on disk in a column-stride fashion. Defaults to true.
+  #        :eager_global_ordinals - The Boolean indicating if global ordinals should be loaded eagerly on refresh. Defaults to false.
+  #        :fields - The Hash of multi-fields for the same string value to be indexed in multiple ways.
+  #        :ignore_above - The Integer limit for the length of the string. Strings longer than this limit will not be indexed. Defaults to 2147483647.
+  #        :index - The Boolean indicating if the field should be quickly searchable. Defaults to true.
+  #        :index_options - The String indicating what information should be stored in the index for scoring purposes. Defaults to 'docs'.
+  #        :meta - The Hash metadata about the field.
+  #        :norms - The Boolean indicating if field-length should be taken into account when scoring queries. Defaults to false.
+  #        :null_value - The String value to be substituted for any explicit null values. Defaults to null.
+  #        :on_script_error - The String defining what to do if the script defined by the :script parameter throws an error at indexing time. Can be 'fail' or 'continue'.
+  #        :script - The String script that will index values generated by this script, rather than reading the values directly from the source.
+  #        :store - The Boolean indicating if the field value should be stored and retrievable separately from the _source field. Defaults to false.
+  #        :similarity - The String scoring algorithm or similarity to be used. Defaults to 'BM25'.
+  #        :normalizer - The String pre-processor for the keyword prior to indexing. Defaults to null.
+  #        :split_queries_on_whitespace - The Boolean indicating if full text queries should split the input on whitespace. Defaults to false.
+  #        :time_series_dimension - The Boolean indicating if the field is a time series dimension. Defaults to false.
+  #
+  # Examples
+  #
+  #   class MyModel
+  #     include StretchyModel
+  #     attribute :description_wildcard, :wildcard
+  #   end
+  #
+  # Returns nothing.
+  class Wildcard < Stretchy::Attributes::Type::Keyword
+    def type
+      :wildcard
+    end
+  end
+end

data/lib/stretchy/attributes.rb

@@ -1,10 +1,76 @@
 module Stretchy
   module Attributes
+    extend ActiveSupport::Concern
+
+    def [](attribute)
+      self.send(attribute)
+    end
+
+    def []=(attribute, value)
+        self.send("#{attribute}=", value)
+    end
+
+    def inspect
+      "#<#{self.class.name} #{attributes.map { |k,v| "#{k}: #{v.blank? ? 'nil' : v}" }.join(', ')}>"
+    end
+
+    class_methods do
+      def inspect
+        "#<#{self.name} #{attribute_types.map { |k,v| "#{k}: #{v.type}" }.join(', ')}>"
+      end
+
+      def attribute_mappings
+        {properties: attribute_types.map { |k,v| v.mappings(k) }.reduce({}, :merge)}.as_json
+      end
+    end
 
     def self.register!
-      ActiveModel::Type.register(:array, ActiveModel::Type::Array)
-      ActiveModel::Type.register(:hash, ActiveModel::Type::Hash)
+      ActiveModel::Type.register(:array, Stretchy::Attributes::Type::Array)
+      ActiveModel::Type.register(:binary, Stretchy::Attributes::Type::Binary)
+      ActiveModel::Type.register(:boolean, Stretchy::Attributes::Type::Boolean)
+      ActiveModel::Type.register(:constant_keyword, Stretchy::Attributes::Type::ConstantKeyword)
+      ActiveModel::Type.register(:datetime, Stretchy::Attributes::Type::DateTime)
+      ActiveModel::Type.register(:flattened, Stretchy::Attributes::Type::Flattened)
+      ActiveModel::Type.register(:geo_point, Stretchy::Attributes::Type::GeoPoint)
+      ActiveModel::Type.register(:geo_shape, Stretchy::Attributes::Type::GeoShape)
+      ActiveModel::Type.register(:histogram, Stretchy::Attributes::Type::Histogram)
+      ActiveModel::Type.register(:hash, Stretchy::Attributes::Type::Hash)
+      ActiveModel::Type.register(:ip, Stretchy::Attributes::Type::IP)
+      ActiveModel::Type.register(:join, Stretchy::Attributes::Type::Join)
       ActiveModel::Type.register(:keyword, Stretchy::Attributes::Type::Keyword)
+      ActiveModel::Type.register(:match_only_text, Stretchy::Attributes::Type::MatchOnlyText)
+      ActiveModel::Type.register(:nested, Stretchy::Attributes::Type::Nested)
+      ActiveModel::Type.register(:percolator, Stretchy::Attributes::Type::Percolator)
+      ActiveModel::Type.register(:point, Stretchy::Attributes::Type::Point)
+      ActiveModel::Type.register(:rank_feature, Stretchy::Attributes::Type::RankFeature)
+
+      ActiveModel::Type.register(:text, Stretchy::Attributes::Type::Text)
+      ActiveModel::Type.register(:token_count, Stretchy::Attributes::Type::TokenCount)
+      ActiveModel::Type.register(:dense_vector, Stretchy::Attributes::Type::DenseVector)
+
+      ActiveModel::Type.register(:search_as_you_type, Stretchy::Attributes::Type::SearchAsYouType)
+      ActiveModel::Type.register(:sparse_vector, Stretchy::Attributes::Type::SparseVector)
+      ActiveModel::Type.register(:string, Stretchy::Attributes::Type::String)
+      ActiveModel::Type.register(:version, Stretchy::Attributes::Type::Version)
+      ActiveModel::Type.register(:wildcard, Stretchy::Attributes::Type::Wildcard)
+      # Numerics
+      ActiveModel::Type.register(:long, Stretchy::Attributes::Type::Numeric::Long)
+      ActiveModel::Type.register(:integer, Stretchy::Attributes::Type::Numeric::Integer)
+      ActiveModel::Type.register(:short, Stretchy::Attributes::Type::Numeric::Short)
+      ActiveModel::Type.register(:byte, Stretchy::Attributes::Type::Numeric::Byte)
+      ActiveModel::Type.register(:double, Stretchy::Attributes::Type::Numeric::Double)
+      ActiveModel::Type.register(:float, Stretchy::Attributes::Type::Numeric::Float)
+      ActiveModel::Type.register(:half_float, Stretchy::Attributes::Type::Numeric::HalfFloat)
+      ActiveModel::Type.register(:scaled_float, Stretchy::Attributes::Type::Numeric::ScaledFloat)
+      ActiveModel::Type.register(:unsigned_long, Stretchy::Attributes::Type::Numeric::UnsignedLong)
+      # Ranges
+      ActiveModel::Type.register(:integer_range, Stretchy::Attributes::Type::Range::IntegerRange)
+      ActiveModel::Type.register(:float_range, Stretchy::Attributes::Type::Range::FloatRange)
+      ActiveModel::Type.register(:long_range, Stretchy::Attributes::Type::Range::LongRange)
+      ActiveModel::Type.register(:double_range, Stretchy::Attributes::Type::Range::DoubleRange)
+      ActiveModel::Type.register(:date_range, Stretchy::Attributes::Type::Range::DateRange)
+      ActiveModel::Type.register(:ip_range, Stretchy::Attributes::Type::Range::IpRange)
+
     end
   end
 end

data/lib/stretchy/common.rb

@@ -2,11 +2,10 @@ module Stretchy
     module Common
         extend ActiveSupport::Concern
 
-        def inspect
-            "#<#{self.class.name} #{attributes.map { |k,v| "#{k}: #{v.blank? ? 'nil' : v}" }.join(', ')}>"
+        def highlights_for(attribute)
+            highlights[attribute.to_s]
         end
 
-
         class_methods do
 
             # Set the default sort key to be used in sort operations
@@ -16,8 +15,9 @@ module Stretchy
                 @default_sort_key
             end
 
-            def default_size(size = 10000)
-                @default_size = size
+            def default_size(size = nil)
+                @default_size = size unless size.nil?
+                @default_size
             end
 
             private

data/lib/stretchy/delegation/gateway_delegation.rb

@@ -18,8 +18,6 @@ module Stretchy
                 :count,
         to: :gateway
 
-      include Rails::Instrumentation::Publishers::Record
-
       def index_name(name=nil, &block)
           if name || block_given?
             return (@index_name = name || block)
@@ -28,13 +26,19 @@ module Stretchy
           if @index_name.respond_to?(:call)
             @index_name.call
           else
-            @index_name || base_class.model_name.collection
+            @index_name || base_class.model_name.collection.parameterize.underscore
           end
       end
 
+      def reload_gateway_configuration!
+        @gateway = nil
+      end
+
       def gateway(&block)
-          @gateway ||= Stretchy::Repository.create(client: Stretchy.configuration.client, index_name: index_name, klass: base_class)
-          block.arity < 1 ? @gateway.instance_eval(&block) : block.call(@gateway) if block_given?
+          reload_gateway_configuration! if @gateway && @gateway.client != Stretchy.configuration.client
+            
+          @gateway ||= Stretchy::Repository.create(client: Stretchy.configuration.client, index_name: index_name, klass: base_class, mapping: base_class.attribute_mappings.merge(dynamic: true)) 
+          # block.arity < 1 ? @gateway.instance_eval(&block) : block.call(@gateway) if block_given?
           @gateway
       end
 

data/lib/stretchy/model/serialization.rb

@@ -9,6 +9,7 @@ module Stretchy
 
             def deserialize(document)
                 attribs = ActiveSupport::HashWithIndifferentAccess.new(document['_source']).deep_symbolize_keys
+                attribs[:_highlights] = document["highlight"] if document["highlight"]
                 _id = __get_id_from_document(document)
                 attribs[:id] = _id if _id
                 klass.new attribs

data/lib/stretchy/querying.rb

@@ -6,13 +6,13 @@ module Stretchy
     delegate *Stretchy::Relations::AggregationMethods::AGGREGATION_METHODS, to: :all
 
     delegate :skip_callbacks, :routing, :search_options, to: :all
-    delegate :must, :must_not, :should, :where_not, :where, :filter_query, :query_string, to: :all
+    delegate :must, :must_not, :should, :where_not, :where, :filter_query, :query_string, :regexp, to: :all
 
     def fetch_results(es)
-      unless es.count?
-        base_class.search(es.to_elastic, es.search_options)
-      else
+      if es.count?
         base_class.count(es.to_elastic, es.search_options)
+      else
+        base_class.search(es.to_elastic, es.search_options)
       end
     end
 

data/lib/stretchy/record.rb

@@ -14,11 +14,6 @@ module Stretchy
                 include ActiveModel::Conversion
                 include ActiveModel::Serialization
                 include ActiveModel::Serializers::JSON
-                include ActiveModel::Validations
-                include ActiveModel::Validations::Callbacks
-                extend ActiveModel::Callbacks
-
-
 
                 include Stretchy::Model::Callbacks
                 include Stretchy::Indexing::Bulk
@@ -28,12 +23,14 @@ module Stretchy
                 include Stretchy::Common
                 include Stretchy::Scoping
                 include Stretchy::Utils
+                include Stretchy::SharedScopes
+                include Stretchy::Attributes
 
                 extend Stretchy::Delegation::DelegateCache
                 extend Stretchy::Querying
 
                 # Set up common attributes
-                attribute :id, :string #, default: lambda { SecureRandom.uuid }
+                attribute :id, :keyword #, default: lambda { SecureRandom.uuid }
                 attribute :created_at, :datetime, default: lambda {  Time.now.utc }
                 attribute :updated_at, :datetime, default: lambda { Time.now.utc }
 
@@ -44,11 +41,13 @@ module Stretchy
                 # overriden by #size
                 default_size 10000
 
-            end
+                attr_accessor :highlights
+
+                def initialize(attributes = {})
+                    @highlights = attributes.delete(:_highlights) 
+                    super(attributes)
+                end
 
-            def initialize(attributes = {})
-                self.assign_attributes(attributes) if attributes
-                super()
             end
 
         end

data/lib/stretchy/relation.rb

@@ -3,20 +3,16 @@ module Stretchy
     # It provides methods for querying and manipulating the documents.
     class Relation
 
-        # These methods can accept multiple values.
-        MULTI_VALUE_METHODS  = [:order, :where, :or_filter, :filter_query, :bind, :extending, :unscope, :skip_callbacks]
-
-        # These methods can accept a single value.
-        SINGLE_VALUE_METHODS = [:limit, :offset, :routing, :size]
-
         # These methods cannot be used with the `delete_all` method.
         INVALID_METHODS_FOR_DELETE_ALL = [:limit, :offset]
 
-        # All value methods.
-        VALUE_METHODS = MULTI_VALUE_METHODS + SINGLE_VALUE_METHODS
-
         # Include modules.
-        include Relations::FinderMethods, Relations::SpawnMethods, Relations::QueryMethods, Relations::AggregationMethods, Relations::SearchOptionMethods, Delegation
+        include Relations::FinderMethods, 
+                Relations::SpawnMethods, 
+                Relations::QueryMethods, 
+                Relations::AggregationMethods, 
+                Relations::SearchOptionMethods, 
+                Delegation
 
         # Getters.
         attr_reader :klass, :loaded
@@ -32,7 +28,7 @@ module Stretchy
         # @param values [Hash] The initial values for the relation.
         def initialize(klass, values={})
             @klass  = klass
-            @values = values
+            @values = values.merge(default_size: klass.default_size)
             @offsets = {}
             @loaded = false
         end
@@ -49,14 +45,13 @@ module Stretchy
         #
         # @return [Array] The results of the relation.
         def to_a
-
           load
           @records
         end
         alias :results :to_a
 
         def response
-          to_a.response
+          results.response
         end
 
         # Returns the results of the relation as a JSON object.
@@ -64,7 +59,7 @@ module Stretchy
         # @param options [Hash] The options to pass to the `as_json` method.
         # @return [Hash] The results of the relation as a JSON object.
         def as_json(options = nil)
-          to_a.as_json(options)
+          results.as_json(options)
         end
 
         # Returns the Elasticsearch query for the relation.
@@ -98,7 +93,6 @@ module Stretchy
         # @return [Relation] The relation object.
         def load
           exec_queries unless loaded?
-
           self
         end
         alias :fetch :load
@@ -146,8 +140,8 @@ module Stretchy
           begin
             entries = to_a.results.take([size_value.to_i + 1, 11].compact.min).map!(&:inspect)
             message = {}
-            message = {total: to_a.total, max: to_a.total}
-            message.merge!(aggregations: results.response.aggregations.keys) unless results.response.aggregations.nil?
+            message = {total: results.total, max: results.total}
+            message.merge!(aggregations: response.aggregations.keys) unless response.aggregations.nil?
             message = message.each_pair.collect { |k,v|  "#{k}: #{v}" }
             message.unshift entries.join(', ') unless entries.size.zero?
             "#<#{self.class.name} #{message.join(', ')}>"

data/lib/stretchy/relations/finder_methods.rb

@@ -39,14 +39,31 @@ module Stretchy
           self
         end
 
+        # size is not permitted to the count API but queries are.
+        #
+        # if a query is supplied with `.count` then the user wants a count of the results
+        # matching the query
+        #  
+        # however, the default_size is used to limit the number of results returned
+        # so we remove the size from the query and then call `.count` API
+        #
+        # but if the user supplies a limit, then we should assume they want a count of the results
+        # which could lead to some confusion 
+        # suppose the user calls `.size(100).count` and the default_size is 100
+        # if we remove size from the query, then the count could be greater than 100
+        # 
+        # I think the best way to handle this is to remove the size from the query only if it was  
+        # applied by the default_size
+        # If the user supplies a limit, then we should assume they want a count of the results
+        # 
+        # if size is called with a limit,
         def count
-          return results.count if @loaded
+          return results.count if @loaded || @values[:size].present?
           spawn.count!
         end
 
         def count!
           @values[:count] = true
-          @values.delete(:size)
           spawned = spawn
           spawned.order_values.clear
           spawned.results

data/lib/stretchy/relations/merger.rb

@@ -7,8 +7,12 @@ module Stretchy
       class HashMerger # :nodoc:
         attr_reader :relation, :hash
 
+        VALUE_METHODS = Stretchy::Relations::QueryMethods::MULTI_VALUE_METHODS.concat( 
+                          Stretchy::Relations::QueryMethods::SINGLE_VALUE_METHODS
+                        )
+
         def initialize(relation, hash)
-          hash.assert_valid_keys(*Relation::VALUE_METHODS)
+          hash.assert_valid_keys(*VALUE_METHODS)
 
           @relation = relation
           @hash     = hash