common_indexer 0.3.4 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f4c04288510a31222bf983bceb65b31f66e5d95d
-  data.tar.gz: cb7eafeef3b091eb6db73afdae1f0b90e9037852
+SHA256:
+  metadata.gz: 931029ffbaed76ee103cb5bc8dd88dcd88fa1556494d2d3f562c2893fae77c38
+  data.tar.gz: 662a785dced385458c692e967d96a71c90aab3fdf9c21a09d6551dc014521f93
 SHA512:
-  metadata.gz: 41412f4df6230e21a54dbd3654c06662a14c760188fe65e2f1f7a5d519e150c271273dd075ca6b66022ab0f27387ffe762f0a667afc458776f6bb34d3163804c
-  data.tar.gz: 7d0c782d6c6a048a4daaf38c6bcbf68382d208275881c83747a2fa73a46d0a90a737522f704d6db472c061e839087952fda04e35a6207a5f81ab78858df9da05
+  metadata.gz: e042d390d0c68c4d3abc7d38569434be1740a9ceed64330d30e6a019cea5aeb718ad6cef3ec2e1bcdf6278a2e612dade48684c48329ca124a81d22c5c63913d9
+  data.tar.gz: e75f6390d3b751dd0f60e655d1218845454d3b87935c9bfc126f3db25f15b46ff9e32eb3b98417000f455aef3e9ced42fce81cfe292ee6c9063834bb338128cc

data/lib/common_indexer.rb

@@ -41,8 +41,8 @@ module CommonIndexer # :nodoc:
 
     def reindex_into(new_index)
       existing_index = client.indices.get(index: index_name).keys.first
-      raise ArgumentError, "Cannot reindex #{index_name} into itself" if existing_index == index_name
-      client.reindex(body: { source: { index: index_name }, dest: { index: new_index } })
+      raise ArgumentError, "Cannot reindex #{index_name} into itself" if existing_index == new_index
+      client.reindex(body: { source: { index: existing_index }, dest: { index: new_index } })
       client.indices.delete(index: existing_index)
     end
   end

data/lib/common_indexer/base.rb

@@ -4,8 +4,11 @@ require 'active_support/concern'
 module CommonIndexer # :nodoc:
   module Base
     extend ActiveSupport::Concern
-
+    
     included do
+      extend ActiveModel::Callbacks
+      define_model_callbacks :delete_common_index, :update_common_index
+
       after_save :update_common_index
       after_destroy :delete_document
     end
@@ -16,18 +19,22 @@ module CommonIndexer # :nodoc:
     end
 
     def delete_document
-      CommonIndexer.client.delete index: CommonIndexer.index_name,
+      _run_delete_common_index_callbacks do
+        CommonIndexer.client.delete index: CommonIndexer.index_name,
                                   id: id,
                                   type: '_doc'
+      end
     rescue Elasticsearch::Transport::Transport::Error => err
       Rails.logger.warn("Common Index delete failure: #{err.message}")
     end
 
     def update_common_index
-      CommonIndexer.client.index index: CommonIndexer.index_name,
-                                 id: id,
-                                 type: '_doc',
-                                 body: to_common_index
+      _run_update_common_index_callbacks do
+        CommonIndexer.client.index index: CommonIndexer.index_name,
+                                  id: id,
+                                  type: '_doc',
+                                  body: to_common_index
+      end  
     rescue Elasticsearch::Transport::Transport::Error => err
       Rails.logger.warn("Common Indexing failure: #{err.message}")
     end

data/lib/common_indexer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CommonIndexer
-  VERSION = '0.3.4'
+  VERSION = '0.4.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: common_indexer
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.1
 platform: ruby
 authors:
 - Michael Klein
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-19 00:00:00.000000000 Z
+date: 2019-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -207,8 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Common Indexing mixin for NUL Digital Collections