sequel-elasticsearch 0.4.11 → 0.4.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcdb91c1414f1bad3b6ea789f58e96c7972c4581d8777769c9c5a93133afd578
-  data.tar.gz: '0599e138dc94ad85b12701dbd3df905838adaf4b2e0393e975956ce5aee095a4'
+  metadata.gz: 37a0e42fb1cc78e626eeb7b83b9054bd932ffe60de8bd02cbbb99f8d2997c190
+  data.tar.gz: a1cd9bc96071fa402aeb274269f8f9ac5aacc122153e5f6660d1317ffe0d88ec
 SHA512:
-  metadata.gz: 6a50a93c261b7a462a848a80db8d27a65dc3ac72ad16b5f372278b75b52adbaf9d36193d35d7ec169bccf66d296ce7a09f18f23233a7aaedd96e97ae79d93988
-  data.tar.gz: 918f315cb32de7564c2fa9cb5aad8a97401d95365b7af2a87e08df6c25c7893b101af95539764fef8ea3908d02e997038ba9005d78ec3fb97df78688b625770b
+  metadata.gz: bed637128c79e6db4afd8feaba9d24bcd5c09386e4bed7d0a94d31e61a7a6319d0b0c51e793597b0a00857dd4663ef689815e083f4026bbfa723aa32c834bc7a
+  data.tar.gz: f6edecdb9f05ad6cfa920e388c3c58551370259c3c4700a31f4e9fe4ac7d4eef41fc44394ed9157cccc3fbc14189bdc87df71be9be9ec157f12be2c3f70a0d6f

data/.travis.yml

@@ -1,22 +1,26 @@
-sudo: false
+os:
+  - linux
+dist: xenial
+services:
+  - elasticsearch
 language: ruby
 rvm:
-- 2.3
 - 2.4
 - 2.5
 - 2.6
+- 2.7
 gemfile: Gemfile.ci
 env:
   global:
   - CC_TEST_REPORTER_ID=f35fd15664b071c621a239733eb3b063caf333ac7e795d3a20690942f64caf62
 before_install:
-- gem install bundler -v 1.13.6
+- gem install bundler
 before_script:
-- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64
-  > ./cc-test-reporter
+- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
 - chmod +x ./cc-test-reporter
 - "./cc-test-reporter before-build"
 - export TZ=Africa/Johannesburg
+- sleep 10
 after_script:
 - "./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT"
 deploy:

data/Gemfile.ci

@@ -4,3 +4,4 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'sqlite3'
+gem 'codeclimate'

data/README.md

@@ -62,6 +62,12 @@ Sequel::Model.plugin :elasticsearch,
 
 And that's it! Just transact as you normally would, and your records will be created and updated in the Elasticsearch cluster.
 
+### Indexing
+
+Ensure that you create the [index mappings](https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping.html) for your data before using this plugin, otherwise you might get some weird results.
+
+The records will by default be indexed using the `values` call of the model. Should you need to customize what's indexed, you can define a `indexed_values` method (or `as_indexed_json` method if you prefer the Rails way).
+
 ### Searching
 
 Your model is now searchable through Elasticsearch. Just pass down a string that's parsable as a [query string query](https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html).

data/lib/sequel/plugins/elasticsearch.rb

@@ -25,7 +25,7 @@ module Sequel
       def self.configure(model, opts = OPTS)
         model.elasticsearch_opts = opts[:elasticsearch] || {}
         model.elasticsearch_index = (opts[:index] || model.table_name.to_s.downcase).to_sym
-        model.elasticsearch_type = (opts[:type] || :_doc).to_sym
+        model.elasticsearch_type = opts[:type]&.to_sym
         model
       end
 
@@ -58,7 +58,7 @@ module Sequel
           scroll_id = scroll_id.scroll_id if scroll_id.is_a? Result
           return nil unless scroll_id
 
-          Result.new es_client.scroll(scroll_id: scroll_id, scroll: duration), self
+          Result.new es_client.scroll(body: scroll_id, scroll: duration), self
         end
 
         # Execute a search or a scroll on the Model's Elasticsearch index.
@@ -95,14 +95,7 @@ module Sequel
             body = []
             ds.all.each do |row|
               print '.'
-              body << {
-                update: {
-                  _index: index_name,
-                  _type: elasticsearch_type,
-                  _id: row.document_id,
-                  data: { doc: row.as_indexed_json, doc_as_upsert: true }
-                }
-              }
+              body << { update: import_object(index_name, row) }
             end
             puts '/'
             es_client.bulk body: body
@@ -110,6 +103,16 @@ module Sequel
           end
         end
 
+        def import_object(idx, row)
+          val = {
+            _index: idx,
+            _id: row.document_id,
+            data: { doc: row.as_indexed_json, doc_as_upsert: true }
+          }
+          val[:_type] = elasticsearch_type if elasticsearch_type
+          val
+        end
+
         # Creates a new index in Elasticsearch from the specified dataset, as
         # well as an alias to the new index.
         #

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

@@ -44,6 +44,11 @@ module Sequel
           result['hits']['hits'].each { |h| yield h }
         end
 
+        # Send back the complete result set
+        def all
+          result['hits']['hits']
+        end
+
         # Send all undefined methods to the +result['hits']['hits']+ array.
         def method_missing(meth, *args, &block)
           respond_to_missing?(meth) ? result['hits']['hits'].send(meth, *args, &block) : super

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

@@ -6,6 +6,6 @@ module Sequel
   # See https://jrgns.github.io/sequel-elasticsearch
   module Elasticsearch
     # The Gem's version.
-    VERSION = '0.4.11'
+    VERSION = '0.4.13'
   end
 end

data/sequel-elasticsearch.gemspec

@@ -26,11 +26,12 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'sequel', '>= 4.0'
 
   spec.add_development_dependency 'bundler', '>= 1.13'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 12.3.3'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '>= 0.52'
   spec.add_development_dependency 'rubocop-rspec', '>= 1.37'
-  spec.add_development_dependency 'simplecov', '~> 0.15'
+  spec.add_development_dependency 'simplecov', '~> 0.15', '< 0.18'
   spec.add_development_dependency 'sqlite3', '~> 1.4'
+  spec.add_development_dependency 'timecop', '>= 0.9'
   spec.add_development_dependency 'webmock', '~> 3.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 0.4.11
+  version: 0.4.13
 platform: ruby
 authors:
 - Jurgens du Toit
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-04 00:00:00.000000000 Z
+date: 2020-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -115,6 +115,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.15'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,6 +125,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.15'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.18'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +142,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -191,8 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: A plugin for the Sequel gem to sync data to Elasticsearch.