geoblacklight 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd5d9169412d20001902df8f9b190829237ae511
-  data.tar.gz: d2eaeafd8633c2512d0f917f5a45e25981036167
+  metadata.gz: 969739fdc56829f296f49fdc519cfcd57cdafd7c
+  data.tar.gz: 5e1c94e9c07557e959e787727130109289c5261f
 SHA512:
-  metadata.gz: 26a1988031a4e0ec4bf578911c62708a23c25da3a5da487c3b22ff38ff0ca4697ec08e33f0fe49cc35bfb75c06fa3c17d0f6d72697d2ada5fa5bd394b5cc4f1a
-  data.tar.gz: beeeb39b51cef29487020632e867f3c50389f3cd4bd99ae960420f5e3b98c1ae63f1c287448151952b8fac916a804427e2a08a044c06fce31e00d67d5fb29d7a
+  metadata.gz: bdbc61dc63defcf0b47ede1f235db3498ebaaa6c0c71e31acde2a3f089cf69ef4975f3ec59aad0d19fc3c16d983d04b01c9025dc112430821cf80665d82d48d4
+  data.tar.gz: b707a45223963f466216cc1b8e4180ebcc1a5175e55c9dc70d30bc028dac7a16e5a2e451c4eb8afb128f807b60a32bb6af87285c4cec7b867d02b71ff8020c8c

data/.gitmodules

@@ -1,5 +0,0 @@
-[submodule "geoblacklight-schema"]
-	path = schema
-	url = https://github.com/geoblacklight/geoblacklight-schema.git
-	branch = master
-

data/.travis.yml

@@ -1,3 +1,6 @@
+cache: bundler
+language: ruby
+sudo: false
 notifications:
   email: false
 

data/README.md

@@ -6,88 +6,29 @@ GeoBlacklight is a world-class discovery platform for geospatial (GIS) holdings.
 is an open collaborative project aiming to build off of the successes
 of the Blacklight Solr-powered discovery interface and the
 multi-institutional OpenGeoportal federated metadata sharing
-communities. We are currently in a collaborative design phase and
-we're actively looking for community input and development partners.
-More coming soon!
+communities. We're actively looking for community input and development partners.
 
-## Features
+###[Installation](https://github.com/geoblacklight/geoblacklight/wiki/Installation)
 
-* Text and spatial search with scoring formula
-* Facet by institution, year, publisher, data type, access, format
-* Facet by place, subject
-* Sort by relevance, year, publisher, title
-* Results list view icons and snippets
-* Detail map view for WMS features
-* Detail map view feature inspection
-* Slugs
-* Results list map view of bounding boxes
-* WMS/WFS/WCS links
-* Download Shapefile
-* Download KML
-* Download Metadata (for Stanford)
-* Built-in sample Solr 4.10 index
-* Search history
+Creating a new GeoBlacklight application from the template
 
-## TODO
+```
+$ rails new app-name -m https://raw.githubusercontent.com/geoblacklight/geoblacklight/master/template.rb
+```
 
-* See https://github.com/geoblacklight/geoblacklight/issues
-* See https://github.com/geoblacklight/geoblacklight-schema/issues
+To install Solr (with Jetty)
 
-## Development
+```
+$ cd app-name
+$ rake jetty:download
+$ rake jetty:unzip
+$ rake geoblacklight:configure_jetty
+```
 
