geoblacklight 0.12.1 → 1.0.0.pre1

data/app/models/concerns/geoblacklight/solr_document.rb

@@ -16,15 +16,15 @@ module Geoblacklight
     end
 
     def public?
-      fetch(:dc_rights_s).downcase == 'public'
+      fetch(Settings.FIELDS.RIGHTS).casecmp('public').zero?
     end
 
     def restricted?
-      fetch(:dc_rights_s).downcase == 'restricted'
+      fetch(Settings.FIELDS.RIGHTS).casecmp('restricted').zero?
     end
 
     def downloadable?
-      (direct_download || download_types.present?) && available?
+      (direct_download || download_types.present? || iiif_download) && available?
     end
 
     def references
@@ -40,7 +40,11 @@ module Geoblacklight
     end
 
     def same_institution?
-      fetch(:dct_provenance_s).downcase == Settings.INSTITUTION.downcase
+      fetch(Settings.FIELDS.PROVENANCE).casecmp(Settings.INSTITUTION.downcase).zero?
+    end
+
+    def iiif_download
+      return references.iiif.to_hash unless references.iiif.blank?
     end
 
     def item_viewer
@@ -52,7 +56,7 @@ module Geoblacklight
     end
 
     def bounding_box_as_wsen
-      geom_field = fetch(Settings.GEOMETRY_FIELD.to_sym)
+      geom_field = fetch(Settings.FIELDS.GEOMETRY)
       exp = /^\s*ENVELOPE\(
                   \s*([-\.\d]+)\s*,
                   \s*([-\.\d]+)\s*,
@@ -60,12 +64,17 @@ module Geoblacklight
                   \s*([-\.\d]+)\s*
                   \)\s*$/x # uses 'x' option for free-spacing mode
       bbox_match = exp.match(geom_field)
-      if bbox_match
-        w, e, n, s = bbox_match.captures
-        return "#{w} #{s} #{e} #{n}"
-      else
-        return s # as-is, not a WKT
-      end
+      return s unless bbox_match # return as-is, not a WKT
+      w, e, n, s = bbox_match.captures
+      "#{w} #{s} #{e} #{n}"
+    end
+
+    def wxs_identifier
+      fetch(Settings.FIELDS.WXS_IDENTIFIER)
+    end
+
+    def file_format
+      fetch(Settings.FIELDS.FILE_FORMAT)
     end
 
     ##

data/{lib/geoblacklight/search_builder.rb → app/models/concerns/geoblacklight/spatial_search_behavior.rb}

@@ -1,11 +1,9 @@
 module Geoblacklight
-  class SearchBuilder < Blacklight::Solr::SearchBuilder
-    self.default_processor_chain += [:add_spatial_params]
+  module SpatialSearchBehavior
+    extend ActiveSupport::Concern
 
-    def initialize(processor_chain, scope)
-      super(processor_chain, scope)
-      @processor_chain += [:add_spatial_params] unless @processor_chain
-                                                       .include?(:add_spatial_params)
+    included do
+      self.default_processor_chain += [:add_spatial_params]
     end
 
     ##
@@ -17,9 +15,9 @@ module Geoblacklight
     def add_spatial_params(solr_params)
       if blacklight_params[:bbox]
         solr_params[:bq] ||= []
-        solr_params[:bq] = ["#{Settings.GEOMETRY_FIELD}:\"IsWithin(#{envelope_bounds})\"^10"]
+        solr_params[:bq] = ["#{Settings.FIELDS.GEOMETRY}:\"IsWithin(#{envelope_bounds})\"^10"]
         solr_params[:fq] ||= []
-        solr_params[:fq] << "#{Settings.GEOMETRY_FIELD}:\"Intersects(#{envelope_bounds})\""
+        solr_params[:fq] << "#{Settings.FIELDS.GEOMETRY}:\"Intersects(#{envelope_bounds})\""
       end
       solr_params
     rescue Geoblacklight::Exceptions::WrongBoundingBoxFormat

