geoblacklight 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a3ffb556c402cb467f68a38e22eedbd9a1c6728
-  data.tar.gz: a3b02401bcf09588a304b1cfd0b6cec5b4d22bdb
+  metadata.gz: 336d18ec6cafab94ffffefb1bab4ea094d00a236
+  data.tar.gz: 5c2897ee61afa85bc2cad7cc76c5c44e2fc2b1ee
 SHA512:
-  metadata.gz: 0ab6305640e1412878865612ace63b887cd193532ec4433cba44bd93728161c66735326dd9c549c835bed1d03d6d63b89250b0f98ecc855dc2e0a1d0c3c3f30f
-  data.tar.gz: e38ecfeabde0a079ca7073ef109ddbae2463e4b8e590a9662d7f0367e9f54e4ea52e6c2016a95070b16553d04f63fc169858aa3d78fb574581062acbbce34bfe
+  metadata.gz: 2520695818063a834b764469d3874269ab69e27cb640093c233f35af57982b62f99fd08818178ca27ebf6ac8d43d12c42ad6b3ca3e2cde0db155162b74a50ee5
+  data.tar.gz: 09a53748f413c5f1a77c0852eae201a758ddd67194a0452671b67bd1878468c68cf4e6b85920f9ef251e9feb5b5bb29e929d1d9ad75ec030d61aafc36371e295

data/README.md

@@ -22,7 +22,7 @@ To install Solr (with Jetty)
 $ cd app-name
 $ rake jetty:download
 $ rake jetty:unzip
-$ rake geoblacklight:configure_jetty
+$ rake geoblacklight:configure_solr
 ```
 
 Or install with [Docker](https://github.com/geoblacklight/geoblacklight-docker)

data/Rakefile

@@ -13,6 +13,8 @@ require 'rspec/core/rake_task'
 require 'engine_cart/rake_task'
 require 'jettywrapper'
 
+Dir.glob('lib/tasks/configure_solr.rake').each { |r| load r}
+
 task default: :ci
 
 RSpec::Core::RakeTask.new(:spec)
@@ -26,24 +28,22 @@ task :fixtures => ['engine_cart:generate'] do
 end
 
 desc "Execute Continuous Integration build"
-task :ci => ['engine_cart:generate', 'jetty:clean', 'geoblacklight:configure_jetty'] do
-  ENV['environment'] = "test"
-  jetty_params = Jettywrapper.load_config
-  jetty_params[:startup_wait]= 60
-
-  Jettywrapper.wrap(jetty_params) do
-    Rake::Task["fixtures"].invoke
-
-    # run the tests
-    Rake::Task["spec"].invoke
-  end
-end
-
-
-namespace :geoblacklight do
-  desc "Copies the default SOLR config for the bundled Testing Server"
-  task :configure_jetty do
-    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'
+task :ci do
+  if Rails.env.test?
+    Rake::Task['engine_cart:generate'].invoke
+    Rake::Task['jetty:clean'].invoke
+    Rake::Task['geoblacklight:configure_solr'].invoke
+    ENV['environment'] = "test"
+    jetty_params = Jettywrapper.load_config
+    jetty_params[:startup_wait]= 60
+
+    Jettywrapper.wrap(jetty_params) do
+      Rake::Task["fixtures"].invoke
+
+      # run the tests
+      Rake::Task["spec"].invoke
+    end
+  else
+    system('rake ci RAILS_ENV=test')
   end
 end

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

@@ -13,12 +13,14 @@
 
 @import 'font-awesome';
 @import 'geoblacklight/styles';
+@import 'modules/coderay';
 @import 'modules/mixins';
 @import 'modules/icons';
 @import 'modules/icon-customization';
 @import 'modules/home';
 @import 'modules/item';
 @import 'modules/layer_opacity';
+@import 'modules/metadata';
 @import 'modules/results';
 @import 'modules/geosearch';
 @import 'modules/search_widgets';

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

@@ -0,0 +1,147 @@
+/*
+ * Based on: https://github.com/pie4dan/CodeRay-GitHub-Theme/blob/master/coderay.css
+ * From: https://github.com/h3rald/glyph/blob/master/styles/coderay.scss
+ */
+.CodeRay {
+  background-color: #FFF;
+  border: 1px solid #ECECEC;
+  line-height: 1.3em;
+  font-size: 12px;
+  font-family: 'Inconsolata', Monospace;
+  color: #000;
+  padding: 10px;
+  margin: 1em 0;
+}
+.CodeRay pre, .CodeRay code {
+  padding: 0;
+  margin: 0;
+}
+
+div.CodeRay { 
+  padding: 0;
+}
+
+span.CodeRay { white-space: pre; border: 0px; padding: 2px }
+
+table.CodeRay { border-collapse: collapse; width: 100%; padding: 2px }
+table.CodeRay td {
+  padding: 1em 0.5em;
+  vertical-align: top;
+}
+
+.CodeRay .line-numbers, .CodeRay .no {
+  margin: 0 2px 0 0;
+  background-color: #ECECEC;
+  color: #AAA;
+  width: 20px;
+  text-align: right;
+}
+.CodeRay .line-numbers tt { font-weight: bold }
+.CodeRay .line-numbers .highlighted { color: red }
+.CodeRay .line { display: block; float: left; width: 100%; }
+.CodeRay .no { padding: 0px 4px }
+.CodeRay .code { width: 100% }
+
+ol.CodeRay { font-size: 10pt }
+ol.CodeRay li { white-space: pre }
+
+.CodeRay .code pre { overflow: auto }
+
+.CodeRay .debug { color:white ! important; background:blue ! important; }
+
+.CodeRay .attribute-name-fat { color:#00C }
+.CodeRay .attribute-name { color:#007 }
+.CodeRay .annotation { color:#f08 }
+.CodeRay .attribute-value { color:#700 }
+.CodeRay .attribute-value-fat { color:#C00 }
+.CodeRay .binary { color:#509; font-weight:bold }
+.CodeRay .comment  { color:#998; font-style: italic; border: 0; background: transparent;}
+
+.CodeRay .char { color:#04D }
+.CodeRay .ch .content { color:#04D }
+.CodeRay .ch .delimiter { color:#039 }
+
+.CodeRay .class { color:#458; font-weight:bold }
+.CodeRay .complex { color:#A08; font-weight:bold }
+.CodeRay .constant { color:teal; }
+.CodeRay .color { color:#0A0 }
+.CodeRay .class-variable { color:#369 }
+.CodeRay .decorator { color:#B0B; }
+.CodeRay .definition { color:#099; font-weight:bold }
+.CodeRay .directive { color:#088; font-weight:bold }
+.CodeRay .delimiter { color:black }
+.CodeRay .doc { color:#970 }
+.CodeRay .doc-type { color:#34b }
+.CodeRay .doc-string { color:#D42; font-weight:bold }
+.CodeRay .escape  { color:#666; font-weight:bold }
+.CodeRay .entity { color:#800; font-weight:bold }
+.CodeRay .error { color:#F00; background-color:#FAA }
+.CodeRay .exception { color:#C00; font-weight:bold }
+.CodeRay .float { color:#099; }
+.CodeRay .function { color:#900; font-weight:bold }
+.CodeRay .global-variable { color:teal; font-weight:bold }
+.CodeRay .hex { color:#058; font-weight:bold }
+.CodeRay .imaginary  { color:#099; }
+.CodeRay .include { color:#B44; font-weight:bold }
+
+.CodeRay .inline { color: black }
+.CodeRay .inline .inline { background: #ccc }
+.CodeRay .inline .inline .inline { background: #bbb }
+.CodeRay .inline .inline-delimiter { color: #D14; }
+.CodeRay .inline-delimiter { color: #D14; }
+
+.CodeRay .imaginary { color:#f00; }
+.CodeRay .include { color:#B2B; font-weight:bold }
+.CodeRay .instance-variable { color:teal }
+.CodeRay .label { color:#970; font-weight:bold }
+.CodeRay .local-variable { color:#963 }
+.CodeRay .octal { color:#40E; font-weight:bold }
+.CodeRay .operator-fat { color:#000; font-weight:bold }
+.CodeRay .operator { }
+.CodeRay .predefined-constant {  font-weight:bold }
+.CodeRay .predefined { color:#369; font-weight:bold }
+.CodeRay .preprocessor { color:#579; }
+.CodeRay .pseudo-class { color:#00C; font-weight:bold }
+.CodeRay .predefined-type { color:#074; font-weight:bold }
+.CodeRay .reserved, .keyword  { color:#000; font-weight:bold }
+
+.CodeRay .key { color: #808; }
+.CodeRay .key .delimiter { color: #606; }
+.CodeRay .key .char { color: #80f; }
+.CodeRay .value { color: #088; }
+
+.CodeRay .regexp { background-color:#fff0ff }
+.CodeRay .regexp .content { color:#808 }
+.CodeRay .regexp .delimiter { color:#404 }
+.CodeRay .regexp .modifier { color:#C2C }
+.CodeRay .regexp .function  { color:#404; font-weight: bold }
+
+.CodeRay .string { color: #D20; }
+.CodeRay .string .content { color: #D14; }
+.CodeRay .string .char { color: #D14; }
+.CodeRay .string .delimiter { color: #D14; }
+
+.CodeRay .shell { color:#D14 }
+.CodeRay .shell .content { }
+.CodeRay .shell .delimiter { color:#D14 }
+
+.CodeRay .symbol { color:#990073 }
+.CodeRay .symbol .content { color:#A60 }
+.CodeRay .symbol .delimiter { color:#630 }
+
+.CodeRay .tag { color:#070 }
+.CodeRay .tag-fat { color:#070; font-weight:bold }
+.CodeRay .tag-special { color:#D70; font-weight:bold }
+.CodeRay .type { color:#339; font-weight:bold }
+.CodeRay .variable  { color:#036 }
+.CodeRay .xml-text { color:#444 }
+
+.CodeRay .insert { background: #afa; }
+.CodeRay .delete { background: #faa; }
+.CodeRay .change { color: #aaf; background: #007; }
+.CodeRay .head { color: #f8f; background: #505 }
+
+.CodeRay .insert .insert { color: #080; font-weight:bold }
+.CodeRay .delete .delete { color: #800; font-weight:bold }
+.CodeRay .change .change { color: #66f; }
+.CodeRay .head .head { color: #f4f; }

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

@@ -32,4 +32,8 @@
 
 .geoblacklight-web_services {
   @extend .fa, .fa-external-link;
-}
+}
+
+.geoblacklight-metadata {
+  @extend .fa, .fa-file-text-o;
+}

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

@@ -0,0 +1,5 @@
+.metadata-view {
+  pre {
+    @extend .pre-scrollable;
+  }
+}

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

@@ -26,6 +26,7 @@
 .index_title {
   @extend .text-span;
   @extend .hide-overflow;
+  @extend h5;
 }
 
 .caret-toggle {

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

@@ -2,6 +2,7 @@
   a .geoblacklight {
     color: $gray-light;
   }
+
   .geoblacklight-citation {
     text-align: center;
     width: 1.4em;
@@ -21,4 +22,9 @@
     text-align: center;
     width: 1.4em;
   }
+
+  .geoblacklight-metadata {
+    text-align: center;
+    width: 1.4em;
+  }
 }

data/app/controllers/download_controller.rb

@@ -22,7 +22,7 @@ class DownloadController < ApplicationController
   def hgl
     @response, @document = get_solr_response_for_doc_id params[:id]
     if params[:email]
-      response = HglDownload.new(@document, params[:email]).get
+      response = Geoblacklight::HglDownload.new(@document, params[:email]).get
       if response.nil?
         flash[:danger] = t 'geoblacklight.download.error'
       else
@@ -42,13 +42,13 @@ class DownloadController < ApplicationController
   def check_type
     case params[:type]
     when 'shapefile'
-      response = ShapefileDownload.new(@document).get
+      response = Geoblacklight::ShapefileDownload.new(@document).get
     when 'kmz'
-      response = KmzDownload.new(@document).get
+      response = Geoblacklight::KmzDownload.new(@document).get
     when 'geojson'
-      response = GeojsonDownload.new(@document).get
+      response = Geoblacklight::GeojsonDownload.new(@document).get
     when 'geotiff'
-      response = GeotiffDownload.new(@document).get
+      response = Geoblacklight::GeotiffDownload.new(@document).get
     end
     response
   end

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

@@ -0,0 +1,48 @@
+<% document ||= @document %>
+<% if document_downloadable? %>
+  <div class='panel-body'>
+    <div class='btn-group' itemprop='distribution' itemscope='itemscope' itemtype='http://schema.org/DataDownload'>
+      <% 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], data: { download: 'trigger', download_type: 'direct', download_id: document[:layer_slug_s] }) %>
+      <% elsif document.hgl_download.present? %>
+      <%= link_to(download_text(document.download_types.first[0]),
+      download_hgl_path(id: document), data: {ajax_modal: 'trigger', download: 'trigger', download_type: 'harvard-hgl', download_id: document[:layer_slug_s] },
+      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])}", download: 'trigger', download_type: document.download_types.first[0], download_id: document[:layer_slug_s] }, class: 'btn btn-default') %>
+      <% end %>
+      <button type='button' class='btn btn-default dropdown-toggle download-dropdown-toggle' data-toggle='dropdown' aria-expanded='false'>
+        <span class='caret'></span>
+        <span class='sr-only'>Toggle Download Dropdown</span>
+      </button>
+      <ul class='dropdown-menu' role='menu'>
+        <% if document.hgl_download.present? %>
+        <li role="presentation" class="dropdown-header">Original</li>
+        <li>
+          <%= link_to(download_text(document.download_types.first[0]),
+          download_hgl_path(id: document), data: {ajax_modal: 'trigger', download: 'trigger', download_type: 'harvard-hgl', download_id: document[:layer_slug_s] }) %>
+        </li>
+        <% 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], data: { download: 'trigger', download_type: 'direct', download_id: document[:layer_slug_s] }) %>
+        </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])}", download: 'trigger', download_type: type[0], download_id: document[:layer_slug_s] }) %>
+        <% end %>
+        <% end %>
+        <% end %>
+        <% end %>
+      </ul>
+    </div>
+  </div>
+  <% elsif document.restricted? && document.same_institution? %>
+    <div class='panel-body'>
+      <%= link_to t('geoblacklight.tools.login_to_view'), new_user_session_path(referrer: request.original_url) %>
+    </div>
+<% end %>

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

@@ -11,38 +11,38 @@
 <div class='container'>
   <div class='row'>
     <div class='col-md-6'>
-      <%= content_tag :h4, t('geoblacklight.home.category_heading'), class: 'text-center' %>
+      <%= content_tag :h3, t('geoblacklight.home.category_heading'), class: 'text-center' %>
       <div class='category-block'>
         <div class='category-icon'>
           <span class='glyphicon glyphicon-home'></span>
         </div>
-        <h3>Institution</h3>
+        <h4>Institution</h4>
         <%= render_facet_tags [:dct_provenance_s] %>
       </div>
       <div class='category-block'>
         <div class='category-icon'>
           <span class='glyphicon glyphicon-download'></span>
         </div>
-        <h3>Data type</h3>
+        <h4>Data type</h4>
         <%= render_facet_tags [:layer_geom_type_s] %>
       </div>
       <div class='category-block'>
         <div class='category-icon'>
           <span class='glyphicon glyphicon-globe'></span>
         </div>
-        <h3>Placename</h3>
+        <h4>Placename</h4>
         <%= render_facet_tags [:dct_spatial_sm] %>
       </div>
       <div class='category-block'>
         <div class='category-icon'>
           <span class='glyphicon glyphicon-tags'></span>
         </div>
-        <h3>Subject</h3>
+        <h4>Subject</h4>
         <%= render_facet_tags [:dc_subject_sm] %>
       </div>
     </div>
     <div class='col-md-6 text-center'>
-      <%= content_tag :h4, t('geoblacklight.home.map_heading') %>
+      <%= content_tag :h3, t('geoblacklight.home.map_heading') %>
       <%= content_tag :div, '', id: 'map', data: { map: 'home', 'catalog-path'=> catalog_index_path , 'map-bbox' => params[:bbox]} %>
     </div>
   </div>

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

@@ -5,14 +5,14 @@
     <%= 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">
+  <h3 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 %>
     </span>
     <%= link_to_document document, document_show_link_field(document), counter: counter, title: document['dc_title_s'] %>
-  </h5>
+  </h3>
 
   <div class='col-md-12 more-info-area'>
     <div class='collapse' data-collapse-target="<%= document['uuid'] %>">

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

@@ -0,0 +1,12 @@
+<% document ||= @document %>
+
+<div class='metadata-view'>
+  <% document.references.refs.each do |ref| %>
+    <% if Settings.METADATA_SHOWN.include?(ref.type.to_s) %>
+      <div class='label label-default'>
+        <%= formatted_name_reference(ref.type) %>
+      </div>
+      <%= CodeRay.scan(Geoblacklight::Metadata.new(ref).metadata, :xml).div(css: :class, tab_width: 2).html_safe %>
+    <% end %>
+  <% end %>
+</div>

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

@@ -7,8 +7,8 @@
 <span class="sr-only"><%= t('blacklight.search.form.search_field.post_label') %></span>
 <% end %>
 <div class="input-group search-input-group">
-  <label for="q" class="sr-only"><%= t('blacklight.search.form.q') %></label>
-  <%= text_field_tag :q, params[:q], :placeholder => t('blacklight.search.form.q'), :class => "search_q q form-control", :id => "q", :autofocus => should_autofocus_on_search_box? %>
+  <label for="q" class="sr-only"><%= t('blacklight.search.form.search.label') %></label>
+  <%= text_field_tag :q, params[:q], :placeholder => t('blacklight.search.form.search.placeholder'), :class => "search_q q form-control", :id => "q", :autofocus => should_autofocus_on_search_box? %>
   
   <span class="input-group-btn">
     <button type="submit" class="btn btn-primary search-btn" id="search">