-To install a development instance of GeoBlacklight follow these instructions.
+Or install with [Docker](https://github.com/geoblacklight/geoblacklight-docker)
+For more information see the [installation guide](https://github.com/geoblacklight/geoblacklight/wiki/Installation)
 
-Clone the repository (using `--recurse`)
-
-    git clone --recurse git@github.com:geoblacklight/geoblacklight.git
-
-Download and configure `jetty` to run Solr
-
-    rake jetty:download jetty:unzip
-    rake geoblacklight:configure_jetty
-
-Create a test app (created at `/spec/internal`)
-
-    rake engine_cart:generate
-
-Boot `jetty`
-
-    rake jetty:start
-
-Boot GeoBlacklight test app
-
-    cd spec/internal
-    rake geoblacklight:solr:seed # to load sample documents into jetty Solr instance
-    rails server
-
-Run tests
-
-    rake ci
-
-## Installation
-
-To bootstrap a new GeoBlacklight Rails application
-
-    $ rails new app-name -m https://raw.githubusercontent.com/geoblacklight/geoblacklight/master/template.rb
-    
-To install Solr (with jetty)
-
-    $ cd app-name
-    $ rake jetty:download
-    $ rake jetty:unzip
-    $ rake geoblacklight:configure_jetty
-    
-
-## Usage
-
-For a non-development instance:
-
-1. Populate a Solr 4.7 index with geoblacklight-schema documents
-2. Configure your GeoBlacklight application's `config/solr.yml` to point to the Solr index
-3. Configure your `config/environments` and `app/controllers/catalog_controller.rb`
-4. `rails server` to run GeoBlacklight
-
-## Contributing
+###[Contributing](https://github.com/geoblacklight/geoblacklight/wiki/Contributing)
 
 1. Fork it ( http://github.com/my-github-username/geoblacklight/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
@@ -95,4 +36,11 @@ For a non-development instance:
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
-Also, if you wish to ask questions or participate further, email the [GeoBlacklight Working Group](https://groups.google.com/forum/#!forum/geoblacklight-working-group) at geoblacklight-working-group@googlegroups.com.
+Also, if you wish to ask questions or participate further, email the [GeoBlacklight Working Group](https://groups.google.com/forum/#!forum/geoblacklight-working-group) at [geoblacklight-working-group@googlegroups.com](mailto:geoblacklight-working-group@googlegroups.com).
+
+###[Development](https://github.com/geoblacklight/geoblacklight/wiki/Development)
+
+See the [development guide](https://github.com/geoblacklight/geoblacklight/wiki/Development) on our wiki for more information about setting up your development environment.
+
+
+Please see the full documentation hosted on our Wiki [Wiki](https://github.com/geoblacklight/geoblacklight/wiki)

data/Rakefile

@@ -43,8 +43,7 @@ end
 namespace :geoblacklight do
   desc "Copies the default SOLR config for the bundled Testing Server"
   task :configure_jetty do
-    FileList['schema/conf/*'].each do |f|
-      cp("#{f}", 'jetty/solr/blacklight-core/conf/', :verbose => true)
-    end
+    system 'curl -o jetty/solr/blacklight-core/conf/schema.xml https://raw.githubusercontent.com/geoblacklight/geoblacklight-schema/master/conf/schema.xml'
+    system 'curl -o jetty/solr/blacklight-core/conf/solrconfig.xml https://raw.githubusercontent.com/geoblacklight/geoblacklight-schema/master/conf/solrconfig.xml'
   end
 end

data/app/assets/javascripts/geoblacklight/downloaders.js

@@ -0,0 +1 @@
+//= require_tree ./downloaders

data/app/assets/javascripts/geoblacklight/downloaders/downloader.js

@@ -0,0 +1,51 @@
+!(function(global) {
+  'use strict';
+
+  var Downloader = L.Class.extend({
+    options: {
+      spinner: $('<i class="fa fa-spinner fa-spin fa-2x fa-align-center"></i>')
+    },
+
+    initialize: function(el, options) {
+      L.Util.setOptions(this, options);
+      this.$el = $(el);
+      this.configureHandler();
+    },
+
+    configureHandler: function() {
+      this.$el.on('click', L.Util.bind(this.download, this));
+    },
+
+    download: function(ev) {
+      var url = this.$el.data('downloadPath');
+      ev.preventDefault();
+      this.$el.closest('.btn-group').append(this.options.spinner);
+      $.getJSON(url)
+        .done(L.Util.bind(this.complete, this))
+        .fail(L.Util.bind(this.error, this));
+    },
+
+    complete: function(data) {
+      this.renderMessage(data);
+      this.options.spinner.hide();
+    },
+
+    error: function(data) {
+      this.options.spinner.hide();
+    },
+
+    renderMessage: function(message) {
+      $.each(message, function(idx, msg) {
+        var flash = '<div class="alert alert-' + msg[0] + '"><button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>' + msg[1] + '</div>';
+        $('div.flash_messages').append(flash);
+      });
+    }
+
+  });
+
+  global.GeoBlacklight.Downloader = Downloader;
+  global.GeoBlacklight.downloader = function(el, options) {
+    return new Downloader(el, options);
+  };
+
+})(this);

data/app/assets/javascripts/geoblacklight/downloaders/hgl_downloader.js

@@ -0,0 +1,32 @@
+//= require geoblacklight/downloaders/downloader
+
+!(function(global) {
+  'use strict';
+
+  var HglDownloader = global.GeoBlacklight.Downloader.extend({
+
+    configureHandler: function() {
+      this.$el.on('submit', L.Util.bind(this.download, this));
+    },
+
+    download: function(ev) {
+      var url, email;
+      ev.preventDefault();
+      $(this.options.modal).modal('hide');
+      email = this.$el.find('#requestEmail').val();
+      url = this.$el.find('#requestUrl').val();
+
+      $.get(url, { email: email })
+        .done(L.Util.bind(this.complete, this))
+        .fail(L.Util.bind(this.error, this));
+    }
+
+  });
+
+  global.GeoBlacklight.HglDownloader = HglDownloader;
+  global.GeoBlacklight.hglDownloader = function(el, options) {
+    return new HglDownloader(el, options);
+  };
+
+
+})(this);

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

@@ -1,45 +1,11 @@
 Blacklight.onLoad(function() {
-  var downloads = [];
   $('[data-download-path]').each(function(i, element) {
-    downloads.push(new GeoBlacklight.Download(element));
+    GeoBlacklight.downloader(element);
   });
-});
-
-GeoBlacklight.Download = function(element) {
-  var _this = this;
-  _this.element = $(element);
-  _this.url = _this.element.data('download-path');
-  _this.buttonGroup = _this.element.closest('.btn-group');
-  _this.spinner = $('<i class="fa fa-spinner fa-spin fa-2x fa-align-center"></i>');
-  _this.buttonGroup.append(_this.spinner.hide());
-  _this.setupClickListener();
-};
-
-GeoBlacklight.Download.prototype = {
-  setupClickListener: function() {
-    var _this = this;
-    _this.element.on('click', function(e) {
-      e.preventDefault();
-      _this.requestDownload();
-    });
-  },
-  requestDownload: function() {
-    var _this = this;
-    _this.spinner.show();
-    $.ajax({
-      url: _this.url,
-      dataType: 'json'
-    }).done(function(data) {
-      _this.renderFlashMessage(data);
-      _this.spinner.hide();
-    }).fail(function(data, e) {
-      _this.spinner.hide();
-    });
-  },
-  renderFlashMessage: function(response) {
-    $.each(response, function(i, val) {
-      var flashHtml = '<div class="alert alert-' + val[0] + '"><button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>' + val[1] + '</div>';
-      $('div.flash_messages').append(flashHtml);
+  $('#ajax-modal').on('loaded.blacklight.ajax-modal', function() {
+    var modal = this;
+    $(this).find('#hglRequest').each(function() {
+      GeoBlacklight.hglDownloader(this, { modal: modal });
     });
-  }
-};
+  });
+});

data/app/controllers/download_controller.rb

@@ -19,6 +19,24 @@ class DownloadController < ApplicationController
     send_file "tmp/cache/downloads/#{params[:id]}.#{params[:format]}", type: 'application/zip', x_sendfile: true
   end
 
+  def hgl
+    @response, @document = get_solr_response_for_doc_id
+    if params[:email]
+      response = HglDownload.new(@document, params[:email]).get
+      if response.nil?
+        flash[:danger] = t 'geoblacklight.download.error'
+      else
+        flash[:success] = t 'geoblacklight.download.hgl_success'
+      end
+      respond_to do |format|
+        format.json { render json: flash, response: response }
+        format.html { render json: flash, response: response }
+      end
+    else
+      render layout: false
+    end
+  end
+
   private
 
   def check_type
@@ -49,7 +67,7 @@ class DownloadController < ApplicationController
       authenticate_user!
     end
   end
-  
+
   def file_name_to_id(file_name)
     file_name.split('-')[0..-2].join('-')
   end

data/app/controllers/wms_controller.rb

@@ -1,6 +1,6 @@
 class WmsController < ApplicationController
   def handle
-    response = WmsLayer.new(params).get_feature_info
+    response = Geoblacklight::WmsLayer.new(params).get_feature_info
 
     respond_to do |format|
       format.json { render json: response }

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

@@ -2,7 +2,7 @@
 
 <div id='geoblacklight-tools'>
   <div class="panel panel-default show-tools">
-    <div class="panel-heading"> 
+    <div class="panel-heading">
       Tools
     </div>
     <div class="panel-body">
@@ -13,12 +13,16 @@
         <%- end -%>
         <%- if @document.respond_to?( :to_sms_text ) -%>
           <%= link_to sms_helper, sms_catalog_path(:id => @document), {:id => 'smsLink', :data => {:ajax_modal => "trigger"}, :class => 'list-group-item'} %>
-        <%- end -%> 
+        <%- end -%>
       </ul>
       <% if document_downloadable? %>
         <div class='btn-group' itemprop='distribution' itemscope='itemscope' itemtype='http://schema.org/DataDownload'>
-          <% unless document.direct_download.blank? %>
+          <% if document.direct_download.present? %>
             <%= link_to(download_text(@document[:dc_format_s]), document.direct_download[:download], class: 'btn btn-default', 'contentUrl' => document.direct_download[:download]) %>
+          <% elsif document.hgl_download.present? %>
+            <%= link_to(download_text(document.download_types.first[0]),
+                download_hgl_path(id: document), data: {ajax_modal: 'trigger'},
+                class: 'btn btn-default') %>
           <% else %>
             <%= link_to(download_text(document.download_types.first[0]), '', data: { download_path: "#{download_path(document[:layer_slug_s], type: document.download_types.first[0])}"}, class: 'btn btn-default') %>
           <% end %>
@@ -27,20 +31,28 @@
             <span class='sr-only'>Toggle Download Dropdown</span>
           </button>
           <ul class='dropdown-menu' role='menu'>
-            <% unless document.direct_download.blank? %>
+            <% if document.hgl_download.present? %>
               <li role="presentation" class="dropdown-header">Original</li>
               <li>
-                <%= link_to(download_text(@document[:dc_format_s]), document.direct_download[:download], 'contentUrl' => document.direct_download[:download]) %>
+                <%= link_to(download_text(document.download_types.first[0]),
+                download_hgl_path(id: document), data: {ajax_modal: 'trigger'}) %>
               </li>
-            <% end %>
-            <% if document.download_types.present? %>
-              <li role="presentation" class="dropdown-header">Generated</li>
-              <% document.download_types.each do |type| %>
-                <%= content_tag(:li) do %>
-                  <% link_to(download_text(type[0]), '', data: { download_path: "#{download_path(document[:layer_slug_s], type: type[0])}" }) %>
+            <% else %>
+              <% if document.direct_download.present? %>
+                <li role="presentation" class="dropdown-header">Original</li>
+                <li>
+                  <%= link_to(download_text(@document[:dc_format_s]), document.direct_download[:download], 'contentUrl' => document.direct_download[:download]) %>
+                </li>
+              <% end %>
+              <% if document.download_types.present? %>
+                <li role="presentation" class="dropdown-header">Generated</li>
+                <% document.download_types.each do |type| %>
+                  <%= content_tag(:li) do %>
+                    <% link_to(download_text(type[0]), '', data: { download_path: "#{download_path(document[:layer_slug_s], type: type[0])}" }) %>
+                  <% end %>
                 <% end %>
-              <% end %> 
-            <% end %>   
+              <% end %>
+            <% end %>
           </ul>
         </div>
       <% elsif document.restricted? && document.same_institution? %>

data/app/views/download/hgl.html.erb

@@ -0,0 +1,25 @@
+<div class="modal-header">
+  <button type="button" class="close" data-dismiss="modal">
+    <span aria-hidden="true">&times;</span>
+  </button>
+  <h4 class="modal-title">Request Layer</h4>
+</div>
+<div class="modal-body">
+  <form class="form-horizontal" role="form" id="hglRequest">
+    <p>Please enter your email address. You will receive a link to download the layer when it is ready.</p>
+    <div class="form-group">
+      <label for="requestEmail" class="col-sm-2 control-label">Email</label>
+      <div class="col-sm-6">
+        <input class="form-control" type="email" id="requestEmail" />
+      </div>
+      <input type="hidden" id="requestUrl"
+        value="<%= download_hgl_path(id: @document) %>" />
+      <div class="col-sm-2">
+        <button type="submit" class="btn btn-primary">Request</button>
+      </div>
+    </div>
+  </form>
+</div>
+<div class="modal-footer">
+  <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+</div>

data/config/locales/geoblacklight.en.yml

@@ -3,6 +3,7 @@ en:
     download:
       download: 'Download'
       success: 'Your file %{title} is ready for download'
+      hgl_success: 'You should receive an email when your download is ready'
       error: 'Sorry, the requested file could not be downloaded'
     home:
       headline: 'Explore and discover...'