data/app/presenters/geoblacklight/document_presenter.rb

@@ -1,15 +1,22 @@
 module Geoblacklight
   ##
   # Adds custom functionality for Geoblacklight document presentation
-  class DocumentPresenter < Blacklight::DocumentPresenter
+  class DocumentPresenter < Blacklight::IndexPresenter
     ##
-    # Accesses a documents configured Wxs Identifier
-    # @param [SolrDocument]
+    # Presents configured index fields in search results. Passes values through
+    # configured helper_method. Multivalued fields separated by presenter
+    # field_value_separator (default: comma). Fields separated by period.
     # @return [String]
-    def wxs_identifier
-      fields = Array(@configuration.wxs_identifier_field)
-      f = fields.find { |field| @document.has? field }
-      render_field_value(@document[f])
+    def index_fields_display
+      fields_values = []
+      @configuration.index_fields.each do |field_name, _|
+        val = field_value(field_name)
+        unless val.blank?
+          val += '.' unless val.end_with?('.')
+          fields_values << val
+        end
+      end
+      fields_values.join(' ')
     end
   end
 end

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

@@ -1,4 +1,4 @@
 <div id="documents" class="docView col-md-6">
   <%= render documents, :as => :document %>
 </div>
-<%= content_tag :div, '', id: 'map', data: { map: 'index', 'catalog-path'=> catalog_index_path , 'map-bbox' => params[:bbox], basemap: geoblacklight_basemap } %>
+<%= content_tag :div, '', id: 'map', data: { map: 'index', 'catalog-path'=> search_catalog_path , 'map-bbox' => params[:bbox], basemap: geoblacklight_basemap } %>

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

@@ -1,45 +1,53 @@
 <% document ||= @document %>
 <% if document_downloadable? %>
-  <div class='panel-body'>
-    <div class='btn-group' itemprop='distribution' itemscope='itemscope' itemtype='http://schema.org/DataDownload'>
-      <% if document.direct_download.present? %>
-      <%= link_to(download_text(@document[:dc_format_s]), document.direct_download[:download], class: 'btn btn-default', 'contentUrl' => document.direct_download[:download], data: { download: 'trigger', download_type: 'direct', download_id: document[:layer_slug_s] }) %>
-      <% elsif document.hgl_download.present? %>
-      <%= link_to(download_text(document.download_types.first[0]),
-      download_hgl_path(id: document), data: {ajax_modal: 'trigger', download: 'trigger', download_type: 'harvard-hgl', download_id: document[:layer_slug_s] },
-      class: 'btn btn-default') %>
+  <div class='btn-group' itemprop='distribution' itemscope='itemscope' itemtype='http://schema.org/DataDownload'>
+    <% if document.direct_download.present? %>
+    <%= link_to(download_text(document.file_format), document.direct_download[:download], class: 'btn btn-default', 'contentUrl' => document.direct_download[:download], data: { download: 'trigger', download_type: 'direct', download_id: document.id }) %>
+    <% elsif document.hgl_download.present? %>
+    <%= link_to(download_text(document.download_types.first[0]),
+    download_hgl_path(id: document), data: {ajax_modal: 'trigger', download: 'trigger', download_type: 'harvard-hgl', download_id: document.id },
+    class: 'btn btn-default') %>
+    <% elsif document.iiif_download.present? %>
+        <%= link_to "Download JPG", iiif_jpg_url, class: 'btn btn-default', download: 'trigger' %>
+    <% else %>
+    <%= link_to(download_text(document.download_types.first[0]), '', data: { download_path: "#{download_path(document.id, type: document.download_types.first[0])}", download: 'trigger', download_type: document.download_types.first[0], download_id: document.id }, class: 'btn btn-default') %>
+    <% end %>
+    <button type='button' class='btn btn-default dropdown-toggle download-dropdown-toggle' data-toggle='dropdown' aria-expanded='false'>
+      <span class='caret'></span>
+      <span class='sr-only'>Toggle Download Dropdown</span>
+    </button>
+    <ul class='dropdown-menu' role='menu'>
+      <% if document.hgl_download.present? %>
+      <li role="presentation" class="dropdown-header">Original</li>
+      <li>
+        <%= link_to(download_text(document.download_types.first[0]),
+        download_hgl_path(id: document), data: {ajax_modal: 'trigger', download: 'trigger', download_type: 'harvard-hgl', download_id: document.id }) %>
+      </li>
       <% else %>
-      <%= link_to(download_text(document.download_types.first[0]), '', data: { download_path: "#{download_path(document[:layer_slug_s], type: document.download_types.first[0])}", download: 'trigger', download_type: document.download_types.first[0], download_id: document[:layer_slug_s] }, class: 'btn btn-default') %>
+      <% if document.direct_download.present? %>
+      <li role="presentation" class="dropdown-header">Original</li>
+      <li>
+        <%= link_to(download_text(@document.file_format), document.direct_download[:download], 'contentUrl' => document.direct_download[:download], data: { download: 'trigger', download_type: 'direct', download_id: document.id }) %>
+      </li>
       <% end %>
-      <button type='button' class='btn btn-default dropdown-toggle download-dropdown-toggle' data-toggle='dropdown' aria-expanded='false'>
-        <span class='caret'></span>
-        <span class='sr-only'>Toggle Download Dropdown</span>
-      </button>
-      <ul class='dropdown-menu' role='menu'>
-        <% if document.hgl_download.present? %>
-        <li role="presentation" class="dropdown-header">Original</li>
-        <li>
-          <%= link_to(download_text(document.download_types.first[0]),
-          download_hgl_path(id: document), data: {ajax_modal: 'trigger', download: 'trigger', download_type: 'harvard-hgl', download_id: document[:layer_slug_s] }) %>
-        </li>
-        <% else %>
-        <% if document.direct_download.present? %>
-        <li role="presentation" class="dropdown-header">Original</li>
-        <li>
-          <%= link_to(download_text(@document[:dc_format_s]), document.direct_download[:download], 'contentUrl' => document.direct_download[:download], data: { download: 'trigger', download_type: 'direct', download_id: document[:layer_slug_s] }) %>
-        </li>
-        <% end %>
-        <% if document.download_types.present? %>
-        <li role="presentation" class="dropdown-header">Generated</li>
-        <% document.download_types.each do |type| %>
-        <%= content_tag(:li) do %>
-        <% link_to(download_text(type[0]), '', data: { download_path: "#{download_path(document[:layer_slug_s], type: type[0])}", download: 'trigger', download_type: type[0], download_id: document[:layer_slug_s] }) %>
-        <% end %>
-        <% end %>
-        <% end %>
-        <% end %>
-      </ul>
-    </div>
+      <% if document.download_types.present? || document.iiif_download.present? %>
+      <li role="presentation" class="dropdown-header">Generated</li>
+      <% end %>
+      <% if document.iiif_download.present? %>
+      <li>
+        <%= link_to "Download JPG", iiif_jpg_url, download: 'trigger' %>
+      </li>
+      <% end %>
+
+      <% if document.download_types.present? %>
+      <% document.download_types.each do |type| %>
+      <%= content_tag(:li) do %>
+      <% link_to(download_text(type[0]), '', data: { download_path: "#{download_path(document.id, type: type[0])}", download: 'trigger', download_type: type[0], download_id: document.id }) %>
+      <% end %>
+      <% end %>
+      <% end %>
+      <% end %>
+    </ul>
   </div>
   <% elsif document.restricted? && document.same_institution? %>
     <div class='panel-body'>

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

@@ -1,3 +1,3 @@
 <% display_facet.items.each do |item| %>
-  <%= link_to item.value, catalog_index_path({f: {"#{facet_field.field}" => [item.value]}}), class: 'home-facet-link' %><%= "," %>
+  <%= link_to item.value, search_catalog_path({f: {"#{facet_field.field}" => [item.value]}}), class: 'home-facet-link' %><%= "," %>
 <% end %>

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

@@ -1,2 +1,2 @@
 <%= yield %>
-<%= link_to t('blacklight.search.facets.more'), catalog_facet_path(display_facet.name), class: 'more_facets_link' %>
+<%= link_to t('blacklight.search.facets.more'), facet_catalog_path(display_facet.name), class: 'more_facets_link' %>

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

@@ -0,0 +1,3 @@
+<%= geoblacklight_icon(document[Settings.FIELDS.GEOM_TYPE]) %>
+<%= geoblacklight_icon(document[Settings.FIELDS.PROVENANCE]) %>
+<%= geoblacklight_icon(document[Settings.FIELDS.RIGHTS]) %>

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

@@ -17,33 +17,33 @@
           <span class='glyphicon glyphicon-home'></span>
         </div>
         <h4>Institution</h4>
-        <%= render_facet_tags [:dct_provenance_s] %>
+        <%= render_facet_tags [Settings.FIELDS.PROVENANCE] %>
       </div>
       <div class='category-block'>
         <div class='category-icon'>
           <span class='glyphicon glyphicon-download'></span>
         </div>
         <h4>Data type</h4>
-        <%= render_facet_tags [:layer_geom_type_s] %>
+        <%= render_facet_tags [Settings.FIELDS.GEOM_TYPE] %>
       </div>
       <div class='category-block'>
         <div class='category-icon'>
           <span class='glyphicon glyphicon-globe'></span>
         </div>
         <h4>Placename</h4>
-        <%= render_facet_tags [:dct_spatial_sm] %>
+        <%= render_facet_tags [Settings.FIELDS.SPATIAL_COVERAGE] %>
       </div>
       <div class='category-block'>
         <div class='category-icon'>
           <span class='glyphicon glyphicon-tags'></span>
         </div>
         <h4>Subject</h4>
-        <%= render_facet_tags [:dc_subject_sm] %>
+        <%= render_facet_tags [Settings.FIELDS.SUBJECT] %>
       </div>
     </div>
     <div class='col-md-6 text-center'>
       <%= content_tag :h3, t('geoblacklight.home.map_heading') %>
-      <%= content_tag :div, '', id: 'map', data: { map: 'home', 'catalog-path'=> catalog_index_path , 'map-bbox' => params[:bbox], basemap: geoblacklight_basemap } %>
+      <%= content_tag :div, '', id: 'map', data: { map: 'home', 'catalog-path'=> search_catalog_path , 'map-bbox' => params[:bbox], basemap: geoblacklight_basemap } %>
     </div>
   </div>
 </div>

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

@@ -1,9 +1,7 @@
 <% # header bar for doc items in index view -%>
-<%= content_tag :div, class: 'documentHeader row', data: { layer_id: document[:uuid], bbox: document.bounding_box_as_wsen } do %>
+<%= content_tag :div, class: 'documentHeader row', data: { layer_id: document.id, bbox: document.bounding_box_as_wsen } do %>
   <div class='status-icons'>
-    <%= geoblacklight_icon(document['layer_geom_type_s']) %>
-    <%= geoblacklight_icon(document['dct_provenance_s']) %>
-    <%= geoblacklight_icon(document['dc_rights_s']) %>
+    <%= render partial: 'header_icons', locals: { document: document } %>
   </div>
   <h3 class="index_title col-sm-9s cosl-lg-10 text-span">
     <span class='caret-toggle'></span>
@@ -11,13 +9,13 @@
     <span class="document-counter">
       <%= t('blacklight.search.documents.counter', :counter => counter) if counter %>
     </span>
-    <%= link_to_document document, document_show_link_field(document), counter: counter, title: document['dc_title_s'] %>
+    <%= link_to_document document, document_show_link_field(document), counter: counter, title: document[blacklight_config.index.title_field] %>
   </h3>
 
   <div class='col-md-12 more-info-area'>
-    <div class='collapse' data-collapse-target="<%= document['uuid'] %>">
+    <div class='collapse' data-collapse-target="<%= document.id %>">
       <small>
-        <%= document['solr_year_i'] %>. <i><%= document['dc_creator_sm'].nil?? '' : document['dc_creator_sm'].join(', ') %></i>. <%= snippit(document['dc_description_s']) %>. <%= document['dc_publisher_s'] %>.
+        <%= geoblacklight_present(:index_fields_display, document) %>
       </small>
     </div>
   </div>

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

@@ -1,5 +1,5 @@
 <%= form_tag search_action_url, :method => :get, :class => 'search-query-form clearfix' do %>
-<%= render_hash_as_hidden_fields(params_for_search().except(:q, :search_field, :qt, :page, :utf8)) %>
+<%= render_hash_as_hidden_fields(search_state.params_for_search().except(:q, :search_field, :qt, :page, :utf8)) %>
 
 <% unless search_fields.empty? %>
 <label for="search_field" class="sr-only"><%= t('blacklight.search.form.search_field.label') %></label>
@@ -8,7 +8,7 @@
 <% end %>
 <div class="input-group search-input-group">
   <label for="q" class="sr-only"><%= t('blacklight.search.form.search.label') %></label>
-  <%= text_field_tag :q, params[:q], :placeholder => t('blacklight.search.form.search.placeholder'), :class => "search_q q form-control", :id => "q", :autofocus => should_autofocus_on_search_box? %>
+  <%= text_field_tag :q, params[:q], :placeholder => t('blacklight.search.form.search.placeholder'), :class => "search_q q form-control", :id => "q", :autofocus => should_autofocus_on_search_box?, data: { autocomplete_enabled: autocomplete_enabled?, autocomplete_path: blacklight.suggest_index_path } %>
   
   <span class="input-group-btn">
     <button type="submit" class="btn btn-primary search-btn" id="search">

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

@@ -1,5 +1,5 @@
 <% document ||= @document %>
 <div id='viewer-container' class="col-md-8">
-  <%= content_tag :div, id: 'map', data: { map: 'item', protocol: document.viewer_protocol.camelize, url: document.viewer_endpoint, 'layer-id' => wxs_identifier(document), 'map-bbox' => document.bounding_box_as_wsen, 'catalog-path'=> catalog_index_path, available: document_available?, inspect: show_attribute_table?, basemap: geoblacklight_basemap } do %>
+  <%= content_tag :div, id: 'map', data: { map: 'item', protocol: document.viewer_protocol.camelize, url: document.viewer_endpoint, 'layer-id' => document.wxs_identifier, 'map-bbox' => document.bounding_box_as_wsen, 'catalog-path'=> search_catalog_path, available: document_available?, inspect: show_attribute_table?, basemap: geoblacklight_basemap, leaflet_options: leaflet_options } do %>
   <% end %>
-</div>
+</div>

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

@@ -1,8 +1,6 @@
 <h2>
   <span itemprop="name"><%= document_heading(document) %></span>
   <small>
-    <%= geoblacklight_icon(document['layer_geom_type_s']) %>
-    <%= geoblacklight_icon(document['dct_provenance_s']) %>
-    <%= geoblacklight_icon(document['dc_rights_s']) %>
+    <%= render partial: 'header_icons', locals: { document: document } %>
   </small>
 </h2>

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

@@ -4,5 +4,5 @@
 
 <div class='form-group form-inline'>
   <label class='control-label'>WFS <code>typeNames</code></label>
