geoblacklight 0.0.2 → 0.0.3

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

@@ -0,0 +1,8 @@
+<h2>
+  <span itemprop="name"><%= document_heading(document) %></span>
+  <small>
+    <%= layer_type_image(document['layer_geom_type_s']) %>
+    <%= layer_institution_image(document['dct_provenance_s']) %>
+    <%= layer_access_image(document['dc_rights_s']) %>
+  </small>
+</h2>

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

@@ -1,12 +1,5 @@
-<%-
-  # Compare with render_document_functions_partial helper, and
-  # _document_functions partial. BL actually has two groups
-  # of document-related tools. "document functions" by default
-  # contains Bookmark functionality shown on both results and
-  # item view. While "document tools" contains external export type
-  # functions by default only on detail.
+<% document ||= @document %>
 
--%>
 <div id='geoblacklight-tools'>
   <div class="panel panel-default show-tools">
     <div class="panel-heading"> 
@@ -14,10 +7,7 @@
     </div>
     <div class="panel-body">
     <ul class="list-group">
-    <%= render_show_doc_actions @document %>
-      <!-- <a href="#" data-no-turbolink class="list-group-item disabled">
-        <i class="fa fa-li fa-star-o"></i> Bookmark
-      </a> -->
+      <%= render_show_doc_actions @document, wrapping_class: 'list-group-item' %>
       <% if @document.respond_to?( :to_email_text ) %>
         <%= link_to email_helper, email_catalog_path(:id => @document), {:id => 'emailLink', :data => {:ajax_modal => "trigger"}, :class => 'list-group-item'} %>
       <%- end -%>
@@ -25,52 +15,22 @@
         <%= link_to sms_helper, sms_catalog_path(:id => @document), {:id => 'smsLink', :data => {:ajax_modal => "trigger"}, :class => 'list-group-item'} %>
       <%- end -%>
       <a href="#" data-no-turbolink class="list-group-item">
-        <i class="fa fa-li fa-bookmark"></i>Cite This
-      </a>
+        <i class="fa fa-bookmark fa-fw"></i>&nbsp;Cite This
+      </a>    
     </ul>
-    <ul class="list-group">
-    <a id="download-metadata" data-no-turbolink class="list-group-item"
-      <% if @document['dct_provenance_s'] == 'Stanford' %>
-      href="<%= @document['dc_identifier_s'] %>.mods"
-      <% else %>
-      href="#" 
-      <% end %>
-      >
-      <i class="fa fa-li fa-download" id="icon-metadata"></i>Metadata
-    </a>
-    <% if @document['dc_rights_s'] == 'Restricted' and @document['dct_provenance_s'] != 'Stanford' %>
-      <a href="#" data-no-turbolink class="list-group-item">
-        <i class="fa fa-li fa-download" id="icon-request"></i>Request This
-      </a><br/>
-    <% else %>
-      <a href="#" id="download-kml" data-no-turbolink class="list-group-item">
-        <i class="fa fa-li fa-download" id="icon-kml"></i>KML
-      </a>
-      <% if @document['dc_format_s'] == 'Shapefile' %>
-        <a href="#" id="download-shapefile" data-no-turbolink class="list-group-item">
-          <i class="fa fa-li fa-download" id="icon-shapefile"></i>Shapefile
-        </a>
-      <% end %>
+    <% if document.downloadable? %>
+      <div class='btn-group'>
+        <%= button_tag(type: 'button', class: 'btn btn-default dropdown-toggle', data: { toggle: 'dropdown' }) do %>
+          Download <span class='caret'></span>
+        <% end %>
+        <ul class="dropdown-menu" role="menu">
+          <% document.download_types.each do |type| %>
+            <%= content_tag(:li) do %>
+              <%= link_to(type[:label], '', data: { download_path: "#{download_path(document[:layer_slug_s], type: type[:type])}" }) %>
+            <% end %>
+          <% end %>
+        </ul>
+      </div>
     <% end %>
