blacklight-spotlight 0.20.3 → 0.21.0

data/lib/generators/spotlight/templates/solr/config/solrconfig.xml

@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<config>
+  <!-- NOTE: various comments and unused configuration possibilities have been purged
+     from this file.  Please refer to http://wiki.apache.org/solr/SolrConfigXml,
+     as well as the default solrconfig file included with Solr -->
+  
+  <abortOnConfigurationError>${solr.abortOnConfigurationError:true}</abortOnConfigurationError>
+  
+  <luceneMatchVersion>6.1.0</luceneMatchVersion>
+
+  <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.StandardDirectoryFactory}"/>
+
+  <updateHandler class="solr.DirectUpdateHandler2">
+    <updateLog>
+      <str name="dir">${solr.core0.data.dir:}</str>
+    </updateLog>
+  </updateHandler>
+
+  <!-- solr lib dirs -->  
+  <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lib" />
+  <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lucene-libs" />
+
+  <dataDir>${solr.data.dir:}</dataDir>
+
+  <requestHandler name="search" class="solr.SearchHandler" default="true">
+    <!-- default values for query parameters can be specified, these
+         will be overridden by parameters in the request
+      -->
+     <lst name="defaults">
+       <str name="defType">edismax</str>
+       <str name="echoParams">explicit</str>
+       <str name="q.alt">*:*</str>
+       <str name="mm">2&lt;-1 5&lt;-2 6&lt;90%</str>
+       <int name="qs">1</int>
+       <int name="ps">2</int>
+       <float name="tie">0.01</float>
+       <!-- this qf and pf are used by default, if not otherwise specified by
+            client. The default blacklight_config will use these for the
+            "keywords" search. See the author_qf/author_pf, title_qf, etc 
+            below, which the default blacklight_config will specify for
+            those searches. You may also be interested in:
+            http://wiki.apache.org/solr/LocalParams
+       -->
+        <str name="qf">
+          id
+          full_title_tesim
+          short_title_tesim
+          alternative_title_tesim
+          active_fedora_model_ssi
+          title_tesim
+          author_tesim
+          subject_tesim
+          all_text_timv
+        </str>
+        <str name="pf">
+          all_text_timv^10
+        </str>
+
+       <str name="author_qf">
+          author_tesim
+       </str>
+       <str name="author_pf">
+       </str>
+       <str name="title_qf">
+          title_tesim
+          full_title_tesim
+          short_title_tesim
+          alternative_title_tesim
+       </str>
+       <str name="title_pf">
+       </str>
+       <str name="subject_qf">
+          subject_tesim
+       </str>
+       <str name="subject_pf">
+       </str>
+       
+       <str name="fl">
+         *, 
+         score
+       </str>
+
+       <str name="facet">true</str>
+       <str name="facet.mincount">1</str>
+       <str name="facet.limit">10</str>
+       <str name="facet.field">active_fedora_model_ssi</str>
+       <str name="facet.field">subject_ssim</str>
+       
+       <str name="spellcheck">true</str>
+       <str name="spellcheck.dictionary">default</str>
+       <str name="spellcheck.onlyMorePopular">true</str>
+       <str name="spellcheck.extendedResults">true</str>
+       <str name="spellcheck.collate">false</str>
+       <str name="spellcheck.count">5</str>
+
+     </lst>
+    <arr name="last-components">
+      <str>spellcheck</str>
+    </arr>
+  </requestHandler>
+
+  <requestHandler name="permissions" class="solr.SearchHandler" >
+    <lst name="defaults">
+      <str name="facet">off</str>
+      <str name="echoParams">all</str>
+      <str name="rows">1</str>
+      <str name="q">{!raw f=id v=$id}</str> <!-- use id=666 instead of q=id:666 -->
+      <str name="fl">
+        id,
+        access_ssim,
+        discover_access_group_ssim,discover_access_person_ssim,
+        read_access_group_ssim,read_access_person_ssim,
+        edit_access_group_ssim,edit_access_person_ssim,
+        depositor_ti,
+        embargo_release_date_dtsi
+        inheritable_access_ssim,
+        inheritable_discover_access_group_ssim,inheritable_discover_access_person_ssim,
+        inheritable_read_access_group_ssim,inheritable_read_access_person_ssim,
+        inheritable_edit_access_group_ssim,inheritable_edit_access_person_ssim,
+        inheritable_embargo_release_date_dtsi
+      </str>
+    </lst>
+  </requestHandler>
+  
+  <requestHandler name="standard" class="solr.SearchHandler">
+     <lst name="defaults">
+       <str name="echoParams">explicit</str>
+       <str name="defType">lucene</str>
+     </lst>
+  </requestHandler>
+
+  <!-- for requests to get a single document; use id=666 instead of q=id:666 -->
+  <requestHandler name="document" class="solr.SearchHandler" >
+    <lst name="defaults">
+      <str name="echoParams">all</str>
+      <str name="fl">*</str>
+      <str name="rows">1</str>
+      <str name="q">{!raw f=id v=$id}</str> <!-- use id=666 instead of q=id:666 -->
+    </lst>
+  </requestHandler>
+
+
+  <searchComponent name="spellcheck" class="solr.SpellCheckComponent">
+    <str name="queryAnalyzerFieldType">textSpell</str>
+    <!-- Multiple "Spell Checkers" can be declared and used by this component
+      (e.g. for title_spell field)
+      -->
+    <lst name="spellchecker">
+      <str name="name">default</str>
+      <str name="field">spell</str>
+      <str name="spellcheckIndexDir">./spell</str>
+      <str name="buildOnOptimize">true</str>
+    </lst>
+  </searchComponent>
+  
+  <requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy" /> 
+  
+  <requestDispatcher handleSelect="true" >
+    <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048" />
+  </requestDispatcher>
+  
+  <requestHandler name="/analysis/field" startup="lazy" class="solr.FieldAnalysisRequestHandler" />
+</config>

data/lib/spotlight/engine.rb

@@ -17,7 +17,15 @@ module Spotlight
   class Engine < ::Rails::Engine
     isolate_namespace Spotlight
     # Breadcrumbs on rails must be required outside of an initializer or it doesn't get loaded.
-    require 'breadcrumbs_on_rails'
+    require 'breadcrumbs_on_rails/breadcrumbs'
+    require 'breadcrumbs_on_rails/action_controller'
+
+    initializer 'breadcrumbs_on_rails.initialize' do
+      ActiveSupport.on_load(:action_controller) do
+        include BreadcrumbsOnRails::ActionController
+      end
+    end
+
     require 'carrierwave'
     require 'carrierwave/crop'
     require 'social-share-button'

data/lib/spotlight/version.rb

@@ -1,3 +1,3 @@
 module Spotlight
-  VERSION = '0.20.3'.freeze
+  VERSION = '0.21.0'.freeze
 end

data/spec/controllers/spotlight/admin_users_controller_spec.rb

@@ -73,7 +73,7 @@ describe Spotlight::AdminUsersController, type: :controller do
 
       it 'redirects back with flash error upon failure' do
         post :invite, user: 'user@example.com', role: 'not-a-real-role'
-        expect(flash[:alert]).to eq 'There was a problem saving the user(s).'
+        expect(flash[:alert]).to eq 'There was a problem saving the user.'
         expect(response).to redirect_to(:back)
       end
     end

data/spec/controllers/spotlight/appearances_controller_spec.rb

@@ -41,15 +41,27 @@ describe Spotlight::AppearancesController, type: :controller do
     end
 
     describe 'PATCH update' do
+      let(:first_nav) { exhibit.main_navigations.first }
+      let(:last_nav) { exhibit.main_navigations.last }
       it 'updates the navigation' do
-        first_nav = exhibit.main_navigations.first
-        last_nav = exhibit.main_navigations.last
-        patch :update, exhibit_id: exhibit, exhibit: {
-          main_navigations_attributes: [
-            { id: first_nav.id, label: 'Some Label', weight: 500 },
-            { id: last_nav.id, display: false }
-          ]
-        }
+        if Rails::VERSION::MAJOR >= 5
+          patch :update, params: {
+            exhibit_id: exhibit,
+            exhibit: {
+              main_navigations_attributes: {
+                0 => { id: first_nav.id, label: 'Some Label', weight: 500 },
+                1 => { id: last_nav.id, display: false }
+              }
+            }
+          }
+        else
+          patch :update, exhibit_id: exhibit, exhibit: {
+            main_navigations_attributes: [
+              { id: first_nav.id, label: 'Some Label', weight: 500 },
+              { id: last_nav.id, display: false }
+            ]
+          }
+        end
         expect(flash[:notice]).to eq 'The exhibit was successfully updated.'
         expect(response).to redirect_to edit_exhibit_appearance_path(exhibit)
         assigns[:exhibit].tap do |saved|

data/spec/controllers/spotlight/roles_controller_spec.rb

@@ -94,7 +94,7 @@ describe Spotlight::RolesController, type: :controller do
           }
         }
         expect(response).to be_successful
-        expect(flash[:alert]).to eq 'There was a problem saving the user(s).'
+        expect(flash[:alert]).to eq 'There was a problem saving the user.'
       end
     end
 
@@ -143,7 +143,7 @@ describe Spotlight::RolesController, type: :controller do
 
       it 'redirects back with flash error upon failure' do
         post :invite, exhibit_id: exhibit, user: 'user@example.com', role: 'not-a-real-role'
-        expect(flash[:alert]).to eq 'There was a problem saving the user(s).'
+        expect(flash[:alert]).to eq 'There was a problem saving the user.'
         expect(response).to redirect_to(:back)
       end
     end

data/spec/controllers/spotlight/solr_controller_spec.rb

@@ -29,7 +29,7 @@ describe Spotlight::SolrController, type: :controller do
           doc = arr.first
         end
 
-        post :update, { a: 1 }.to_json, content_type: :json, exhibit_id: exhibit
+        post_update_with_json_body(exhibit, a: 1)
 
         expect(response).to be_successful
         expect(doc).to include 'a' => 1
@@ -41,7 +41,7 @@ describe Spotlight::SolrController, type: :controller do
         end
 
         it 'raises an error' do
-          post :update, { a: 1 }.to_json, content_type: :json, exhibit_id: exhibit
+          post_update_with_json_body(exhibit, a: 1)
 
           expect(response.code).to eq '409'
         end
@@ -53,7 +53,7 @@ describe Spotlight::SolrController, type: :controller do
           doc = arr.first
         end
 
-        post :update, { a: 1 }.to_json, content_type: :json, exhibit_id: exhibit
+        post_update_with_json_body(exhibit, a: 1)
 
         expect(response).to be_successful
         expect(doc).to include exhibit.solr_data
@@ -67,11 +67,19 @@ describe Spotlight::SolrController, type: :controller do
 
         allow_any_instance_of(SolrDocument).to receive(:to_solr).and_return(b: 1)
 
-        post :update, { a: 1 }.to_json, content_type: :json, exhibit_id: exhibit
+        post_update_with_json_body(exhibit, a: 1)
 
         expect(response).to be_successful
         expect(doc).to include b: 1
       end
     end
   end
+
+  def post_update_with_json_body(exhibit, hash)
+    if Rails::VERSION::MAJOR >= 5
+      post :update, body: hash.to_json, params: { exhibit_id: exhibit }, as: :json
+    else
+      post :update, hash.to_json, content_type: :json, exhibit_id: exhibit
+    end
+  end
 end

data/spec/models/spotlight/resource_spec.rb

@@ -4,6 +4,24 @@ describe Spotlight::Resource, type: :model do
   end
   let(:exhibit) { FactoryGirl.create(:exhibit) }
 
+  describe '#enqueued_at' do
+    it 'casts values to Time objects' do
+      t = Time.zone.now.at_beginning_of_minute
+      subject.enqueued_at = t
+
+      expect(subject.enqueued_at).to eq t
+    end
+  end
+
+  describe '#last_indexed_finished' do
+    it 'casts values to Time objects' do
+      t = Time.zone.now.at_beginning_of_minute
+      subject.last_indexed_finished = t
+
+      expect(subject.last_indexed_finished).to eq t
+    end
+  end
+
   describe '#reindex' do
     context 'with a provider that generates ids' do
       subject do

data/spec/spec_helper.rb

@@ -1,11 +1,13 @@
 ENV['RAILS_ENV'] ||= 'test'
-
 require 'factory_girl'
 require 'database_cleaner'
 require 'devise'
 require 'engine_cart'
 EngineCart.load_application!
 
+Internal::Application.config.active_job.queue_adapter = :inline
+
+require 'rails-controller-testing' if Rails::VERSION::MAJOR >= 5
 require 'rspec/collection_matchers'
 require 'rspec/its'
 require 'rspec/rails'
@@ -47,6 +49,7 @@ FIXTURES_PATH = File.expand_path('../fixtures', __FILE__)
 
 RSpec.configure do |config|
   config.infer_spec_type_from_file_location!
+  config.filter_rails_from_backtrace!
 
   config.use_transactional_fixtures = false
 
