blacklight-spotlight 1.4.1 → 1.5.1

data/spec/features/translation_scope_spec.rb

@@ -0,0 +1,24 @@
+describe 'Translations scope setting', type: :feature do
+  let(:exhibit) { FactoryBot.create(:exhibit) }
+  let(:other_exhibit) { FactoryBot.create(:exhibit) }
+  let(:exhibit_curator) { FactoryBot.create(:exhibit_curator, exhibit: exhibit) }
+
+  describe 'exhibit route set' do
+    before do
+      login_as exhibit_curator
+      FactoryBot.create(:translation, exhibit: exhibit)
+      FactoryBot.create(:translation, exhibit: other_exhibit)
+    end
+    it 'default scope of Translation should be limited to current exhibit' do
+      visit spotlight.exhibit_path(exhibit)
+      expect(Translation.all.count).to eq 1
+    end
+  end
+
+  describe 'without the context of an exhibit' do
+    it 'renders page ok' do
+      visit root_path
+      expect(page).to have_css '.site-title', text: 'Blacklight'
+    end
+  end
+end

data/spec/models/spotlight/ability_spec.rb

@@ -4,10 +4,10 @@ describe Spotlight::Ability, type: :model do
   before do
     allow_any_instance_of(Spotlight::Search).to receive(:set_default_featured_image)
   end
-  let(:exhibit) { FactoryBot.create(:exhibit) }
-  let(:search) { FactoryBot.create(:published_search, exhibit: exhibit) }
-  let(:unpublished_search) { FactoryBot.create(:search, exhibit: exhibit) }
-  let(:page) { FactoryBot.create(:feature_page, exhibit: exhibit) }
+  let(:exhibit) { FactoryBot.build_stubbed(:exhibit) }
+  let(:search) { FactoryBot.build_stubbed(:published_search, exhibit: exhibit) }
+  let(:unpublished_search) { FactoryBot.build_stubbed(:search, exhibit: exhibit) }
+  let(:page) { FactoryBot.build_stubbed(:feature_page, exhibit: exhibit) }
   subject { Ability.new(user) }
 
   describe 'a user with no roles' do
@@ -30,6 +30,7 @@ describe Spotlight::Ability, type: :model do
   describe 'a user with admin role' do
     let(:user) { FactoryBot.create(:exhibit_admin, exhibit: exhibit) }
     let(:role) { FactoryBot.create(:role, resource: exhibit) }
+    let(:blacklight_config) { exhibit.blacklight_configuration }
 
     it { is_expected.to be_able_to(:update, exhibit) }
 
@@ -41,12 +42,12 @@ describe Spotlight::Ability, type: :model do
     it { is_expected.to be_able_to(:import, exhibit) }
     it { is_expected.to be_able_to(:process_import, exhibit) }
     it { is_expected.to be_able_to(:destroy, exhibit) }
-
-    let(:blacklight_config) { exhibit.blacklight_configuration }
   end
 
   describe 'a user with curate role' do
     let(:user) { FactoryBot.create(:exhibit_curator, exhibit: exhibit) }
+    let(:contact) { FactoryBot.build_stubbed(:contact, exhibit: exhibit) }
+    let(:blacklight_config) { exhibit.blacklight_configuration }
 
     it { is_expected.not_to be_able_to(:update, exhibit) }
     it { is_expected.to be_able_to(:curate, exhibit) }
@@ -64,13 +65,9 @@ describe Spotlight::Ability, type: :model do
 
     it { is_expected.to be_able_to(:tag, exhibit) }
 
-    let(:contact) { FactoryBot.create(:contact, exhibit: exhibit) }
-
     it { is_expected.to be_able_to(:edit, contact) }
     it { is_expected.to be_able_to(:new, contact) }
     it { is_expected.to be_able_to(:create, contact) }
     it { is_expected.to be_able_to(:destroy, contact) }
-
-    let(:blacklight_config) { exhibit.blacklight_configuration }
   end
 end

data/spec/models/spotlight/contact_email_spec.rb

