blacklight-spotlight 3.5.0.2 → 3.6.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b37ca44843ce17defff551d04be7ad02dec03229756548a7f42dbda6d7608ed
-  data.tar.gz: d240e8284f7030833fd81256d232c37f3ee178c8b329823007a1de6d44e6e7ca
+  metadata.gz: 873afa136e88244140b880144b141d3d514a3c6ba8fb1d529ce8b212e6b01554
+  data.tar.gz: 993f4ab59db2c83969345916e74f227a494ea06e4e093abab6d47188581c2e9f
 SHA512:
-  metadata.gz: 6ab409d1cb4743910da14cc580d2048fe18a798edcbaa5b5dcbf93c67b1a7c9a6e40a9647a44262d369e13830cf7e3a0419278c18a3de58bbb70a2df93933716
-  data.tar.gz: 900d4dec2ff3596e0f9ee37f66b118419317eb8c1a2931827a1ed3ebb117a3a6324e9358bb660180f94c63427db39520b3663e8cb167afc2db4d54bd01ef86a5
+  metadata.gz: 1a9a2ebe6e17e218ad85edc0ef503a9823c32b91c933643399bbf79a4bc416489a96e62497e62c95b334bf0764684833fcfc038e07816ac847dda1a072116840
+  data.tar.gz: a3e4dcad0114bfb10c7513c2635867cca01cc6d63ec46bdc393ea8ed481a0d6908873823fa5d9dcbec63fdf74fc28ad326a1b86dcdecb474804062eb56d71153

data/README.md

@@ -75,6 +75,14 @@ Our `$ rake ci` and `$ rake spotlight:server` tasks utilize Solr and the testing
 
 See more detailed instructions for development environment setup at ["Contributing to Spotlight"](https://github.com/projectblacklight/spotlight/wiki/Contributing-to-Spotlight)
 
+## With Docker
+
+```sh
+# because of how docker-compose handles named images, running `docker-compose up --build` will error when the Rails images have not been built locally
+docker-compose build
+docker-compose up
+```
+
 ## Tests
 
 ### Run all the tests:
@@ -104,3 +112,15 @@ See [developer-facing instructions for enabling translation](https://github.com/
 - Google Groups
   - [Blacklight Development Google group](https://groups.google.com/forum/#!forum/blacklight-development)
   - [Spotlight Community Group](https://groups.google.com/forum/#!forum/spotlight-community) (equivalent to #spotlight-service)
+
+
+## Building the javascript
+The javascript is built by npm from sources in `app/javascript` into a bundle
+in `app/assets/javascripts/spotlight/spotlight.js`. This file should not be edited
+by hand as any changes would be overwritten.  When any of the javascript
+components in the gem are changed, this bundle should be rebuild with the
+following steps:
+1. [Install npm](https://www.npmjs.com/get-npm)
+1. run `npm install` to download dependencies
+1. run `npm run prepare` to build the bundle
+1. run `npm publish` to push the javascript package to https://npmjs.org/package/spotlight-frontend

data/Rakefile

@@ -34,10 +34,10 @@ task ci: ['engine_cart:generate'] do
   ENV['environment'] = 'test'
 
   SolrWrapper.wrap(port: '8983') do |solr|
-    solr.with_collection(name: 'blacklight-core', dir: File.join(__dir__, 'solr_conf', 'conf')) do
+    solr.with_collection(name: 'blacklight-core', dir: 'lib/generators/spotlight/templates/solr/conf') do
       within_test_app do
         system 'bundle install'
-        system 'bundle exec rake db:migrate'
+        system 'bin/rails db:migrate'
       end
 
       Rake::Task['spotlight:fixtures'].invoke
@@ -62,14 +62,13 @@ namespace :spotlight do
     Rake::Task['engine_cart:generate'].invoke
 
     SolrWrapper.wrap(port: '8983') do |solr|
-      solr.with_collection(name: 'blacklight-core', dir: File.join(__dir__, 'solr_conf', 'conf')) do
+      solr.with_collection(name: 'blacklight-core', dir: 'lib/generators/spotlight/templates/solr/conf') do
         within_test_app do
           unless File.exist? '.initialized'
-            system 'bundle exec rake spotlight:initialize'
-            system 'bundle exec rake spotlight_test:solr:seed'
+            system 'bin/rails spotlight:initialize spotlight_test:solr:seed'
             File.open('.initialized', 'w') {}
           end
-          system 'bundle exec rails s'
+          system 'bin/rails s'
         end
       end
     end
@@ -104,7 +103,7 @@ namespace :spotlight do
                 APP_ROOT = Dir.pwd
                 SolrWrapper.wrap(port: '8983') do |solr|
                   solr.with_collection(name: 'blacklight-core', dir: File.join(File.expand_path('..', File.dirname(__FILE__)), 'solr', 'conf')) do
-                    system 'bundle exec rails s'
+                    system 'bin/rails s'
                   end
                 end
               end

data/app/assets/config/spotlight/manifest.js

@@ -0,0 +1 @@
+//= link spotlight/blocks/sir-trevor-icons.svg

data/app/assets/javascripts/spotlight/application.js

@@ -1,14 +1,9 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// compiled file.
-//
-// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
-// about supported directives.
-//
-//= require spotlight/user/index
-//= require spotlight/admin/index
+// This is the sprockets entrypoint.
+//= require leaflet
+//= require sir-trevor
+//= require clipboard
+//= require handlebars
+//= require tiny-slider
+//= require typeahead.bundle.min.js
+
+//= require spotlight/spotlight