- 
-    </ul>
-    <% unless @document['dc_rights_s'] == 'Restricted' and @document['dct_provenance_s'] != 'Stanford' %>
-  
-    <ul class="list-group">
-      <a href="<%= @document['solr_wms_url'] %>?request=GetCapabilities" data-no-turbolink class="list-group-item">
-        <i class="fa fa-li fa-link"></i>WMS Link
-      </a>
-      <% if @document['layer_geom_type_s'] == 'Raster' %>
-        <a href="<%= @document['solr_wcs_url'] %>?request=GetCapabilities" data-no-turbolink class="list-group-item">
-          <i class="fa fa-li fa-link"></i>WCS Link
-        </a>
-        <% else %>
-      <a href="<%= @document['solr_wfs_url'] %>?request=GetCapabilities" data-no-turbolink class="list-group-item">
-        <i class="fa fa-li fa-link"></i>WFS Link
-      </a>
-      <% end %>
-    </ul>
-    <% end %>
-    </div>
   </div>
 </div>

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

@@ -0,0 +1,38 @@
+<% document ||= @document %>
+<div class="geoblacklight-view-panel">
+
+  <dl class="dl-horizontal">
+    <% unless document['dc_creator_sm'].nil? %>
+      <dt>Author</dt>
+      <dd itemprop="author"><%= document['dc_creator_sm'].join(', ') %>&nbsp;</dd>
+  <% end %>
+    <% unless document['dc_publisher_s'].nil? %>
+      <dt>Publisher</dt>
+      <dd itemprop="publisher"><%= document['dc_publisher_s'] %>&nbsp;</dd>
+  <% end %>
+    <dt>Year</dt>
+    <dd itemprop="dateCreated"><%= document['solr_year_i'] %>&nbsp;</dd>
+    <dt>Abstract</dt>
+    <dd id="" itemprop="description"><%= abstract_truncator(document['dc_description_s']) %>&nbsp;</dd>
+    <% unless document['dct_isPartOf_sm'].nil? %>
+      <dt>Collection</dt>
+      <dd itemprop="isPartOf"><%= document['dct_isPartOf_sm'].sort.join(', ') %>&nbsp;</dd>
+    <% end %>
+    <% if document['dct_provenance_s'] == 'Stanford' and not document['dc_identifier_s'].nil? %>
+      <dt>Citation</dt>
+      <dd itemprop="url"><%= link_to document['dc_identifier_s'], document['dc_identifier_s'] %>&nbsp;</dd>
+    <% end %>
+    <% unless document['dct_spatial_sm'].nil? %>
+      <dt>Places</dt>
+      <dd itemprop="spatial"><%= document['dct_spatial_sm'].sort.join(', ') %>&nbsp;</dd>
+    <% end %>
+    <% unless document['dc_subject_sm'].nil? %>
+      <dt>Subjects</dt>
+      <dd itemprop="keywords"><%= document['dc_subject_sm'].sort.join(', ') %>&nbsp;</dd>
+    <% end %>
+    <% unless document['dct_temporal_sm'].nil? %>
+      <dt>Years</dt>
+      <dd itemprop="temporal"><%= document['dct_temporal_sm'].sort.join(', ') %>&nbsp;</dd>
+    <% end %>
+  </dl>
+</div>

data/config/initializers/rails_config.rb

@@ -0,0 +1,3 @@
+RailsConfig.setup do |config|
+  config.const_name = "Settings"
+end

data/config/jetty.yml

@@ -0,0 +1,6 @@
+default:
+  jetty_port: 8983
+test:
+  jetty_port: <%= ENV['TEST_JETTY_PORT'] || 8888 %>
+  jetty_home: <%= ENV['TEST_JETTY_PATH'] || File.expand_path(File.join('..', 'jetty'), __FILE__) %>
+  startup_wait: 15

data/config/locales/geoblacklight.en.yml

@@ -0,0 +1,5 @@
+en:
+  geoblacklight:
+    download:
+      success: 'Your file %{title} is ready for download'
+      error: 'Sorry, the requested file could not be downloaded'

data/geoblacklight.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ['drh@stanford.edu', 'pjreed@stanford.edu']
   spec.summary       = 'A discovery platform for geospatial holdings'
   spec.description   = 'GeoBlacklight started at Stanford and its goal is to provide a world-class discovery platform for geospatial (GIS) holdings. It is an open collaborative project aiming to build off of the successes of the Blacklight Solr-powered discovery interface and the multi-institutional OpenGeoportal federated metadata sharing communities.'
-  spec.homepage      = 'http://github.com/sul-dlss/geoblacklight'
+  spec.homepage      = 'http://github.com/geoblacklight/geoblacklight'
   spec.license       = 'Apache 2.0'
 
   spec.files         = `git ls-files -z`.split(%Q{\x0})
