geoblacklight 0.7.0 → 0.7.1

data/lib/geoblacklight/routes.rb

@@ -12,6 +12,7 @@ module Geoblacklight
         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}"
+        get "#{primary_resource}/:id/metadata" => "#{primary_resource}#metadata", as: "metadata_#{primary_resource}"
       end
     end
   end

data/lib/geoblacklight/solr_document.rb

@@ -52,7 +52,13 @@ module Geoblacklight
     end
 
     def bounding_box_as_wsen
-      get(Settings.GEOMETRY_FIELD.to_sym)
+      s = get(Settings.GEOMETRY_FIELD.to_sym)
+      if s =~ /^\s*ENVELOPE\(\s*([-\.\d]+)\s*,\s*([-\.\d]+)\s*,\s*([-\.\d]+)\s*,\s*([-\.\d]+)\s*\)\s*$/
+        w, s, e, n = $1, $4, $2, $3
+        return "#{w} #{s} #{e} #{n}"
+      else
+        return s # as-is, not a WKT
+      end
     end
     ##
     # Provides a convenience method to access a SolrDocument's References

data/lib/geoblacklight/version.rb

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

data/lib/tasks/configure_solr.rake

@@ -0,0 +1,36 @@
+require 'rails/generators'
+require 'generators/geoblacklight/install_generator'
+require 'geoblacklight'
+require 'open-uri'
+
+namespace :geoblacklight do
+  desc 'Copies the default SOLR config for the included Solr'
+  task :configure_solr do
+    files_urls = [
+      {
+        url: 'https://raw.githubusercontent.com/geoblacklight/geoblacklight-schema/v0.3.0/conf/schema.xml',
+        file: 'schema.xml'
+      },
+      {
+        url: 'https://raw.githubusercontent.com/geoblacklight/geoblacklight-schema/v0.3.0/conf/solrconfig.xml',
+        file: 'solrconfig.xml'
+      }
+    ]
+    files_urls.each do |item|
+      puts item.inspect
+      begin
+        open(item[:url]) do |io|
+          IO.copy_stream(io, "jetty/solr/blacklight-core/conf/#{item[:file]}")
+        end
+      rescue Exception => e
+        abort "Unable to download #{item[:file]} from #{item[:url]} #{e.message}"
+      end
+    end
+  end
+
+  # Leaving this task in for backwards compatibility
+  desc 'Runs geoblacklight:configure_solr, you should just use geoblacklight:configure_solr'
+  task :configure_jetty do
+    Rake::Task['geoblacklight:configure_solr'].invoke
+  end
+end

data/lib/tasks/geoblacklight.rake

@@ -2,12 +2,6 @@ require 'rails/generators'
 require 'generators/geoblacklight/install_generator'
 
 namespace :geoblacklight do
-  desc "Copies the default SOLR config for the included Solr"
-  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'
-  end
-
   namespace :solr do
     desc "Put sample data into solr"
     task :seed => :environment do

data/spec/controllers/download_controller_spec.rb

@@ -33,7 +33,7 @@ describe Geoblacklight::DownloadController, type: :controller do
   end
   describe '#hgl' do
     it 'should request file' do
-      expect_any_instance_of(HglDownload).to receive(:get).and_return('success')
+      expect_any_instance_of(Geoblacklight::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

data/spec/features/download_layer_spec.rb

@@ -2,13 +2,13 @@ require 'spec_helper'
 
 feature 'Download layer' do
   scenario 'clicking initial shapefile download button should trigger download', js: true do
-    expect_any_instance_of(ShapefileDownload).to receive(:get).and_return('mit-us-ma-e25zcta5dct-2000-shapefile.zip')
+    expect_any_instance_of(Geoblacklight::ShapefileDownload).to receive(:get).and_return('mit-us-ma-e25zcta5dct-2000-shapefile.zip')
     visit catalog_path('mit-us-ma-e25zcta5dct-2000')
     find('a', text: 'Download Shapefile').click
     expect(page).to have_css('a', text: 'Your file mit-us-ma-e25zcta5dct-2000-shapefile.zip is ready for download')
   end
   scenario 'clicking kmz download button should trigger download', js: true do
-    expect_any_instance_of(KmzDownload).to receive(:get).and_return('mit-us-ma-e25zcta5dct-2000-kmz.kmz')
+    expect_any_instance_of(Geoblacklight::KmzDownload).to receive(:get).and_return('mit-us-ma-e25zcta5dct-2000-kmz.kmz')
     visit catalog_path('mit-us-ma-e25zcta5dct-2000')
     find('button.download-dropdown-toggle').click
     find('a', text: 'Download KMZ').click
@@ -48,7 +48,7 @@ feature 'Download layer' do
     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')
+    expect_any_instance_of(Geoblacklight::HglDownload).to receive(:get).and_return('success')
     visit catalog_path('harvard-g7064-s2-1834-k3')
     find('a', text: 'Download GeoTIFF').click
     within '#hglRequest' do

data/spec/features/metadata_panel_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+feature 'Metadata tools' do
+  feature 'when metadata references are available', js: :true do
+    scenario 'shows up in tools' do
+      visit catalog_path 'stanford-cg357zz0321'
+      expect(page).to have_css 'li.metadata a', text: 'Metadata'
+      click_link 'Metadata'
+      within '.modal-body' do
+        expect(page).to have_css 'div.label', text: 'MODS'
+        expect(page).to have_css 'div.CodeRay', count: 2
+        expect(page).to have_css 'div.label', text: 'ISO 19139'
+      end
+    end
+  end
+  feature 'when metadata references are not available' do
+    scenario 'is not in tools' do
+      visit catalog_path 'mit-us-ma-e25zcta5dct-2000'
+      expect(page).to_not have_css 'li.metadata a', text: 'Metadata'
+    end
+  end
+end

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

@@ -20,7 +20,6 @@
         "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

@@ -21,7 +21,6 @@
   "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

@@ -8,7 +8,7 @@
   "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_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\":\"https://raw.githubusercontent.com/OpenGeoMetadata/edu.tufts/master/165/242/110/132/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"
   ],
@@ -20,7 +20,6 @@
   "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
 }

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

@@ -5,7 +5,7 @@
         "dc_description_s": "This layer is a 10-color shaded relief GeoTIFF that contains high-resolution bathymetric data collected from the Elkhorn Slough region of Monterey Bay, California. The survey for Elkhorn Slough was conducted 8/12/2005 - 8/15/2005. Elkhorn Slough, one of the largest remaining coastal wetlands in California, has been directly subjected to tidal scour since the opening of Moss Landing Harbor in 1946. This erosion endangers the habitat of several rare and endangered species and disrupts the wetland ecosystem as a whole. In 2003, the Seafloor Mapping Lab of California State University, Monterey Bay created the most detailed bathymetry model of the Slough to date using a combination of multi-beam sonar, single-beam sonar and aerial photography. This layer was created as part of the California Seafloor Mapping Project.This project was conducted to determine changes in the pattern of erosion and deposition in Elkhorn Slough since surveys conducted in 1993, 2001 and 2003. Marine data offered here represent the efforts of a comprehensive state waters mapping program for California launched by the California State Coastal Conservancy, Ocean Protection Council, Department of Fish and Game, and the NOAA National Marine Sanctuary Program. The ultimate goal is the creation of a high-resolution 1:24,000 scale geologic and habitat base map series covering all of California's 14,500 km2 state waters out to the 3 mile limit, and support of the state's Marine Life Protection Act Initiative (MLPA) goal to create a statewide network of Marine Protected Areas (MPAs). This statewide project requires, involves and leverages expertise from industry, resource management agencies and academia. The tiered mapping campaign involves the use of state-of-the-art sonar, LIDAR (aerial laser) and video seafloor mapping technologies; computer aided classification and visualization; expert geologic and habitat interpretations codified into strip maps spanning California's land/sea boundary; and the creation of an online, publicly accessible data repository for the dissemination of all mapping products.\n",
         "dc_rights_s": "Restricted",
         "dct_provenance_s": "Stanford",
-        "dct_references_s": "{\"http://schema.org/url\":\"http://purl.stanford.edu/dp018hs9766\",\"http://schema.org/downloadUrl\":\"http://stacks.stanford.edu/file/druid:dp018hs9766/data.zip\",\"http://www.loc.gov/mods/v3\":\"http://purl.stanford.edu/dp018hs9766.mods\",\"http://www.isotc211.org/schemas/2005/gmd/\":\"http://opengeometadata.stanford.edu/metadata/edu.stanford.purl/druid:dp018hs9766/iso19139.xml\",\"http://www.w3.org/1999/xhtml\":\"http://opengeometadata.stanford.edu/metadata/edu.stanford.purl/druid:dp018hs9766/default.html\",\"http://www.opengis.net/def/serviceType/ogc/wcs\":\"http://kurma-podd1.stanford.edu/geoserver/wcs\",\"http://www.opengis.net/def/serviceType/ogc/wms\":\"http://kurma-podd1.stanford.edu/geoserver/wms\"}",
+        "dct_references_s": "{\"http://schema.org/url\":\"http://purl.stanford.edu/dp018hs9766\",\"http://schema.org/downloadUrl\":\"http://stacks.stanford.edu/file/druid:dp018hs9766/data.zip\",\"http://www.loc.gov/mods/v3\":\"http://purl.stanford.edu/dp018hs9766.mods\",\"http://www.isotc211.org/schemas/2005/gmd/\":\"https://raw.githubusercontent.com/OpenGeoMetadata/edu.stanford.purl/master/dp/018/hs/9766/iso19139.xml\",\"http://www.w3.org/1999/xhtml\":\"http://opengeometadata.stanford.edu/metadata/edu.stanford.purl/druid:dp018hs9766/default.html\",\"http://www.opengis.net/def/serviceType/ogc/wcs\":\"http://kurma-podd1.stanford.edu/geoserver/wcs\",\"http://www.opengis.net/def/serviceType/ogc/wms\":\"http://kurma-podd1.stanford.edu/geoserver/wms\"}",
         "layer_id_s": "druid:dp018hs9766",
         "layer_slug_s": "stanford-dp018hs9766",
         "layer_geom_type_s": "Raster",
@@ -39,6 +39,5 @@
         "georss_box_s": "36.8085911 -121.7948738 36.8606925 -121.7389503",
         "georss_polygon_s": "36.8085911 -121.7948738 36.8606925 -121.7948738 36.8606925 -121.7389503 36.8085911 -121.7389503 36.8085911 -121.7948738",
         "solr_geom": "ENVELOPE(-121.7948738, -121.7389503, 36.8606925, 36.8085911)",
-        "solr_bbox": "-121.7948738 36.8085911 -121.7389503 36.8606925",
         "solr_year_i": 2005
       }

data/spec/fixtures/solr_documents/harvard_raster.json

@@ -26,7 +26,7 @@
   ],
   "dc_title_s": "Saint Petersburg Region, Russia, 1834 (Raster Image)",
   "dc_type_s": "Dataset",
-  "dct_references_s": "{\"http://schema.org/DownloadAction\":\"http://hgl.harvard.edu:8080/HGL/HGLOpenDelivery\",\"http://www.opengis.net/def/serviceType/ogc/wcs\":\"http://hgl.harvard.edu:8080/geoserver/wcs\",\"http://www.opengis.net/def/serviceType/ogc/wms\":\"http://hgl.harvard.edu:8080/geoserver/wms\"}",
+  "dct_references_s": "{\"http://schema.org/DownloadAction\":\"http://hgl.harvard.edu:8080/HGL/HGLOpenDelivery\",\"http://www.opengis.net/def/serviceType/ogc/wcs\":\"http://hgl.harvard.edu:8080/geoserver/wcs\",\"http://www.opengis.net/def/serviceType/ogc/wms\":\"http://hgl.harvard.edu:8080/geoserver/wms\",\"http://www.opengis.net/cat/csw/csdgm\":\"https://raw.githubusercontent.com/OpenGeoMetadata/edu.harvard/master/217/121/227/77/fgdc.xml\"}",
   "dct_spatial_sm": [
     "Russia Saint Petersburg"
   ],
@@ -41,7 +41,6 @@
   "layer_id_s": "cite:SDE2.G7064_S2_1834_K3",
   "layer_geom_type_s": "Raster",
   "layer_modified_dt": "2014-05-27T18:09:36Z",
-  "solr_bbox": "30.013108 59.669749 30.875309 60.041712",
   "solr_geom": "ENVELOPE(30.013108, 30.875309, 60.041712, 59.669749)",
   "solr_year_i": 1834,
   "solr_issued_dt": "2000-01-01T00:00:00Z"

data/spec/fixtures/solr_documents/public_iiif_princeton.json

@@ -32,7 +32,6 @@
   "layer_id_s": "02870w62c",
   "layer_geom_type_s": "Raster",
   "layer_modified_dt": "2014-10-09T18:00:18Z",
-  "solr_bbox": "-76.3394 38.6693 -72.1916 46.5798",
   "solr_geom": "ENVELOPE(-76.3394, -72.1916, 46.5798, 38.6693)",
   "solr_year_i": 1778
 }

data/spec/fixtures/solr_documents/public_polygon_mit.json

@@ -36,12 +36,7 @@
   "layer_id_s": "sde:SDE_DATA.US_MA_E25ZCTA5DCT_2000",
   "layer_geom_type_s": "Polygon",
   "layer_modified_dt": "2014-05-27T18:09:34Z",
-  "solr_bbox": "-73.533237 41.230345 -69.898565 42.888068",
-  "solr_ne_pt": "42.888068,-69.898565",
-  "solr_sw_pt": "41.230345,-73.533237",
   "solr_geom": "ENVELOPE(-73.533237, -69.898565, 42.888068, 41.230345)",
   "solr_year_i": 2000,
-  "solr_issued_dt": "2000-01-01T00:00:00Z",
-  "solr_wms_url": "http://arrowsmith.mit.edu:8080/geoserver/wms",
-  "solr_wfs_url": "http://arrowsmith.mit.edu:8080/geoserver/wfs"
+  "solr_issued_dt": "2000-01-01T00:00:00Z"
 }

data/spec/fixtures/solr_documents/restricted-line.json

@@ -5,7 +5,7 @@
         "dc_description_s": "This line shapefile contains contours that were derived from a mosiac of 10 meter digital elevation models for the extent of the Russian River basin, located in Sonoma and Mendocino Counties, California.This layer can be used for watershed analysis and planning in the Russian River region of California.",
         "dc_rights_s": "Restricted",
         "dct_provenance_s": "Stanford",