@@ -88,6 +91,10 @@ RSpec.configure do |config|
   config.after(:each, type: :feature) { Warden.test_reset! }
   config.include Controllers::EngineHelpers, type: :controller
   config.include Capybara::DSL
+  if Rails::VERSION::MAJOR >= 5
+    config.include ::Rails.application.routes.url_helpers
+    config.include ::Rails.application.routes.mounted_helpers
+  end
   config.include Spotlight::TestFeaturesHelpers, type: :feature
 end
 

data/spec/support/helpers/controller_level_helpers.rb

@@ -3,11 +3,23 @@ module ControllerLevelHelpers
     @search_state ||= Blacklight::SearchState.new(params, blacklight_config)
   end
 
+  def current_site
+    Spotlight::Site.instance
+  end
+
   def blacklight_configuration_context
     @blacklight_configuration_context ||= Blacklight::Configuration::Context.new(controller)
   end
 
   def initialize_controller_helpers(helper)
     helper.extend ControllerLevelHelpers
+    initialize_routing_helpers(helper)
+  end
+
+  def initialize_routing_helpers(helper)
+    return unless Rails::VERSION::MAJOR >= 5
+
+    helper.class.include ::Rails.application.routes.url_helpers
+    helper.class.include ::Rails.application.routes.mounted_helpers if ::Rails.application.routes.respond_to?(:mounted_helpers)
   end
 end

data/spec/support/views/test_view_helpers.rb

@@ -4,8 +4,12 @@ module Spotlight
 
     included do
       before do
+        view.send(:extend, Spotlight::MainAppHelpers)
         view.send(:extend, Spotlight::CrudLinkHelpers)
         view.send(:extend, Spotlight::TitleHelper)
+        view.send(:extend, Spotlight::NavbarHelper)
+        view.send(:extend, Blacklight::ComponentHelperBehavior)
+        view.send(:extend, BreadcrumbsOnRails::ActionController::HelperMethods)
       end
     end
   end

data/spec/test_app_templates/Gemfile.extra

@@ -0,0 +1,2 @@
+gem 'friendly_id', github: 'norman/friendly_id'
+gem 'social-share-button', github: 'cbeer/social-share-button', branch: 'on_load'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 0.20.3
+  version: 0.21.0
 platform: ruby
 authors:
 - Chris Beer
@@ -11,28 +11,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-28 00:00:00.000000000 Z
+date: 2016-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
@@ -149,30 +149,36 @@ dependencies:
   name: acts-as-taggable-on
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: 4.0.0.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: 4.0.0.pre
 - !ruby/object:Gem::Dependency
   name: friendly_id
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.2.0.beta.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.2.0.beta.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: breadcrumbs_on_rails
   requirement: !ruby/object:Gem::Requirement
@@ -509,6 +515,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails-controller-testing
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -1133,8 +1153,8 @@ files:
 - lib/generators/spotlight/templates/config/initializers/riiif.rb
 - lib/generators/spotlight/templates/config/initializers/social_share_button.rb
 - lib/generators/spotlight/templates/config/sitemap.rb
-- lib/generators/spotlight/templates/solr_conf/conf/schema.xml
-- lib/generators/spotlight/templates/solr_conf/conf/solrconfig.xml
+- lib/generators/spotlight/templates/solr/config/schema.xml
+- lib/generators/spotlight/templates/solr/config/solrconfig.xml
 - lib/generators/spotlight/templates/spotlight.js
 - lib/generators/spotlight/templates/spotlight.scss
 - lib/generators/spotlight/templates/spotlight_helper.rb
@@ -1299,6 +1319,7 @@ files:
 - spec/support/features/test_features_helpers.rb
 - spec/support/helpers/controller_level_helpers.rb
 - spec/support/views/test_view_helpers.rb
+- spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/carrierwave.rb
 - spec/test_app_templates/catalog_controller.rb
 - spec/test_app_templates/lib/generators/test_app_generator.rb
@@ -1385,7 +1406,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Enable librarians, curators, and others who are responsible for digital collections
@@ -1550,6 +1571,7 @@ test_files:
 - spec/support/views/test_view_helpers.rb
 - spec/test_app_templates/carrierwave.rb
 - spec/test_app_templates/catalog_controller.rb
+- spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - spec/test_app_templates/spotlight_test.rake
 - spec/uploaders/spotlight/item_uploader_spec.rb