@@ -1,5 +1,5 @@
 describe Spotlight::ContactEmail, type: :model do
-  let(:exhibit) { FactoryBot.create(:exhibit) }
+  let(:exhibit) { FactoryBot.build_stubbed(:exhibit) }
   subject { described_class.new(exhibit: exhibit) }
 
   it { is_expected.not_to be_valid }

data/spec/models/spotlight/contact_form_spec.rb

@@ -1,6 +1,6 @@
 describe Spotlight::ContactForm do
   subject { described_class.new(name: 'Root', email: 'user@example.com').tap { |c| c.current_exhibit = exhibit } }
-  let(:exhibit) { FactoryBot.create(:exhibit) }
+  let(:exhibit) { FactoryBot.build_stubbed(:exhibit) }
   let(:honeypot_field_name) { Spotlight::Engine.config.spambot_honeypot_email_field }
 
   context 'with a site-wide contact email' do

data/spec/models/spotlight/resources/iiif_harvester_spec.rb

@@ -7,6 +7,9 @@ describe Spotlight::Resources::IiifHarvester do
   describe 'Validation' do
     subject { harvester }
     context 'when given an invalid URL' do
+      before do
+        stub_request(:head, 'http://example.com').to_return(status: 200, headers: { 'Content-Type' => 'text/html' })
+      end
       let(:url) { 'http://example.com' }
 
       it 'errors when the URL is not a IIIF URL' do

data/spec/models/spotlight/solr_document/atomic_updates_spec.rb

@@ -28,7 +28,7 @@ describe Spotlight::SolrDocument::AtomicUpdates, type: :model do
     it 'sends an atomic update request' do
       expected = {
         params: { commitWithin: 500 },
-        data: [{ id: 'doc_id', a: { set: 1 }, b: { set: 2 } }].to_json,
+        data: [{ id: 'doc_id', a: { set: 1 }, b: { set: 2 }, timestamp: { set: nil } }].to_json,
         headers: { 'Content-Type' => 'application/json' }
       }
       expect(blacklight_solr).to receive(:update).with(expected)
@@ -36,7 +36,7 @@ describe Spotlight::SolrDocument::AtomicUpdates, type: :model do
     end
 
     it 'cowardlies refuse to index a document if the only value is an id' do
-      allow(subject).to receive_messages(to_solr: { id: 'doc_id' })
+      allow(subject).to receive_messages(to_solr: { id: 'doc_id' }, timestamp: { set: nil })
       expect(blacklight_solr).not_to receive(:update)
       subject.reindex
     end

data/spec/spec_helper.rb

@@ -7,7 +7,7 @@ EngineCart.load_application!
 
 Internal::Application.config.active_job.queue_adapter = :inline
 
-require 'rails-controller-testing' if Rails::VERSION::MAJOR >= 5
+require 'rails-controller-testing'
 require 'rspec/collection_matchers'
 require 'rspec/its'
 require 'rspec/rails'
@@ -15,19 +15,24 @@ require 'rspec/active_model/mocks'
 require 'paper_trail/frameworks/rspec'
 
 require 'selenium-webdriver'
+require 'webmock/rspec'
 
 Capybara.javascript_driver = :headless_chrome
 
+# @note In January 2018, TravisCI disabled Chrome sandboxing in its Linux
+#       container build environments to mitigate Meltdown/Spectre
+#       vulnerabilities, at which point Spotlight needs to use the --no-sandbox
+#       flag. https://github.com/travis-ci/docs-travis-ci-com/blob/c1da4af0b7ee5de35fa4490fa8e0fc4b44881089/user/chrome.md
+#       h/t @mjgiarlo
 Capybara.register_driver :headless_chrome do |app|
   capabilities = Selenium::WebDriver::Remote::Capabilities.chrome(
-    chromeOptions: { args: %w[headless disable-gpu] }
+    chromeOptions: { args: %w[headless disable-gpu no-sandbox window-size=1280,1696] }
   )
 
   Capybara::Selenium::Driver.new(app,
                                  browser: :chrome,
                                  desired_capabilities: capabilities)
 end
