blacklight-spotlight 0.29.1 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8aa5b0b3b677f689a7ba441aac0ab64a27ceb251
-  data.tar.gz: 40967db22fab3aeae71a4178a36855f4367a6baa
+  metadata.gz: 7dd88ac0b2f47a2f72fbbaa0d7395c31ab24a86d
+  data.tar.gz: d15195cc46560c6ac23745bf6a46afd5cde83870
 SHA512:
-  metadata.gz: 0432f79d47f9758d3f43f4bdd63ea33b6dca2a0e7f4e9a7864086723cb8bfc60c1b6b6bb2261ff02e483f380b7627a71914643059b7445b887c6adfea479d873
-  data.tar.gz: d13f7995cc6c25ecc0a87963495b815e3278daf696e02c4b32a10bc86d85fb18539f0b7b2eec52acd87c6ba11ecdb97f813c5cf1b50715992cddfb1a050c76b5
+  metadata.gz: b9966f72907df2f6d2e945047ae2d72c37bbba13adbd2cc2df56f39b9eee4fc4df238bc85ad561d5c82f32fc18ddded497033218d81f3daeb7946c089cf15ea8
+  data.tar.gz: 787eafb42229bb8d5504fa7b8a97b46876079bcb348f91e5cfef39f4ce3fb7697270d41fd2aa20c2cd89e0e54a7ba39e723ad5dd8aa5e0e5c7e77d633b07f8ef

data/app/controllers/spotlight/admin_users_controller.rb

@@ -6,8 +6,7 @@ module Spotlight
     before_action :load_site
     load_and_authorize_resource :site, class: 'Spotlight::Site'
 
-    def index
-    end
+    def index; end
 
     def create
       if update_roles

data/app/controllers/spotlight/exhibits_controller.rb

@@ -8,7 +8,7 @@ module Spotlight
     load_and_authorize_resource
 
     def index
-      @published_exhibits = @exhibits.published.ordered_by_weight.page(params[:page])
+      @published_exhibits = @exhibits.includes(:thumbnail).published.ordered_by_weight.page(params[:page])
       @published_exhibits = @published_exhibits.tagged_with(params[:tag]) if params[:tag]
 
       if @exhibits.one?

data/app/controllers/spotlight/pages_controller.rb

@@ -38,8 +38,7 @@ module Spotlight
     end
 
     # GET /exhibits/1/pages/new
-    def new
-    end
+    def new; end
 
     # GET /pages/1/edit
     def edit

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

@@ -13,10 +13,9 @@ module Spotlight
       load_and_authorize_resource :exhibit, class: Spotlight::Exhibit
 
       def create
-        file = csv_params[:url]
-        csv = CSV.parse(file.read, headers: true, return_headers: false, encoding: 'utf-8').map(&:to_hash)
+        csv = CSV.parse(csv_io_param, headers: true, return_headers: false).map(&:to_hash)
         Spotlight::AddUploadsFromCSV.perform_later(csv, current_exhibit, current_user)
-        flash[:notice] = t('spotlight.resources.upload.csv.success', file_name: file.original_filename)
+        flash[:notice] = t('spotlight.resources.upload.csv.success', file_name: csv_io_name)
         redirect_back(fallback_location: spotlight.exhibit_resources_path(current_exhibit))
       end
 
@@ -37,6 +36,29 @@ module Spotlight
       def data_param_keys
         Spotlight::Resources::Upload.fields(current_exhibit).map(&:field_name) + current_exhibit.custom_fields.map(&:field)
       end
+
+      # Gets an IO-like object for the CSV parser to use.
+      # @return IO
+      def csv_io_param
+        file_or_io = csv_params[:url]
+        io = if file_or_io.respond_to?(:to_io)
+               file_or_io.to_io
+             else
+               file_or_io
+             end
+
+        io.set_encoding('utf-8')
+      end
+
+      def csv_io_name
+        file_or_io = csv_params[:url]
+
+        if file_or_io.respond_to? :original_filename
+          file_or_io.original_filename
+        else
+          t('spotlight.resources.upload.csv.anonymous_file')
+        end
+      end
     end
   end
 end

data/app/controllers/spotlight/sites_controller.rb

@@ -6,11 +6,9 @@ module Spotlight
     before_action :load_site
     load_and_authorize_resource
 
-    def edit
-    end
+    def edit; end
 
-    def edit_exhibits
-    end
+    def edit_exhibits; end
 
     def update
       if @site.update(site_params)

data/app/jobs/spotlight/add_uploads_from_csv.rb

@@ -15,11 +15,13 @@ module Spotlight
         url = row.delete('url')
         next unless url.present?
 
-        Spotlight::Resources::Upload.create(
+        resource = Spotlight::Resources::Upload.new(
           remote_url_url: url,
           data: row,
           exhibit: exhibit
         )
+
+        resource.save_and_index
       end
     end
 

data/app/models/concerns/spotlight/ar_light.rb

@@ -30,15 +30,13 @@ module Spotlight
         false
       end
 
-      def before_destroy(*_args)
-      end
+      def before_destroy(*_args); end
 
       def pluralize_table_names
         true
       end
 
-      def add_autosave_association_callbacks(_arg)
-      end
+      def add_autosave_association_callbacks(_arg); end
 
       # needed for Rails 4.1 + act_as_taggable
       def dangerous_attribute_method?(*_args)

data/config/locales/spotlight.en.yml

@@ -515,6 +515,7 @@ en:
       upload:
         csv:
           success: "'%{file_name}' has been uploaded.  An email will be sent to you once indexing is complete."
+          anonymous_file: '(blank)'
         new:
           single_item_form: "Single item"
           multi_item_form: "Multiple items using CSV file"

data/db/migrate/20160929180534_add_document_index_to_solr_document_sidecar.rb

@@ -0,0 +1,6 @@
+class AddDocumentIndexToSolrDocumentSidecar < ActiveRecord::Migration
+  def change
+    add_index :spotlight_solr_document_sidecars, [:exhibit_id, :document_type, :document_id], name: 'spotlight_solr_document_sidecars_exhibit_document'
+    add_index :spotlight_solr_document_sidecars, [:document_type, :document_id], name: 'spotlight_solr_document_sidecars_solr_document'
+  end
+end

data/lib/spotlight/version.rb

@@ -1,3 +1,3 @@
 module Spotlight
-  VERSION = '0.29.1'.freeze
+  VERSION = '0.30.0'.freeze
 end

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

@@ -33,6 +33,13 @@ describe Spotlight::Resources::CsvUploadController, type: :controller do
             'spotlight_upload_description_tesim' => 'A random 900 by 600 image from lorempixel',
             'spotlight_upload_attribution_tesim' => 'lorempixel.com',
             'spotlight_upload_date_tesim' => '2014'
+          },
+          {
+            'url' => 'http://lorempixel.com/900/600/',
+            'full_title_tesim' => 'Yet another random image to test UTF8 text',
+            'spotlight_upload_description_tesim' => 'A random 900 by 600 image from lorempixel and some UTF8: Hüsker Dü',
+            'spotlight_upload_attribution_tesim' => 'lorempixel.com',
+            'spotlight_upload_date_tesim' => '2016'
           }
         ]
       end

data/spec/examples.txt

@@ -0,0 +1,8 @@
+example_id                                                                    | status | run_time        |
+----------------------------------------------------------------------------- | ------ | --------------- |
+./spec/controllers/spotlight/resources/csv_upload_controller_spec.rb[1:1:1:1] | passed | 0.50985 seconds |
+./spec/controllers/spotlight/resources/csv_upload_controller_spec.rb[1:2:1:1] | passed | 0.12143 seconds |
+./spec/controllers/spotlight/resources/csv_upload_controller_spec.rb[1:2:1:2] | passed | 0.10647 seconds |
+./spec/controllers/spotlight/resources/csv_upload_controller_spec.rb[1:2:1:3] | passed | 0.11359 seconds |
+./spec/jobs/spotlight/add_uploads_from_csv_spec.rb[1:1:1]                     | passed | 0.09125 seconds |
+./spec/jobs/spotlight/add_uploads_from_csv_spec.rb[1:2]                       | passed | 0.48251 seconds |