-        "dct_references_s": "{\"http://schema.org/url\":\"http://purl.stanford.edu/cg357zz0321\",\"http://schema.org/downloadUrl\":\"http://stacks.stanford.edu/file/druid:cg357zz0321/data.zip\",\"http://www.loc.gov/mods/v3\":\"http://purl.stanford.edu/cg357zz0321.mods\",\"http://www.isotc211.org/schemas/2005/gmd/\":\"http://opengeometadata.stanford.edu/metadata/edu.stanford.purl/druid:cg357zz0321/iso19139.xml\",\"http://www.w3.org/1999/xhtml\":\"http://opengeometadata.stanford.edu/metadata/edu.stanford.purl/druid:cg357zz0321/default.html\",\"http://www.opengis.net/def/serviceType/ogc/wfs\":\"http://geowebservices-restricted.stanford.edu/geoserver/wfs\",\"http://www.opengis.net/def/serviceType/ogc/wms\":\"http://geowebservices-restricted.stanford.edu/geoserver/wms\"}",
+        "dct_references_s": "{\"http://schema.org/url\":\"http://purl.stanford.edu/cg357zz0321\",\"http://schema.org/downloadUrl\":\"http://stacks.stanford.edu/file/druid:cg357zz0321/data.zip\",\"http://www.loc.gov/mods/v3\":\"http://purl.stanford.edu/cg357zz0321.mods\",\"http://www.isotc211.org/schemas/2005/gmd/\":\"https://raw.githubusercontent.com/OpenGeoMetadata/edu.stanford.purl/master/cg/357/zz/0321/iso19139.xml\",\"http://www.w3.org/1999/xhtml\":\"http://opengeometadata.stanford.edu/metadata/edu.stanford.purl/druid:cg357zz0321/default.html\",\"http://www.opengis.net/def/serviceType/ogc/wfs\":\"http://geowebservices-restricted.stanford.edu/geoserver/wfs\",\"http://www.opengis.net/def/serviceType/ogc/wms\":\"http://geowebservices-restricted.stanford.edu/geoserver/wms\"}",
         "layer_id_s": "druid:cg357zz0321",
         "layer_slug_s": "stanford-cg357zz0321",
         "layer_geom_type_s": "Line",
@@ -38,6 +38,5 @@
         "georss_box_s": "38.302994 -123.387366 39.398403 -122.52958",
         "georss_polygon_s": "38.302994 -123.387366 39.398403 -123.387366 39.398403 -122.52958 38.302994 -122.52958 38.302994 -123.387366",
         "solr_geom": "ENVELOPE(-123.387366, -122.52958, 39.398403, 38.302994)",
-        "solr_bbox": "-123.387366 38.302994 -122.52958 39.398403",
         "solr_year_i": 2002
       }

data/spec/lib/geoblacklight/download/geojson_download_spec.rb

@@ -1,14 +1,19 @@
 require 'spec_helper'
 
-describe GeojsonDownload do
-  let(:document) { SolrDocument.new(layer_slug_s: 'test', solr_wfs_url: 'http://www.example.com/wfs', layer_id_s: 'stanford-test', solr_bbox: '-180 -90 180 90') }
-  let(:download) { GeojsonDownload.new(document) }
+describe Geoblacklight::GeojsonDownload do
+  let(:document) { SolrDocument.new(layer_slug_s: 'test', solr_wfs_url: 'http://www.example.com/wfs', layer_id_s: 'stanford-test', solr_geom: 'ENVELOPE(-180, 180, 90, -90)') }
+  let(:download) { Geoblacklight::GeojsonDownload.new(document) }
   describe '#initialize' do
     it 'should initialize as a GeojsonDownload object with specific options' do
-      expect(download).to be_an GeojsonDownload
+      expect(download).to be_an Geoblacklight::GeojsonDownload
       options = download.instance_variable_get(:@options)
       expect(options[:content_type]).to eq 'application/json'
       expect(options[:request_params][:typeName]).to eq 'stanford-test'
     end
+    it 'should merge custom options' do
+      download = Geoblacklight::GeojsonDownload.new(document, timeout: 33)
+      options = download.instance_variable_get(:@options)
+      expect(options[:timeout]).to eq 33
+    end
   end
 end

data/spec/lib/geoblacklight/download/geotiff_download_spec.rb

@@ -1,15 +1,20 @@
 require 'spec_helper'
 
-describe GeotiffDownload do
-  let(:document) { SolrDocument.new(layer_slug_s: 'test', layer_id_s: 'stanford-test', solr_bbox: '-180 -90 180 90') }
-  let(:download) { GeotiffDownload.new(document) }
+describe Geoblacklight::GeotiffDownload do
+  let(:document) { SolrDocument.new(layer_slug_s: 'test', layer_id_s: 'stanford-test', solr_geom: 'ENVELOPE(-180, 180, 90, -90)') }
+  let(:download) { Geoblacklight::GeotiffDownload.new(document) }
   describe '#initialize' do
     it 'should initialize as a GeotiffDownload object with specific options' do