-Capybara.default_max_wait_time = 10
 
 if ENV['COVERAGE'] || ENV['CI']
   require 'simplecov'
@@ -56,7 +61,9 @@ RSpec.configure do |config|
   config.filter_rails_from_backtrace!
 
   config.use_transactional_fixtures = false
-
+  config.before :all do
+    WebMock.disable_net_connect!(allow_localhost: true)
+  end
   config.before :each do
     DatabaseCleaner.strategy = if Capybara.current_driver == :rack_test
                                  :transaction
@@ -96,6 +103,7 @@ RSpec.configure do |config|
   config.include ::Rails.application.routes.url_helpers
   config.include ::Rails.application.routes.mounted_helpers
   config.include Spotlight::TestFeaturesHelpers, type: :feature
+  config.include CapybaraDefaultMaxWaitMetadataHelper, type: :feature
 
   config.expect_with :rspec do |expectations|
     expectations.include_chain_clauses_in_custom_matcher_descriptions = true

data/spec/support/disable_friendly_id_deprecation_warnings.rb

@@ -0,0 +1,8 @@
+default_deprecation_behaviours = ActiveSupport::Deprecation.behavior
+ActiveSupport::Deprecation.behavior = lambda do |message, callstack|
+  raise 'Remove friendly_id deprecation silencing patch!' if Rails::VERSION::MAJOR == 5 && Rails::VERSION::MINOR > 1
+  unless callstack.find { |l| l.path =~ %r{gems/friendly_id} } &&
+         message =~ /The behavior of .* inside of after callbacks will be changing/
+    default_deprecation_behaviours.each { |b| b.call(message, callstack) }
+  end
+end

data/spec/support/features/capybara_default_max_wait_metadata_helper.rb

@@ -0,0 +1,16 @@
+module CapybaraDefaultMaxWaitMetadataHelper
+  extend ActiveSupport::Concern
+
+  included do
+    before do |example|
+      next unless example.metadata[:default_max_wait_time]
+      @previous_wait_time = Capybara.default_max_wait_time
+      Capybara.default_max_wait_time = example.metadata[:default_max_wait_time]
+    end
+
+    after do |example|
+      next unless example.metadata[:default_max_wait_time]
+      Capybara.default_max_wait_time = @previous_wait_time
+    end
+  end
+end

data/spec/support/features/test_features_helpers.rb

@@ -13,6 +13,13 @@ module Spotlight
       find('.tt-suggestion', text: opts[:with], match: :first).click
     end
 
+    # just like #fill_in_typeahead_field, but wait for the
+    # form fields to show up on the page too
+    def fill_in_solr_document_block_typeahead_field(opts)
+      fill_in_typeahead_field(opts)
+      expect(page).to have_css('li[data-resource-id="' + opts[:with] + '"]')
+    end
+
     def add_widget(type)
       click_add_widget
 
@@ -31,10 +38,13 @@ module Spotlight
     end
 
     def save_page
-      sleep 1
+      page.execute_script <<-EOF
+        SirTrevor.getInstance().onFormSubmit();
+      EOF
       click_button('Save changes')
       # verify that the page was created
-      expect(page).to have_content('page was successfully updated')
+      expect(page).to_not have_selector('.alert-danger')
+      expect(page).to have_selector('.alert-info', text: 'page was successfully updated')
     end
 
     RSpec::Matchers.define :have_breadcrumbs do |*expected|

data/spec/views/spotlight/browse/show.html.erb_spec.rb

@@ -6,7 +6,6 @@ describe 'spotlight/browse/show', type: :view do
   before do
     allow(view).to receive_messages(resource_masthead?: false)
     allow(view).to receive_messages(blacklight_config: Blacklight::Configuration.new)
-    view.blacklight_config.view.gallery = true
     allow(search).to receive_messages(documents: double(size: 15))
     allow(view).to receive_messages(render_document_index_with_view: '')
     stub_template('_results_pagination.html.erb' => '')
@@ -62,10 +61,4 @@ describe 'spotlight/browse/show', type: :view do
     render
     expect(response).to have_content 'Sort and Per Page actions'
   end
