update wxs_identifier field

geoblacklight · Mar 24, 2016 · 37b6bfe · 37b6bfe
1 parent 1dec4c3
commit 37b6bfe
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 19 deletions.
diff --git a/app/presenters/geoblacklight/document_presenter.rb b/app/presenters/geoblacklight/document_presenter.rb
@@ -4,12 +4,10 @@ module Geoblacklight
   class DocumentPresenter < Blacklight::DocumentPresenter
     ##
     # Accesses a documents configured Wxs Identifier
-    # @param [SolrDocument]
     # @return [String]
     def wxs_identifier
-      fields = Array(@configuration.wxs_identifier_field)
-      f = fields.find { |field| @document.has? field }
-      render_field_value(@document[f])
+      field = Settings.FIELDS.WXS_IDENTIFIER.to_sym
+      render_field_value(@document[field])
     end
 
     def file_format

diff --git a/lib/generators/geoblacklight/templates/catalog_controller.rb b/lib/generators/geoblacklight/templates/catalog_controller.rb
@@ -33,10 +33,6 @@ class CatalogController < ApplicationController
 
     config.show.display_type_field = 'format'
 
-    # Custom GeoBlacklight fields which currently map to GeoBlacklight-Schema
-    # v0.3.2
-    config.wxs_identifier_field = 'layer_id_s'
-
     # solr fields that will be treated as facets by the blacklight application
     #   The ordering of the field names is the order of the display
     #

diff --git a/lib/generators/geoblacklight/templates/settings.yml b/lib/generators/geoblacklight/templates/settings.yml
@@ -14,6 +14,7 @@ GEOMETRY_FIELD: 'solr_geom'
 FIELDS:
   :FILE_FORMAT: 'dc_format_s'
   :GEOMETRY: 'solr_geom'
+  :WXS_IDENTIFIER: 'layer_id_s'
 
 # Institution deployed at
 INSTITUTION: 'Stanford'

diff --git a/spec/lib/geoblacklight/document_presenter_spec.rb b/spec/lib/geoblacklight/document_presenter_spec.rb
@@ -2,7 +2,8 @@
 
 describe Geoblacklight::DocumentPresenter do
   let(:request_context) { double(add_facet_params: '') }
-  let(:config) { Blacklight::Configuration.new }
+  let(:wxs_identifier_field) { Blacklight::Configuration.new }
+  let(:solr_fields) { Settings.FIELDS }
   subject { presenter }
   let(:presenter) do
     described_class.new(document, request_context, config)
@@ -13,17 +14,14 @@
   end
 
   describe '#wxs_identifier' do
-    describe 'without wxs identifier in configuration' do
-    end
-    it 'returns empty string' do
-      expect(subject.wxs_identifier).to eq ''
-    end
-    describe 'without wxs identifier in configuration' do
-      let(:config) do
-        Blacklight::Configuration.new.configure do |config|
-          config.wxs_identifier_field = 'layer_id_s'
-        end
+    context 'document without wxs identifier field present' do
+      before { solr_fields.WXS_IDENTIFIER = 'non_present_field' }
+      it 'returns empty string' do
+        expect(subject.wxs_identifier).to eq ''
       end
+    end
+    context 'without wxs identifier in configuration' do
+      before { solr_fields.WXS_IDENTIFIER = 'layer_id_s' }
       it 'returns configured field' do
         expect(subject.wxs_identifier).to eq 'druid:abc123'
       end