-      expect(download).to be_an GeotiffDownload
+      expect(download).to be_an Geoblacklight::GeotiffDownload
       options = download.instance_variable_get(:@options)
       expect(options[:content_type]).to eq 'image/geotiff'
       expect(options[:request_params][:layers]).to eq 'stanford-test'
       expect(options[:reflect]).to be_truthy
     end
+    it 'should merge custom options' do
+      download = Geoblacklight::GeotiffDownload.new(document, timeout: 33)
+      options = download.instance_variable_get(:@options)
+      expect(options[:timeout]).to eq 33
+    end
   end
 end

data/spec/lib/geoblacklight/download/hgl_download_spec.rb

@@ -1,14 +1,19 @@
 require 'spec_helper'
 
-describe HglDownload do
+describe Geoblacklight::HglDownload do
   let(:document) { SolrDocument.new(layer_slug_s: 'test', layer_id_s: 'cite:harvard-test') }
-  let(:download) { HglDownload.new(document, 'foo@example.com') }
+  let(:download) { Geoblacklight::HglDownload.new(document, 'foo@example.com') }
   describe '#initialize' do
     it 'should initialize as an HglDownload object with specific options' do
-      expect(download).to be_an HglDownload
+      expect(download).to be_an Geoblacklight::HglDownload
       options = download.instance_variable_get(:@options)
       expect(options[:request_params]['LayerName']).to eq 'harvard-test'
       expect(options[:request_params]['UserEmail']).to eq 'foo@example.com'
     end
+    it 'should merge custom options' do
+      download = Geoblacklight::HglDownload.new(document, 'foo@example.com', timeout: 33)
+      options = download.instance_variable_get(:@options)
+      expect(options[:timeout]).to eq 33
+    end
   end
 end

data/spec/lib/geoblacklight/download/kmz_download_spec.rb

@@ -1,15 +1,20 @@
 require 'spec_helper'
 
-describe KmzDownload do
-  let(:document) { SolrDocument.new(layer_slug_s: 'test', solr_wfs_url: 'http://www.example.com/wfs', layer_id_s: 'stanford-test', solr_bbox: '-180 -90 180 90') }
-  let(:download) { KmzDownload.new(document) }
+describe Geoblacklight::KmzDownload do
+  let(:document) { SolrDocument.new(layer_slug_s: 'test', solr_wfs_url: 'http://www.example.com/wfs', layer_id_s: 'stanford-test', solr_geom: 'ENVELOPE(-180, 180, 90, -90)') }
+  let(:download) { Geoblacklight::KmzDownload.new(document) }
   describe '#initialize' do
     it 'should initialize as a KmzDownload object with specific options' do
-      expect(download).to be_an KmzDownload
+      expect(download).to be_an Geoblacklight::KmzDownload
       options = download.instance_variable_get(:@options)
       expect(options[:content_type]).to eq 'application/vnd.google-earth.kmz'
       expect(options[:request_params][:layers]).to eq 'stanford-test'
       expect(options[:request_params][:bbox]).to eq '-180, -90, 180, 90'
     end
+    it 'should merge custom options' do
+      download = Geoblacklight::KmzDownload.new(document, timeout: 33)
+      options = download.instance_variable_get(:@options)
+      expect(options[:timeout]).to eq 33
+    end
   end
 end

data/spec/lib/geoblacklight/download/shapefile_download_spec.rb

@@ -1,14 +1,19 @@
 require 'spec_helper'
 