data/spec/fixtures/csv-upload-fixture.csv

@@ -1 +1,4 @@
-url,full_title_tesim,spotlight_upload_description_tesim,spotlight_upload_attribution_tesim,spotlight_upload_date_tesim
+url,full_title_tesim,spotlight_upload_description_tesim,spotlight_upload_attribution_tesim,spotlight_upload_date_tesim
+http://lorempixel.com/800/500/,A random image,A random 800 by 500 image from lorempixel,lorempixel.com,2015
+http://lorempixel.com/900/600/,Another random image,A random 900 by 600 image from lorempixel,lorempixel.com,2014
+http://lorempixel.com/900/600/,Yet another random image to test UTF8 text,A random 900 by 600 image from lorempixel and some UTF8: Hüsker Dü,lorempixel.com,2016

data/spec/jobs/spotlight/add_uploads_from_csv_spec.rb

@@ -0,0 +1,37 @@
+describe Spotlight::AddUploadsFromCSV do
+  subject(:job) { described_class.new(data, exhibit, user) }
+  let(:exhibit) { FactoryGirl.create(:exhibit) }
+  let(:user) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }
+  let(:data) do
+    [
+      { 'url' => 'x' },
+      { 'url' => 'y' }
+    ]
+  end
+
+  let(:resource_x) { instance_double(Spotlight::Resource) }
+  let(:resource_y) { instance_double(Spotlight::Resource) }
+
+  before do
+    allow(Spotlight::IndexingCompleteMailer).to receive(:documents_indexed).and_return(double(deliver_now: true))
+  end
+
+  context 'with empty data' do
+    let(:data) { [] }
+
+    it 'sends the user an email after the indexing job is complete' do
+      expect(Spotlight::IndexingCompleteMailer).to receive(:documents_indexed).and_return(double(deliver_now: true))
+      job.perform_now
+    end
+  end
+
+  it 'creates uploaded resources for each row of data' do
+    expect(Spotlight::Resources::Upload).to receive(:new).with(hash_including(remote_url_url: 'x')).and_return(resource_x)
+    expect(Spotlight::Resources::Upload).to receive(:new).with(hash_including(remote_url_url: 'y')).and_return(resource_y)
+
+    expect(resource_x).to receive(:save_and_index)
+    expect(resource_y).to receive(:save_and_index)
+
+    job.perform_now
+  end
+end

data/spec/spec_helper.rb

@@ -98,6 +98,49 @@ RSpec.configure do |config|
     config.include BackportTestHelpers, type: :controller
   end
   config.include Spotlight::TestFeaturesHelpers, type: :feature
+
+  config.expect_with :rspec do |expectations|
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  config.default_formatter = 'doc' if config.files_to_run.one?
+
+  config.shared_context_metadata_behavior = :apply_to_host_groups
+
+  # This allows you to limit a spec run to individual examples or groups
+  # you care about by tagging them with `:focus` metadata. When nothing
+  # is tagged with `:focus`, all examples get run. RSpec also provides
+  # aliases for `it`, `describe`, and `context` that include `:focus`
+  # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
+  config.filter_run_when_matching :focus
+
+  config.example_status_persistence_file_path = 'spec/examples.txt'
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = 'doc'
+  end
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 10
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  # config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
 end
 
 def add_new_page_via_button(title = 'New Page')

data/vendor/assets/javascripts/sir-trevor.js

