stretchy 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 12bb7b9359e948fc32ff9d27f45544220ea82066
-  data.tar.gz: 43608164105614fbc8b5165eea18cf0fd9ddc855
+SHA256:
+  metadata.gz: 76d1eeb5c2be5aad546eed305e53d83ea4c64dd9c61e9b40a64ec0246de6c4cf
+  data.tar.gz: 4a6ddb55f798e90fde4ce5a1a5cb2b39559ca0eb2b5f9f92f353b0c108dfe224
 SHA512:
-  metadata.gz: dc23211b16ca77b169658edebae3f3fb502b0d7f9279c6c6ff2349e989b93c58c12306c47383f3da629536d72e0de5d079b1e3673c2820187b160f1b54532a54
-  data.tar.gz: 0f485ba770bf7c9334fad83a62a0be88407d355da989421564c9af37b8acd14395037da2e50b286b5b3806129f0a2ea95b8bf765470cbac0b08d8da27334028b
+  metadata.gz: 58dd985f4bdee6edd189c6b5235d2cb59dd96a79c479fae3abae7f88a087f10c383e4c4eb183090c49c9619b2bc5dddad5ad8fdc6f80efc6a507be1dd8de609f
+  data.tar.gz: 055776e2bfb69e791c631df6576ed33c76337d74e64720c9ec86e8e79500248d2c37f2104f820aa32c978ee4ee6280dbfc5a9f54c8cfa809465456ee9401c97a

data/.ruby-version

@@ -1 +1 @@
-2.3.3
+2.4.2

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.

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/lib/stretchy/factory.rb

@@ -94,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
@@ -133,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
           }
@@ -180,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/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/version.rb

@@ -1,3 +1,3 @@
 module Stretchy
-  VERSION = "0.7.0"
+  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,6 +1,6 @@
 ---
-ruby_version: ruby-2.2.3
-bundler_version: 1.13.7
+ruby_version: ruby-2.4.2
+bundler_version: 1.14.6
 test_pattern:
   - spec/**/*_spec.rb
 elasticsearch:

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",  "~> 5.0"
+  spec.add_dependency "elasticsearch",  "~> 7.0"
   spec.add_dependency "excon",          "~> 0.45"
 
   spec.add_development_dependency "rake",           "~> 10.4"
@@ -27,5 +27,5 @@ Gem::Specification.new do |spec|
   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.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - agius
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-09 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: '5.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
@@ -114,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
@@ -174,8 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Query builder for Elasticsearch