stretchy 0.5.3 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fc1f47df9e733b26cbf7a600076991ef6c2fd740
-  data.tar.gz: f62cabd7fc16980276d70de66c90dba0d25fb03e
+SHA256:
+  metadata.gz: 76d1eeb5c2be5aad546eed305e53d83ea4c64dd9c61e9b40a64ec0246de6c4cf
+  data.tar.gz: 4a6ddb55f798e90fde4ce5a1a5cb2b39559ca0eb2b5f9f92f353b0c108dfe224
 SHA512:
-  metadata.gz: 0642e6ceab6cb04e30aef51cfedefbc1ae4b49f49b387528f71425d7a72bd9bf21a0763f6e1968e95c4568cc9d9148a66f5565cc42b0e5802adfbf08d6c7d6e7
-  data.tar.gz: 33e7884e2d19d7dbc269258b21b3cb448b8174e055c0f88338ef786caad83efc38886be1386ec3d094b96b4fed584ab7754bb3f2d7c239fd7d8a838f13be9b35
+  metadata.gz: 58dd985f4bdee6edd189c6b5235d2cb59dd96a79c479fae3abae7f88a087f10c383e4c4eb183090c49c9619b2bc5dddad5ad8fdc6f80efc6a507be1dd8de609f
+  data.tar.gz: 055776e2bfb69e791c631df6576ed33c76337d74e64720c9ec86e8e79500248d2c37f2104f820aa32c978ee4ee6280dbfc5a9f54c8cfa809465456ee9401c97a

data/.rubocop.yml

@@ -0,0 +1,260 @@
+# This configuration was generated by `rubocop --auto-gen-config`
+# on 2015-12-09 14:43:24 -0800 using RuboCop version 0.32.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Lint/BlockAlignment:
+  Enabled: false
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: AlignWith, SupportedStyles, AutoCorrect.
+Lint/EndAlignment:
+  Enabled: false
+
+# Offense count: 1
+Lint/HandleExceptions:
+  Enabled: false
+
+# Offense count: 3
+# Cop supports --auto-correct.
+Lint/UnusedBlockArgument:
+  Enabled: true
+
+# Offense count: 2
+Lint/UselessAssignment:
+  Enabled: true
+
+# Offense count: 5
+Metrics/AbcSize:
+  Max: 15
+
+# Offense count: 2
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 250
+
+# Offense count: 1
+Metrics/CyclomaticComplexity:
+  Max: 7
+
+# Offense count: 3
+# Configuration parameters: AllowURI, URISchemes.
+Metrics/LineLength:
+  Max: 80
+
+# Offense count: 8
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 20
+
+# Offense count: 2
+# Configuration parameters: CountComments.
+Metrics/ModuleLength:
+  Max: 250
+
+# Offense count: 14
+# Cop supports --auto-correct.
+Style/Alias:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle, SupportedLastArgumentHashStyles.
+Style/AlignHash:
+  Enabled: false
+
+# Offense count: 7
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods, FunctionalMethods, IgnoredMethods.
+Style/BlockDelimiters:
+  Enabled: false
+
+# Offense count: 3
+# Cop supports --auto-correct.
+Style/BlockEndNewline:
+  Enabled: false
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/BracesAroundHashParameters:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/ClosingParenthesisIndentation:
+  Enabled: false
+
+# Offense count: 18
+Style/Documentation:
+  Enabled: false
+
+# Offense count: 3
+Style/DoubleNegation:
+  Enabled: false
+
+# Offense count: 5
+# Cop supports --auto-correct.
+Style/ElseAlignment:
+  Enabled: false
+
+# Offense count: 16
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/EmptyLinesAroundBlockBody:
+  Enabled: false
+
+# Offense count: 6
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/EmptyLinesAroundClassBody:
+  Enabled: false
+
+# Offense count: 6
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/EmptyLinesAroundModuleBody:
+  Enabled: false
+
+# Offense count: 4
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/FirstParameterIndentation:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, UseHashRocketsWithSymbolValues.
+Style/HashSyntax:
+  Enabled: false
+
+# Offense count: 16
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/IndentHash:
+  Enabled: false
+
+# Offense count: 18
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/IndentationConsistency:
+  Enabled: false
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: Width.
+Style/IndentationWidth:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/LineEndConcatenation:
+  Enabled: false
+
+# Offense count: 3
+# Cop supports --auto-correct.
+Style/MultilineBlockLayout:
+  Enabled: false
+
+# Offense count: 10
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/MultilineOperationIndentation:
+  Enabled: false
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: PreferredDelimiters.
+Style/PercentLiteralDelimiters:
+  Enabled: false
+
+# Offense count: 1
+# Configuration parameters: NamePrefix, NamePrefixBlacklist.
+Style/PredicateName:
+  Enabled: false
+
+# Offense count: 3
+# Configuration parameters: SupportedStyles.
+Style/RaiseArgs:
+  EnforcedStyle: compact
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/RedundantSelf:
+  Enabled: false
+
+# Offense count: 4
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/SignalException:
+  Enabled: false
+
+# Offense count: 4
+# Cop supports --auto-correct.
+Style/SingleSpaceBeforeFirstArg:
+  Enabled: false
+
+# Offense count: 9
+# Cop supports --auto-correct.
+Style/SpaceAfterComma:
+  Enabled: false
+
+# Offense count: 6
+# Cop supports --auto-correct.
+# Configuration parameters: MultiSpaceAllowedForOperators.
+Style/SpaceAroundOperators:
+  Enabled: false
+
+# Offense count: 5
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/SpaceBeforeBlockBraces:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/SpaceBeforeSemicolon:
+  Enabled: false
+
+# Offense count: 25
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
+Style/SpaceInsideBlockBraces:
+  Enabled: false
+
+# Offense count: 145
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces, SupportedStyles.
+Style/SpaceInsideHashLiteralBraces:
+  Enabled: false
+
+# Offense count: 33
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/StringLiterals:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: ExactNameMatch, AllowPredicates, AllowDSLWriters, IgnoreClassMethods, Whitelist.
+Style/TrivialAccessors:
+  Enabled: false
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/UnneededPercentQ:
+  Enabled: false
+
+# Align with the style guide.
+Style/CollectionMethods:
+  PreferredMethods:
+    collect: 'map'
+    collect!: 'map!'
+    inject: 'reduce'
+    detect: 'find'
+    find_all: 'select'

data/.ruby-version

@@ -1 +1 @@
-2.2.2
+2.4.2

data/CHANGELOG.md

@@ -0,0 +1,12 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](http://semver.org/), although
+"minor" (0.x) changes will include breaking changes until a stable 1.0 release.
+
+## [Unreleased]
+
+## [0.6.0] - 2015-12-15
+### Changed
+
+* [FEATURE] compatible with [new query / filter contexts](https://www.elastic.co/guide/en/elasticsearch/reference/current/query-filter-context.html) for Elasticsearch 2.0+
+

data/Dockerfile

@@ -0,0 +1,12 @@
+FROM ruby:slim
+RUN apt-get update -qq && apt-get install -y  \
+  git \
+  build-essential \
+  libpq-dev \
+  curl
+RUN gem install bundler
+RUN mkdir /stretchy
+WORKDIR /stretchy
+ADD . /stretchy
+RUN bundle install
+

data/README.md

@@ -52,7 +52,7 @@ Stretchy.client = Elasticsearch::Client.new
 
 ```ruby
 # returns a Stretchy::API object
-api = Stretchy.query(index: 'myapp_development', type: 'model_name')
+api = Stretchy.query(index: 'myapp_development')
 ```
 
 From here, you can chain the methods to build your desired query.
@@ -219,7 +219,7 @@ Performs a query for the given string anywhere in the document. At least one of
 api = api.more_like(ids: [1, 2, 3])
          .more_like(docs: other_search.results)
          .more_like(
-           like_text: 'puppies and kittens are great',
+           like: 'puppies and kittens are great',
            fields: ['about_me']
          )
 ```
@@ -436,7 +436,7 @@ Included in the Results object for Kaminari compatibility.
 
 ## Development
 
-After checking out the repo, run `bundle install` to install dependencies. Then, run `pry` for an interactive prompt that will allow you to experiment.
+After checking out the repo, run `bundle install` to install dependencies. Then, run `pry` for an interactive prompt that will allow you to experiment. Run specs with `rspec`
 
 ## Contributing
 

data/Rakefile

@@ -13,8 +13,8 @@ namespace :fixtures do
   task :gen do
     require 'json'
 
-    q = Stretchy.query(index: 'stretchy_test', type: 'game_dev')
-          .match(_all: 'game')
+    q = Stretchy.query(index: 'stretchy_test')
+          .multi_match(query: 'game')
           .where(url_slug: [
             'masahiro-sakurai',
             'tetsuya-mizuguchi',

data/docker-compose.yml

@@ -0,0 +1,24 @@
+version: '2'
+services:
+  elastictwo:
+    image: elasticsearch:2-alpine
+  elasticfive:
+    image: elasticsearch:5-alpine
+  testtwo:
+    build: .
+    command: bundle exec rake
+    environment:
+      ELASTICSEARCH_URL: 'elastictwo:9200'
+    volumes:
+      - .:/stretchy
+    links:
+      - elastictwo
+  testfive:
+    build: .
+    command: bundle exec rake
+    environment:
+      ELASTICSEARCH_URL: 'elasticfive:9200'
+    volumes:
+      - .:/stretchy
+    links:
+      - elastictwo

data/lib/stretchy/and_collector.rb

@@ -22,138 +22,65 @@ module Stretchy
     end
 
     def node
-      @node ||= if boost_nodes.any?
+      @node ||= if function_score_node?
         function_score_node
-      elsif filter_nodes.any?
-        filtered_query_node
       elsif query_nodes.any?
-        single_query_node
+        query_node
       else
         Node.new({match_all: {}}, context)
       end
     end
 
     def query_nodes
-      @query_nodes ||= collect_nodes nodes do |n|
-        n.context?(:query)  &&
-        !n.context?(:boost) &&
-        !n.context?(:filter)
-      end
-    end
-
-    def filter_node
-      @filter_node ||= if query_nodes.any?
-        if boost_nodes.any?
-          Node.new({query: function_score_node.json}, context)
-        elsif filter_nodes.any?
-          Node.new({query: filtered_query_node.json}, context)
-        else
-          Node.new({query: single_query_node.json}, context)
-        end
-      else
-        Node.new(compile_nodes(filter_nodes).json, context)
-      end
-    end
-
-    def filter_json
-      filter_node.json
+      @query_nodes ||= nodes.reject {|n| n.context? :boost }
     end
 
-    def filter_nodes
-      @filter_nodes ||= begin
-        node_arr = collect_nodes nodes do |n|
-          n.context?(:filter) &&
-          !n.context?(:query) &&
-          !n.context?(:boost)
-        end
-        node_arr += Array(compile_query_filter_node)
-        node_arr.compact
-      end
-    end
-
-    def query_filter_nodes
-      @query_filter_nodes ||= collect_nodes nodes do |n|
-        n.context?(:filter) &&
-        n.context?(:query)  &&
-        !n.context?(:boost)
-      end
+    def boost_nodes
+      @boost_nodes ||= nodes.select {|n| n.context? :boost }
     end
 
-    def boost_nodes
-      @boost_nodes ||= collect_nodes nodes do |n|
-        n.context?(:boost)
-      end
+    def function_score_node?
+      boost_nodes.reject { |n| n.empty? }.any?
     end
 
     private
 
-      def collect_nodes(node_arr)
-        coll = []
-        node_arr.each do |n|
-          next unless yield(n)
-
-          if n.respond_to? :node
-            coll << Node.new(n.node.json, n.context)
-          else
-            coll << n
-          end
+      def query_node
+        if query_nodes.size > 1 || multicontext?(query_nodes)
+          compile_bool query_nodes
+        else
+          query_nodes.first
         end
-        coll.compact
       end
 
-      def compile_nodes(node_arr)
-        if node_arr.size > 1 ||
-           node_arr.any?{|n| n.context?(:must_not) || n.context?(:should)}
-
-          compile_bool(node_arr)
-        else
-          node_arr.first
-        end
+      def multicontext?(node_arr)
+        Array(node_arr).any? {|n| n.context?(:must_not) || n.context?(:should) }
       end
 
       def compile_bool(bool_nodes)
         split_nodes = split_nodes_for_bool(bool_nodes)
-        bool_json = {}
-        if split_nodes[:should_not].size > 0
-          bool_json[:should] = [
-            {
-              bool: {
-                must:     split_nodes[:should].map(&:as_json),
-                must_not: split_nodes[:should_not].map(&:as_json)
-              }
-            }
-          ]
-        else
-          bool_json[:should] = split_nodes[:should].map(&:as_json)
+        refined = bool_ctx.each_with_object(split_nodes) do |k, hash|
+          hash[k] = Array(compile_bool(hash[k])) if multicontext? hash[k]
         end
-        bool_json[:must_not] = split_nodes[:must_not].map(&:as_json)
-        bool_json[:must]     = split_nodes[:must].map(&:as_json)
+        bool_json = Hash[refined.map{|k,v| [k, v.map(&:as_json)] }]
         Node.new(bool: bool_json)
       end
 
+      def bool_ctx
+        [:filter, :must_not, :should]
+      end
+
       def split_nodes_for_bool(bool_nodes)
-        split_nodes = {must: [], must_not: [], should: [], should_not: []}
-        bool_nodes.each do |n|
-          if n.context?(:should)
-            if n.context?(:must_not)
-              split_nodes[:should_not] << n
-            else
-              split_nodes[:should] << n
-            end
-          else
-            if n.context?(:must_not)
-              split_nodes[:must_not] << n
-            else
-              split_nodes[:must] << n
-            end
-          end
+        bool_nodes.each_with_object({}) do |n, hash|
+          key = bool_ctx.find{|c| n.context? c } || :must
+          hash[key] ||= []
+          hash[key] << Node.new(n.json, n.context.merge(key => nil))
         end
-        split_nodes
       end
 
       def compile_boost_functions
         boost_nodes.map do |n|
-          next unless n.json.any?
+          next if n.empty?
           n.json
         end.compact
       end
@@ -164,36 +91,13 @@ module Stretchy
         end
       end
 
-      def compile_query_filter_node
-        compiled = compile_nodes(query_filter_nodes)
-        Node.new(query: compiled.json) if compiled
-      end
-
       def function_score_node
         function_score_json = compile_function_score_options
         function_score_json[:functions] = compile_boost_functions
-
-        if query_nodes.any?
-          function_score_json[:query]   = filtered_query_node.json
-        elsif filter_nodes.any?
-          function_score_json[:filter]  = filter_node.json
-        end
+        function_score_json[:query] = query_node.json if query_nodes.any?
 
         Node.new({function_score: function_score_json}, context)
       end
 
-      def filtered_query_node
-        filtered_json = {}
-        q = compile_nodes(query_nodes)
-        f = compile_nodes(filter_nodes)
-        filtered_json[:query]   = q.json  if q
-        filtered_json[:filter]  = f.json  if f
-        Node.new({filtered: filtered_json}, context)
-      end
-
-      def single_query_node
-        Node.new(compile_nodes(query_nodes).json, context)
-      end
-
   end
 end

data/lib/stretchy/api.rb

@@ -11,19 +11,11 @@ module Stretchy
 
     attr_reader :collector, :opts, :root, :body, :context
 
+    delegate [:with_context, :json, :as_json] => :collector
+
     delegate [
-      :total,
-      :total_count,
-      :length,
-      :size,
-      :total_pages,
-      :results,
-      :hits,
-      :to_a,
-      :ids,
-      :scores,
-      :explanations,
-      :aggregations
+      :total, :total_count, :length, :size, :total_pages, :results, :hits,
+      :to_a, :ids, :scores, :explanations, :aggregations, :each
     ] => :results_obj
 
     def initialize(opts = {})
@@ -74,9 +66,11 @@ module Stretchy
     end
 
     def fields(*list)
-      add_root fields: list
+      add_root _source: list
     end
 
+    alias :source :fields
+
     def aggs(params = {})
       add_body aggs: params
     end
@@ -130,20 +124,19 @@ module Stretchy
     end
 
     def range(params = {})
-      require_context!
       add_params params, nil, :range_node
     end
 
     def geo_distance(params = {})
-      add_params params, :filter, :geo_distance_node
+      add_params params, nil, :geo_distance_node
     end
 
     def boost(params = {}, options = {})
-      return add_context(:boost) unless params.any?
+      return add_context(:boost) if Utils.is_empty? params
 
       subcontext = context.merge(boost: true)
       if params.is_a? self.class
-        boost_json = options.merge(filter: params.filter_node.json)
+        boost_json = options.merge(filter: params.json)
         add_nodes Node.new(boost_json, subcontext)
       else
         add_nodes Factory.raw_boost_node(params, subcontext)
@@ -184,21 +177,8 @@ module Stretchy
       results_obj.ids.count
     end
 
-    def method_missing(method, *args, &block)
-      if collector.respond_to?(method)
-        collector.send(method, *args, &block)
-      else
-        super
-      end
-    end
-
     private
 
-      def require_context!
-        return true if context?(:query) || context?(:filter)
-        raise 'You must specify either query or filter context'
-      end
-
       def args_to_context(*args)
         args.reduce({}) do |ctx, item|
           next ctx if item.nil?

data/lib/stretchy/factory.rb

@@ -23,9 +23,7 @@ module Stretchy
     end
 
     def extract_boost_params!(params)
-      boost_params = Utils.extract_options!(params, BOOST_OPTIONS)
-      boost_params = {weight: DEFAULT_WEIGHT} unless boost_params.any?
-      boost_params
+      Utils.extract_options!(params, BOOST_OPTIONS)
     end
 
     def extract_function_score_options!(params)
@@ -53,19 +51,17 @@ module Stretchy
       context[:fn_score] = extract_function_score_options!(params)
       context[:boost]    = true
       context[:filter]   = true
-      json = context[:query] ? {query: params} : params
-      Node.new(boost_params.merge(filter: json), context)
+      boost_params.merge!(filter: params) unless Utils.is_empty? params
+      Node.new(boost_params, context)
     end
 
     def context_nodes(params, context = default_context)
-      subparams = dotify_params(params, context)
-
       if context[:boost]
-        params_to_boost(subparams, context)
-      elsif context[:query]
-        params_to_queries(subparams, context)
+        params_to_boost(params, context)
+      elsif context[:filter] && !context[:query]
+        params_to_filters(dotify_params(params, context), context)
       else
-        params_to_filters(subparams, context)
+        params_to_queries(dotify_params(params, context), context)
       end
     end
 
@@ -76,14 +72,12 @@ module Stretchy
       nodes               = context_nodes(params, subcontext)
       collector           = AndCollector.new(nodes, subcontext)
 
-      if context[:query]
-        Node.new(boost_params.merge(filter: {query: collector.json}), context)
-      else
-        Node.new(
-          boost_params.merge(filter: collector.filter_node.json),
-          context
-        )
+      boost_params.merge!(filter: collector.json) if collector.any?
+      if boost_params.count == 1 && boost_params.key?(:filter)
+        boost_params[:weight] = DEFAULT_WEIGHT
       end
+
+      Node.new(boost_params, context)
     end
 
     def params_to_queries(params, context = default_context)
@@ -100,7 +94,11 @@ module Stretchy
         when Hash
           nested(val, field, context)
         else
-          Node.new({match: {field => val}}, context)
+          if field == '_all' 
+            Node.new({multi_match: {:query => val}}, context)
+          else
+            Node.new({match: {field => val}}, context)
+          end
         end
       end
     end
@@ -111,7 +109,8 @@ module Stretchy
         when Range
           Node.new({range: {field => {gte: val.min, lte: val.max}}}, context)
         when nil
-          Node.new({missing: {field: field}}, context)
+          nil_ctx = context.merge(must_not: true)
+          Node.new({exists: {field: field}}, nil_ctx)
         when Hash
           nested(val, field, context)
         else
@@ -121,19 +120,16 @@ module Stretchy
     end
 
     def nested(params, path, context = default_context)
-      type, json = if context[:query]
-        nodes = params_to_queries(params, context)
-        json  = AndCollector.new(nodes, context).json
-        [:query, json]
+      nodes = if context[:filter] && !context[:query]
+        params_to_filters(params, context)
       else
-        nodes = params_to_filters(params, context)
-        json  = AndCollector.new(nodes, context).filter_json
-        [:filter, json]
+        params_to_queries(params, context)
       end
+      json  = AndCollector.new(nodes, context).json
 
       Node.new({nested: {
         path:   path,
-        type => json
+        query:  json
       }}, context)
     end
 
@@ -141,18 +137,16 @@ module Stretchy
     def fulltext_nodes_from_string(params, context = default_context)
       subcontext = context.merge(query: true)
       nodes = [raw_node({
-        match: {
-          _all: {
+          multi_match: {
             query: params,
             minimum_should_match: 1
           }
-        }
       }, subcontext)]
 
       subcontext = subcontext.merge(should: true)
       nodes << Factory.raw_node({
         match_phrase: {
-          _all: {
+          multi_match: {
             query: params,
             slop:  DEFAULT_SLOP
           }
@@ -188,7 +182,7 @@ module Stretchy
 
     # https://www.elastic.co/guide/en/elasticsearch/reference/current/querydslfunctionscorequery.html#functionrandom
     def random_score_function_node(params, context = default_context)
-      json          = {random_score: {seed: params[:seed]}}
+      json          = {random_score: {seed: params[:seed], field: :id}}
       json[:weight] = params[:weight] if params[:weight]
       Node.new(json, context)
     end

data/lib/stretchy/node.rb

@@ -9,6 +9,10 @@ module Stretchy
       @context = context
     end
 
+    def empty?
+      !@json.any?
+    end
+
     def context?(*args)
       args.all? {|c| !!context[c] }
     end

data/lib/stretchy/results.rb

@@ -1,3 +1,4 @@
+require 'json'
 module Stretchy
   class Results
 
@@ -12,7 +13,10 @@ module Stretchy
     def self.fake
       self.new(
         {size: API::DEFAULT_PER_PAGE, fake: true},
-        {'hits' => {'total' => 0, 'hits' => [], 'aggregations' => {}}}
+        {'hits' => {'total' => {
+          "value" => 3,
+          "relation" => "eq"
+      }, 'hits' => [], 'aggregations' => {}}}
       )
     end
 
@@ -43,7 +47,7 @@ module Stretchy
     end
 
     def total
-      response['hits']['total']
+      response['hits']['total']['value']
     end
     alias :total_count  :total
     alias :count        :total

data/lib/stretchy/utils.rb

@@ -5,7 +5,9 @@ module Stretchy
       # detects empty string, empty array, empty hash, nil
       def is_empty?(arg = nil)
         return true if arg.nil?
-        if arg.respond_to?(:any?)
+        if arg.respond_to?(:collector)
+          !arg.collector.any?
+        elsif arg.respond_to?(:any?)
           !arg.any? {|a| !is_empty?(a) }
         elsif arg.respond_to?(:empty?)
           arg.empty?

data/lib/stretchy/version.rb

@@ -1,3 +1,3 @@
 module Stretchy
-  VERSION = "0.5.3"
+  VERSION = "0.8.0"
 end

data/lib/stretchy.rb

@@ -58,7 +58,7 @@ module Stretchy
   end
 
   def index_document(params = {})
-    Utils.require_params!(:index_document, params, :index, :type, :body)
+    Utils.require_params!(:index_document, params, :index, :body)
 
     raise IndexDoesNotExistError.new(
       "index #{params[:index]} does not exist"

data/solano.yml

@@ -1,9 +1,9 @@
 ---
-ruby_version: ruby-2.2.2
-bundler_version: 1.9.4
+ruby_version: ruby-2.4.2
+bundler_version: 1.14.6
 test_pattern:
   - spec/**/*_spec.rb
 elasticsearch:
-  version: '1.6'
+  version: 5.0.1
 java:
-  java_version: java-7-openjdk
+  java_version: java-8-openjdk

data/stretchy.gemspec

@@ -19,14 +19,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "elasticsearch",  "~> 1.0"
+  spec.add_dependency "elasticsearch",  "~> 7.0"
   spec.add_dependency "excon",          "~> 0.45"
 
-  spec.add_development_dependency "bundler",        "~> 1.8"
-  spec.add_development_dependency "rake",           "~> 10.0"
+  spec.add_development_dependency "rake",           "~> 10.4"
   spec.add_development_dependency "rspec",          "~> 3.2"
   spec.add_development_dependency "fuubar",         "~> 2.0"
   spec.add_development_dependency "pry",            "~> 0.10"
   spec.add_development_dependency "awesome_print",  "~> 1.6"
-  spec.add_development_dependency "yard",           "~> 0.8"
+  spec.add_development_dependency "yard",           "~> 0.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stretchy
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.8.0
 platform: ruby
 authors:
 - agius
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-30 00:00:00.000000000 Z
+date: 2021-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
@@ -38,34 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.45'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10.4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
 description: Build queries for Elasticsearch with a chainable interface like ActiveRecord's.
 email:
 - andrew@atevans.com
@@ -145,14 +131,18 @@ extra_rdoc_files: []
 files:
 - ".editorconfig"
 - ".gitignore"
+- ".rubocop.yml"
 - ".ruby-version"
 - ".yardopts"
+- CHANGELOG.md
 - CONTRIBUTING.md
+- Dockerfile
 - Gemfile
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
+- docker-compose.yml
 - lib/stretchy.rb
 - lib/stretchy/and_collector.rb
 - lib/stretchy/api.rb
@@ -184,10 +174,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Query builder for Elasticsearch
 test_files: []
-has_rdoc: