stretchy 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e36573d3774c867031bf443889b538d83cd97976
-  data.tar.gz: 90490ce53bb095a4d160b25dc4db38bca87ea92f
+  metadata.gz: 12bb7b9359e948fc32ff9d27f45544220ea82066
+  data.tar.gz: 43608164105614fbc8b5165eea18cf0fd9ddc855
 SHA512:
-  metadata.gz: adcd1104eae7977fd773e29bfbaa1e28f56e5c79408c7c3b3d68533ed8afd7e53b9d12f8f12acbba2a33a27b8b9d97bdc32aebcb0a5ac004013fb084dfa4b51d
-  data.tar.gz: 6bc2768805817f20749aa6eb2f8ef615cc71b1b87a8ae5b3eca4cc5d85e2f08b702a4793bd1e5f11bc7cb1bc9c450f4c60af054ac23b4e300195dd153d62e25d
+  metadata.gz: dc23211b16ca77b169658edebae3f3fb502b0d7f9279c6c6ff2349e989b93c58c12306c47383f3da629536d72e0de5d079b1e3673c2820187b160f1b54532a54
+  data.tar.gz: 0f485ba770bf7c9334fad83a62a0be88407d355da989421564c9af37b8acd14395037da2e50b286b5b3806129f0a2ea95b8bf765470cbac0b08d8da27334028b

data/.ruby-version

@@ -1 +1 @@
-2.2.3
+2.3.3

data/Dockerfile

@@ -1,5 +1,9 @@
-FROM ruby:2.2.0
-RUN apt-get update -qq && apt-get install -y build-essential libpq-dev
+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

data/README.md

@@ -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/docker-compose.yml

@@ -1,13 +1,24 @@
-elastic:
-  image: elasticsearch:2.1
-web:
-  build: .
-  command: bundle exec rake
-  environment:
-    ELASTICSEARCH_URL: 'elastic:9200'
-  volumes:
-    - .:/stretchy
-  ports:
-    - "3000:3000"
-  links:
-    - elastic
+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,7 +22,7 @@ module Stretchy
     end
 
     def node
-      @node ||= if boost_nodes.any?
+      @node ||= if function_score_node?
         function_score_node
       elsif query_nodes.any?
         query_node
@@ -39,6 +39,10 @@ module Stretchy
       @boost_nodes ||= nodes.select {|n| n.context? :boost }
     end
 
+    def function_score_node?
+      boost_nodes.reject { |n| n.empty? }.any?
+    end
+
     private
 
       def query_node
@@ -76,7 +80,7 @@ module Stretchy
 
       def compile_boost_functions
         boost_nodes.map do |n|
-          next unless n.json.any?
+          next if n.empty?
           n.json
         end.compact
       end

data/lib/stretchy/api.rb

@@ -66,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

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,12 +51,11 @@ 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)
-      # binding.pry
       if context[:boost]
         params_to_boost(params, context)
       elsif context[:filter] && !context[:query]
@@ -75,7 +72,12 @@ module Stretchy
       nodes               = context_nodes(params, subcontext)
       collector           = AndCollector.new(nodes, subcontext)
 
-      Node.new(boost_params.merge(filter: collector.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)
@@ -103,7 +105,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

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/version.rb

@@ -1,3 +1,3 @@
 module Stretchy
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

data/solano.yml

@@ -1,9 +1,9 @@
 ---
 ruby_version: ruby-2.2.3
-bundler_version: 1.9.4
+bundler_version: 1.13.7
 test_pattern:
   - spec/**/*_spec.rb
 elasticsearch:
-  version: '2.1'
+  version: 5.0.1
 java:
-  java_version: java-7-openjdk
+  java_version: java-8-openjdk

data/stretchy.gemspec

@@ -19,7 +19,7 @@ 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",  "~> 5.0"
   spec.add_dependency "excon",          "~> 0.45"
 
   spec.add_development_dependency "rake",           "~> 10.4"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stretchy
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - agius
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-15 00:00:00.000000000 Z
+date: 2017-03-09 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: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
@@ -175,9 +175,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Query builder for Elasticsearch
 test_files: []
-has_rdoc: