elasticsearch-model-extensions 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 147bafb31fb754df6328f7fa3c2e27a5af454d06
-  data.tar.gz: dc047cf6c1423e9b3a45682737cee36869389f94
+  metadata.gz: cc88b24aa703c53b9c35f7f0dfc72c291299d861
+  data.tar.gz: 8ee00b4d40f76173ec408ea6068d4a697a3fb9b0
 SHA512:
-  metadata.gz: 05d3f75d719269e736958c19e64cf3c19c16a3a89562f73e71c9c925023526dbc755487c67cd1d001ba2adc235ed765514f3dccd7d516641d3201c1c84ce8041
-  data.tar.gz: 33b5d02632d47fa7584ede224f6692c8f12604cd6f1ffff16c3d316e732fb4d26fef182ffc5cd1880b25e46860859b68915750540334f84e0e22163e1290f60e
+  metadata.gz: 181f6efceba36b6a0b032f06a9e612e51d8a371f3c88cc780b641262b7a59149ebbf2dd1528c6bf4f864823c7e6bd6773a4a4f9fada2eccc6e5d7e4248c364d5
+  data.tar.gz: 139e8c22de2c2be86dc885b1a54552f940aac3725ec88bc7d6a137efd50cd253c890f37268a2da7e78ddcd79d75b4f8972855cffa674fb73a17361bbdb074aca

data/lib/elasticsearch/model/extensions/callback.rb

@@ -12,6 +12,37 @@ module Elasticsearch
         def config
           @config
         end
+
+        def with_error_logging
+          begin
+            yield
+          rescue => e
+            log "An error occured while calling Elasticsearch::Model::Extensions::#{self.class.name}#after_commit"
+            log e.message
+            log e.backtrace.join("\n")
+          end
+
+          true
+        end
+
+        def update_for_records(*records)
+          field_to_update = config.field_to_update
+          optionally_delayed = config.optionally_delayed
+          block = config.block
+
+          records.map(&:reload).map(&optionally_delayed).each do |t|
+            log "Indexing #{t.class} id=#{t.id} fields=#{[*field_to_update].join(', ')}"
+            block.call(t, [*field_to_update])
+          end
+        end
+
+        def log(message)
+          if defined?(::Rails.logger.warn)
+            ::Rails.logger.warn message
+          else
+            warn message
+          end
+        end
       end
     end
   end

data/lib/elasticsearch/model/extensions/delayed_job/document_job.rb

@@ -5,6 +5,8 @@ module Elasticsearch
     module Extensions
       module DelayedJob
 
+        require 'delayed_job'
+
         class DocumentJob
           def initialize(params)
             record = params[:record]

data/lib/elasticsearch/model/extensions/delayed_job.rb

@@ -1,3 +1,4 @@
+require 'delayed_job'
 require_relative 'delayed_job/index_document_job'
 require_relative 'delayed_job/partially_update_document_job'
 require_relative 'delayed_job/delete_document_job'

data/lib/elasticsearch/model/extensions/destroy_callback.rb

@@ -5,23 +5,21 @@ module Elasticsearch
     module Extensions
       class DestroyCallback < Callback
         def after_commit(record)
-          field_to_update = config.field_to_update
-          records_to_update_documents = config.records_to_update_documents
-          optionally_delayed = config.optionally_delayed
-          only_if = config.only_if
-          block = config.block
+          with_error_logging do
+            records_to_update_documents = config.records_to_update_documents
+            only_if = config.only_if
+            callback = self
 
-          record.instance_eval do
-            return unless only_if.call(self)
+            record.instance_eval do
+              return unless only_if.call(self)
 
-            target = records_to_update_documents.call(self)
+              target = records_to_update_documents.call(self)
 
-            if target.respond_to? :each
-              target.map(&:reload).map(&optionally_delayed).each do |t|
-                block.call(t, [*field_to_update])
+              if target.respond_to? :each
+                callback.update_for_records(*target)
+              else
+                callback.update_for_records(target)
               end
-            else
-              optionally_delayed.call(target.reload).partially_update_document(field_to_update)
             end
           end
         end

data/lib/elasticsearch/model/extensions/update_callback.rb

@@ -5,36 +5,34 @@ module Elasticsearch
     module Extensions
       class UpdateCallback < Callback
         def after_commit(record)
-          field_to_update = config.field_to_update
-          records_to_update_documents = config.records_to_update_documents
-          optionally_delayed = config.optionally_delayed
-          only_if = config.only_if
-          block = config.block
+          with_error_logging do
+            records_to_update_documents = config.records_to_update_documents
+            only_if = config.only_if
+            callback = self
 
-          record.instance_eval do
-            return unless only_if.call(self) && index_update_required?
+            record.instance_eval do
+              return unless only_if.call(self) && index_update_required?
 
-            target = records_to_update_documents.call(self)
+              target = records_to_update_documents.call(self)
 
-            if target.respond_to? :each
-              # `reload` required to ensure that the outer record is up-to-date with changes
-              # when `self` is an instance of a `through` model.
-              #
-              # Imagine the case where we have an association containing:
-              #
-              #   `article has_many comments through article_comments`
-              #
-              # and:
-              #
-              #   `article_comments belongs_to article`
-              #
-              # Here, `article_comment.article` may contain outdated `comments` because `article_comment.article`
-              # won't be notified with changes in `article_comments` thus won't reload `comments` automatically.
-              target.map(&:reload).map(&optionally_delayed).each do |t|
-                block.call(t, [*field_to_update])
+              if target.respond_to? :each
+                # `reload` required to ensure that the outer record is up-to-date with changes
+                # when `self` is an instance of a `through` model.
+                #
+                # Imagine the case where we have an association containing:
+                #
+                #   `article has_many comments through article_comments`
+                #
+                # and:
+                #
+                #   `article_comments belongs_to article`
+                #
+                # Here, `article_comment.article` may contain outdated `comments` because `article_comment.article`
+                # won't be notified with changes in `article_comments` thus won't reload `comments` automatically.
+                callback.update_for_records(*target)
+              else
+                callback.update_for_records(target)
               end
-            else
-              optionally_delayed.call(target.reload).partially_update_document(field_to_update)
             end
           end
         end

data/lib/elasticsearch/model/extensions/version.rb

@@ -1,7 +1,7 @@
 module Elasticsearch
   module Model
     module Extensions
-      VERSION = "0.2.0"
+      VERSION = "0.2.2"
     end
   end
 end

data/spec/setup/articles_with_comments_and_delayed_jobs.rb

@@ -1,5 +1,7 @@
 load 'setup/undefine.rb'
 
+require 'delayed_job_active_record'
+
 require 'elasticsearch/model/extensions/all'
 require 'elasticsearch/model/extensions/delayed_job'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-model-extensions
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Yusuke KUOKA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-30 00:00:00.000000000 Z
+date: 2014-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler