geoblacklight 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3c10c3715efdc9443e4deec764b0d3d7855fc11
-  data.tar.gz: cdce289bfb3b6427ed07c3b68a09f5626bd49298
+  metadata.gz: bb4ed10cd413d3a4e9d2dad9426f3daec4fd2ca2
+  data.tar.gz: 913bff7e68d24e3c7ff712691ec68425e804656a
 SHA512:
-  metadata.gz: d7e11f1386470600bdb5052784c0edfadd4d4b82f18a866a2275499e9574fd536869c79e15f8c8f5f55cf01b24e19605e0e40d2b21c671717a6c247f3e91b3dc
-  data.tar.gz: ff81e343deba1e7cb2f76b11ec9a4a80e9e170e8ea025bf2958297bb73ecac62f69087a3e2d333fdbfa9372c5c51622508f8d8394647c2a3a9c63515dc8d5c70
+  metadata.gz: aa35b2e12fc1ee5056e74bf6bb6a2f068db3c35968f874025f4100815267cbe85fbc596dc2cfb29e3cf4f62b63f6534b77d067ed7297437c89cef66e05f87401
+  data.tar.gz: 9bae8b906915dc34bfec3b4f22e02157cab44c4aeed8dda2e69856942d1e309ac1342bcc23bcde35cf80809d78691e76717d4d3be470da01faf8c1ffa851586a

data/CONTRIBUTING.md

@@ -25,7 +25,7 @@ GeoBlacklight welcomes code and documentation contributions. We follow the [pull
 
 #### Merging Changes
 
-- It is considered "poor from" to merge your own request.
+- It is considered "poor form" to merge your own request.
 - Please take the time to review the changes and get a sense of what is being changed. Things to consider:
   - Does the commit message explain what is going on?
   - Does the code changes have tests? _Not all changes need new tests, some changes are refactorings_

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

@@ -23,6 +23,7 @@
 @import 'modules/metadata_content';
 @import 'modules/metadata_missing';
 @import 'modules/metadata_markup';
+@import 'modules/modal';
 @import 'modules/results';
 @import 'modules/geosearch';
 @import 'modules/search_widgets';

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

@@ -0,0 +1,14 @@
+.modal-header, .modal-body, .modal-footer {
+  .hide-without-js {
+    display: none;
+  }
+}
+
+#ajax-modal {
+  .modal-header, .modal-body, .modal-footer {
+    .hide-without-js {
+      display: inline-block; 
+    }
+  }
+
+}

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

@@ -1 +1,11 @@
-<%= render :partial => 'metadata' %>
+<div class="modal-header">
+  <button type="button" class="ajax-modal-close close" data-dismiss="modal" aria-hidden="true">×</button>
+  <h3 class="modal-title">View Metadata</h3>
+</div>
+<div class="modal-body">
+  <%= render partial: 'metadata' %>
+</div>
+<div class="modal-footer">
+  <button type="button" class="btn btn-default hide-without-js" data-dismiss="modal">Close</button>
+  <a href="#" target="_blank" rel="noopener noreferrer" id="btn-metadata-download" class="btn btn-primary">Download</a>
+</div>

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

@@ -1 +1,10 @@
-<%= render :partial => 'web_services' %>
+<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 class="modal-footer">
+    <button type="button" class="btn btn-default hide-without-js" data-dismiss="modal">Close</button>
+  </div>
+</div>

data/app/views/relation/_ancestors.html.erb

@@ -1,4 +1,6 @@
-<b><%= t('geoblacklight.relations.ancestor') %></b>
+<li>
+  <b><%= t('geoblacklight.relations.ancestor') %></b>
+</li>
 <% @relations.ancestors['docs'].each do |ancestor| %>
   <li>
     <%= link_to solr_document_path(ancestor['layer_slug_s']) do %>

data/app/views/relation/_descendants.html.erb

@@ -1,4 +1,6 @@
-<b><%= t('geoblacklight.relations.descendant', count: @relations.descendants['numFound']) %></b>
+<li>
+  <b><%= t('geoblacklight.relations.descendant', count: @relations.descendants['numFound']) %></b>
+</li>
 <% @relations.descendants['docs'][0..2].each do |descendant| %>
   <li>
     <%= link_to solr_document_path(descendant['layer_slug_s']) do %>

data/geoblacklight.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.required_rubygems_version = '>= 2.5.2'
 
   spec.add_dependency 'rails', '~> 5.0'
-  spec.add_dependency 'blacklight', '~> 6.10'
+  spec.add_dependency 'blacklight', '~> 6.11'
   spec.add_dependency 'leaflet-rails', '~> 0.7.3'
   spec.add_dependency 'font-awesome-rails'
   spec.add_dependency 'config'
@@ -30,6 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'geoblacklight-icons', '>= 0.2'
   spec.add_dependency 'deprecation'
   spec.add_dependency 'geo_combine', '>= 0.3'
+  spec.add_dependency 'mime-types'
 
   spec.add_development_dependency 'solr_wrapper'
   spec.add_development_dependency 'rails-controller-testing'

data/lib/generators/geoblacklight/install_generator.rb

@@ -7,25 +7,27 @@ module Geoblacklight
     desc 'Install Geoblacklight'
 
     def mount_geoblacklight_engine
-      route "mount Geoblacklight::Engine => 'geoblacklight'"
+      inject_into_file 'config/routes.rb', "mount Geoblacklight::Engine => 'geoblacklight'\n", before: /^end/
     end
 
     def inject_geoblacklight_routes
-      route <<-EOF.strip_heredoc
-          concern :gbl_exportable, Geoblacklight::Routes::Exportable.new
-          resources :solr_documents, only: [:show], path: '/catalog', controller: 'catalog' do
-            concerns :gbl_exportable
-          end
-          concern :gbl_wms, Geoblacklight::Routes::Wms.new
-          namespace :wms do
-            concerns :gbl_wms
-          end
-          concern :gbl_downloadable, Geoblacklight::Routes::Downloadable.new
-          namespace :download do
-            concerns :gbl_downloadable
-          end
-          resources :download, only: [:show]
-      EOF
+      routes = <<-"ROUTES"
+        concern :gbl_exportable, Geoblacklight::Routes::Exportable.new
+        resources :solr_documents, only: [:show], path: '/catalog', controller: 'catalog' do
+          concerns :gbl_exportable
+        end
+        concern :gbl_wms, Geoblacklight::Routes::Wms.new
+        namespace :wms do
+          concerns :gbl_wms
+        end
+        concern :gbl_downloadable, Geoblacklight::Routes::Downloadable.new
+        namespace :download do
+          concerns :gbl_downloadable
+        end
+        resources :download, only: [:show]
+      ROUTES
+
+      inject_into_file 'config/routes.rb', routes, before: /^end/
     end
 
     def assets

data/lib/geoblacklight/controller_override.rb

@@ -3,10 +3,20 @@ module Geoblacklight
     extend ActiveSupport::Concern
     def web_services
       @response, @document = fetch params[:id]
+      respond_to do |format|
+        format.html do
+          return render layout: false if request.xhr?
+        end
+      end
     end
 
     def metadata
       @response, @document = fetch params[:id]
+      respond_to do |format|
+        format.html do
+          return render layout: false if request.xhr?
+        end
+      end
     end
   end
 end

data/lib/geoblacklight/engine.rb

@@ -7,6 +7,7 @@ require 'faraday'
 require 'faraday_middleware'
 require 'nokogiri'
 require 'geoblacklight-icons'
+require 'mime/types'
 
 module Geoblacklight
   class Engine < ::Rails::Engine

data/lib/geoblacklight/version.rb

@@ -1,3 +1,3 @@
 module Geoblacklight
-  VERSION = '1.6.0'.freeze
+  VERSION = '1.7.0'.freeze
 end

data/spec/routing/catalog_routing_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+
+describe 'Catalog Routes', type: :routing do
+  # Test paths for custom routes
+  it "maps { :controller => 'catalog', :action => 'opensearch', :format => 'xml' } to /catalog/opensearch.xml" do
+    expect(get: '/catalog/opensearch.xml').to route_to(controller: 'catalog', action: 'opensearch', format: 'xml')
+  end
+end

data/spec/spec_helper.rb

@@ -14,7 +14,7 @@ require 'selenium-webdriver'
 
 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 window-size=1280,1024) }
   )
 
   Capybara::Selenium::Driver.new(app,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Mike Graves
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-23 00:00:00.000000000 Z
+date: 2017-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -33,14 +33,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.10'
+        version: '6.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.10'
+        version: '6.11'
 - !ruby/object:Gem::Dependency
   name: leaflet-rails
   requirement: !ruby/object:Gem::Requirement
@@ -167,6 +167,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: solr_wrapper
   requirement: !ruby/object:Gem::Requirement
@@ -365,6 +379,7 @@ files:
 - app/assets/stylesheets/geoblacklight/modules/metadata_markup.scss
 - app/assets/stylesheets/geoblacklight/modules/metadata_missing.scss
 - app/assets/stylesheets/geoblacklight/modules/mixins.scss
+- app/assets/stylesheets/geoblacklight/modules/modal.scss
 - app/assets/stylesheets/geoblacklight/modules/results.scss
 - app/assets/stylesheets/geoblacklight/modules/search_widgets.scss
 - app/assets/stylesheets/geoblacklight/modules/toolbar.scss
@@ -409,12 +424,10 @@ files:
 - app/views/catalog/_web_services_wms.html.erb
 - app/views/catalog/index.html.erb
 - app/views/catalog/metadata.html.erb
-- app/views/catalog/metadata.js.erb
 - app/views/catalog/metadata/_content.html.erb
 - app/views/catalog/metadata/_markup.html.erb
 - app/views/catalog/metadata/_missing.html.erb
 - app/views/catalog/web_services.html.erb
-- app/views/catalog/web_services.js.erb
 - app/views/download/hgl.html.erb
 - app/views/relation/_ancestors.html.erb
 - app/views/relation/_descendants.html.erb
@@ -571,6 +584,7 @@ files:
 - spec/models/concerns/geoblacklight/solr_document/inspection_spec.rb
 - spec/models/concerns/geoblacklight/solr_document_spec.rb
 - spec/models/concerns/geoblacklight/spatial_search_behavior_spec.rb
+- spec/routing/catalog_routing_spec.rb
 - spec/spec_helper.rb
 - spec/support/backport_test_helpers.rb
 - spec/support/features.rb
@@ -610,7 +624,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.5.2
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: A discovery platform for geospatial holdings
@@ -702,6 +716,7 @@ test_files:
 - spec/models/concerns/geoblacklight/solr_document/inspection_spec.rb
 - spec/models/concerns/geoblacklight/solr_document_spec.rb
 - spec/models/concerns/geoblacklight/spatial_search_behavior_spec.rb
+- spec/routing/catalog_routing_spec.rb
 - spec/spec_helper.rb
 - spec/support/backport_test_helpers.rb
 - spec/support/features.rb

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

@@ -1,11 +0,0 @@
-<div class="modal-header">
-  <button type="button" class="ajax-modal-close close" data-dismiss="modal" aria-hidden="true">×</button>
-  <h3 class="modal-title">View Metadata</h3>
-</div>
-<div class="modal-body">
-  <%= render partial: 'metadata' %>
-</div>
-<div class="modal-footer">
-  <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-  <a href="#" target="_blank" rel="noopener noreferrer" id="btn-metadata-download" class="btn btn-primary">Download</a>
-</div>

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

@@ -1,7 +0,0 @@
-<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>