blacklight-spotlight 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fca6298cd0b33b7047e4476caa703812750e677
-  data.tar.gz: 6eb41f57205d58a1728cfa00a12d65132762644a
+  metadata.gz: 19ff3a47f366456895a647229c3c9fea67ec3b76
+  data.tar.gz: 7a59c82abf7fcc1b25bebc9319867779b31082f4
 SHA512:
-  metadata.gz: 74e40b060f9ff6840fc5a8d3a6f6b0f9fba7a2dd44d38d42121a1311eee5281448e4205498f9801d7627d7a0d1bf363f11a085cde8caa39e1783db5b4c0d72cb
-  data.tar.gz: be19923238f9a87ee0717ccdd04261571c7757dbd62d413c3042cd6eb88246582b4f1a01e3a7dd66d0b08303fae41dfb62bff91d571ace2c0e18286aec939294
+  metadata.gz: 059110ca3e0365f26885a4ca692b4ba405b29f0d469f1ebfc34122d45ce71aa3313860f381f963e05da98810795614a55937e0eeea64841f47392773c131ffba
+  data.tar.gz: 4b546801b5cc566c9440a49cebd4b6b78aac9e8abcf208f24edf05b0acc83ba0edb91e3934c4b19ef7bf8d1057d82183d9cfe0cec5e0946be9aa424d5f35ce93

data/README.md

@@ -71,7 +71,7 @@ See the [Spotlight wiki](https://github.com/sul-dlss/spotlight/wiki) for more de
 
 Spotlight:
 
-* is a Rails engine and needs to be used in the context of a Rails application. We use [engine_cart](https://github.com/cbeer/engine_cart) to create an internal test application at spec/internal.
+* is a Rails engine and needs to be used in the context of a Rails application. We use [engine_cart](https://github.com/cbeer/engine_cart) to create an internal test application at .internal_test_app/
 * uses Solr as part of its integration tests. We use [jettywrapper](https://github.com/projecthydra/jettywrapper) to manage the Solr instance used for development and test.
 
 Our `$ rake ci` and `$ rake spotlight:server` tasks utilize Solr and the testing rails app automatically.

data/app/controllers/spotlight/pages_controller.rb

@@ -7,7 +7,7 @@ module Spotlight
 
     helper Openseadragon::OpenseadragonHelper
     include Spotlight::Base
-    include Blacklight::Catalog::SearchContext
+    include Blacklight::SearchContext
     include Spotlight::Catalog::AccessControlsEnforcement
 
     helper_method :get_search_results, :search_results, :search_params_logic, :fetch, :page_collection_name

data/app/controllers/spotlight/resources/upload_controller.rb

@@ -22,7 +22,7 @@ module Spotlight
         add_breadcrumb t(:'spotlight.resources.upload.new.header'), new_exhibit_resources_upload_path(@exhibit)
       end
 
-      # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+      # rubocop:disable Metrics/MethodLength
       def create
         @resource.attributes = resource_params
 
@@ -38,7 +38,7 @@ module Spotlight
           redirect_to admin_exhibit_catalog_index_path(@resource.exhibit, sort: :timestamp)
         end
       end
-      # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+      # rubocop:enable Metrics/MethodLength
 
       def csv_upload
         file = csv_params[:url]

data/app/controllers/spotlight/searches_controller.rb

@@ -11,7 +11,6 @@ module Spotlight
 
     include Spotlight::Base
 
-    # rubocop:disable Metrics/AbcSize
     def create
       @search.attributes = search_params
       @search.query_params = params.except(:exhibit_id, :search, *blacklisted_search_session_params).reject { |_k, v| v.blank? }
@@ -22,7 +21,6 @@ module Spotlight
         redirect_to :back, alert: @search.errors.full_messages.join('<br>'.html_safe)
       end
     end
-    # rubocop:enable Metrics/AbcSize
 
     def index
       respond_to do |format|

data/app/models/spotlight/search.rb

@@ -44,7 +44,7 @@ module Spotlight
     def documents
       return enum_for(:documents) unless block_given?
 
-      Blacklight::SolrResponse.new(solr_response, {}).docs.each do |result|
+      Blacklight::Solr::Response.new(solr_response, {}).docs.each do |result|
         yield blacklight_config.document_model.new(result)
       end
     end

data/lib/spotlight.rb

@@ -4,8 +4,8 @@ require 'spotlight/engine'
 ##
 # Spotlight
 module Spotlight
-  require 'spotlight/config'
-  require 'spotlight/base'
-  require 'spotlight/controller'
-  require 'spotlight/catalog'
+  autoload :Config, 'spotlight/config'
+  autoload :Base, 'spotlight/base'
+  autoload :Controller, 'spotlight/controller'
+  autoload :Catalog, 'spotlight/catalog'
 end

data/lib/spotlight/engine.rb

@@ -125,11 +125,13 @@ module Spotlight
 
     Spotlight::Engine.config.default_browse_index_view_type = :gallery
 
-    # Field containing the last modified date for a Solr document
-    Blacklight::Configuration.default_values[:index].timestamp_field ||= 'timestamp'
+    initializer 'blacklight.configuration' do
+      # Field containing the last modified date for a Solr document
+      Blacklight::Configuration.default_values[:index].timestamp_field ||= 'timestamp'
 
-    # Field containing the last modified date for a Solr document
-    Blacklight::Configuration.default_values[:browse] ||= Blacklight::OpenStructWithHashAccess.new(document_actions: [])
+      # Default configuration for the browse view
+      Blacklight::Configuration.default_values[:browse] ||= Blacklight::OpenStructWithHashAccess.new(document_actions: [])
+    end
 
     # make blacklight configuration play nice with bootstrap_form
     Blacklight::OpenStructWithHashAccess.send(:extend, ActiveModel::Translation)

data/lib/spotlight/version.rb

@@ -1,4 +1,4 @@
 #
 module Spotlight
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

data/spec/controllers/spotlight/resources/upload_controller_spec.rb

@@ -29,7 +29,7 @@ describe Spotlight::Resources::UploadController, type: :controller do
     end
 
     describe 'POST csv_upload' do
-      let(:csv) { fixture_file_upload(File.expand_path(File.join('..', 'fixtures', 'csv-upload-fixture.csv'), Rails.root), 'text/csv') }
+      let(:csv) { fixture_file_upload(File.expand_path(File.join('..', 'spec', 'fixtures', 'csv-upload-fixture.csv'), Rails.root), 'text/csv') }
       let(:serialized_csv) do
         [
           {

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -1,10 +1,10 @@
 require 'rails/generators'
 
 class TestAppGenerator < Rails::Generators::Base
-  source_root '../../spec/test_app_templates'
+  source_root '../spec/test_app_templates'
 
   def add_gems
-    gem 'blacklight', '~> 5.13'
+    gem 'blacklight', '~> 5.16'
     gem 'blacklight-gallery', '>= 0.3.0'
     gem 'jettywrapper'
     Bundler.with_clean_env do

data/spec/test_app_templates/spotlight_test.rake

@@ -4,7 +4,7 @@ namespace :spotlight_test do
   namespace :solr do
     desc 'Index test data into solr; must be run from within an app (see spotlight:fixtures)'
     task :seed do
-      docs = YAML.load(File.open(File.expand_path(File.join('..', 'fixtures', 'sample_solr_documents.yml'), Rails.root)))
+      docs = YAML.load(File.open(File.expand_path(File.join('..', 'spec', 'fixtures', 'sample_solr_documents.yml'), Rails.root)))
       Blacklight.default_index.connection.add docs
       Blacklight.default_index.connection.commit
     end

data/spec/uploaders/spotlight/item_uploader_spec.rb

@@ -18,7 +18,7 @@ describe Spotlight::ItemUploader do
     end
 
     before do
-      subject.store!(File.open(File.expand_path(File.join('..', 'fixtures', '800x600.png'), Rails.root)))
+      subject.store!(File.open(File.expand_path(File.join('..', 'spec', 'fixtures', '800x600.png'), Rails.root)))
     end
 
     after do
@@ -52,7 +52,7 @@ describe Spotlight::ItemUploader do
           end
         end
       }
-      subject.store!(File.open(File.expand_path(File.join('..', 'fixtures', '800x600.png'), Rails.root)))
+      subject.store!(File.open(File.expand_path(File.join('..', 'spec', 'fixtures', '800x600.png'), Rails.root)))
     end
 
     after do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Chris Beer
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-27 00:00:00.000000000 Z
+date: 2015-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -39,14 +39,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.13'
+        version: '5.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.13'
+        version: '5.16'
 - !ruby/object:Gem::Dependency
   name: autoprefixer-rails
   requirement: !ruby/object:Gem::Requirement
@@ -533,16 +533,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.35'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.35'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -1270,7 +1270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Enable librarians, curators, and others who are responsible for digital collections