-
-  it 'displays the search results' do
-    expect(view).to receive(:render_document_index_with_view).with(:gallery, anything, anything).and_return 'Gallery View'
-    render
-    expect(response).to include 'Gallery View'
-  end
 end

data/spec/views/spotlight/roles/index.html.erb_spec.rb

@@ -17,6 +17,8 @@ describe 'spotlight/roles/index', type: :view do
     assert_select "form[action='#{action}'][method='post']" do
       assert_select "tr[data-show-for='#{admin_role.id}']"
       assert_select "tr[data-edit-for='#{admin_role.id}']"
+      assert_select 'td', /jane@example.com/
+      assert_select 'td', 'Admin'
       assert_select "input[type='submit'][data-behavior='destroy-user'][data-target='#{admin_role.id}']"
       assert_select "input[type='hidden'][data-destroy-for='#{admin_role.id}']"
       assert_select "a[data-behavior='cancel-edit']"

data/spec/views/spotlight/tags/index.html.erb_spec.rb

@@ -15,6 +15,7 @@ describe 'spotlight/tags/index.html.erb', type: :view do
       render
       [tag1.tag.name, tag2.tag.name].each do |name|
         expect(rendered).to have_css('td', text: name)
+        expect(rendered).to have_link(name, href: 't')
       end
     end
   end

data/vendor/assets/javascripts/Leaflet.Editable.js

@@ -716,6 +716,7 @@
             this.editor.refresh();
             var icon = this._icon;
             var marker = this.editor.addVertexMarker(e.latlng, this.latlngs);
+            this.editor.onNewVertex(marker);
             /* Hack to workaround browser not firing touchend when element is no more on DOM */
             var parent = marker._icon.parentNode;
             parent.removeChild(marker._icon);
@@ -1018,7 +1019,7 @@
         initVertexMarkers: function (latlngs) {
             if (!this.enabled()) return;
             latlngs = latlngs || this.getLatLngs();
-            if (L.Polyline._flat(latlngs)) this.addVertexMarkers(latlngs);
+            if (isFlat(latlngs)) this.addVertexMarkers(latlngs);
             else for (var i = 0; i < latlngs.length; i++) this.initVertexMarkers(latlngs[i]);
         },
 
@@ -1037,6 +1038,14 @@
             return new this.tools.options.vertexMarkerClass(latlng, latlngs, this);
         },
 
+        onNewVertex: function (vertex) {
+            // 🍂namespace Editable
+            // 🍂section Vertex events
+            // 🍂event editable:vertex:new: VertexEvent
+            // Fired when a new vertex is created.
+            this.fireAndForward('editable:vertex:new', {latlng: vertex.latlng, vertex: vertex});
+        },
+
         addVertexMarkers: function (latlngs) {
             for (var i = 0; i < latlngs.length; i++) {
                 this.addVertexMarker(latlngs[i], latlngs);
@@ -1219,7 +1228,8 @@
             if (this._drawing === L.Editable.FORWARD) this._drawnLatLngs.push(latlng);
             else this._drawnLatLngs.unshift(latlng);
             this.feature._bounds.extend(latlng);
-            this.addVertexMarker(latlng, this._drawnLatLngs);
+            var vertex = this.addVertexMarker(latlng, this._drawnLatLngs);
+            this.onNewVertex(vertex);
             this.refresh();
         },
 
@@ -1431,7 +1441,7 @@
         },
 
         ensureMulti: function () {
-            if (this.feature._latlngs.length && L.Polyline._flat(this.feature._latlngs)) {
+            if (this.feature._latlngs.length && isFlat(this.feature._latlngs)) {
                 this.feature._latlngs = [this.feature._latlngs];
             }
         },
@@ -1447,7 +1457,7 @@
         },
 
         formatShape: function (shape) {
-            if (L.Polyline._flat(shape)) return shape;
+            if (isFlat(shape)) return shape;
             else if (shape[0]) return this.formatShape(shape[0]);
         },
 
