geoblacklight 0.0.2 → 0.0.3

data/lib/geoblacklight/download/kmz_download.rb

@@ -0,0 +1,14 @@
+class KmzDownload < Download
+  KMZ_DOWNLOAD_PARAMS = { service: 'wms', version: '1.1.0', request: 'GetMap', srsName: 'EPSG:900913', format: 'application/vnd.google-earth.kmz', width: 2000, height: 2000 }
+  
+  def initialize(document)
+    request_params = KMZ_DOWNLOAD_PARAMS.merge(layers: document[:layer_id_s], bbox: document[:solr_bbox].split(' ').join(', '))
+    super(document, {
+      type: 'kmz',
+      extension: 'kmz',
+      request_params: request_params,
+      content_type: 'application/vnd.google-earth.kmz',
+      service_type: :solr_wms_url
+    })
+  end
+end

data/lib/geoblacklight/download/shapefile_download.rb

@@ -0,0 +1,14 @@
+class ShapefileDownload < Download
+  SHAPEFILE_DOWNLOAD_PARAMS = { service: 'wfs', version: '2.0.0', request: 'GetFeature', srsName: 'EPSG:4326', outputformat: 'SHAPE-ZIP' }
+  
+  def initialize(document)
+    request_params = SHAPEFILE_DOWNLOAD_PARAMS.merge(typeName: document[:layer_id_s])
+    super(document, {
+      type: 'shapefile',
+      extension: 'zip',
+      request_params: request_params,
+      content_type: 'application/zip',
+      service_type: :solr_wfs_url
+    })
+  end
+end

data/lib/geoblacklight/engine.rb

@@ -1,15 +1,25 @@
 require 'blacklight'
 require 'leaflet-rails'
+# move towards removing httparty, replaced by faraday
 require 'httparty'
 require 'font-awesome-rails'
+require 'rails_config'
+require 'faraday'
 
 module Geoblacklight
   class Engine < ::Rails::Engine
 
+    Blacklight::Configuration.default_values[:view].split.partials = ['index']
+    Blacklight::Configuration.default_values[:view].delete_field('list')
+
     # GeoblacklightHelper is needed by all helpers, so we inject it
-    # into action view base here. 
+    # into action view base here.
     initializer 'geoblacklight.helpers' do |app|
       ActionView::Base.send :include, GeoblacklightHelper
     end
+
+    config.to_prepare do
+      Geoblacklight.inject!
+    end
   end
 end

data/lib/geoblacklight/solr_document.rb

@@ -0,0 +1,30 @@
+module Geoblacklight
+  # Extends Blacklight::Solr::Document for GeoBlacklight specific functionalit
+  module SolrDocument
+    extend Blacklight::Solr::Document
+
+    def available?
+      public? || same_institution?
+    end
+
+    def public?
+      get(:dc_rights_s) == 'Public'
+    end
+
+    def downloadable?
+      get(:solr_wfs_url) && get(:solr_wms_url) && available?
+    end
+
+    def download_types
+      [{ label: 'Shapefile', type: 'shapefile' }, { label: 'KMZ', type: 'kmz' }]
+    end
+
+    def same_institution?
+      get(:dct_provenance_s) == Settings.Institution
+    end
+
+    def itemtype
+      "http://schema.org/Dataset"
+    end
+  end
+end

data/lib/geoblacklight/version.rb

@@ -1,3 +1,3 @@
 module Geoblacklight
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/geoblacklight/view_helper_override.rb

@@ -0,0 +1,17 @@
+module Geoblacklight
+  module ViewHelperOverride
+    
+    def has_spatial_parameters?
+      params[:bbox]
+    end
+    
+    # Overrides BL method to enable results for spatial only params
+    def has_search_parameters?
+      super || has_spatial_parameters?
+    end
+    
+    def query_has_contraints(params = params)
+      super || has_search_parameters?
+    end
+  end
+end

data/lib/geoblacklight/wms_layer.rb

@@ -0,0 +1,38 @@
+require 'nokogiri'
+require 'geoblacklight/wms_layer/feature_info_response'
+class WmsLayer
+
+  def initialize(params)
+    @params = params.merge(Settings.WMS_PARAMS)
+    @response = FeatureInfoResponse.new(request_response)
+  end
+
+  def url
+    @params['URL']
+  end
+
+  def search_params
+    @params.except('URL')
+  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: 2,
+          open_timeout: 2
+        }
+      end
+    rescue Faraday::Error::ConnectionFailed => error
+      { error: error }
+    rescue Faraday::Error::TimeoutError => error
+      { error: error }
+    end
+  end
+end

data/lib/geoblacklight/wms_layer/feature_info_response.rb