@@ -18,19 +18,19 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'rails', '~> 4.0.0' # Rails 4.1.x has Spring on by default
-  spec.add_dependency 'blacklight', '~> 5.4.0'
-  spec.add_dependency 'bootstrap-sass', '~> 3.0'
+  spec.add_dependency 'blacklight', '~> 5.7.1'
   spec.add_dependency 'leaflet-rails', '~> 0.7.3'
   spec.add_dependency 'blacklight_range_limit', '~> 5.0.1'
   spec.add_dependency 'font-awesome-rails', '~> 4.1.0.0'
   spec.add_dependency 'httparty', '~> 0.13.1'
+  spec.add_dependency 'rails_config'
+  spec.add_dependency 'faraday'
 
   spec.add_development_dependency 'bundler', '~> 1.5'
   spec.add_development_dependency 'rake', '~> 10.3.2'
   spec.add_development_dependency 'rspec-rails', '~> 3.0.1'
   spec.add_development_dependency 'jettywrapper', '~> 1.7.0'
-  spec.add_development_dependency 'engine_cart', '~> 0.3.4'
+  spec.add_development_dependency 'engine_cart', '~> 0.4.0'
   spec.add_development_dependency 'capybara', '~> 2.3.0'
   spec.add_development_dependency 'poltergeist', '~> 1.5.0'
 end

data/lib/generators/geoblacklight/install_generator.rb

@@ -17,9 +17,19 @@ module Geoblacklight
       copy_file "catalog_controller.rb", "app/controllers/catalog_controller.rb"
     end
 
+    def rails_config
+      copy_file 'settings.yml', 'config/settings.yml'
+    end
+
+    def include_geoblacklight_solrdocument
+      inject_into_file 'app/models/solr_document.rb', after: 'include Blacklight::Solr::Document' do
+        "\n include Geoblacklight::SolrDocument"
+      end
+    end
+
     def fixtures
-      FileUtils.mkdir_p "spec/fixtures/geoblacklight_schema"
-      copy_file "../../../../schema/examples/selected.json", "spec/fixtures/geoblacklight_schema/selected.json"
+      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'
     end
 
     def add_unique_key
@@ -27,20 +37,40 @@ module Geoblacklight
         "\n  self.unique_key = 'layer_slug_s'"
       end
     end
-    
+
     def inject_routes
-      # route 'devise_for :users'
-      # route 'constraints(:id => /[0-9A-Za-z\-\.\:\_\/]+/) do
-      #          blacklight_for :catalog
-      #          resources :bookmarks
-      #        end'
-      # route 'get \'/catalog/facet/:id\' => \'catalog#facet\''
-      # route 'root :to => "catalog#index"'
       route 'post "wms/handle"'
-      route 'post "download/kml"'
-      route 'post "download/shapefile"'
-      route 'get "download/file"'
-    end 
-    
+      route 'resources :download, only: [:show, :file]'
+      route "get 'download/file/:id' => 'download#file', as: :download_file"
+    end
+
+    def create_downloads_directory
+      if !Dir.exists?('tmp/downloads')
+        Dir.mkdir('tmp/downloads')
+      end
+    end
+
+    # Necessary for bootstrap-sass 3.2
+    def inject_sprockets
+      blacklight_css = Dir["app/assets/stylesheets/blacklight.css.scss"].first
+      if blacklight_css
+        insert_into_file blacklight_css, before: "@import 'bootstrap';" do
+          "@import 'bootstrap-sprockets';\n"
+        end
+      else
+        say_status "warning", "Can not find blacklight.css.scss, did not insert our require", :red
+      end
+    end
+
+    def disable_turbolinks
+      gsub_file('app/assets/javascripts/application.js', /\/\/= require turbolinks/, '')
+    end
+
+    def bundle_install
+      Bundler.with_clean_env do
+        run "bundle install"
+      end
+    end
+
   end
 end

data/lib/generators/geoblacklight/templates/geoblacklight.css.scss

