sequel-elasticsearch 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8260688e9dc94491a1a01b53304f853a9ffbea3b61ac23709aacf5659581307
-  data.tar.gz: 69b8b7917a4e443b8cccd1a4e84d623bdb6852485749844d0708f6a2a7eda750
+  metadata.gz: 9fedd83674e13bf3111df6c01a4a7c997e39cfd16906ea9849c5e22ca9944d36
+  data.tar.gz: 3799f9f9eba3821790e96abf8d00016600dc71cb6620c439c6dd82ffb69dd09e
 SHA512:
-  metadata.gz: c739c3145aa85fdd3d0fdee97bf9459b52a534fcee17daa3b87fe9d923ab22bec561fd9c0cfe1224400f6a20d803ae30aa128db36011440111c5674feddecd8a
-  data.tar.gz: ad01667caf9ac32e3e26fe9bee9c12d78878d8b0e94c36f131bfd0f39bf484f7928269b17a3824d3b92696ec01dee9e2100c1bf923733e012269e208fafddfbd
+  metadata.gz: 7219a5449f7c7a88f49a71d43ed1cce202e6312ad050cdde494171289aed5ee199628ba7d2cc36b3c28344aff5fdb76a94acea6701cb224cb15062a474aa3994
+  data.tar.gz: 2db11be8b0cb25339a3399325511a992c69591147b9810978aa03cf2c223f97dc10f7217dbb75720ea6ae82bac2a03ec38c8c5b0451e682959b3eacd448253e3

data/lib/sequel/plugins/elasticsearch/result.rb

@@ -4,23 +4,40 @@ module Sequel
       class Result
         include Enumerable
 
-        attr_reader :results, :scroll_id, :total, :took, :timed_out
+        attr_reader :results, :scroll_id, :total, :took, :timed_out, :model
 
-        def initialize(results)
+        def initialize(results, model = nil)
           return unless results && results['hits']
           @results = results
           @scroll_id = results['_scroll_id']
           @total = results['hits']['total']
           @timed_out = results['timed_out']
           @took = results['took']
+          @model = model
         end
 
         def each
           return [] unless results['hits'] && results['hits']['hits']
-          results['hits']['hits'].each { |h| yield h }
+          results['hits']['hits'].each do |h|
+            yield convert(h)
+          end
           # TODO: Use the scroll id to get more if needed
           # We will need access to the client, somehow...
         end
+
+        def all
+          results['hits']['hits'].map do |h|
+            convert(h)
+          end
+        end
+
+        private
+
+        def convert(hit)
+          return hit unless model
+          source = hit['_source'].each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
+          model.call source
+        end
       end
     end
   end

data/lib/sequel/plugins/elasticsearch/version.rb

@@ -1,5 +1,5 @@
 module Sequel
   module Elasticsearch
-    VERSION = '0.3.2'.freeze
+    VERSION = '0.3.3'.freeze
   end
 end

data/lib/sequel/plugins/elasticsearch.rb

@@ -31,7 +31,7 @@ module Sequel
             type: elasticsearch_type
           }.merge(opts)
           query.is_a?(String) ? opts[:q] = query : opts[:body] = query
-          Result.new es_client.search(opts)
+          Result.new es_client.search(opts), self
         end
 
         def es(query = '', opts = {})

data/sequel-elasticsearch.gemspec

@@ -21,8 +21,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.0'
-  spec.add_dependency 'sequel', '~> 5.4'
+  spec.add_dependency 'elasticsearch', '>= 1.0'
+  spec.add_dependency 'sequel', '>= 4.0'
 
   spec.add_development_dependency 'bundler', '~> 1.13'
   spec.add_development_dependency 'rake', '~> 10.0'

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: sequel-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Jurgens du Toit
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-07 00:00:00.000000000 Z
+date: 2018-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.4'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.4'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement