geoblacklight 0.3.4 → 0.4.0

data/lib/generators/geoblacklight/install_generator.rb

@@ -28,8 +28,8 @@ module Geoblacklight
     end
 
     def fixtures
-      FileUtils.mkdir_p 'spec/fixtures/geoblacklight_schema'
-      system 'curl -L https://raw.githubusercontent.com/geoblacklight/geoblacklight-schema/master/examples/selected.json -o spec/fixtures/geoblacklight_schema/selected.json'
+      FileUtils.mkdir_p 'spec/fixtures/solr_documents'
+      directory 'solr_documents', 'spec/fixtures/solr_documents'
     end
 
     def add_unique_key
@@ -42,6 +42,7 @@ module Geoblacklight
       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

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

@@ -1,4 +1,5 @@
 //= require geoblacklight/geoblacklight
 //= require geoblacklight/viewers
 //= require geoblacklight/modules
+//= require geoblacklight/downloaders
 //= require blacklight_range_limit

data/lib/geoblacklight.rb

@@ -9,11 +9,13 @@ module Geoblacklight
   require 'geoblacklight/item_viewer'
   require 'geoblacklight/solr_document'
   require 'geoblacklight/wms_layer'
+  require 'geoblacklight/wms_layer/feature_info_response'
   require 'geoblacklight/download'
   require 'geoblacklight/download/geojson_download'
   require 'geoblacklight/download/geotiff_download'
   require 'geoblacklight/download/kmz_download'
   require 'geoblacklight/download/shapefile_download'
+  require 'geoblacklight/download/hgl_download'
   require 'geoblacklight/reference'
   require 'geoblacklight/references'
   def self.inject!

data/lib/geoblacklight/constants.rb

@@ -13,7 +13,8 @@ module Geoblacklight
       url: 'http://schema.org/url',
       wcs: 'http://www.opengis.net/def/serviceType/ogc/wcs',
       wfs: 'http://www.opengis.net/def/serviceType/ogc/wfs',
-      wms: 'http://www.opengis.net/def/serviceType/ogc/wms'
+      wms: 'http://www.opengis.net/def/serviceType/ogc/wms',
+      hgl: 'http://schema.org/DownloadAction'
     }
   end
 end

data/lib/geoblacklight/download/hgl_download.rb

@@ -0,0 +1,17 @@
+class HglDownload < Download
+  def initialize(document, email)
+
+    request_params = {
+      "LayerName" => document[:layer_id_s].sub(/^cite:/, ''),
+      "UserEmail" => email
+    }
+    super(document, {
+      request_params: request_params,
+      service_type: 'hgl'
+    })
+  end
+
+  def get
+    initiate_download
+  end
+end

data/lib/geoblacklight/engine.rb

@@ -6,6 +6,7 @@ require 'font-awesome-rails'
 require 'rails_config'
 require 'faraday'
 require 'blacklight_range_limit'
+require 'nokogiri'
 
 module Geoblacklight
   class Engine < ::Rails::Engine

data/lib/geoblacklight/solr_document.rb

@@ -35,6 +35,10 @@ module Geoblacklight
       return references.download.to_hash unless references.download.blank?
     end
 
+    def hgl_download
+      return references.hgl.to_hash unless references.hgl.blank?
+    end
+
     def same_institution?
       get(:dct_provenance_s).downcase == Settings.INSTITUTION.downcase
     end

data/lib/geoblacklight/version.rb

@@ -1,3 +1,3 @@
 module Geoblacklight
-  VERSION = '0.3.4'
+  VERSION = '0.4.0'
 end

data/lib/geoblacklight/wms_layer.rb

@@ -1,40 +1,40 @@
-require 'nokogiri'
-require 'geoblacklight/wms_layer/feature_info_response'
-class WmsLayer
+module Geoblacklight
+  class WmsLayer
 
-  def initialize(params)
-    @params = params.merge(Settings.WMS_PARAMS)
-    @response = FeatureInfoResponse.new(request_response)
-  end
+    def initialize(params)
+      @params = params.merge(Settings.WMS_PARAMS)
+      @response = Geoblacklight::FeatureInfoResponse.new(request_response)
+    end
 
-  def url
-    @params['URL']
-  end
+    def url
+      @params['URL']
+    end
 
-  def search_params
-    @params.except('URL')
-  end
+    def search_params
+      @params.except('URL')
+    end
 
-  def get_feature_info
-    @response.check
-  end
+    def get_feature_info
+      @response.check
+    end
 
-  def request_response
-    begin
-      conn = Faraday.new(url: url)
-      conn.get do |request|
-        request.params = search_params
-        request.options = {
-          timeout: Settings.TIMEOUT_WMS,
-          open_timeout: Settings.TIMEOUT_WMS
-        }
+    def request_response
+      begin
+        conn = Faraday.new(url: url)
+        conn.get do |request|
+          request.params = search_params
+          request.options = {
+            timeout: Settings.TIMEOUT_WMS,
+            open_timeout: Settings.TIMEOUT_WMS
+          }
+        end
+      rescue Faraday::Error::ConnectionFailed => error
+        Geoblacklight.logger.error error.inspect
+        { error: error.inspect }
+      rescue Faraday::Error::TimeoutError => error
+        Geoblacklight.logger.error error.inspect
+        { error: error.inspect }
       end
-    rescue Faraday::Error::ConnectionFailed => error
-      Geoblacklight.logger.error error.inspect
-      { error: error.inspect }
-    rescue Faraday::Error::TimeoutError => error
-      Geoblacklight.logger.error error.inspect
-      { error: error.inspect }
     end
   end
 end

data/lib/geoblacklight/wms_layer/feature_info_response.rb

@@ -1,30 +1,32 @@
-class FeatureInfoResponse
-  def initialize(response)
-    @response = response
-  end
-
-  def check
-    if error?
-      @response
-    else
-      format
+module Geoblacklight
+  class FeatureInfoResponse
+    def initialize(response)
+      @response = response
     end
-  end
 
-  def format
-    page = Nokogiri::HTML(@response.body)
-    table_values = { values: [] }
-    page.css('th').each do |th|
-      table_values[:values].push([th.text])
+    def check
+      if error?
+        @response
+      else
+        format
+      end
     end
-    page.css('td').each_with_index do |td, index|
-      table_values[:values][index].push(td.text)
+
+    def format
+      page = Nokogiri::HTML(@response.body)
+      table_values = { values: [] }
+      page.css('th').each do |th|
+        table_values[:values].push([th.text])
+      end
+      page.css('td').each_with_index do |td, index|
+        table_values[:values][index].push(td.text)
+      end
+      table_values
     end
-    table_values
-  end
 
-  def error?
-    @response[:error] ||
-      @response.headers['content-type'].slice(0, 9) == 'text/xml'
+    def error?
+      @response[:error] ||
+        @response.headers['content-type'].slice(0, 9) == 'text/xml'
+    end
   end
-end
+end

data/lib/tasks/geoblacklight.rake

@@ -5,11 +5,11 @@ namespace :geoblacklight do
   namespace :solr do
     desc "Put sample data into solr"
     task :seed => :environment do
-      docs = JSON::parse(File.read("#{Rails.root}/spec/fixtures/geoblacklight_schema/selected.json"))
+      docs = Dir['spec/fixtures/solr_documents/*.json'].map { |f| JSON.parse File.read(f) }.flatten
       Blacklight.solr.add docs
       Blacklight.solr.commit
     end
-    
+
     desc "Ingests a GeoHydra transformed.json"
     task :ingest_all => :environment do
       docs = JSON::parse(File.read("#{Rails.root}/tmp/transformed.json"))

data/spec/controllers/download_controller_spec.rb

@@ -4,7 +4,7 @@ describe Geoblacklight::DownloadController, type: :controller do
   describe '#file' do
     describe 'restricted file' do
       it 'should redirect to login for authentication' do
-        get :file, id: 'stanford-jf841ys4828-shapefile', format: 'zip'
+        get :file, id: 'stanford-cg357zz0321-shapefile', format: 'zip'
         expect(response.status).to eq 401
       end
     end
@@ -20,7 +20,7 @@ describe Geoblacklight::DownloadController, type: :controller do
   describe '#show' do
     describe 'restricted file' do
       it 'should redirect to login for authentication' do
-        get 'show', id: 'stanford-jf841ys4828', format: 'json'
+        get 'show', id: 'stanford-cg357zz0321', format: 'json'
         expect(response.status).to eq 401
       end
     end
@@ -31,4 +31,15 @@ describe Geoblacklight::DownloadController, type: :controller do
       end
     end
   end
+  describe '#hgl' do
+    it 'should request file' do
+      expect_any_instance_of(HglDownload).to receive(:get).and_return('success')
+      get :hgl, id: 'harvard-g7064-s2-1834-k3', email: 'foo@example.com'
+      expect(response.status).to eq 200
+    end
+    it 'should render form' do
+      get :hgl, id: 'harvard-g7064-s2-1834-k3'
+      expect(response).to render_template('hgl')
+    end
+  end
 end

data/spec/features/download_layer_spec.rb

@@ -21,20 +21,20 @@ feature 'Download layer' do
     expect(page).to have_css('li a', text: 'Download KMZ')
   end
   scenario 'restricted layer should not have download available to non logged in user' do
-    visit catalog_path('stanford-jf841ys4828')
+    visit catalog_path('stanford-cg357zz0321')
     expect(page).to have_css 'a', text: 'Login to view and download'
     expect(page).to_not have_css 'button', text: 'Download Shapefile'
   end
   scenario 'restricted layer should have download available to logged in user' do
     sign_in
-    visit catalog_path('stanford-jf841ys4828')
+    visit catalog_path('stanford-cg357zz0321')
     expect(page).to_not have_css 'a', text: 'Login to view and download'
     expect(page).to have_css 'a', text: 'Download Shapefile'
     expect(page).to have_css 'button.download-dropdown-toggle'
   end
   scenario 'layer with direct download and wms/wfs should include all download types' do
     sign_in
-    visit catalog_path('stanford-jf841ys4828')
+    visit catalog_path('stanford-cg357zz0321')
     expect(page).to have_css 'a', text: 'Download Shapefile'
     find('button.download-dropdown-toggle').click
     expect(page).to have_css 'li.dropdown-header', text: 'Original'
@@ -42,4 +42,19 @@ feature 'Download layer' do
     expect(page).to have_css 'li a', text: 'Download Shapefile'
     expect(page).to have_css 'li a', text: 'Download KMZ'
   end
+  scenario 'clicking GeoTIFF button for Harvard layer should show email form', js: true do
+    visit catalog_path('harvard-g7064-s2-1834-k3')
+    find('a', text: 'Download GeoTIFF').click
+    expect(page).to have_css('#hglRequest')
+  end
+  scenario 'submitting email form should trigger HGL request', js: true do
+    expect_any_instance_of(HglDownload).to receive(:get).and_return('success')
+    visit catalog_path('harvard-g7064-s2-1834-k3')
+    find('a', text: 'Download GeoTIFF').click
+    within '#hglRequest' do
+      fill_in('Email', with: 'foo@example.com')
+      click_button('Request')
+    end
+    expect(page).to have_content('You should receive an email when your download is ready')
+  end
 end

data/spec/features/home_page_spec.rb

@@ -14,11 +14,11 @@ feature 'Home page', js: true do # use js: true for tests which require js, but
   end
   scenario 'find by category' do
     expect(page).to have_css '.category-block', count: 4
-    expect(page).to have_css '.home-facet-link', count: 28
+    expect(page).to have_css '.home-facet-link', count: 29
     expect(page).to have_css 'a.more_facets_link', count: 4
-    click_link 'Census'
+    click_link 'Elevation'
     expect(page).to have_css '.filterName', text: 'Subject'
-    expect(page).to have_css '.filterValue', text: 'Census'
+    expect(page).to have_css '.filterValue', text: 'Elevation'
   end
   scenario 'map should be visible' do
     within '#main-container' do

data/spec/features/layer_preview_spec.rb

@@ -2,10 +2,10 @@ require 'spec_helper'
 
 feature 'Layer preview', js: true do
   scenario 'Restricted layer should show bounding box' do
-    visit catalog_path('mit-us-ma-cambridge-s1consv-2007')
+    visit catalog_path('stanford-cg357zz0321')
     expect(Nokogiri::HTML.parse(page.body).css('path').length).to eq 1
   end
-  
+
   scenario 'Public layer should show wms layer not bounding box' do
     visit catalog_path('mit-us-ma-e25zcta5dct-2000')
     expect(Nokogiri::HTML.parse(page.body).css('path').length).to eq 0
@@ -13,4 +13,4 @@ feature 'Layer preview', js: true do
       expect(page).to have_css('.leaflet-layer', count: 2)
     end
   end
-end
+end

data/spec/features/split_view.html.erb_spec.rb

@@ -24,10 +24,8 @@ feature 'Index view', js: true do
       expect(page).to have_css('div.panel.facet_limit', text: 'Format')
     end
     click_link 'Institution'
-    expect(page).to have_css('a.facet_select', text: 'Harvard', visible: true)
     expect(page).to have_css('a.facet_select', text: 'Tufts', visible: true)
     expect(page).to have_css('a.facet_select', text: 'MIT', visible: true)
-    expect(page).to have_css('a.facet_select', text: 'MassGIS', visible: true)
     expect(page).to have_css('a.facet_select', text: 'Stanford', visible: true)
   end
 
@@ -48,9 +46,9 @@ feature 'Index view', js: true do
   end
 
   scenario 'spatial search should reset to page one' do
-    visit '/?f%5Bdc_format_s%5D%5B%5D=Shapefile&page=2'
+    visit '/?per_page=5&q=%2A&page=2'
     find("#map").double_click
-    expect(find('.page_entries')).to have_content('1 - 10')
+    expect(find('.page_entries')).to have_content('1 - 2 of 2')
   end
 
   scenario 'clicking map search should retain current search parameters' do

data/spec/fixtures/solr_documents/actual-papermap1.json

@@ -0,0 +1,26 @@
+{
+        "uuid": "urn:arrowsmith.mit.edu:MIT.001145244",
+        "dc_description_s": "Panel title. Depths shown by isolines. \"Geological map [copyright] NERC 1996.\" Also available on flat sheet. \"Sheet 1\"--on panel. Includes text, notes, organizations' logos, and ancillary map of \"Orogenic terranes of Britain, Ireland and surrounding seas.\"",
+        "dc_format_s": "Paper",
+        "dc_identifier_s": "urn:arrowsmith.mit.edu:MIT.001145244",
+        "dc_language_s": "English",
+        "dc_publisher_s": "British Geological Survey",
+        "dc_rights_s": "Public",
+        "dc_title_s": "1:1 500 000 series [cartographic material] : tectonic map of Britain, Ireland and adjacent areas / British Geological Survey ; Geological Survey of Ireland ; Geological Survey of Northern Ireland.",
+        "dc_type_s": "Dataset",
+        "dct_references_s": "{\"http://schema.org/url\":\"http://library.mit.edu/item/001145244\",\"http://www.opengis.net/cat/csw/csdgm\":\"http://opengeometadata.stanford.edu/metadata/org.opengeoportal/MIT:001145244/fgdc.xml\",\"http://www.w3.org/1999/xhtml\":\"http://opengeometadata.stanford.edu/metadata/org.opengeoportal/MIT:001145244/fgdc.html\"}",
+        "dct_temporal_sm": [
+          "1996"
+        ],
+        "dct_issued_s": "2000",
+        "dct_provenance_s": "MIT",
+        "georss_box_s": "49.0 -13.0 62.0 4.0",
+        "georss_polygon_s": "62.0 -13.0 62.0 4.0 49.0 4.0 49.0 -13.0 62.0 -13.0",
+        "layer_slug_s": "mit-001145244",
+        "layer_id_s": "MIT:001145244",
+        "layer_geom_type_s": "Paper Map",
+        "layer_modified_dt": "2014-12-04T21:32:59Z",
+        "solr_bbox": "-13.0 49.0 4.0 62.0",
+        "solr_geom": "ENVELOPE(-13.0, 4.0, 62.0, 49.0)",
+        "solr_year_i": 1996
+      }

data/spec/fixtures/solr_documents/actual-point1.json

@@ -0,0 +1,27 @@
+{
+  "uuid": "urn:columbia.edu:Columbia.landinfo_global_aet",
+  "dc_description_s": "Actual Evapotrans is a point theme representing the sum of evaporation and plant transpiration to the atmosphere from throughout the world.  Measurements are represented by points at every.5 degrees and provided for every month of the year. This dataset is a part of the Global Climate Database from the Global Change Department National Institute of Public Health and Environmental Protection.",
+  "dc_format_s": "Shapefile",
+  "dc_identifier_s": "urn:columbia.edu:Columbia.landinfo_global_aet",
+  "dc_language_s": "English",
+  "dc_rights_s": "Public",
+  "dc_title_s": "Actual Evapotrans",
+  "dc_type_s": "Dataset",
+  "dct_references_s": "{\"http://www.opengis.net/cat/csw/csdgm\":\"http://opengeometadata.stanford.edu/metadata/org.opengeoportal/Columbia:Columbia.landinfo_global_aet/fgdc.xml\",\"http://www.w3.org/1999/xhtml\":\"http://opengeometadata.stanford.edu/metadata/org.opengeoportal/Columbia:Columbia.landinfo_global_aet/fgdc.html\"}",
+  "dct_spatial_sm": [
+    "World"
+  ],
+  "dct_temporal_sm": [
+    "1996"
+  ],
+  "dct_provenance_s": "Columbia",
+  "georss_box_s": "-56.0 -179.5 83.0 180.0",
+  "georss_polygon_s": "83.0 -179.5 83.0 180.0 -56.0 180.0 -56.0 -179.5 83.0 -179.5",
+  "layer_slug_s": "columbia-columbia-landinfo-global-aet",
+  "layer_id_s": "Columbia:Columbia.landinfo_global_aet",
+  "layer_geom_type_s": "Point",
+  "layer_modified_dt": "2014-12-12T19:54:57Z",
+  "solr_bbox": "-179.5 -56.0 180.0 83.0",
+  "solr_geom": "ENVELOPE(-179.5, 180.0, 83.0, -56.0)",
+  "solr_year_i": 1996
+}

data/spec/fixtures/solr_documents/actual-polygon1.json

@@ -0,0 +1,26 @@
+{
+  "uuid": "urn:geodata.tufts.edu:Tufts.CambridgeGrid100_04",
+  "dc_description_s": "This polygon dataset is a 100 foot grid overlay for Cambridge, MA.",
+  "dc_format_s": "Shapefile",
+  "dc_identifier_s": "urn:geodata.tufts.edu:Tufts.CambridgeGrid100_04",
+  "dc_language_s": "English",
+  "dc_publisher_s": "Cambridge (Mass.) Geographic Information Systems",
+  "dc_rights_s": "Public",
+  "dc_title_s": "100 Foot Grid Cambridge MA 2004",
+  "dc_type_s": "Dataset",
+  "dct_references_s": "{\"http://www.opengis.net/def/serviceType/ogc/wfs\":\"http://geoserver01.uit.tufts.edu/wfs\",\"http://www.opengis.net/def/serviceType/ogc/wms\":\"http://geoserver01.uit.tufts.edu/wms\",\"http://www.opengis.net/cat/csw/csdgm\":\"http://opengeometadata.stanford.edu/metadata/org.opengeoportal/sde:GISPORTAL.GISOWNER01.CAMBRIDGEGRID100_04/fgdc.xml\",\"http://www.w3.org/1999/xhtml\":\"http://opengeometadata.stanford.edu/metadata/org.opengeoportal/sde:GISPORTAL.GISOWNER01.CAMBRIDGEGRID100_04/fgdc.html\"}",
+  "dct_temporal_sm": [
+    "2004"
+  ],
+  "dct_issued_s": "2005",
+  "dct_provenance_s": "Tufts",
+  "georss_box_s": "42.34757 -71.163984 42.408316 -71.052581",
+  "georss_polygon_s": "42.408316 -71.163984 42.408316 -71.052581 42.34757 -71.052581 42.34757 -71.163984 42.408316 -71.163984",
+  "layer_slug_s": "tufts-cambridgegrid100-04",
+  "layer_id_s": "sde:GISPORTAL.GISOWNER01.CAMBRIDGEGRID100_04",
+  "layer_geom_type_s": "Polygon",
+  "layer_modified_dt": "2014-12-04T21:33:07Z",
+  "solr_bbox": "-71.163984 42.34757 -71.052581 42.408316",
+  "solr_geom": "ENVELOPE(-71.163984, -71.052581, 42.408316, 42.34757)",
+  "solr_year_i": 2004
+}