Merge pull request #4294 from samvera/valkyrie-indexing-no-gen

remove the indexer initializer generator

lib/generators/hyrax/config_generator.rb

@@ -46,10 +46,6 @@ def create_initializer_config_file
     copy_file 'config/initializers/hyrax.rb'
   end
 
-  def create_initializer_indexers_file
-    copy_file 'config/initializers/indexers.rb'
-  end
-
   # Add mini-magick configuration
   def minimagick_config
     copy_file 'config/initializers/mini_magick.rb'

lib/generators/hyrax/work_resource/templates/indexer.rb.erb

@@ -3,7 +3,7 @@
 # Generated via
 #  `rails generate hyrax:work_resource <%= class_name %>`
 class <%= class_name %>Indexer < Hyrax::ValkyrieWorkIndexer
-  Hyrax::ValkyrieIndexer.register self, as_indexer_for: <%= class_name %>
+  include Hyrax::Indexer(:basic_metadata)
 
   # Uncomment this block if you want to add custom indexing behavior:
   #  def to_solr

lib/generators/hyrax/work_resource/work_resource_generator.rb

@@ -38,10 +38,12 @@ def create_indexer
   end
 
   def register_indexer
-    config = 'config/initializers/indexers.rb'
-    register_line = "  Hyrax::ValkyrieIndexer.register #{class_name}Indexer, as_indexer_for: #{class_name}\n"
-    inject_into_file config, after: "# Register Indexers\n" do
-      return if File.read(config).include?(register_line)
+    config = 'config/initializers/hyrax.rb'
+    register_line = "Hyrax::ValkyrieIndexer.register #{class_name}Indexer, as_indexer_for: #{class_name}\n"
+
+    return if File.read(config).include?(register_line)
+
+    append_to_file config do
       register_line
     end
   end

lib/hyrax.rb

@@ -16,6 +16,7 @@
 require 'hyrax/engine'
 require 'hyrax/version'
 require 'hyrax/inflections'
+require 'hyrax/name'
 require 'hyrax/valkyrie_can_can_adapter'
 require 'kaminari_route_prefix'