@@ -1,79 +1,3 @@
 /*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the top of the
- * compiled file, but it's generally better to create a new file per style scope.
- *
- *= require_self
- *= require leaflet
- *= require font-awesome
- */
-
-.docView{
-
-}
-
-.text-span{
-  width:100%;
-}
-
-.hide-overflow {
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  display:block
-}
-
-#map.mapview-map {
-  height: 440px;
-  cursor: crosshair; 
-}
-
-#map.listview-map {
-  height: 485px;
-}
-
-#table-container{
-  overflow:scroll;
-  max-height: 450px;
-}
-
-#control {
-  text-align: center;
-  background: #FFF;
-  position: absolute;
-  left: 24px;
-  top: 120px;
-  height: 200px;
-  width: 28px;
-  border: 1px solid #BBB;
-  -webkit-border-radius: 3px;
-  border-radius: 3px;
-  z-index: 999;
-}
-
-#handle {
-  background: #000;
-  position: absolute;
-  left: -1px;
-  top: 20px;
-  width: 28px;
-  height: 10px;
-}
-
-#bottom {
-  position: absolute;
-  bottom:0px;
-  left: 8px;
-  text-align: center;
-}
-
-#handle:hover {
-  cursor: pointer;
-  background: #444;
-  cursor: ns-resize;
-}
+*= require geoblacklight/application
+*/

data/lib/generators/geoblacklight/templates/settings.yml

@@ -0,0 +1,9 @@
+INSTITUTION: 'Stanford'
+WMS_PARAMS:
+  :SERVICE: 'WMS'
+  :VERSION: '1.1.1'
+  :REQUEST: 'GetFeatureInfo'
+  :STYLES: ''
+  :SRS: 'EPSG:4326'
+  :EXCEPTIONS: 'application/json'
+  :INFO_FORMAT: 'text/html'

data/lib/geoblacklight.rb

@@ -2,4 +2,17 @@ require "geoblacklight/engine"
 
 module Geoblacklight
   require 'geoblacklight/config'
+  require 'geoblacklight/controller_override'
+  require 'geoblacklight/view_helper_override'
+  require 'geoblacklight/solr_document'
+  require 'geoblacklight/wms_layer'
+  require 'geoblacklight/download'
+  require 'geoblacklight/download/shapefile_download'
+  require 'geoblacklight/download/kmz_download'
+  def self.inject!
+    CatalogController.send(:include, Geoblacklight::ControllerOverride)
+    CatalogController.send(:include, Geoblacklight::ViewHelperOverride)
+    SearchHistoryController.send(:helper, Geoblacklight::ViewHelperOverride) unless
+      SearchHistoryController.helpers.is_a?(Geoblacklight::ViewHelperOverride)
+  end
 end

data/lib/geoblacklight/controller_override.rb

@@ -0,0 +1,18 @@
+module Geoblacklight
+  module ControllerOverride
+    extend ActiveSupport::Concern
+    included do
+      solr_search_params_logic << :add_spatial_params
+    end
+    
+    def add_spatial_params(solr_params, req_params)
+      if req_params[:bbox]
+        solr_params[:q] ||= "*"
+        solr_params[:q] += " solr_bbox:\"IsWithin(#{req_params[:bbox]})\"^10"
+        solr_params[:fq] ||= []
+        solr_params[:fq] << "solr_bbox:\"Intersects(#{req_params[:bbox]})\""
+      end
+      solr_params
+    end
+  end
+end

data/lib/geoblacklight/download.rb

@@ -0,0 +1,63 @@
+class Download
+  def initialize(document, options = {})
+    @document = document
+    @options = options
+  end
+
+  def downloadable?
+    @document.downloadable?
+  end
+
+  def file_name
+    "#{@document[:layer_slug_s]}-#{@options[:type]}.#{@options[:extension]}"
+  end
+
+  def file_path
+    "#{Rails.root}/tmp/downloads/#{file_name}"
+  end
+
+  def download_exists?
+    File.file?(file_path)
+  end
+
+  def get
+    if download_exists?
+      file_name
+    else
+      create_download_file
+    end
+  end
+
+  def create_download_file
+    download = initiate_download
+    File.open("#{file_path}.tmp", 'wb')  do |file|
+      if download.headers['content-type'] == @options[:content_type]
+        file.write download.body
+      else
+        fail 'Wrong type of download'
+      end
+    end
+    File.rename("#{file_path}.tmp", file_path)
+    file_name
+  rescue
+    File.delete("#{file_path}.tmp")
+    nil
+  end
+
+  def initiate_download
+    conn = Faraday.new(url: @document[@options[:service_type]])
+    conn.get do |request|
+      request.params = @options[:request_params]
+      request.options = {
+        timeout: 10,
+        open_timeout: 10
+      }
+    end
+  rescue Faraday::Error::ConnectionFailed => error
+    puts error
+    nil
+  rescue Faraday::Error::TimeoutError => error
+    puts error
+    nil
+  end
+end