@@ -1512,13 +1522,13 @@
         },
 
         ensureMulti: function () {
-            if (this.feature._latlngs.length && L.Polyline._flat(this.feature._latlngs[0])) {
+            if (this.feature._latlngs.length && isFlat(this.feature._latlngs[0])) {
                 this.feature._latlngs = [this.feature._latlngs];
             }
         },
 
         ensureNotFlat: function () {
-            if (!this.feature._latlngs.length || L.Polyline._flat(this.feature._latlngs)) this.feature._latlngs = [this.feature._latlngs];
+            if (!this.feature._latlngs.length || isFlat(this.feature._latlngs)) this.feature._latlngs = [this.feature._latlngs];
         },
 
         vertexCanBeDeleted: function (vertex) {
@@ -1537,7 +1547,7 @@
             // [[1, 2], [3, 4]] => must be nested
             // [] => must be nested
             // [[]] => is already nested
-            if (L.Polyline._flat(shape) && (!shape[0] || shape[0].length !== 0)) return [shape];
+            if (isFlat(shape) && (!shape[0] || shape[0].length !== 0)) return [shape];
             else return shape;
         }
 
@@ -1706,7 +1716,7 @@
 
     // 🍂namespace Editable; 🍂class EditableMixin
     // `EditableMixin` is included to `L.Polyline`, `L.Polygon`, `L.Rectangle`, `L.Circle`
-    // and `L.Marker`. It adds some methods to them.
+    // and `L.Marker`. It adds some methods to them.
     // *When editing is enabled, the editor is accessible on the instance with the
     // `editor` property.*
     var EditableMixin = {
@@ -1768,7 +1778,7 @@
             var shape = null;
             latlngs = latlngs || this._latlngs;
             if (!latlngs.length) return shape;
-            else if (L.Polyline._flat(latlngs) && this.isInLatLngs(latlng, latlngs)) shape = latlngs;
+            else if (isFlat(latlngs) && this.isInLatLngs(latlng, latlngs)) shape = latlngs;
             else for (var i = 0; i < latlngs.length; i++) if (this.isInLatLngs(latlng, latlngs[i])) return latlngs[i];
             return shape;
         },
@@ -1807,8 +1817,8 @@
             var shape = null;
             latlngs = latlngs || this._latlngs;
             if (!latlngs.length) return shape;
-            else if (L.Polyline._flat(latlngs) && this.isInLatLngs(latlng, latlngs)) shape = latlngs;
-            else if (L.Polyline._flat(latlngs[0]) && this.isInLatLngs(latlng, latlngs[0])) shape = latlngs;
+            else if (isFlat(latlngs) && this.isInLatLngs(latlng, latlngs)) shape = latlngs;
+            else if (isFlat(latlngs[0]) && this.isInLatLngs(latlng, latlngs[0])) shape = latlngs;
             else for (var i = 0; i < latlngs.length; i++) if (this.isInLatLngs(latlng, latlngs[i][0])) return latlngs[i];
             return shape;
         },
@@ -1872,6 +1882,7 @@
         this.on('add', this._onEditableAdd);
     };
 
