sequel-elasticsearch 0.4.0 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b72432bc6c37b866fb0959c07d71b0bb90fa8773ad0006fe65250f62e80b48e
-  data.tar.gz: 7eb98c377331877a870449a1e3c1060504c70eb6e7f7cc9905a0ad767406090e
+  metadata.gz: 2a43685e46f98064dabf222a2145e4248bb02415e6a3fa3d664b7314c1b17e5f
+  data.tar.gz: 2356dfe5cd6efe4d97e5ac177c55bfd6362e14f803816b3ae8b81db87c859c9e
 SHA512:
-  metadata.gz: 1de1abc8e613aeaea8f256626b5f20c370e91f8bad909be2b9c76988a08868aed16caab5c10066fe70098984c49bf0c280e10398957d3b277fcf7a36c39c1297
-  data.tar.gz: 40005b30e9552ceed6e2d560e843eeec2666f9dd444c36007581a59bc4a6ab94d293172502daf5ed3068cb8229b6673318182c66fed1d841a40c695c37b4b62e
+  metadata.gz: 99de7a66cf051b722ba2da36200c591c680c1a78fcbeeebbc8c6572974bf5638fe908c9a7dc61e287cd6cf57664a44ddad4e56fdd421bebd268136cf689c22c4
+  data.tar.gz: f03ae3900ac8b2d72b2c4b4d153df0d252ffd3c399d104fe2d3d1e3ff32299bc2df190321fe850ef47a7d542711bb72e4af0281fd087e18dddc510baec751766

data/.travis.yml

@@ -1,9 +1,9 @@
 sudo: false
 language: ruby
 rvm:
-- 2.3.6
-- 2.4.3
-- 2.5.0
+- 2.3.7
+- 2.4.4
+- 2.5.1
 gemfile: Gemfile.ci
 env:
   global:
@@ -15,6 +15,7 @@ before_script:
   > ./cc-test-reporter
 - chmod +x ./cc-test-reporter
 - "./cc-test-reporter before-build"
+- export TZ=Africa/Johannesburg
 after_script:
 - "./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT"
 deploy:

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

@@ -1,6 +1,9 @@
 module Sequel
+  # The Sequel::Elasticsearch model plugin
+  #
+  # See https://jrgns.github.io/sequel-elasticsearch
   module Elasticsearch
     # The Gem's version.
-    VERSION = '0.4.0'.freeze
+    VERSION = '0.4.3'.freeze
   end
 end

data/lib/sequel/plugins/elasticsearch.rb

@@ -1,7 +1,9 @@
 require 'elasticsearch'
 require 'sequel/plugins/elasticsearch/result'
 
+# Sequel: The Database Toolkit for Ruby
 module Sequel
+  # Sequel Plugins - http://sequel.jeremyevans.net/plugins.html
   module Plugins
     # The Sequel::Elasticsearch model plugin
     #
@@ -56,6 +58,7 @@ module Sequel
         def scroll!(scroll_id, duration)
           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
         end
 
@@ -68,13 +71,16 @@ module Sequel
         # Wrapper method in which error handling is done for Elasticsearch calls.
         def call_es
           yield
-        rescue ::Elasticsearch::Transport::Transport::Errors::NotFound, ::Elasticsearch::Transport::Transport::Error => e
-          db.loggers.first.warn e if db.loggers.count.positive?
-          nil
-        rescue Faraday::ConnectionFailed => e
+        rescue ::Elasticsearch::Transport::Transport::Errors::NotFound,
+               ::Elasticsearch::Transport::Transport::Error,
+               Faraday::ConnectionFailed => e
           db.loggers.first.warn e if db.loggers.count.positive?
           nil
         end
+
+        # Import the whole dataset into Elasticsearch
+        def import!
+        end
       end
 
       # The instance methods that will be added to the Sequel::Model
@@ -105,14 +111,20 @@ module Sequel
           self.class.es_client
         end
 
-        private
+        def as_indexed_json
+          indexed_values
+        end
 
-        # Determine the ID to be used for the document in the Elasticsearch cluster.
-        # It will join the values of a multi field primary key with an underscore.
-        def document_id
-          doc_id = pk
-          doc_id = doc_id.join('_') if doc_id.is_a? Array
-          doc_id
+        # Create or update the document on the Elasticsearch cluster.
+        def index_document
+          params = document_path
+          params[:body] = indexed_values
+          es_client.index params
+        end
+
+        # Remove the document from the Elasticsearch cluster.
+        def destroy_document
+          es_client.delete document_path
         end
 
         # Determine the complete path to a document (/index/type/id) in the Elasticsearch cluster.
@@ -124,16 +136,20 @@ module Sequel
           }
         end
 
-        # Create or update the document on the Elasticsearch cluster.
-        def index_document
-          params = document_path
-          params[:body] = values.each_key { |k| values[k] = values[k].strftime('%FT%T%:z') if values[k].is_a?(Time) }
-          es_client.index params
+        private
+
+        # Determine the ID to be used for the document in the Elasticsearch cluster.
+        # It will join the values of a multi field primary key with an underscore.
+        def document_id
+          doc_id = pk
+          doc_id = doc_id.join('_') if doc_id.is_a? Array
+          doc_id
         end
 
-        # Remove the document from the Elasticsearch cluster.
-        def destroy_document
-          es_client.delete document_path
+        # Values to be indexed
+        def indexed_values
+          # TODO: Deprecate this method in favour of as_indexed_json
+          values.each_key { |k| values[k] = values[k].strftime('%FT%T%:z') if values[k].is_a?(Time) }
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.3
 platform: ruby
 authors:
 - Jurgens du Toit
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-09 00:00:00.000000000 Z
+date: 2018-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch
@@ -164,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.5
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A plugin for the Sequel gem to sync data to Elasticsearch.