@@ -0,0 +1,30 @@
+class FeatureInfoResponse
+  def initialize(response)
+    @response = response
+  end
+
+  def check
+    if error?
+      @response
+    else
+      format
+    end
+  end
+
+  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
+
+  def error?
+    @response[:error] ||
+      @response.headers['content-type'].slice(0, 9) == 'text/xml'
+  end
+end

data/lib/tasks/geoblacklight.rake

@@ -9,5 +9,20 @@ namespace :geoblacklight do
       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"))
+      docs.each do |doc|
+        Blacklight.solr.add doc
+        Blacklight.solr.commit
+      end
+    end
+  end
+  namespace :downloads do
+    desc 'Delete all cached downloads'
+    task delete: :environment do
+      FileUtils.rm_rf Dir.glob("#{Rails.root}/tmp/downloads/*")
+    end
   end
 end

data/spec/features/download_layer_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+feature 'Download layer', js: true do
+  scenario 'clicking shapefile download button should trigger download' do
+    expect_any_instance_of(ShapefileDownload).to receive(:get).and_return('mit-us-ma-e25zcta5dct-2000-shapefile.zip')
+    visit catalog_path('mit-us-ma-e25zcta5dct-2000')
+    find('button', text: 'Download').click
+    find('a', text: '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' do
+    expect_any_instance_of(KmzDownload).to receive(:get).and_return('mit-us-ma-e25zcta5dct-2000-kmz.kmz')
+    visit catalog_path('mit-us-ma-e25zcta5dct-2000')
+    find('button', text: 'Download').click
+    find('a', text: 'KMZ').click
+    expect(page).to have_css('a', text: 'Your file mit-us-ma-e25zcta5dct-2000-kmz.kmz is ready for download')
+  end
+end

data/spec/features/home_page_spec.rb

@@ -0,0 +1,49 @@
+require 'spec_helper'
+
+feature 'Home page', js: true do # use js: true for tests which require js, but it slows things down
+  before do
+    visit root_path
+  end
+  scenario 'should have facets listed correctly' do
+    within '#facet-panel-collapse' do
+      expect(page).to have_css('div.panel.facet_limit', text: 'Institution')
+      expect(page).to have_css('div.panel.facet_limit', text: 'Publisher')
+      expect(page).to have_css('div.panel.facet_limit', text: 'Subject')
+      expect(page).to have_css('div.panel.facet_limit', text: 'Place')
+      expect(page).to have_css('div.panel.facet_limit', text: 'Year')
+      expect(page).to have_css('div.panel.facet_limit', text: 'Access')
+      expect(page).to have_css('div.panel.facet_limit', text: 'Data type')
+      expect(page).to have_css('div.panel.facet_limit', text: 'Format')
+      expect(page).to have_css('div.panel.facet_limit', text: 'Language')
+    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
+  scenario 'map should be visible' do
+    within '#content' do
+      expect(page).to have_css('#map')
+      expect(page).to have_css('img.leaflet-tile', count: 16)
+    end
+  end
+  scenario 'clicking map search should create a spatial search' do
+    find('#map').double_click
+    within '#map' do
+      find('a.search-control').click
+      expect(page.current_url).to match /bbox=/
+    end
+    expect(page).to have_css '#documents'
+  end
+
+  scenario 'clicking map search should retain current search parameters' do
+    visit '/?f[dc_subject_sm][]=polygon&f[dc_subject_sm][]=boundaries'
+    find('#map').double_click
+    within '#appliedParams' do
+      expect(page).to have_content('Subject polygon')
+      expect(page).to have_content('Subject boundaries')
+    end
+  end
+end

data/spec/features/layer_inspection_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+feature 'Layer inspection', js: true do
+  scenario 'clicking map should trigger inspection' do
+    visit catalog_path('mit-us-ma-e25zcta5dct-2000')
+    find('#map').click
+    expect(page).to have_css('th', text: 'Attribute')
+  end
+end

data/spec/features/layer_preview_spec.rb

@@ -0,0 +1,16 @@
+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')
+    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
+    within '.leaflet-tile-pane' do
+      expect(page).to have_css('.leaflet-layer', count: 2)
+    end
+  end
+end

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

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+feature 'Index view', js: true do
+  before do
+    visit catalog_index_path( f: { dct_provenance_s: ['Stanford']})
+  end
+
+  scenario 'should have documents and map on page' do
+    expect(page).to have_css('#documents')
+    expect(page).to have_css(".document", count: 2)
+    expect(page).to have_css('#map')
+  end
+
+  scenario 'hover on record should produce bounding box on map' do
+    # Needed to find an svg element on the page
+    expect(Nokogiri::HTML.parse(page.body).css('path').length).to eq 0
+    find('.documentHeader', match: :first).trigger(:mouseover)
+    expect(Nokogiri::HTML.parse(page.body).css('path').length).to eq 1
+  end
+
+  scenario 'click on a record area to expand collapse' do
+    within('.documentHeader', match: :first) do
+      expect(page).to_not have_css('.collapse')
+      find('.status-icons').click
+      expect(page).to have_css('.collapse', visible: true)
+    end
+  end
+
+  scenario 'spatial search should reset to page one' do
+    visit '/?f%5Bdc_format_s%5D%5B%5D=Shapefile&page=2'
+    find("#map").double_click
+    expect(find('.page_entries')).to have_content('1 - 10')
+  end
+
+end

data/spec/fixtures/test-berkeley-fields.json

@@ -0,0 +1,44 @@
+[
+  {
+    "uuid": "http://ark.cdlib.org/ark:/28722/bk0012h5z5n",
+    "dc_description_s": "Field boundaries for Napa County.",
+    "dc_format_s": "Shapefile",
+    "dc_identifier_s": "http://ark.cdlib.org/ark:/28722/bk0012h5z5n",
+    "dc_language_s": "English",
+    "dc_publisher_s": "UC Berkeley Libraries",
+    "dc_rights_s": "Public",
+    "dc_subject_sm": [
+      "boundaries",
+      "farming"
+    ],
+    "dc_title_s": "Field Boundaries",
+    "dc_type_s": "Dataset",
+    "dct_references_s": "{\"http://www.opengis.net/def/serviceType/ogc/wfs\":\"http://gis.lib.berkeley.edu:8080/geoserver/wfs\",\"http://www.opengis.net/def/serviceType/ogc/wms\":\"http://gis.lib.berkeley.edu:8080/geoserver/wms\"}",
+    "dct_spatial_sm": [
+      "Napa County",
+      "American Canyon",
+      "Yountville",
+      "St Helena",
+      "Calistoga"
+    ],
+    "dct_temporal_sm": [
+      "2007"
+    ],
+    "dct_issued_s": "2000",
+    "dct_provenance_s": "Berkeley",
+    "georss_box_s": "38.157173 -122.647473 38.861126 -122.084131",
+    "georss_polygon_s": "38.861126 -122.647473 38.861126 -122.084131 38.157173 -122.084131 38.157173 -122.647473 38.861126 -122.647473",
+    "layer_slug_s": "berkeley-fields",
+    "layer_id_s": "UCB:fields",
+    "layer_geom_type_s": "Polygon",
+    "layer_modified_dt": "2014-05-27T18:09:33Z",
+    "solr_bbox": "-122.647473 38.157173 -122.084131 38.861126",
+    "solr_ne_pt": "38.861126,-122.084131",
+    "solr_sw_pt": "38.157173,-122.647473",
+    "solr_geom": "ENVELOPE(-122.647473, -122.084131, 38.861126, 38.157173)",
+    "solr_year_i": 2007,
+    "solr_issued_dt": "2000-01-01T00:00:00Z",
+    "solr_wms_url": "http://gis.lib.berkeley.edu:8080/geoserver/wms",
+    "solr_wfs_url": "http://gis.lib.berkeley.edu:8080/geoserver/wfs"
+  }
+]

data/spec/lib/geoblacklight/controller_override_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe Geoblacklight::ControllerOverride do
+  class GeoblacklightControllerTestClass
+  end
+  
+  before(:each) do
+    @fake_controller = GeoblacklightControllerTestClass.new
+    @fake_controller.extend(Geoblacklight::ControllerOverride)
+  end
+  
+  let(:solr_params) { OpenStruct.new }
+  let(:req_params) { OpenStruct.new }
+  
+  describe 'add_spatial_params' do
+    it 'should return the solr_params when no bbox is given' do
+      expect(@fake_controller.add_spatial_params(solr_params, req_params)).to eq solr_params
+    end
+    it 'should return a spatial search if bbox is given' do
+      req_params.bbox = '123'
+      expect(has_spatial_query(solr_params, req_params)).to be_truthy
+    end
+  end
+end
+
+def has_spatial_query(solr_params, req_params)
+  /Intersects/ =~ @fake_controller.add_spatial_params(solr_params, req_params).fq.first
+end

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

@@ -0,0 +1,15 @@
+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 '#initialize' do
+    it 'should initialize as a KmzDownload object with specific options' do
+      expect(download).to be_an 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
+  end
+end

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

@@ -0,0 +1,14 @@
+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 '#initialize' do
+    it 'should initialize as a ShapefileDownload object with specific options' do
+      expect(download).to be_an 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
+  end
+end