blacklight-spotlight 3.0.3 → 3.3.0

data/lib/generators/spotlight/install_generator.rb

@@ -39,8 +39,7 @@ module Spotlight
 
     def friendly_id
       gem 'friendly_id'
-      # we need to immediately run `bundle install` while pointing at github.
-      Bundler.with_clean_env { run 'bundle install' }
+      bundle_install
       generate 'friendly_id'
     end
 
@@ -56,7 +55,7 @@ module Spotlight
     def sitemaps
       gem 'sitemap_generator'
 
-      Bundler.with_clean_env { run 'bundle install' }
+      bundle_install
 
       copy_file 'config/sitemap.rb', 'config/sitemap.rb'
 
@@ -91,7 +90,7 @@ module Spotlight
     end
 
     def add_model_mixin
-      if File.exist? 'app/models/solr_document.rb'
+      if File.exist? File.expand_path('app/models/solr_document.rb', destination_root)
         inject_into_file 'app/models/solr_document.rb', after: 'include Blacklight::Solr::Document' do
           "\n  include Spotlight::SolrDocument\n"
         end
@@ -101,7 +100,7 @@ module Spotlight
     end
 
     def add_solr_indexing_mixin
-      if File.exist? 'app/models/solr_document.rb'
+      if File.exist? File.expand_path('app/models/solr_document.rb', destination_root)
         inject_into_file 'app/models/solr_document.rb', after: "include Spotlight::SolrDocument\n" do
           "\n  include #{options[:solr_update_class]}\n"
         end
@@ -111,7 +110,7 @@ module Spotlight
     end
 
     def add_search_builder_mixin
-      if File.exist? 'app/models/search_builder.rb'
+      if File.exist? File.expand_path('app/models/search_builder.rb', destination_root)
         inject_into_file 'app/models/search_builder.rb', after: "include Blacklight::Solr::SearchBuilderBehavior\n" do
           "\n  include Spotlight::SearchBuilder\n"
         end
@@ -126,12 +125,13 @@ module Spotlight
 
     def add_osd_viewer
       gem 'blacklight-gallery', '~> 3.0'
+      bundle_install
       generate 'blacklight_gallery:install'
     end
 
     def add_oembed
       gem 'blacklight-oembed', '~> 1.0'
-      Bundler.with_clean_env { run 'bundle install' }
+      bundle_install
       generate 'blacklight_oembed:install'
       copy_file 'config/initializers/oembed.rb'
     end
@@ -160,6 +160,7 @@ module Spotlight
 
     def generate_devise_invitable
       gem 'devise_invitable'
+      bundle_install
       generate 'devise_invitable:install'
       generate 'devise_invitable', 'User'
     end
@@ -167,5 +168,13 @@ module Spotlight
     def add_translations
       copy_file 'config/initializers/translation.rb'
     end
+
+    private
+
+    def bundle_install
+      inside destination_root do
+        Bundler.with_clean_env { run 'bundle install' }
+      end
+    end
   end
 end

data/lib/generators/spotlight/templates/config/initializers/translation.rb

@@ -5,17 +5,19 @@ require 'i18n/backend/fallbacks'
 
 Translation = I18n::Backend::ActiveRecord::Translation
 
-if Translation.table_exists?
-  ##
-  # Sets up the new Spotlight Translation backend, backed by ActiveRecord. To
-  # turn on the ActiveRecord backend, uncomment the following lines.
+ActiveSupport::Reloader.to_prepare do
+  if Translation.table_exists?
+    ##
+    # Sets up the new Spotlight Translation backend, backed by ActiveRecord. To
+    # turn on the ActiveRecord backend, uncomment the following lines.
 
-  I18n.backend = I18n::Backend::ActiveRecord.new
-  I18n::Backend::ActiveRecord.include I18n::Backend::Memoize
-  Translation.include Spotlight::CustomTranslationExtension
-  I18n::Backend::Simple.include I18n::Backend::Memoize
-  I18n::Backend::Simple.include I18n::Backend::Pluralization
-  I18n::Backend::Simple.include I18n::Backend::Fallbacks
+    I18n.backend = I18n::Backend::ActiveRecord.new
+    I18n::Backend::ActiveRecord.include I18n::Backend::Memoize
+    Translation.include Spotlight::CustomTranslationExtension
+    I18n::Backend::Simple.include I18n::Backend::Memoize
+    I18n::Backend::Simple.include I18n::Backend::Pluralization
+    I18n::Backend::Simple.include I18n::Backend::Fallbacks
 
-  I18n.backend = I18n::Backend::Chain.new(I18n.backend, I18n::Backend::Simple.new)
+    I18n.backend = I18n::Backend::Chain.new(I18n.backend, I18n::Backend::Simple.new)
+  end
 end

data/lib/spotlight/engine.rb

@@ -179,7 +179,9 @@ module Spotlight
     config.analytics_provider = nil
 
     initializer 'analytics.initialize' do
-      Spotlight::Engine.config.analytics_provider = Spotlight::Analytics::Ga
+      ActiveSupport::Reloader.to_prepare do
+        Spotlight::Engine.config.analytics_provider = Spotlight::Analytics::Ga
+      end
     end
 
     # If you use Google Analytics, you need to wire your site to report to a Google Analytics property.

data/lib/spotlight/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Spotlight
-  VERSION = '3.0.3'
+  VERSION = '3.3.0'
 end

data/lib/tasks/spotlight_tasks.rake

@@ -18,10 +18,10 @@ namespace :spotlight do
 
   desc 'Create a new exhibit'
   task exhibit: :environment do
-    print 'Exhibit title: '
-    title = $stdin.gets.chomp
+    title = prompt_for_title
+    slug = prompt_for_slug
 
-    exhibit = Spotlight::Exhibit.create!(title: title)
+    exhibit = Spotlight::Exhibit.create!({ title: title, slug: slug })
 
     puts 'Who can admin this exhibit?'
 
@@ -88,11 +88,15 @@ namespace :spotlight do
   end
 
   def prompt_for_email
+    return ENV['SPOTLIGHT_USER_EMAIL'] if ENV['SPOTLIGHT_USER_EMAIL']
+
     print 'Email: '
     $stdin.gets.chomp
   end
 
   def prompt_for_password
+    return ENV['SPOTLIGHT_USER_PASSWORD'] if ENV['SPOTLIGHT_USER_PASSWORD']
+
     begin
       system 'stty -echo'
       print 'Password (must be 8+ characters): '
@@ -104,6 +108,20 @@ namespace :spotlight do
     password
   end
 
+  def prompt_for_title
+    return ENV['SPOTLIGHT_EXHIBIT_TITLE'] if ENV['SPOTLIGHT_EXHIBIT_TITLE']
+
+    print 'Exhibit title: '
+    $stdin.gets.chomp
+  end
+
+  def prompt_for_slug
+    return ENV['SPOTLIGHT_EXHIBIT_SLUG'] if ENV['SPOTLIGHT_EXHIBIT_SLUG']
+
+    print 'Exhibit URL slug: '
+    $stdin.gets.chomp
+  end
+
   namespace :check do
     desc 'Check the Solr connection and controller configuration'
     task :solr, [:model_name] => ['blacklight:check:solr', :environment] do |_, _args|