geoblacklight 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f0b1899937af72972b9fcd3639998ff099faa9d
-  data.tar.gz: d41109a86c1db2ac475165f99f74e0c4ae32b722
+  metadata.gz: 7a3ffb556c402cb467f68a38e22eedbd9a1c6728
+  data.tar.gz: a3b02401bcf09588a304b1cfd0b6cec5b4d22bdb
 SHA512:
-  metadata.gz: b3fae7290320ddc95574fc946183ef4544fdb186e6daf2a1a2856e1273258c2bc053b2e078b53c986719d2e6500d56083c2dc333e62e28341c17ad392be48fd1
-  data.tar.gz: 183a501a8f613323cc124341679f0ed5aff66d9d1195ececd774aae7c71a0a60a6b82c9a5e7c0d8462c2fdc900fc9109befc6daa6ba936336df12f588d1301d2
+  metadata.gz: 0ab6305640e1412878865612ace63b887cd193532ec4433cba44bd93728161c66735326dd9c549c835bed1d03d6d63b89250b0f98ecc855dc2e0a1d0c3c3f30f
+  data.tar.gz: e38ecfeabde0a079ca7073ef109ddbae2463e4b8e590a9662d7f0367e9f54e4ea52e6c2016a95070b16553d04f63fc169858aa3d78fb574581062acbbce34bfe

data/Rakefile

@@ -5,7 +5,7 @@ rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
 
-BLACKLIGHT_JETTY_VERSION = '4.10.2'
+BLACKLIGHT_JETTY_VERSION = '4.10.3'
 ZIP_URL = "https://github.com/projectblacklight/blacklight-jetty/archive/v#{BLACKLIGHT_JETTY_VERSION}.zip"
 APP_ROOT = File.dirname(__FILE__)
 

data/app/assets/javascripts/geoblacklight/modules/collapse.js

@@ -2,5 +2,6 @@ Blacklight.onLoad(function() {
   $('#content')
     .on('click', '#documents [data-layer-id]', function() {
       $(this).find('.collapse').collapse('toggle');
+      $(this).find('.caret-toggle').toggleClass('open');
     });
 });

data/app/assets/javascripts/geoblacklight/viewers/map.js

@@ -7,7 +7,7 @@ GeoBlacklight.Viewer.Map = GeoBlacklight.Viewer.extend({
     * Initial bounds of map
     * @type {L.LatLngBounds}
     */
-    bbox: [[-85, -180], [85, 180]]
+    bbox: [[-80, -195], [80, 185]]
   },
 
   basemap: L.tileLayer(

data/app/assets/stylesheets/geoblacklight/_geoblacklight.scss

@@ -23,3 +23,4 @@
 @import 'modules/geosearch';
 @import 'modules/search_widgets';
 @import 'modules/toolbar';
+@import 'modules/web_services';

data/app/assets/stylesheets/geoblacklight/modules/icon-customization.scss

@@ -29,3 +29,7 @@
 .geoblacklight-email {
   @extend .fa, .fa-envelope;
 }
+
+.geoblacklight-web_services {
+  @extend .fa, .fa-external-link;
+}

data/app/assets/stylesheets/geoblacklight/modules/results.scss

@@ -26,4 +26,14 @@
 .index_title {
   @extend .text-span;
   @extend .hide-overflow;
+}
+
+.caret-toggle {
+  @extend .fa, .fa-caret-right;
+  cursor: pointer;
+  width: 10px;
+
+  &.open {
+    @extend .fa, .fa-caret-down;
+  }
 }

data/app/assets/stylesheets/geoblacklight/modules/toolbar.scss

@@ -16,4 +16,9 @@
     text-align: center;
     width: 1.4em;
   }
+
+  .geoblacklight-web_services {
+    text-align: center;
+    width: 1.4em;
+  }
 }

data/app/assets/stylesheets/geoblacklight/modules/web_services.scss

@@ -0,0 +1,5 @@
+.web-services-form {
+  .form-control[readonly] {
+    cursor: text;
+  }
+}

data/app/helpers/geoblacklight_helper.rb

@@ -55,6 +55,14 @@ module GeoblacklightHelper
     t "geoblacklight.formats.#{format.downcase}"
   end
 
+  ##
+  # Looks up formatted names for references
+  # @param (String, Symbol) reference
+  # @return (String)
+  def formatted_name_reference(reference)
+    t "geoblacklight.references.#{reference}"
+  end
+
   ##
   # Wraps download text with proper_case_format
   #

data/app/views/catalog/_index_split_default.html.erb

@@ -1,11 +1,12 @@
 <% # header bar for doc items in index view -%>
-<%= content_tag :div, class: 'documentHeader row', data: { layer_id: document[:uuid], bbox: document[:solr_bbox], geom: document[:solr_geom] } do %>
+<%= content_tag :div, class: 'documentHeader row', data: { layer_id: document[:uuid], bbox: document.bounding_box_as_wsen } do %>
   <div class='status-icons'>
     <%= geoblacklight_icon(document['layer_geom_type_s']) %>
     <%= geoblacklight_icon(document['dct_provenance_s']) %>
     <%= geoblacklight_icon(document['dc_rights_s']) %>
   </div>
   <h5 class="index_title col-sm-9s cosl-lg-10 text-span">
+    <span class='caret-toggle'></span>
     <% counter = document_counter_with_offset(document_counter) %>
     <span class="document-counter">
       <%= t('blacklight.search.documents.counter', :counter => counter) if counter %>

data/app/views/catalog/_show_default_viewer_container.html.erb

@@ -1,5 +1,5 @@
 <% document ||= @document %>
 <div id='viewer-container' class="col-md-8">
-  <%= content_tag :div, id: 'map', data: { map: 'item', protocol: document.viewer_protocol, url: document.viewer_endpoint, 'layer-id' => document[:layer_id_s], 'map-bbox' => document[:solr_bbox], 'catalog-path'=> catalog_index_path, available: document_available? } do %>
+  <%= content_tag :div, id: 'map', data: { map: 'item', protocol: document.viewer_protocol, url: document.viewer_endpoint, 'layer-id' => document[:layer_id_s], 'map-bbox' => document.bounding_box_as_wsen, 'catalog-path'=> catalog_index_path, available: document_available? } do %>
   <% end %>
 </div>

data/app/views/catalog/_web_services.html.erb

@@ -0,0 +1,12 @@
+<% document ||= @document %>
+
+<% document.references.refs.each do |reference| %>
+  <% if Settings.WEBSERVICES_SHOWN.include? reference.type.to_s %>
+    <div class='form-group web-services-form'>
+      <label for='<%= reference.type%>_webservice'>
+        <%= "#{formatted_name_reference(reference.type)} link" %>
+      </label>
+      <input type='text' id='<%= reference.type%>_webservice' value='<%= reference.endpoint %>' readonly='readonly' class='form-control'>
+    </div>
+  <% end %>
+<% end %>

data/app/views/catalog/web_services.html

@@ -0,0 +1 @@
+<%= render :partial => 'web_services' %>

data/app/views/catalog/web_services.js.erb

@@ -0,0 +1,7 @@
+<div class="modal-header">
+  <button type="button" class="ajax-modal-close close" data-dismiss="modal" aria-hidden="true">×</button>
+  <h1 class="modal-title">Web services</h1>
+  <div class="modal-body">
+    <%= render partial: 'web_services' %>
+  </div>
+</div>

data/config/locales/geoblacklight.en.yml

@@ -18,3 +18,6 @@ en:
       geotiff: 'GeoTIFF'
       kmz: 'KMZ'
       shapefile: 'Shapefile'
+    references:
+      wms: 'Web Mapping Service (WMS)'
+      wfs: 'Web Feature Service (WFS)'

data/geoblacklight.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'blacklight', '~> 5.8.2'
+  spec.add_dependency 'blacklight', '~> 5.9'
   spec.add_dependency 'leaflet-rails', '~> 0.7.3'
   spec.add_dependency 'blacklight_range_limit', '~> 5.0.3'
   spec.add_dependency 'font-awesome-rails', '~> 4.1.0.0'
@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.5'
   spec.add_development_dependency 'rake', '~> 10.3.2'
   spec.add_development_dependency 'rspec-rails', '~> 3.0.1'
-  spec.add_development_dependency 'jettywrapper', '~> 1.8.3'
+  spec.add_development_dependency 'jettywrapper', '>= 2.0'
   spec.add_development_dependency 'engine_cart', '~> 0.4.0'
   spec.add_development_dependency 'capybara', '~> 2.3.0'
   spec.add_development_dependency 'poltergeist', '~> 1.5.0'

data/lib/generators/geoblacklight/install_generator.rb

@@ -9,17 +9,12 @@ module Geoblacklight
 
     desc "Install Geoblacklight"
 
-    def install_rails_assets_gems
-      gem 'rails-assets-leaflet-iiif', '~> 0.0.3', source: 'https://rails-assets.org'
-      gem 'rails-assets-readmore', source: 'https://rails-assets.org'
-    end
-
     def install_jettywrapper
       return unless options[:jettywrapper]
       copy_file 'config/jetty.yml'
 
       append_to_file 'Rakefile',
-        "\nZIP_URL = \"https://github.com/projectblacklight/blacklight-jetty/archive/v4.10.2.zip\"\n" +
+        "\nZIP_URL = \"https://github.com/projectblacklight/blacklight-jetty/archive/v4.10.3.zip\"\n" +
         "require 'jettywrapper'\n"
     end
 
@@ -49,13 +44,6 @@ module Geoblacklight
       end
     end
 
-    def inject_routes
-      route 'post "wms/handle"'
-      route 'resources :download, only: [:show, :file]'
-      route "get 'download/file/:id' => 'download#file', as: :download_file"
-      route "get 'download/hgl/:id' => 'download#hgl', as: :download_hgl"
-    end
-
     def create_downloads_directory
       FileUtils.mkdir_p("tmp/cache/downloads") unless File.directory?("tmp/cache/downloads")
     end

data/lib/generators/geoblacklight/templates/catalog_controller.rb

@@ -205,6 +205,9 @@ class CatalogController < ApplicationController
     # If there are more than this many search results, no spelling ("did you
     # mean") suggestion is offered.
     config.spell_max = 5
+
+    # Custom tools for GeoBlacklight
+    config.add_show_tools_partial :web_services, if: proc { |_context, _config, options| (Settings.WEBSERVICES_SHOWN & options[:document].references.refs.map(&:type).map(&:to_s)).any? }
   end
 
 

data/lib/generators/geoblacklight/templates/geoblacklight.js

@@ -4,4 +4,4 @@
 //= require geoblacklight/downloaders
 //= require blacklight_range_limit
 //= require leaflet-iiif
-//= require readmore
+//= require readmore.min

data/lib/generators/geoblacklight/templates/settings.yml

@@ -1,3 +1,6 @@
+#Main Solr geometry field used for spatial search and bounding box. Should be type 'rpt'
+GEOMETRY_FIELD: 'solr_bbox'
+
 # Institution deployed at
 INSTITUTION: 'Stanford'
 
@@ -7,6 +10,11 @@ TIMEOUT_DOWNLOAD: 16
 # (For WMS inspection) timeout and open_timeout parameters for Faraday
 TIMEOUT_WMS: 4
 
+# Web services shown in tool panel
+WEBSERVICES_SHOWN:
+  - 'wms'
+  - 'wfs'
+
 # WMS Parameters
 WMS_PARAMS:
   :SERVICE: 'WMS'

data/lib/geoblacklight.rb

@@ -19,6 +19,8 @@ module Geoblacklight
   require 'geoblacklight/download/hgl_download'
   require 'geoblacklight/reference'
   require 'geoblacklight/references'
+  require 'geoblacklight/routes'
+  
   def self.inject!
     CatalogController.send(:include, Geoblacklight::ControllerOverride)
     CatalogController.send(:include, Geoblacklight::CatalogHelperOverride)
@@ -29,6 +31,7 @@ module Geoblacklight
       SearchHistoryController.helpers.is_a?(Geoblacklight::ViewHelperOverride)
     SavedSearchesController.send(:helper, Geoblacklight::ViewHelperOverride) unless
       SavedSearchesController.helpers.is_a?(Geoblacklight::ViewHelperOverride)