@@ -1877,16 +1877,16 @@ return /******/ (function(modules) { // webpackBootstrap
 /* 26 */
 /***/ function(module, exports) {
 
-	module.exports = function(module) {
-		if(!module.webpackPolyfill) {
-			module.deprecate = function() {};
-			module.paths = [];
-			// module.parent = undefined by default
-			module.children = [];
-			module.webpackPolyfill = 1;
-		}
-		return module;
-	}
+	module.exports = function(module) {
+		if(!module.webpackPolyfill) {
+			module.deprecate = function() {};
+			module.paths = [];
+			// module.parent = undefined by default
+			module.children = [];
+			module.webpackPolyfill = 1;
+		}
+		return module;
+	}
 
 
 /***/ },
@@ -1899,7 +1899,7 @@ return /******/ (function(modules) { // webpackBootstrap
 /* 28 */
 /***/ function(module, exports) {
 
-	module.exports = function() { throw new Error("define cannot be used indirect"); };
+	module.exports = function() { throw new Error("define cannot be used indirect"); };
 
 
 /***/ },
@@ -17054,7 +17054,12 @@ return /******/ (function(modules) { // webpackBootstrap
 	    if (this._scribe.getTextContent() !== '') {
 	      var fakeContent = document.createElement('div');
 	      fakeContent.innerHTML = this.getTextBlockHTML();
-	      content = fakeContent.firstChild.innerHTML || fakeContent.innerHTML;
+
+	      // We concatenate the content of each paragraph and take into account the new lines
+	      content = fakeContent.children && Array.prototype.slice.call(fakeContent.children).reduce(function (res, child) {
+	        return res + child.innerHTML;
+	      }, '') || fakeContent.innerHTML;
+
 	      return content.replace(/^[\s\uFEFF\xA0]+|$/g, '');
 	    }
 	    return content;
@@ -18790,7 +18795,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	      _this3.deleteEl.classList.remove("active");
 	    };
 
-	    this.ui.insertAdjacentHTML("beforeend", DELETE_TEMPLATE);
+	    this.ui.insertAdjacentHTML("beforeend", DELETE_TEMPLATE());
 	    Events.delegate(this.el, ".js-st-block-confirm-delete", "click", this.onDeleteConfirm);
 	    Events.delegate(this.el, ".js-st-block-deny-delete", "click", onDeleteDeny);
 	  },
@@ -18882,19 +18887,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	        return;
 	      }
 
-	      var ctrlDown = false;
-
-	      Events.delegate(block.el, '.st-text-block', 'keyup', function (ev) {
-	        if (ev.which === 17 || ev.which === 224 || ev.which === 91) {
-	          ctrlDown = false;
-	        }
-	      });
 	      Events.delegate(block.el, '.st-text-block', 'keydown', function (ev) {
-	        if (ev.which === 17 || ev.which === 224 || ev.which === 91) {
-	          ctrlDown = true;
-	        }
-
-	        if (ev.which === cmd.keyCode && ctrlDown) {
+	        if ((ev.metaKey || ev.ctrlKey) && ev.keyCode === cmd.keyCode) {
 	          ev.preventDefault();
 	          block.execTextBlockCommand(cmd.cmd);
 	        }
@@ -19625,9 +19619,11 @@ return /******/ (function(modules) { // webpackBootstrap
 /* 252 */
 /***/ function(module, exports) {
 
-	'use strict';
+	"use strict";
 
-	module.exports = '\n  <div class="st-block__ui-delete-controls">\n    <label class="st-block__delete-label">\n      ' + i18n.t('general:delete') + '\n    </label>\n    <button class=\'st-block-ui__confirm js-st-block-confirm-delete\' type="button">\n      ' + i18n.t('general:yes') + '\n    </button>\n    <button class=\'st-block-ui__confirm js-st-block-deny-delete\' type="button">\n      ' + i18n.t('general:no') + '\n    </button>\n  </div>\n';
+	module.exports = function () {
+	  return '\n    <div class="st-block__ui-delete-controls">\n      <label class="st-block__delete-label">\n        ' + i18n.t('general:delete') + '\n      </label>\n      <button class=\'st-block-ui__confirm js-st-block-confirm-delete\' type="button">\n        ' + i18n.t('general:yes') + '\n      </button>\n      <button class=\'st-block-ui__confirm js-st-block-deny-delete\' type="button">\n        ' + i18n.t('general:no') + '\n      </button>\n    </div>\n  ';
+	};
 
 /***/ },
 /* 253 */
@@ -19764,6 +19760,14 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	      range.setStartBefore(scribe.el.firstChild, 0);
 
+	      var node = range.endContainer.nodeType === 3 ? range.endContainer.parentNode : range.endContainer;
+
+	      // We make sure that the caret must be inside the first element to consider
+	      // it at the beginning of the block
+	      if (scribe.el.firstChild !== node) {
+	        return false;
+	      }
+
 	      return rangeToHTML(range, false) === '';
 	    };
 
@@ -20499,8 +20503,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	    if (_.isUndefined(data.status_url)) {
 	      data.status_url = '';
 	    }
-	    var iframe = this.inner.querySelector('iframe');
-	    Dom.remove(iframe);
+	    var twitterwidget = this.inner.querySelector('twitterwidget');
+	    Dom.remove(twitterwidget);
 
 	    this.inner.insertAdjacentHTML("afterbegin", tweet_template(data));
 
@@ -21632,4 +21636,4 @@ return /******/ (function(modules) { // webpackBootstrap
 17
 /******/ ])))
 });
-;
+;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 0.29.1
+  version: 0.30.0
 platform: ruby
 authors:
 - Chris Beer
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-26 00:00:00.000000000 Z
+date: 2016-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -541,34 +541,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.41'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.41.2
+        version: '0.45'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.41'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.41.2
+        version: '0.45'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: poltergeist
   requirement: !ruby/object:Gem::Requirement
@@ -1128,6 +1122,7 @@ files:
 - db/migrate/20160711121314_add_default_view_to_spotlight_searches.rb
 - db/migrate/20160815165432_add_resource_to_solr_document_sidecar.rb
 - db/migrate/20160816165432_add_index_status_to_solr_document_sidecar.rb
+- db/migrate/20160929180534_add_document_index_to_solr_document_sidecar.rb
 - lib/blacklight/spotlight.rb
 - lib/generators/spotlight/install_generator.rb
 - lib/generators/spotlight/scaffold_resource_generator.rb
@@ -1173,6 +1168,7 @@ files:
 - spec/controllers/spotlight/tags_controller_spec.rb
 - spec/controllers/spotlight/versions_controller_spec.rb
 - spec/controllers/spotlight/view_configurations_controller_spec.rb
+- spec/examples.txt
 - spec/factories/contacts.rb
 - spec/factories/custom_fields.rb
 - spec/factories/exhibits.rb
@@ -1248,6 +1244,7 @@ files:
 - spec/helpers/spotlight/roles_helper_spec.rb
 - spec/helpers/spotlight/search_configurations_helper_spec.rb
 - spec/helpers/spotlight/title_helper_spec.rb
+- spec/jobs/spotlight/add_uploads_from_csv_spec.rb
 - spec/jobs/spotlight/default_thumbnail_job_spec.rb
 - spec/jobs/spotlight/reindex_job_spec.rb
 - spec/jobs/spotlight/rename_sidecar_field_job_spec.rb
@@ -1409,7 +1406,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Enable librarians, curators, and others who are responsible for digital collections
@@ -1444,6 +1441,7 @@ test_files:
 - spec/controllers/spotlight/tags_controller_spec.rb
 - spec/controllers/spotlight/versions_controller_spec.rb
 - spec/controllers/spotlight/view_configurations_controller_spec.rb
+- spec/examples.txt
 - spec/factories/contacts.rb
 - spec/factories/custom_fields.rb
 - spec/factories/exhibits.rb
@@ -1519,6 +1517,7 @@ test_files:
 - spec/helpers/spotlight/roles_helper_spec.rb
 - spec/helpers/spotlight/search_configurations_helper_spec.rb
 - spec/helpers/spotlight/title_helper_spec.rb
+- spec/jobs/spotlight/add_uploads_from_csv_spec.rb
 - spec/jobs/spotlight/default_thumbnail_job_spec.rb
 - spec/jobs/spotlight/reindex_job_spec.rb
 - spec/jobs/spotlight/rename_sidecar_field_job_spec.rb