-  <input type='text' value='<%= wxs_identifier(document) %>' readonly='readonly' class='form-control'>
+  <input type='text' value='<%= document.wxs_identifier %>' readonly='readonly' class='form-control'>
 </div>

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

@@ -4,5 +4,5 @@
 
 <div class='form-group form-inline'>
   <label class='control-label'>WMS <code>layers</code></label>
-  <input type='text' value='<%= wxs_identifier(document) %>' readonly='readonly' class='form-control'>
+  <input type='text' value='<%= document.wxs_identifier %>' readonly='readonly' class='form-control'>
 </div>

data/config/jetty.yml

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

data/config/locales/geoblacklight.en.yml

@@ -22,6 +22,7 @@ en:
     references:
       wms: 'Web Mapping Service (WMS)'
       wfs: 'Web Feature Service (WFS)'
+      iiif: 'International Image Interoperability Framework (IIIF)'
       iso19139: 'ISO 19139'
       mods: 'MODS'
       fgdc: 'FGDC'

data/geoblacklight.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'blacklight', '~> 5.12', '< 6'
+  spec.add_dependency 'blacklight', '~> 6.3'
   spec.add_dependency 'leaflet-rails', '~> 0.7.3'
   spec.add_dependency 'font-awesome-rails', '~> 4.1.0.0'
   spec.add_dependency 'rails_config', '~> 0.4.2'
@@ -27,10 +27,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'geoblacklight-icons', '>= 0.2'
 
   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 'rake', '~> 11.0.1'
+  spec.add_development_dependency 'rspec-rails', '~> 3.4.2'
   spec.add_development_dependency 'jettywrapper', '>= 2.0'
-  spec.add_development_dependency 'engine_cart', '~> 0.8'
+  spec.add_development_dependency 'engine_cart', '~> 0.10'
   spec.add_development_dependency 'capybara', '~> 2.3.0'
   spec.add_development_dependency 'poltergeist', '~> 1.5'
   spec.add_development_dependency 'factory_girl_rails'

data/lib/generators/geoblacklight/install_generator.rb

@@ -11,6 +11,31 @@ module Geoblacklight
 
     desc 'Install Geoblacklight'
 
+    def mount_geoblacklight_engine
+      route "mount Geoblacklight::Engine => 'geoblacklight'"
+    end
+
+    def inject_geoblacklight_routes
+      route <<-EOF.strip_heredoc
+          concern :gbl_exportable, Geoblacklight::Routes::Exportable.new
+          resources :solr_documents, only: [:show], 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
+    end
+
     def install_jettywrapper
       return unless options[:jettywrapper]
       copy_file 'config/jetty.yml'
@@ -21,7 +46,7 @@ module Geoblacklight
     end
 
     def assets
-      copy_file 'geoblacklight.css.scss', 'app/assets/stylesheets/geoblacklight.css.scss'
+      copy_file 'geoblacklight.scss', 'app/assets/stylesheets/geoblacklight.scss'
       copy_file 'geoblacklight.js', 'app/assets/javascripts/geoblacklight.js'
 
       append_to_file 'config/initializers/assets.rb',
@@ -49,19 +74,25 @@ module Geoblacklight
       end
     end
 
+    def add_spatial_search_behavior
+      inject_into_file 'app/models/search_builder.rb', after: 'include Blacklight::Solr::SearchBuilderBehavior' do
+        "\n  include Geoblacklight::SpatialSearchBehavior"
+      end
+    end
+
     def create_downloads_directory
       FileUtils.mkdir_p('tmp/cache/downloads') unless File.directory?('tmp/cache/downloads')
     end
 
     # Necessary for bootstrap-sass 3.2
     def inject_sprockets
-      blacklight_css = Dir['app/assets/stylesheets/blacklight.css.scss'].first
+      blacklight_css = Dir['app/assets/stylesheets/blacklight.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
+        say_status 'warning', 'Can not find blacklight.scss, did not insert our require', :red
       end
     end