sequel-elasticsearch 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a1b9f57743a4f411f924497691250d65ef79dcec
-  data.tar.gz: cca07116bde1f723925469d8587a2cf8e303cb36
+SHA256:
+  metadata.gz: 3ec57146972164d9b3940a06d43f971d27b578db9a851f8ca90b33f6239b4f72
+  data.tar.gz: 21cc2da346ba2f249956e4b945b8cd4331ef4420eb670efb32ebe387bd3b9676
 SHA512:
-  metadata.gz: c099502b9b552e0399d9861ac24db496af9436a550a94d36561df4406af49b7567cad8c8e9b242e4240b075de1fb74255d33a1957deaa09e3d8839befee7a89b
-  data.tar.gz: 2bdc291308bda70e04a01ee04fc138417b73a37c4430f78495a194d3906f803ae7760813c46dadfa174dc18edf1a0dddf619d6ef84bef0f7969a26af1f3721da
+  metadata.gz: d2d560ca5424d915563d586dfc605b6ace4e660283472209a4152464ec165612080afb87d85ece0a1f59ea6884ea4a52f981c961fbb69d574b5f2202930eb936
+  data.tar.gz: f21cd9634945eb35227d0f65a882486c40ccc4c4c368144cb2978baba18376d7902ab553cd49aeeb01cae2738f3df71546aad756e3ee002890764087f617ee2c

data/README.md

@@ -68,8 +68,8 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/jrgns/
 
 Features that needs to be built:
 
-- [ ] Asynchronous workers so that the updates can be processed in the background.
-- [ ] An `es` method to search through the data on the cluster.
+- [x] An `es` method to search through the data on the cluster.
+- [ ] Let `es` return an enumerator of `Sequel::Model` instances.
 - [ ] A rake task to create or suggest mappings for a table.
 
 ## License

data/lib/sequel/plugins/elasticsearch.rb

@@ -19,26 +19,53 @@ module Sequel
 
       module ClassMethods
         attr_accessor :elasticsearch_opts, :elasticsearch_index, :elasticsearch_type
+
+        def es_client
+          @es_client = ::Elasticsearch::Client.new elasticsearch_opts
+        end
+
+        def es!(query = '', opts = {})
+          opts = {
+            index: elasticsearch_index,
+            type: elasticsearch_type
+          }.merge(opts)
+          query.is_a?(String) ? opts[:q] = query : opts[:body] = query
+          es_client.search opts
+        end
+
+        def es(query = '', opts = {})
+          call_es { es! query, opts }
+        end
+
+        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
+          db.loggers.first.warn e if db.loggers.count.positive?
+          nil
+        end
       end
 
       module InstanceMethods
         def after_create
           super
-          index_document
+          self.class.call_es { index_document }
         end
 
         def after_destroy
           super
-          destroy_document
+          self.class.call_es { destroy_document }
         end
 
         def after_update
           super
-          index_document
+          self.class.call_es { index_document }
         end
 
         def es_client
-          @es_client = ::Elasticsearch::Client.new self.class.elasticsearch_opts
+          self.class.es_client
         end
 
         private

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

@@ -1,5 +1,5 @@
 module Sequel
   module Elasticsearch
-    VERSION = '0.1.0'.freeze
+    VERSION = '0.2.0'.freeze
   end
 end

metadata

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