+    Blacklight::Routes.send(:include, Geoblacklight::Routes)
   end
 
   def self.logger

data/lib/geoblacklight/controller_override.rb

@@ -4,15 +4,19 @@ module Geoblacklight
     included do
       solr_search_params_logic << :add_spatial_params
     end
-    
+
     def add_spatial_params(solr_params, req_params)
       if req_params[:bbox]
         solr_params[:bq] ||= []
-        solr_params[:bq] = ["solr_bbox:\"IsWithin(#{req_params[:bbox]})\"^10"]
+        solr_params[:bq] = ["#{Settings.GEOMETRY_FIELD}:\"IsWithin(#{req_params[:bbox]})\"^10"]
         solr_params[:fq] ||= []
-        solr_params[:fq] << "solr_bbox:\"Intersects(#{req_params[:bbox]})\""
+        solr_params[:fq] << "#{Settings.GEOMETRY_FIELD}:\"Intersects(#{req_params[:bbox]})\""
       end
       solr_params
     end
+
+    def web_services
+      @response, @document = get_solr_response_for_doc_id params[:id]
+    end
   end
 end

data/lib/geoblacklight/download/kmz_download.rb

@@ -2,7 +2,7 @@ class KmzDownload < Download
   KMZ_DOWNLOAD_PARAMS = { service: 'wms', version: '1.1.0', request: 'GetMap', srsName: 'EPSG:900913', format: 'application/vnd.google-earth.kmz', width: 2000, height: 2000 }
   
   def initialize(document)