-describe ShapefileDownload do
-  let(:document) { SolrDocument.new(layer_slug_s: 'test', solr_wfs_url: 'http://www.example.com/wfs', layer_id_s: 'stanford-test', solr_bbox: '-180 -90 180 90') }
-  let(:download) { ShapefileDownload.new(document) }
+describe Geoblacklight::ShapefileDownload do
+  let(:document) { SolrDocument.new(layer_slug_s: 'test', solr_wfs_url: 'http://www.example.com/wfs', layer_id_s: 'stanford-test', solr_geom: 'ENVELOPE(-180, 180, 90, -90)') }
+  let(:download) { Geoblacklight::ShapefileDownload.new(document) }
   describe '#initialize' do
     it 'should initialize as a ShapefileDownload object with specific options' do
-      expect(download).to be_an ShapefileDownload
+      expect(download).to be_an Geoblacklight::ShapefileDownload
       options = download.instance_variable_get(:@options)
       expect(options[:content_type]).to eq 'application/zip'
       expect(options[:request_params][:typeName]).to eq 'stanford-test'
     end
+    it 'should merge custom options' do
+      download = Geoblacklight::ShapefileDownload.new(document, timeout: 33)
+      options = download.instance_variable_get(:@options)
+      expect(options[:timeout]).to eq 33
+    end
   end
 end

data/spec/lib/geoblacklight/download_spec.rb

@@ -1,16 +1,16 @@
 require 'spec_helper'
 
-describe Download do
+describe Geoblacklight::Download do
   let(:response) { double('response') }
   let(:get) { double('get') }
   let(:body) { double('body') }
   let(:document) { SolrDocument.new(layer_slug_s: 'test', dct_references_s: {'http://www.opengis.net/def/serviceType/ogc/wms' => 'http://www.example.com/wms'}.to_json) }
   let(:options) { { type: 'shapefile', extension: 'zip', service_type: 'wms', content_type: 'application/zip' } }
-  let(:download) { Download.new(document, options) }
+  let(:download) { Geoblacklight::Download.new(document, options) }
 
   describe '#initialize' do
     it 'should initialize as a Download object' do
-      expect(download).to be_an Download
+      expect(download).to be_an Geoblacklight::Download
     end
   end
   describe '#file_name' do

data/spec/lib/geoblacklight/metadata_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe Geoblacklight::Metadata do
+  let(:response) { double('response') }
+  let(:get) { double('get') }
+  let(:opengeometadata) {
+    Geoblacklight::Metadata.new(
+      Geoblacklight::Reference.new(
+        ['http://www.loc.gov/mods/v3', 'http://purl.stanford.edu/cg357zz0321.mods']
+      )
+    )
+  }
+  describe '#retrieve_metadata' do
+    it 'returns response from an endpoint url' do
+      expect(response).to receive(:get).and_return(get)
+      expect(Faraday).to receive(:new).with(url: 'http://purl.stanford.edu/cg357zz0321.mods').and_return(response)
+      opengeometadata.retrieve_metadata
+    end
+    it 'returns nil when a connection error' do
+      expect(response).to receive(:get).and_return(Faraday::Error::ConnectionFailed)
+      expect(Faraday).to receive(:new).with(url: 'http://purl.stanford.edu/cg357zz0321.mods').and_return(response)
+      opengeometadata.retrieve_metadata
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Mike Graves
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-23 00:00:00.000000000 Z
+date: 2015-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -97,6 +97,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coderay
+  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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -269,12 +283,14 @@ files:
 - app/assets/stylesheets/geoblacklight/_geoblacklight.scss
 - app/assets/stylesheets/geoblacklight/_styles.scss
 - app/assets/stylesheets/geoblacklight/application.scss
+- app/assets/stylesheets/geoblacklight/modules/coderay.scss
 - app/assets/stylesheets/geoblacklight/modules/geosearch.scss
 - app/assets/stylesheets/geoblacklight/modules/home.scss
 - app/assets/stylesheets/geoblacklight/modules/icon-customization.scss
 - app/assets/stylesheets/geoblacklight/modules/icons.scss
 - app/assets/stylesheets/geoblacklight/modules/item.scss
 - app/assets/stylesheets/geoblacklight/modules/layer_opacity.scss
