From 6cf34ac13934f5e2b92a1f7692d11c5ab8d8ca08 Mon Sep 17 00:00:00 2001
From: Jeremy Friesen <jeremy.n.friesen@gmail.com>
Date: Mon, 13 Feb 2023 11:56:04 -0500
Subject: [PATCH] Consolidating generators

Prior to this commit, we had two generators touching the same file, with
each generator doing one small thing.

With this commit, I've consolidated some of the logic into a single
generator.

Closes #121
---
 .../blacklight_iiif_search_generator.rb       | 25 -------------------
 .../catalog_controller_generator.rb           | 15 +++++++++--
 .../iiif_print/install_generator.rb           |  4 ---
 3 files changed, 13 insertions(+), 31 deletions(-)
 delete mode 100644 lib/generators/iiif_print/blacklight_iiif_search_generator.rb

diff --git a/lib/generators/iiif_print/blacklight_iiif_search_generator.rb b/lib/generators/iiif_print/blacklight_iiif_search_generator.rb
deleted file mode 100644
index 6bfa07b0..00000000
--- a/lib/generators/iiif_print/blacklight_iiif_search_generator.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# adds controller-scope behavior to the implementing application
-require 'rails/generators'
-
-module IiifPrint
-  class BlacklightIiifSearchGenerator < Rails::Generators::Base
-    desc "
-      This generator makes the following changes to your app:
-
-      1. Adjusts Blacklight IIIF Search configuration settings in CatalogController
-      "
-
-    # Update the blacklight catalog controller
-    def adjust_catalog_controller_all_text_config
-      gsub_file('app/controllers/catalog_controller.rb',
-                " full_text_field: 'text',",
-                " full_text_field: 'all_text_tsimv',")
-    end
-
-    def adjust_catalog_controller_is_page_of_config
-      gsub_file('app/controllers/catalog_controller.rb',
-                " object_relation_field: 'is_page_of_s',",
-                " object_relation_field: 'is_page_of_ssim',")
-    end
-  end
-end
diff --git a/lib/generators/iiif_print/catalog_controller_generator.rb b/lib/generators/iiif_print/catalog_controller_generator.rb
index c7a824e6..52f93057 100644
--- a/lib/generators/iiif_print/catalog_controller_generator.rb
+++ b/lib/generators/iiif_print/catalog_controller_generator.rb
@@ -3,11 +3,10 @@
 
 module IiifPrint
   class CatalogControllerGenerator < Rails::Generators::Base
-    source_root File.expand_path('../templates', __FILE__)
-
     desc "
       This generator makes the following changes to your app:
       1. Adds index fields in CatalogController
+      2. Adjusts Blacklight IIIF Search configuration settings in CatalogController
       "
 
     def add_index_fields_to_catalog_controller
@@ -17,5 +16,17 @@ def add_index_fields_to_catalog_controller
         "    config.add_index_field 'all_text_tsimv', highlight: true, helper_method: :render_ocr_snippets\n"
       end
     end
+
+    def adjust_catalog_controller_all_text_config
+      gsub_file('app/controllers/catalog_controller.rb',
+                " full_text_field: 'text',",
+                " full_text_field: 'all_text_tsimv',")
+    end
+
+    def adjust_catalog_controller_is_page_of_config
+      gsub_file('app/controllers/catalog_controller.rb',
+                " object_relation_field: 'is_page_of_s',",
+                " object_relation_field: 'is_page_of_ssim',")
+    end
   end
 end
diff --git a/lib/generators/iiif_print/install_generator.rb b/lib/generators/iiif_print/install_generator.rb
index 388ff51f..195a3fc3 100644
--- a/lib/generators/iiif_print/install_generator.rb
+++ b/lib/generators/iiif_print/install_generator.rb
@@ -18,10 +18,6 @@ def verify_biiif_installed
       generate 'blacklight_iiif_search:install'
     end
 
-    def iiif_configuration
-      generate 'iiif_print:blacklight_iiif_search'
-    end
-
     def catalog_controller_configuration
       generate 'iiif_print:catalog_controller'
     end