-    request_params = KMZ_DOWNLOAD_PARAMS.merge(layers: document[:layer_id_s], bbox: document[:solr_bbox].split(' ').join(', '))
+    request_params = KMZ_DOWNLOAD_PARAMS.merge(layers: document[:layer_id_s], bbox: document.bounding_box_as_wsen.split(' ').join(', '))
     super(document, {
       type: 'kmz',
       extension: 'kmz',

data/lib/geoblacklight/engine.rb

@@ -11,7 +11,6 @@ module Geoblacklight
 
     Blacklight::Configuration.default_values[:view].split.partials = ['index']
     Blacklight::Configuration.default_values[:view].delete_field('list')
-
     # GeoblacklightHelper is needed by all helpers, so we inject it
     # into action view base here.
     initializer 'geoblacklight.helpers' do |app|

data/lib/geoblacklight/routes.rb

@@ -0,0 +1,18 @@
+module Geoblacklight
+  module Routes
+    extend ActiveSupport::Concern
+    included do |klass|
+      klass.default_route_sets += [:web_services_routes]
+    end
+
+    def web_services_routes(primary_resource)
+      add_routes do |options|
+        post 'wms/handle'
+        resources :download, only: [:show, :file]
+        get 'download/file/:id' => 'download#file', as: :download_file
+        get 'download/hgl/:id' => 'download#hgl', as: :download_hgl
+        get "#{primary_resource}/:id/web_services" => "#{primary_resource}#web_services", as: "web_services_#{primary_resource}"
+      end
+    end
+  end
+end

data/lib/geoblacklight/solr_document.rb

@@ -51,6 +51,9 @@ module Geoblacklight
       "http://schema.org/Dataset"
     end
 
+    def bounding_box_as_wsen
+      get(Settings.GEOMETRY_FIELD.to_sym)
+    end
     ##
     # Provides a convenience method to access a SolrDocument's References
     # endpoint url without having to check and see if it is available

data/lib/geoblacklight/version.rb

@@ -1,3 +1,3 @@
 module Geoblacklight
-  VERSION = '0.6.2'
+  VERSION = '0.7.0'
 end

data/lib/geoblacklight/view_helper_override.rb

@@ -30,7 +30,7 @@ module Geoblacklight
       if params[:bbox]
         content << render_constraint_element('Bounding Box',
           params[:bbox],
-          remove: catalog_index_path(remove_spatial_filter_group(:bbox, params)))
+          remove: search_action_path(remove_spatial_filter_group(:bbox, params)))
       end
 
       return content

data/spec/controllers/catalog_controller_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe CatalogController, type: :controller do
+  describe '#web_services' do
+    it 'should return a document based off an id' do
+      get :web_services, id: 'mit-us-ma-e25zcta5dct-2000'
+      expect(response.status).to eq 200
+      expect(assigns(:document)).to_not be_nil
+    end
+  end
+end

data/spec/features/web_services_modal_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+feature 'web services tools' do
+  feature 'when wms/wfs are provided', js: true do
+    scenario 'shows up in tools' do
+      visit catalog_path 'stanford-cg357zz0321'
+      expect(page).to have_css 'li.web_services a', text: 'Web services'
+      click_link 'Web services'
+      within '.modal-body' do
+        expect(page).to have_css 'input', count: 2
+        expect(page).to have_css 'label', text: 'Web Feature Service (WFS) link'
+        expect(page).to have_css 'input[value="http://geowebservices-restricted.stanford.edu/geoserver/wfs"]'
+        expect(page).to have_css 'label', text: 'Web Mapping Service (WMS) link'
+        expect(page).to have_css 'input[value="http://geowebservices-restricted.stanford.edu/geoserver/wms"]'
+      end
+    end
+  end
+  feature 'no wms or wfs provided' do
+    scenario 'does not show up in tools' do
+      visit catalog_path 'mit-001145244'
+      expect(page).to_not have_css 'li.web_services a', text: 'Web services'
+    end
+  end
+end

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

@@ -4,7 +4,7 @@ class TestAppGenerator < Rails::Generators::Base
   source_root '../../spec/test_app_templates'
 
   def add_gems
-    gem 'blacklight', "~> 5.8.2"
+    gem 'blacklight', "~> 5.9"
     Bundler.with_clean_env do
       run "bundle install"
     end

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

@@ -0,0 +1,185 @@
+/*
+ * Leaflet-IIIF 0.0.5
+ * IIIF Viewer for Leaflet
+ * by Jack Reed, @mejackreed
+ */
+
+L.TileLayer.Iiif = L.TileLayer.extend({
+  options: {
+    continuousWorld: true,
+    tileSize: 256,
+    updateWhenIdle: true
+  },
+
+  initialize: function(url, options) {
+    options = L.setOptions(this, options);
+    this._infoDeferred = new $.Deferred();
+    this._infoUrl = url;
+    this._baseUrl = this._templateUrl();
+    this._getInfo();
+  },
+  getTileUrl: function(coords) {
+    var _this = this,
+      x = coords.x,
+      y = (coords.y),
+      zoom = _this._map.getZoom(),
+      scale = Math.pow(2, _this.maxZoom - zoom),
+      tileBaseSize = _this.options.tileSize * scale,
+      minx = (x * tileBaseSize),
+      miny = (y * tileBaseSize),
+      maxx = Math.min(minx + tileBaseSize, _this.x),
+      maxy = Math.min(miny + tileBaseSize, _this.y);
+
+    return L.Util.template(this._baseUrl, L.extend({
+      format: 'jpg',
+      quality: _this.quality,
+      region: [minx, miny, (maxx - minx), (maxy - miny)].join(','),
+      rotation: 0,
+      size: 'pct:' + (100 / scale)
+    }, this.options));
+  },
+  onAdd: function(map) {
+    var _this = this;
+
+    // Wait for deferred to complete
+    $.when(_this._infoDeferred).done(function() {
+
+      // Find best zoom level and center map
+      var initialZoom = _this._getInitialZoom(map.getSize()),
+        imageSize = _this._imageSizes[initialZoom],
+        sw = map.options.crs.pointToLatLng(L.point(0, imageSize.y), initialZoom),
+        ne = map.options.crs.pointToLatLng(L.point(imageSize.x, 0), initialZoom),
+        bounds = L.latLngBounds(sw, ne);
+
+      map.fitBounds(bounds, true);
+
+      // Set maxZoom for map
+      map._layersMaxZoom = _this.maxZoom;
+
+      // Call add TileLayer
+      L.TileLayer.prototype.onAdd.call(_this, map);
+
+      // Reset tile sizes to handle non 256x256 IIIF tiles
+      _this.on('tileload', function(tile, url) {
+
+        var height = tile.tile.naturalHeight,
+          width = tile.tile.naturalWidth;
+
+        // No need to resize if tile is 256 x 256
+        if (height === 256 && width === 256) return;
+
+        tile.tile.style.width = width + 'px';
+        tile.tile.style.height = height + 'px';
+
+      });
+    });
+  },
+  _getInfo: function() {
+    var _this = this;
+
+    // Look for a way to do this without jQuery
+    $.getJSON(_this._infoUrl)
+      .done(function(data) {
+        _this.y = data.height;
+        _this.x = data.width;
+
+        var profile,
+          tierSizes = [],
+          imageSizes = [],
+          scale,
+          width_,
+          height_,
+          tilesX_,
+          tilesY_;
+
+        // Set quality based off of IIIF version
+        if (data.profile instanceof Array) {
+          profile = data.profile[0];
+        }else {
+          profile = data.profile;
+        }
+        switch (profile) {
+          case 'http://library.stanford.edu/iiif/image-api/compliance.html#level1':
+            _this.quality = 100;
+            break;
+          case 'http://library.stanford.edu/iiif/image-api/1.1/compliance.html':
+            _this.quality = 'native';
+            break;
+          case 'http://library.stanford.edu/iiif/image-api/1.1/compliance.html#level1':
+            _this.quality = 'native';
+            break;
+          case 'http://iiif.io/api/image/2/level2.json':
+            _this.quality = 'default';
+            break;
+          case 'http://iiif.io/api/image/2/level1.json':
+            _this.quality = 'default';
+            break;
+          case 'http://iiif.io/api/image/2/level0.json':
+            _this.quality = 'default';
+            break;
+        }
+
+        ceilLog2 = function(x) {
+          return Math.ceil(Math.log(x) / Math.LN2);
+        };
+
+        // Calculates maxZoom for the layer
+        _this.maxZoom = Math.max(ceilLog2(_this.x / _this.options.tileSize),
+          ceilLog2(_this.y / _this.options.tileSize));
+
+        for (var i = 0; i <= _this.maxZoom; i++) {
+          scale = Math.pow(2, _this.maxZoom - i);
+          width_ = Math.ceil(_this.x / scale);
+          height_ = Math.ceil(_this.y / scale);
+          tilesX_ = Math.ceil(width_ / _this.options.tileSize);
+          tilesY_ = Math.ceil(height_ / _this.options.tileSize);
+          tierSizes.push([tilesX_, tilesY_]);
+          imageSizes.push(L.point(width_,height_));
+        }
+
+        _this._tierSizes = tierSizes;
+        _this._imageSizes = imageSizes;
+
+        // Resolved Deferred to initiate tilelayer load
+        _this._infoDeferred.resolve();
+      });
+  },
+  _infoToBaseUrl: function() {
+    return this._infoUrl.replace('info.json', '');
+  },
+  _templateUrl: function() {
+    return this._infoToBaseUrl() + '{region}/{size}/{rotation}/{quality}.{format}';
+  },
+  _tileShouldBeLoaded: function(coords) {
+    var _this = this,
+      zoom = _this._map.getZoom(),
+      sizes = _this._tierSizes[zoom],
+      x = coords.x,
+      y = (coords.y);
+
+    if (!sizes) return false;
+    if (x < 0 || sizes[0] <= x || y < 0 || sizes[1] <= y) {
+      return false;
+    }else {
+      return true;
+    }
+  },
+  _getInitialZoom: function (mapSize) {
+    var _this = this,
+      tolerance = 0.8,
+      imageSize;
+
+    for (var i = _this.maxZoom; i >= 0; i--) {
+      imageSize = this._imageSizes[i];
+      if (imageSize.x * tolerance < mapSize.x && imageSize.y * tolerance < mapSize.y) {
+        return i;
+      }
+    }
+    // return a default zoom
+    return 2;
+  }
+});
+
+L.tileLayer.iiif = function(url, options) {
+  return new L.TileLayer.Iiif(url, options);
+};

data/vendor/assets/javascripts/readmore.min.js

@@ -0,0 +1,11 @@
+/*!
+ * @preserve
+ *
+ * Readmore.js jQuery plugin
+ * Author: @jed_foster
+ * Project home: http://jedfoster.github.io/Readmore.js
+ * Licensed under the MIT license
+ *
+ * Debounce function from http://davidwalsh.name/javascript-debounce-function
+ */
+!function(e){"use strict";function t(e,t,a){var i;return function(){var n=this,o=arguments,r=function(){i=null,a||e.apply(n,o)},s=a&&!i;clearTimeout(i),i=setTimeout(r,t),s&&e.apply(n,o)}}function a(e){var t=++h;return String(null==e?"rmjs-":e)+t}function i(e){var t=e.clone().css({height:"auto",width:e.width(),maxHeight:"none",overflow:"hidden"}).insertAfter(e),a=t.outerHeight(),i=parseInt(t.css({maxHeight:""}).css("max-height").replace(/[^-\d\.]/g,""),10),n=e.data("defaultHeight");t.remove();var o=i||e.data("collapsedHeight")||n;e.data({expandedHeight:a,maxHeight:i,collapsedHeight:o}).css({maxHeight:"none"})}function n(e){if(!d[e.selector]){var t=" ";e.embedCSS&&""!==e.blockCSS&&(t+=e.selector+" + [data-readmore-toggle], "+e.selector+"[data-readmore]{"+e.blockCSS+"}"),t+=e.selector+"[data-readmore]{transition: height "+e.speed+"ms;overflow: hidden;}",function(e,t){var a=e.createElement("style");a.type="text/css",a.styleSheet?a.styleSheet.cssText=t:a.appendChild(e.createTextNode(t)),e.getElementsByTagName("head")[0].appendChild(a)}(document,t),d[e.selector]=!0}}function o(t,a){this.element=t,this.options=e.extend({},s,a),n(this.options),this._defaults=s,this._name=r,this.init(),window.addEventListener("load",l),window.addEventListener("resize",l)}var r="readmore",s={speed:100,collapsedHeight:200,heightMargin:16,moreLink:'<a href="#">Read More</a>',lessLink:'<a href="#">Close</a>',embedCSS:!0,blockCSS:"display: block; width: 100%;",startOpen:!1,beforeToggle:function(){},afterToggle:function(){}},d={},h=0,l=t(function(){e("[data-readmore]").each(function(){var t=e(this),a="true"===t.attr("aria-expanded");i(t),t.css({height:t.data(a?"expandedHeight":"collapsedHeight")})})},100);o.prototype={init:function(){var t=this,n=e(this.element);n.data({defaultHeight:this.options.collapsedHeight,heightMargin:this.options.heightMargin}),i(n);var o=n.data("collapsedHeight"),r=n.data("heightMargin");if(n.outerHeight(!0)<=o+r)return!0;var s=n.attr("id")||a(),d=t.options.startOpen?t.options.lessLink:t.options.moreLink;n.attr({"data-readmore":"","aria-expanded":!1,id:s}),n.after(e(d).on("click",function(e){t.toggle(this,n[0],e)}).attr({"data-readmore-toggle":"","aria-controls":s})),t.options.startOpen||n.css({height:o})},toggle:function(t,a,i){i&&i.preventDefault(),t||(t=e('[aria-controls="'+this.element.id+'"]')[0]),a||(a=this.element);var n=this,o=e(a),r="",s="",d=!1,h=o.data("collapsedHeight");o.height()<=h?(r=o.data("expandedHeight")+"px",s="lessLink",d=!0):(r=h,s="moreLink"),n.options.beforeToggle(t,a,!d),o.css({height:r}),o.on("transitionend",function(){n.options.afterToggle(t,a,d),e(this).attr({"aria-expanded":d}).off("transitionend")}),e(t).replaceWith(e(n.options[s]).on("click",function(e){n.toggle(this,a,e)}).attr({"data-readmore-toggle":"","aria-controls":o.attr("id")}))},destroy:function(){e(this.element).each(function(){var t=e(this);t.attr({"data-readmore":null,"aria-expanded":null}).css({maxHeight:"",height:""}).next("[data-readmore-toggle]").remove(),t.removeData()})}},e.fn.readmore=function(t){var a=arguments,i=this.selector;return t=t||{},"object"==typeof t?this.each(function(){if(e.data(this,"plugin_"+r)){var a=e.data(this,"plugin_"+r);a.destroy.apply(a)}t.selector=i,e.data(this,"plugin_"+r,new o(this,t))}):"string"==typeof t&&"_"!==t[0]&&"init"!==t?this.each(function(){var i=e.data(this,"plugin_"+r);i instanceof o&&"function"==typeof i[t]&&i[t].apply(i,Array.prototype.slice.call(a,1))}):void 0}}(jQuery);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Mike Graves
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-02 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.8.2
+        version: '5.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.8.2
+        version: '5.9'
 - !ruby/object:Gem::Dependency
   name: leaflet-rails
   requirement: !ruby/object:Gem::Requirement
@@ -143,16 +143,16 @@ dependencies:
   name: jettywrapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: engine_cart
   requirement: !ruby/object:Gem::Requirement
@@ -279,6 +279,7 @@ files:
 - app/assets/stylesheets/geoblacklight/modules/results.scss
 - app/assets/stylesheets/geoblacklight/modules/search_widgets.scss
 - app/assets/stylesheets/geoblacklight/modules/toolbar.scss
+- app/assets/stylesheets/geoblacklight/modules/web_services.scss
 - app/controllers/download_controller.rb
 - app/controllers/wms_controller.rb
 - app/helpers/geoblacklight_helper.rb
@@ -296,7 +297,10 @@ files:
 - app/views/catalog/_show_header_default.html.erb
 - app/views/catalog/_show_tools.html.erb
 - app/views/catalog/_upper_metadata.html.erb
+- app/views/catalog/_web_services.html.erb
 - app/views/catalog/index.html.erb
+- app/views/catalog/web_services.html
+- app/views/catalog/web_services.js.erb
 - app/views/download/hgl.html.erb
 - app/views/shared/_header_navbar.html.erb
 - config/initializers/rails_config.rb
@@ -325,12 +329,14 @@ files:
 - lib/geoblacklight/item_viewer.rb
 - lib/geoblacklight/reference.rb
 - lib/geoblacklight/references.rb
+- lib/geoblacklight/routes.rb
 - lib/geoblacklight/solr_document.rb
 - lib/geoblacklight/version.rb
 - lib/geoblacklight/view_helper_override.rb
 - lib/geoblacklight/wms_layer.rb
 - lib/geoblacklight/wms_layer/feature_info_response.rb
 - lib/tasks/geoblacklight.rake
+- spec/controllers/catalog_controller_spec.rb
 - spec/controllers/download_controller_spec.rb
 - spec/factories/user.rb
 - spec/features/download_layer_spec.rb
@@ -343,6 +349,7 @@ files:
 - spec/features/search_bar_spec.rb
 - spec/features/show_page_metadata_spec.rb
 - spec/features/split_view.html.erb_spec.rb
+- spec/features/web_services_modal_spec.rb
 - spec/fixtures/solr_documents/actual-papermap1.json
 - spec/fixtures/solr_documents/actual-point1.json
 - spec/fixtures/solr_documents/actual-polygon1.json
@@ -372,7 +379,9 @@ files:
 - spec/views/catalog/_document_split.html.erb_spec.rb
 - spec/views/catalog/_index_split.html.erb_spec.rb
 - template.rb
+- vendor/assets/javascripts/leaflet-iiif.js
 - vendor/assets/javascripts/native.history.js
+- vendor/assets/javascripts/readmore.min.js
 homepage: http://github.com/geoblacklight/geoblacklight
 licenses:
 - Apache 2.0
@@ -398,6 +407,7 @@ signing_key:
 specification_version: 4
 summary: A discovery platform for geospatial holdings
 test_files:
+- spec/controllers/catalog_controller_spec.rb
 - spec/controllers/download_controller_spec.rb
 - spec/factories/user.rb
 - spec/features/download_layer_spec.rb
@@ -410,6 +420,7 @@ test_files:
 - spec/features/search_bar_spec.rb
 - spec/features/show_page_metadata_spec.rb
 - spec/features/split_view.html.erb_spec.rb
+- spec/features/web_services_modal_spec.rb
 - spec/fixtures/solr_documents/actual-papermap1.json
 - spec/fixtures/solr_documents/actual-point1.json
 - spec/fixtures/solr_documents/actual-polygon1.json