+    var isFlat = L.LineUtil.isFlat || L.LineUtil._flat || L.Polyline._flat;  // <=> 1.1 compat.
 
 
     if (L.Polyline) {

data/vendor/assets/javascripts/leaflet-iiif.js

@@ -1,5 +1,5 @@
 /*
- * Leaflet-IIIF 1.0.2
+ * Leaflet-IIIF 2.0.0
  * IIIF Viewer for Leaflet
  * by Jack Reed, @mejackreed
  */
@@ -10,7 +10,8 @@ L.TileLayer.Iiif = L.TileLayer.extend({
     tileSize: 256,
     updateWhenIdle: true,
     tileFormat: 'jpg',
-    fitBounds: true
+    fitBounds: true,
+    setMaxBounds: false
   },
 
   initialize: function(url, options) {
@@ -25,6 +26,11 @@ L.TileLayer.Iiif = L.TileLayer.extend({
       this._explicitTileSize = true;
     }
 
+    // Check for an explicit quality
+    if (options.quality) {
+      this._explicitQuality = true;
+    }
+
     options = L.setOptions(this, options);
     this._infoDeferred = new $.Deferred();
     this._infoUrl = url;
@@ -42,7 +48,7 @@ L.TileLayer.Iiif = L.TileLayer.extend({
       miny = (y * tileBaseSize),
       maxx = Math.min(minx + tileBaseSize, _this.x),
       maxy = Math.min(miny + tileBaseSize, _this.y);
-
+    
     var xDiff = (maxx - minx);
     var yDiff = (maxy - miny);
 
@@ -63,6 +69,25 @@ L.TileLayer.Iiif = L.TileLayer.extend({
       // Set maxZoom for map
       map._layersMaxZoom = _this.maxZoom;
 
+      // Set minZoom and minNativeZoom based on how the imageSizes match up
+      var smallestImage = _this._imageSizes[0];
+      var mapSize = _this._map.getSize();
+      var newMinZoom = 0;
+      // Loop back through 5 times to see if a better fit can be found.
+      for (var i = 1; i <= 5; i++) {
+        if (smallestImage.x > mapSize.x || smallestImage.y > mapSize.y) {
+          smallestImage = smallestImage.divideBy(2);
+          _this._imageSizes.unshift(smallestImage);
+          newMinZoom = -i;
+        } else {
+          break;
+        }
+      }
+      _this.options.minZoom = newMinZoom;
+      _this.options.minNativeZoom = newMinZoom;
+      _this._prev_map_layersMinZoom = _this._map._layersMinZoom;
+      _this._map._layersMinZoom = newMinZoom;
+
       // Call add TileLayer
       L.TileLayer.prototype.onAdd.call(_this, map);
 
@@ -70,6 +95,10 @@ L.TileLayer.Iiif = L.TileLayer.extend({
         _this._fitBounds();
       }
 
+      if(_this.options.setMaxBounds) {
+        _this._setMaxBounds();
+      }
+
       // Reset tile sizes to handle non 256x256 IIIF tiles
       _this.on('tileload', function(tile, url) {
 
@@ -85,18 +114,45 @@ L.TileLayer.Iiif = L.TileLayer.extend({
       });
     });
   },
+  onRemove: function(map) {
+    var _this = this;
+    
+    map._layersMinZoom = _this._prev_map_layersMinZoom;
+
+    // Remove maxBounds set for this image
+    if(_this.options.setMaxBounds) {
+      map.setMaxBounds(null);
+    }
+
+    // Call remove TileLayer
+    L.TileLayer.prototype.onRemove.call(_this, map);
+
+  },
   _fitBounds: function() {
     var _this = this;
 
     // Find best zoom level and center map
     var initialZoom = _this._getInitialZoom(_this._map.getSize());
-    var imageSize = _this._imageSizes[initialZoom];
+    var offset = _this._imageSizes.length - 1 - _this.options.maxNativeZoom;
+    var imageSize = _this._imageSizes[initialZoom + offset];
     var sw = _this._map.options.crs.pointToLatLng(L.point(0, imageSize.y), initialZoom);
     var ne = _this._map.options.crs.pointToLatLng(L.point(imageSize.x, 0), initialZoom);
     var bounds = L.latLngBounds(sw, ne);
 
     _this._map.fitBounds(bounds, true);
   },
+  _setMaxBounds: function() {
+    var _this = this;
+
+    // Find best zoom level, center map, and constrain viewer
+    var initialZoom = _this._getInitialZoom(_this._map.getSize());
+    var imageSize = _this._imageSizes[initialZoom];
+    var sw = _this._map.options.crs.pointToLatLng(L.point(0, imageSize.y), initialZoom);
+    var ne = _this._map.options.crs.pointToLatLng(L.point(imageSize.x, 0), initialZoom);
+    var bounds = L.latLngBounds(sw, ne);
+
+    _this._map.setMaxBounds(bounds, true);
+  },
   _getInfo: function() {
     var _this = this;
 
@@ -136,14 +192,15 @@ L.TileLayer.Iiif = L.TileLayer.extend({
           }
         }
 
-        ceilLog2 = function(x) {
+        function ceilLog2(x) {
           return Math.ceil(Math.log(x) / Math.LN2);
         };
 
         // Calculates maximum native zoom for the layer
         _this.maxNativeZoom = Math.max(ceilLog2(_this.x / _this.options.tileSize),
           ceilLog2(_this.y / _this.options.tileSize));
-
+        _this.options.maxNativeZoom = _this.maxNativeZoom;
+        
         // Enable zooming further than native if maxZoom option supplied
         if (_this._customMaxZoom && _this.options.maxZoom > _this.maxNativeZoom) {
           _this.maxZoom = _this.options.maxZoom;
@@ -151,7 +208,7 @@ L.TileLayer.Iiif = L.TileLayer.extend({
         else {
           _this.maxZoom = _this.maxNativeZoom;
         }
-
+        
         for (var i = 0; i <= _this.maxZoom; i++) {
           scale = Math.pow(2, _this.maxNativeZoom - i);
           width_ = Math.ceil(_this.x / scale);
@@ -172,18 +229,24 @@ L.TileLayer.Iiif = L.TileLayer.extend({
 
   _setQuality: function() {
     var _this = this;
+    var profileToCheck = _this.profile;
 
-    // Quality already specified by consumer
-    if (_this.options.quality) {
+    if (_this._explicitQuality) {
       return;
     }
 
+    // If profile is an object
+    if (typeof(profileToCheck) === 'object') {
+      profileToCheck = profileToCheck['@id'];
+    }
+
     // Set the quality based on the IIIF compliance level
     switch (true) {
-      case /^http:\/\/library.stanford.edu\/iiif\/image-api\/1.1\/compliance.html.*$/.test(_this.profile):
+      case /^http:\/\/library.stanford.edu\/iiif\/image-api\/1.1\/compliance.html.*$/.test(profileToCheck):
         _this.options.quality = 'native';
         break;
-      case /^http:\/\/iiif.io\/api\/image\/2.*$/.test(_this.profile):
+      // Assume later profiles and set to default
+      default:
         _this.options.quality = 'default';
         break;
     }
@@ -196,11 +259,15 @@ L.TileLayer.Iiif = L.TileLayer.extend({
     return this._infoToBaseUrl() + '{region}/{size}/{rotation}/{quality}.{format}';
   },
   _isValidTile: function(coords) {
-    var _this = this,
-      zoom = _this._getZoomForUrl(),
-      sizes = _this._tierSizes[zoom],
-      x = coords.x,
-      y = (coords.y);
+    var tileBounds = this._tileCoordsToBounds(coords);
+    var _this = this;
+    var zoom = _this._getZoomForUrl();
+    var sizes = _this._tierSizes[zoom];
+    var x = coords.x;
+    var y = coords.y;
+    if (zoom < 0 && x >= 0 && y >= 0) {
+      return true;
+    }
 
     if (!sizes) return false;
     if (x < 0 || sizes[0] <= x || y < 0 || sizes[1] <= y) {
@@ -210,14 +277,15 @@ L.TileLayer.Iiif = L.TileLayer.extend({
     }
   },
   _getInitialZoom: function (mapSize) {
-    var _this = this,
-      tolerance = 0.8,
-      imageSize;
-
-    for (var i = _this.maxNativeZoom; i >= 0; i--) {
-      imageSize = this._imageSizes[i];
+    var _this = this;
+    var tolerance = 0.8;
+    var imageSize;
+    // Calculate an offset between the zoom levels and the array accessors
+    var offset = _this._imageSizes.length - 1 - _this.options.maxNativeZoom;
+    for (var i = _this._imageSizes.length - 1; i >= 0; i--) {
+      imageSize = _this._imageSizes[i];
       if (imageSize.x * tolerance < mapSize.x && imageSize.y * tolerance < mapSize.y) {
-        return i;
+        return i - offset;
       }
     }
     // return a default zoom