+- app/assets/stylesheets/geoblacklight/modules/metadata.scss
 - app/assets/stylesheets/geoblacklight/modules/mixins.scss
 - app/assets/stylesheets/geoblacklight/modules/results.scss
 - app/assets/stylesheets/geoblacklight/modules/search_widgets.scss
@@ -285,21 +301,24 @@ files:
 - app/helpers/geoblacklight_helper.rb
 - app/views/catalog/_document_action.html.erb
 - app/views/catalog/_document_split.html.erb
+- app/views/catalog/_downloads.html.erb
 - app/views/catalog/_facet_tag_item.html.erb
 - app/views/catalog/_facet_tag_layout.html.erb
 - app/views/catalog/_home_text.html.erb
 - app/views/catalog/_icon_facet.html.erb
 - app/views/catalog/_index_split_default.html.erb
+- app/views/catalog/_metadata.html.erb
 - app/views/catalog/_search_form_no_navbar.html.erb
 - app/views/catalog/_show_default.html.erb
 - app/views/catalog/_show_default_attribute_table.html.erb
 - app/views/catalog/_show_default_viewer_container.html.erb
 - 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/metadata.html.erb
+- app/views/catalog/metadata.js.erb
+- app/views/catalog/web_services.html.erb
 - app/views/catalog/web_services.js.erb
 - app/views/download/hgl.html.erb
 - app/views/shared/_header_navbar.html.erb
@@ -327,6 +346,7 @@ files:
 - lib/geoblacklight/engine.rb
 - lib/geoblacklight/exceptions.rb
 - lib/geoblacklight/item_viewer.rb
+- lib/geoblacklight/metadata.rb
 - lib/geoblacklight/reference.rb
 - lib/geoblacklight/references.rb
 - lib/geoblacklight/routes.rb
@@ -335,6 +355,7 @@ files:
 - lib/geoblacklight/view_helper_override.rb
 - lib/geoblacklight/wms_layer.rb
 - lib/geoblacklight/wms_layer/feature_info_response.rb
+- lib/tasks/configure_solr.rake
 - lib/tasks/geoblacklight.rake
 - spec/controllers/catalog_controller_spec.rb
 - spec/controllers/download_controller_spec.rb
@@ -345,6 +366,7 @@ files:
 - spec/features/layer_inspection_spec.rb
 - spec/features/layer_preview_spec.rb
 - spec/features/layer_with_no_references_spec.rb
+- spec/features/metadata_panel_spec.rb
 - spec/features/saved_searches_spec.rb
 - spec/features/search_bar_spec.rb
 - spec/features/show_page_metadata_spec.rb
@@ -367,6 +389,7 @@ files:
 - spec/lib/geoblacklight/download/shapefile_download_spec.rb
 - spec/lib/geoblacklight/download_spec.rb
 - spec/lib/geoblacklight/item_viewer_spec.rb
+- spec/lib/geoblacklight/metadata_spec.rb
 - spec/lib/geoblacklight/references_spec.rb
 - spec/lib/geoblacklight/solr_document_spec.rb
 - spec/lib/geoblacklight/view_helper_override_spec.rb
@@ -416,6 +439,7 @@ test_files:
 - spec/features/layer_inspection_spec.rb
 - spec/features/layer_preview_spec.rb
 - spec/features/layer_with_no_references_spec.rb
+- spec/features/metadata_panel_spec.rb
 - spec/features/saved_searches_spec.rb
 - spec/features/search_bar_spec.rb
 - spec/features/show_page_metadata_spec.rb
@@ -438,6 +462,7 @@ test_files:
 - spec/lib/geoblacklight/download/shapefile_download_spec.rb
 - spec/lib/geoblacklight/download_spec.rb
 - spec/lib/geoblacklight/item_viewer_spec.rb
+- spec/lib/geoblacklight/metadata_spec.rb
 - spec/lib/geoblacklight/references_spec.rb
 - spec/lib/geoblacklight/solr_document_spec.rb
 - spec/lib/geoblacklight/view_helper_override_spec.rb