elastic-rails 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9da2682888e51090d97a0eb180f6c8e0bb77b3079fd75c78935f3fb594f19b0
-  data.tar.gz: 2ce5060f1350d7111551382d36d2bd7a26d9426ac4efa0118d77ce8f5714dc5e
+  metadata.gz: 57425010a4ed0bb6ef3f1d82233503fe234e6c17fa5ac2361424c53987ea0568
+  data.tar.gz: b357bc3e4b2e13c243a0a671ce2fe75a96b292945390e93a49c1283959c75b25
 SHA512:
-  metadata.gz: bb864146e44eb1839779527e269cd6bf2c31cecd7176ccb164ab9ca9ed5b02eb4dc312c4a0c0b652c1abc31ac46b3ebc335093467cef45649021b68822aa2f9c
-  data.tar.gz: e884e21c92a22c756091118ec4936e04738bb703d70ff31ea68e7b6ef2a30d9d2fb2e136babed8f9cc846cd7198471d6008254fae3e06972f9477f0382dd12fe
+  metadata.gz: fd6b5042e2c40c1a75dc8561571593bd734304b8b0aee7e14ea33a2b8055fcfb9a15409f2343cdbdc72d49f03be43324bef4d5474d3979e7d872cefb47de60d3
+  data.tar.gz: 13ea4a8691ce83ae7e175ed09626347a2a2e1e40280914014195f8c0d25d5fd77f4d977da98470ab8d6fe153574662bece1dbd6cc1ffdaaa1546a64a62de207d

data/elastic-rails.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "elasticsearch", "~> 6.3.1"
-  spec.add_dependency "activesupport"
+  spec.add_dependency "elasticsearch", "~> 6.8"
+  spec.add_dependency "activesupport", [">= 4.0", "< 8.0"]
 
   spec.add_development_dependency "dotenv"
   spec.add_development_dependency "bundler", "~> 2.0"

data/lib/elastic/commands/build_sort_from_params.rb

@@ -29,7 +29,7 @@ module Elastic::Commands
       path = parse_nesting_path(_field)
       raise NotImplementedError, "nested fields not yet supported in sorting" if path
 
-      node.add_sort(_field, _options)
+      node.add_sort(_field, **_options)
     end
 
     def parse_nesting_path(_field)

data/lib/elastic/dsl/metric_builder.rb

@@ -43,7 +43,7 @@ module Elastic::Dsl
     def aggregate_metric(_klass, _field, _options, _default_name, &_block)
       # TODO: detect nested name and wrap node
       name = _options.delete(:as) || sprintf(_default_name, _field)
-      node = _klass.build(name, _field, _options)
+      node = _klass.build(name, _field, **_options)
       _block.call node unless _block.nil?
       aggregate node
     end

data/lib/elastic/shims/concerns/hit_picker.rb

@@ -21,7 +21,7 @@ module Elastic::Shims::Concerns
     private
 
     def set_hits_source
-      child.pick(Elastic::Nodes::Concerns::HitProvider) do |node|
+      child.pick_nodes(Elastic::Nodes::Concerns::HitProvider) do |node|
         node.source = required_source_fields
       end
     end

data/lib/elastic/shims/grouping.rb

@@ -9,7 +9,7 @@ module Elastic::Shims
     private
 
     def extract_aggregation_chain
-      child.pick(Elastic::Nodes::Concerns::Aggregable).map do |node|
+      child.pick_nodes(Elastic::Nodes::Concerns::Aggregable).map do |node|
         bucketed = node.aggregations.find { |n| n.is_a? Elastic::Nodes::Concerns::Bucketed }
         bucketed.try(:name)
       end.reject(&:nil?)

data/lib/elastic/shims/populating.rb

@@ -20,13 +20,13 @@ module Elastic::Shims
     private
 
     def disable_hits_source
-      child.pick(Elastic::Nodes::Concerns::HitProvider) do |node|
+      child.pick_nodes(Elastic::Nodes::Concerns::HitProvider) do |node|
         node.source = false
       end
     end
 
     def populate(_result)
-      hits = _result.pick(Elastic::Results::Hit).to_a
+      hits = _result.pick_nodes(Elastic::Results::Hit).to_a
 
       if populate_by_id?
         ids = hits.map(&:id)

data/lib/elastic/support/traversable.rb

@@ -4,7 +4,7 @@ module Elastic::Support
       raise NotImplementedError, "every traversable tree must implement 'traverse'"
     end
 
-    def pick(*_types, &_block)
+    def pick_nodes(*_types, &_block)
       if _types.empty?
         enum = Enumerator.new do |y|
           traverse { |h| y << h }

data/lib/elastic/version.rb

@@ -1,3 +1,3 @@
 module Elastic
-  VERSION = "1.0.2"
+  VERSION = "1.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Ignacio Baixas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-18 00:00:00.000000000 Z
+date: 2024-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch
@@ -16,28 +16,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.3.1
+        version: '6.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.3.1
+        version: '6.8'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
@@ -330,7 +336,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Elasticsearch integration for Ruby on Rails by Platanus