spotlight-dor-resources 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 020d6aad248dc730e3ee61896bb5883eb3842350
-  data.tar.gz: 76cd9bc6a57381ce04336628dabe02ea8a00d94b
+  metadata.gz: b9c7b421a13eda5a5700db8c0bf1901f5f5838a3
+  data.tar.gz: 05e7e9e1f72e767085fb48df489843281bebfa1d
 SHA512:
-  metadata.gz: fe9fd0ec3cf1e57b32183e71344d7e483ddb94562e09464d586d2377dfab0070fa8ff3b82b24ffcefd7bd7b16fb062c66721dbdad2c9456e4b394b03c77ac639
-  data.tar.gz: 42fef0ae0264474124e6dffd8eada91b6d463760b40e5a28e1388227a594d2844afb32663de4f1b6d0d6d149b9fc5a379e2413bd3c65da329bdc985cf79d80e5
+  metadata.gz: 84d0129c9e2a56a2f2962d659a63a6f1a861b771e32a4901704f1be5307dd57fffa57dab5595e71563fde33454b87d708af789e29f1ce90b91f251b28d2d8fe4
+  data.tar.gz: 445c27164425683a629d5fb7eea1aeb0327462bab585cdec08506060782486119d66e2e5ac02353c092d963653ed996f0b942cb7e66ea57b4380f16f7546c742

data/app/models/spotlight/resources/dor_resource.rb

@@ -4,33 +4,22 @@ module Spotlight::Resources
     include ActiveSupport::Benchmarkable
 
     ##
-    # Generate solr documents for the DOR resources identified by this object.
+    # Generate solr documents for the DOR resources identified by this object
     #
     # @return [Enumerator] an enumerator of solr document hashes for indexing
-    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-    def to_solr(&block)
+    def to_solr
       return to_enum(:to_solr) { indexable_resources.size } unless block_given?
 
-      # We use the Parallel gem to support parallel processing of the collection,
-      # but need to jump through some hoops to make it yield an enumerable in the end.
-      #
-      # Here, we create a hook that simply yields the result to the enumerable. We configure
-      # this as a 'finish' hook, which Parallel will run on the main process.
-      yield_to_enum = ->(_item, _i, result) { block.call(result) }
-
-      size = indexable_resources.size
-
-      benchmark "Indexing resource #{inspect} (est. #{size} items)" do
+      benchmark "Indexing resource #{inspect}" do
         base_doc = super
 
-        Parallel.each_with_index(indexable_resources, parallel_options.merge(finish: yield_to_enum)) do |res, idx|
-          benchmark "Indexing item #{res.druid} in resource #{id} (#{idx} / #{size})" do
-            base_doc.merge(to_solr_document(res))
+        indexable_resources.each_with_index do |res, idx|
+          benchmark "Indexing item #{res.druid} in resource #{id} (#{idx})" do
+            yield base_doc.merge(to_solr_document(res))
           end
         end
       end
     end
-    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
     def resource
       @resource ||= Spotlight::Dor::Resources.indexer.resource doc_id
@@ -67,9 +56,5 @@ module Spotlight::Resources
     def logger
       Spotlight::Dor::Resources.indexer.logger
     end
-
-    def parallel_options
-      Spotlight::Dor::Resources::Engine.config.parallel_options
-    end
   end
 end

data/lib/spotlight/dor/resources/version.rb

@@ -2,7 +2,7 @@ module Spotlight
   module Dor
     # :nodoc:
     module Resources
-      VERSION = '0.2.0'
+      VERSION = '0.2.1'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spotlight-dor-resources
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Chris Beer