geoblacklight 4.0.0.pre.alpha.3 → 4.0.0.pre.rc3

data/lib/geoblacklight/faraday_middleware/follow_redirects.rb

@@ -0,0 +1,176 @@
+# frozen_string_literal: true
+# :nocov:
+require 'faraday'
+require 'set'
+
+module Geoblacklight
+  # NOTE: We copied this class from faraday_middleware in order to support
+  # both Faraday 1 & 2. If this middleware is ever extracted from
+  # faraday_middleware into its own gem we should remove this and use that
+  # instead.
+  module FaradayMiddleware
+    # Exception thrown when the maximum amount of requests is
+    # exceeded.
+    class RedirectLimitReached < ::Faraday::ClientError
+      attr_reader :response
+
+      def initialize(response)
+        super "too many redirects; last one to: #{response['location']}"
+        @response = response
+      end
+    end
+
+    # Public: Follow HTTP 301, 302, 303, 307, and 308 redirects.
+    #
+    # For HTTP 301, 302, and 303, the original GET, POST, PUT, DELETE, or PATCH
+    # request gets converted into a GET. With `:standards_compliant => true`,
+    # however, the HTTP method after 301/302 remains unchanged. This allows you
+    # to opt into HTTP/1.1 compliance and act unlike the major web browsers.
+    #
+    # This middleware currently only works with synchronous requests; i.e. it
+    # doesn't support parallelism.
+    #
+    # If you wish to persist cookies across redirects, you could use
+    # the faraday-cookie_jar gem:
+    #
+    #   Faraday.new(:url => url) do |faraday|
+    #     faraday.use FaradayMiddleware::FollowRedirects
+    #     faraday.use :cookie_jar
+    #     faraday.adapter Faraday.default_adapter
+    #   end
+    #
+    class FollowRedirects < ::Faraday::Middleware
+      # HTTP methods for which 30x redirects can be followed
+      ALLOWED_METHODS = Set.new [:head, :options, :get, :post, :put, :patch, :delete]
+      # HTTP redirect status codes that this middleware implements
+      REDIRECT_CODES  = Set.new [301, 302, 303, 307, 308]
+      # Keys in env hash which will get cleared between requests
+      ENV_TO_CLEAR    = Set.new [:status, :response, :response_headers]
+
+      # Default value for max redirects followed
+      FOLLOW_LIMIT = 3
+
+      # Regex that matches characters that need to be escaped in URLs, sans
+      # the "%" character which we assume already represents an escaped sequence.
+      URI_UNSAFE = %r{[^\-_.!~*'()a-zA-Z\d;/?:@&=+$,\[\]%]}.freeze
+
+      AUTH_HEADER = 'Authorization'
+
+      # Public: Initialize the middleware.
+      #
+      # options - An options Hash (default: {}):
+      #     :limit                      - A Numeric redirect limit (default: 3)
+      #     :standards_compliant        - A Boolean indicating whether to respect
+      #                                  the HTTP spec when following 301/302
+      #                                  (default: false)
+      #     :callback                   - A callable used on redirects
+      #                                  with the old and new envs
+      #     :cookies                    - An Array of Strings (e.g.
+      #                                  ['cookie1', 'cookie2']) to choose
+      #                                  cookies to be kept, or :all to keep
+      #                                  all cookies (default: []).
+      #     :clear_authorization_header - A Boolean indicating whether the request
+      #                                  Authorization header should be cleared on
+      #                                  redirects (default: true)
+      def initialize(app, options = {})
+        super(app)
+        @options = options
+
+        @convert_to_get = Set.new [303]
+        @convert_to_get << 301 << 302 unless standards_compliant?
+      end
+
+      def call(env)
+        perform_with_redirection(env, follow_limit)
+      end
+
+      private
+
+      def convert_to_get?(response)
+        [:head, :options].exclude?(response.env[:method]) &&
+          @convert_to_get.include?(response.status)
+      end
+
+      def perform_with_redirection(env, follows)
+        request_body = env[:body]
+        response = @app.call(env)
+
+        response.on_complete do |response_env|
+          if follow_redirect?(response_env, response)
+            fail RedirectLimitReached, response if follows.zero?
+
+            new_request_env = update_env(response_env.dup, request_body, response)
+            callback&.call(response_env, new_request_env)
+            response = perform_with_redirection(new_request_env, follows - 1)
+          end
+        end
+        response
+      end
+
+      def update_env(env, request_body, response)
+        redirect_from_url = env[:url].to_s
+        redirect_to_url = safe_escape(response['location'] || '')
+        env[:url] += redirect_to_url
+
+        ENV_TO_CLEAR.each { |key| env.delete key }
+
+        if convert_to_get?(response)
+          env[:method] = :get
+          env[:body] = nil
+        else
+          env[:body] = request_body
+        end
+
+        clear_authorization_header(env, redirect_from_url, redirect_to_url)
+
+        env
+      end
+
+      def follow_redirect?(env, response)
+        ALLOWED_METHODS.include?(env[:method]) &&
+          REDIRECT_CODES.include?(response.status)
+      end
+
+      def follow_limit
+        @options.fetch(:limit, FOLLOW_LIMIT)
+      end
+
+      def standards_compliant?
+        @options.fetch(:standards_compliant, false)
+      end
+
+      def callback
+        @options[:callback]
+      end
+
+      # Internal: escapes unsafe characters from an URL which might be a path
+      # component only or a fully qualified URI so that it can be joined onto an
+      # URI:HTTP using the `+` operator. Doesn't escape "%" characters so to not
+      # risk double-escaping.
+      def safe_escape(uri)
+        uri = uri.split('#')[0] # we want to remove the fragment if present
+        uri.to_s.gsub(URI_UNSAFE) do |match|
+          "%#{match.unpack('H2' * match.bytesize).join('%').upcase}"
+        end
+      end
+
+      def clear_authorization_header(env, from_url, to_url)
+        return env if redirect_to_same_host?(from_url, to_url)
+        return env unless @options.fetch(:clear_authorization_header, true)
+
+        env[:request_headers].delete(AUTH_HEADER)
+      end
+
+      def redirect_to_same_host?(from_url, to_url)
+        return true if to_url.start_with?('/')
+
+        from_uri = URI.parse(from_url)
+        to_uri = URI.parse(to_url)
+
+        [from_uri.scheme, from_uri.host, from_uri.port] ==
+          [to_uri.scheme, to_uri.host, to_uri.port]
+      end
+    end
+  end
+end
+# :nocov:

data/lib/geoblacklight/item_viewer.rb

@@ -51,8 +51,20 @@ module Geoblacklight
       @references.tms
     end
 
+    def xyz
+      @references.xyz
+    end
+
+    def tilejson
+      @references.tilejson
+    end
+
+    def wmts
+      @references.wmts
+    end
+
     def viewer_preference
-      [oembed, index_map, tms, wms, iiif, tiled_map_layer, dynamic_map_layer,
+      [oembed, index_map, tilejson, xyz, wmts, tms, wms, iiif, tiled_map_layer, dynamic_map_layer,
        image_map_layer, feature_layer].compact.map(&:to_hash).first
     end
   end

data/lib/geoblacklight/metadata/base.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require 'geoblacklight/faraday_middleware/follow_redirects'
 module Geoblacklight
   module Metadata
     ##
@@ -47,7 +48,7 @@ module Geoblacklight
       # connection error
       def retrieve_metadata
         connection = Faraday.new(url: @reference.endpoint) do |conn|
-          conn.use FaradayMiddleware::FollowRedirects
+          conn.use Geoblacklight::FaradayMiddleware::FollowRedirects
           conn.adapter Faraday.default_adapter
         end
         begin

data/lib/geoblacklight/metadata_transformer/base.rb

@@ -31,7 +31,7 @@ module Geoblacklight
       def cleaned_metadata
         transformed_doc = Nokogiri::XML(@metadata.to_html)
         if transformed_doc.xpath('//body').children.empty?
-          fail TransformError,\
+          fail TransformError, \
                'Failed to extract the <body> child elements from the transformed metadata'
         end
         transformed_doc.xpath('//body').children

data/lib/geoblacklight/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Geoblacklight
-  VERSION = '4.0.0-alpha.3'
+  VERSION = '4.0.0-rc3'
 end

data/lib/geoblacklight/view_helper_override.rb

@@ -1,41 +1,15 @@
 # frozen_string_literal: true
 module Geoblacklight
+  # Override Blacklight helpers to inject behavior
   module ViewHelperOverride
-    include CatalogHelperOverride
-
-    def spatial_parameters?
-      params[:bbox]
-    end
-
-    # Overrides BL method to enable results for spatial only params
-    def has_search_parameters?
-      spatial_parameters? || super
-    end
-
-    def query_has_constraints?(localized_params = params)
-      has_search_parameters? || super(localized_params)
-    end
-
     def render_search_to_s(params)
       super + render_search_to_s_bbox(params)
     end
 
     def render_search_to_s_bbox(params)
       return ''.html_safe if params['bbox'].blank?
-      render_search_to_s_element(t('geoblacklight.bbox_label'), render_filter_value(params['bbox']))
-    end
 
-    def render_constraints_filters(localized_params = params)
-      content = super(localized_params)
-      localized_params = localized_params.to_h if localized_params.respond_to?(:to_h)
-
-      if localized_params[:bbox]
-        path = search_action_path(remove_spatial_filter_group(:bbox, localized_params))
-        content << render_constraint_element(t('geoblacklight.bbox_label'),
-                                             localized_params[:bbox], remove: path)
-      end
-
-      content
+      render_search_to_s_element(t('geoblacklight.bbox_label'), render_filter_value(params['bbox']))
     end
   end
 end

data/lib/geoblacklight.rb

@@ -4,7 +4,6 @@ require 'geoblacklight/engine'
 
 module Geoblacklight
   require 'geoblacklight/bounding_box'
-  require 'geoblacklight/catalog_helper_override'
   require 'geoblacklight/constants'
   require 'geoblacklight/exceptions'
   require 'geoblacklight/geometry'
@@ -34,15 +33,6 @@ module Geoblacklight
   require 'geoblacklight/relation/ancestors'
   require 'geoblacklight/relation/relation_response'
 
-  def self.inject!
-    CatalogController.send(:include, Geoblacklight::CatalogHelperOverride)
-    CatalogController.send(:include, Geoblacklight::ViewHelperOverride)
-    CatalogController.send(:helper, Geoblacklight::ViewHelperOverride) unless
-      CatalogController.helpers.is_a?(Geoblacklight::ViewHelperOverride)
-    SearchHistoryController.send(:helper, Geoblacklight::ViewHelperOverride) unless
-      SearchHistoryController.helpers.is_a?(Geoblacklight::ViewHelperOverride)
-  end
-
   def self.logger
     ::Rails.logger
   end

data/lib/tasks/geoblacklight.rake

@@ -87,7 +87,7 @@ namespace :geoblacklight do
         fail 'Please supply required arguments [document_id, download_type and timeout]'
       end
       document = Geoblacklight::SolrDocument.find(args[:doc_id])
-      fail Blacklight::Exceptions::RecordNotFound if document[:layer_slug_s] != args[:doc_id]
+      fail Blacklight::Exceptions::RecordNotFound if document[:id] != args[:doc_id]
       download = "Geoblacklight::#{args[:download_type].capitalize}Download"
                  .constantize.new(document, timeout: args[:timeout].to_i)
       download.get

data/schema/geoblacklight-schema-aardvark.json

@@ -67,28 +67,7 @@
     "dcat_theme_sm": {
       "type": "array",
       "items": {
-        "type": "string",
-        "enum": [
-          "Farming",
-          "Biota",
-          "Boundaries",
-          "Climatology, Meteorology and Atmosphere",
-          "Economy",
-          "Elevation",
-          "Environment",
-          "Geoscientific Information",
-          "Health",
-          "Imagery and Base Maps",
-          "Intelligence and Military",
-          "Inland Waters",
-          "Location",
-          "Oceans",
-          "Planning and Cadastral",
-          "Society",
-          "Structure",
-          "Transportation",
-          "Utilities and Communications"
-        ]
+        "type": "string"
       }
     },
     "dcat_keyword_sm": {
@@ -123,7 +102,8 @@
       }
     },
     "locn_geometry": { "type": "string" },
-    "dcat_centroid_ss": { "type": "string" },
+    "dcat_bbox": { "type": "string" },
+    "dcat_centroid": { "type": "string" },
     "dct_relation_sm": {
       "type": "array",
       "items": {

data/solr/conf/schema.xml

@@ -4,20 +4,36 @@
   <fields>
     <field name="_version_" type="long"   stored="true" indexed="true"/>
     <field name="timestamp" type="date"   stored="true" indexed="true" default="NOW"/>
-    <field name="geoblacklight_version" type="string" stored="true" indexed="true"/>
-    <field name="id"      type="string" stored="true" indexed="true" required="true"/>
+    <field name="id"        type="string" stored="true" indexed="true" required="true"/>
 
     <!-- core generated fields -->
     <field name="text" type="text_en" stored="false" indexed="true" multiValued="true"
                        termVectors="true" termPositions="true" termOffsets="true" />
 
+    <!-- Spatial Field Type: Represents the exent of the resource and powers map search functionality.
+      Value can be any valid WKT or ENVELOPE String:
+        <field name="locn_geometry">POLYGON((1 8, 1 9, 2 9, 2 8, 1 8))</field>
+        <field name="locn_geometry">ENVELOPE(-117.312, -115.39, 84.31, 83.1)</field> -->
+    <field name="locn_geometry" type="location_geo3d" stored="true" indexed="true"/>
+
+    <!-- Spatial Field Type: The bounding box of the resource. Used in overlap ratio boosting.
+      Value must be an ENVELOPE String:
+        <field name="dcat_bbox">ENVELOPE(-117.312, -115.39, 84.31, 83.1)</field> -->
+    <field name="dcat_bbox" type="location_rpt" stored="true" indexed="true"/>
+
+    <!-- Spatial Field Type: Used to display the center point of a resource. -->
+    <field name="dcat_centroid" type="location" stored="true" indexed="true"/>
+
+    <!-- Spatial Field Type: Internal field used for overlap ratio boosting. -->
+    <field name="solr_bboxtype" type="bbox" stored="true" indexed="true"/>
+
     <!-- dynamic field with simple types by suffix -->
     <dynamicField name="*_b"    type="boolean" stored="true"  indexed="true"/>
     <dynamicField name="*_d"    type="double"  stored="true"  indexed="true"/>
     <dynamicField name="*_dt"   type="date"    stored="true"  indexed="true"/>
     <dynamicField name="*_f"    type="float"   stored="true"  indexed="true"/>
     <dynamicField name="*_i"    type="int"     stored="true"  indexed="true"/>
-    <dynamicField name="*_im"   type="int"     stored="true"  indexed="true" multiValued="true" />
+    <dynamicField name="*_im"   type="int"     stored="true"  indexed="true" multiValued="true" sortMissingLast="true" />
     <dynamicField name="*_l"    type="long"    stored="true"  indexed="true"/>
     <dynamicField name="*_s"    type="string"  stored="true"  indexed="true"/>
     <dynamicField name="*_ss"   type="string"  stored="true"  indexed="false"/>
@@ -44,31 +60,6 @@
 
     <!-- date range (_drsim) -->
     <dynamicField name="*_drsim" type="dateRange" stored="true" indexed="true" multiValued="true"/>
-
-    <!-- Spatial field types:
-
-         Solr3:
-           <field name="my_pt">83.1,-117.312</field>
-             as (y,x)
-
-         Solr4:
-
-           <field name="my_bbox">-117.312 83.1 -115.39 84.31</field>
-             as (W S E N)
-
-           <field name="my_geom">ENVELOPE(-117.312, -115.39, 84.31, 83.1)</field>
-             as (W E N S)
-
-           <field name="my_jts">POLYGON((1 8, 1 9, 2 9, 2 8, 1 8))</field>
-             as WKT for point, linestring, polygon
-
-      -->
-    <dynamicField name="*_pt"   type="location"     stored="true" indexed="true"/>
-    <dynamicField name="*_bbox" type="location_rpt" stored="true" indexed="true"/><!-- deprecated -->
-    <dynamicField name="*_geom" type="location_rpt" stored="true" indexed="true"/>
-    <dynamicField name="*_geometry" type="location_rpt" stored="true" indexed="true"/>
-    <dynamicField name="*_bboxtype" type="bbox" stored="true" indexed="true"/>
-
   </fields>
 
   <types>
@@ -146,32 +137,36 @@
     </fieldType>
 
     <!-- Spatial field types -->
-    <fieldType name="location" class="solr.LatLonType" subFieldSuffix="_d"/>
-
+    <fieldType name="location" class="solr.LatLonPointSpatialField" docValues="true"/>
     <fieldType name="location_rpt" class="solr.SpatialRecursivePrefixTreeFieldType"
                geo="true" distErrPct="0.025" maxDistErr="0.001" distanceUnits="kilometers"/>
+    <fieldType name="location_geo3d"
+      class="solr.SpatialRecursivePrefixTreeFieldType"
+      spatialContextFactory="Geo3D"
+      prefixTree="s2"
+      geo="true"
+      maxDistErr="0.001"
+      planetModel="WGS84"/>
+
     <!-- Adding field type for bboxField that enables, among other things, overlap ratio calculations -->
     <fieldType name="bbox" class="solr.BBoxField"
            geo="true" distanceUnits="kilometers" numberType="pdouble" />
     <fieldType name="pdouble" class="solr.DoublePointField" docValues="true"/>
-
-
   </types>
 
   <!-- for scoring formula -->
   <copyField source="dct_spatial_sm"     dest="dct_spatial_tmi"     maxChars="10000"/>
   <copyField source="dct_temporal_sm"    dest="dct_temporal_tmi"    maxChars="10000"/>
-  <copyField source="dct_creator_sm"      dest="dc_creator_tmi"      maxChars="1000"/>
-  <copyField source="dct_description_sm"   dest="dc_description_tmi"   maxChars="10000"/>
-  <copyField source="dct_format_s"        dest="dc_format_ti"        maxChars="100"/>
-  <copyField source="dct_identifier_sm"    dest="dc_identifier_tmi"    maxChars="100"/>
-  <copyField source="dct_publisher_sm"     dest="dc_publisher_tmi"     maxChars="1000"/>
-  <copyField source="dct_accessRights_s"        dest="dc_rights_ti"        maxChars="100"/>
+  <copyField source="dct_creator_sm"      dest="dct_creator_tmi"      maxChars="1000"/>
+  <copyField source="dct_description_sm"   dest="dct_description_tmi"   maxChars="10000"/>
+  <copyField source="dct_format_s"        dest="dct_format_ti"        maxChars="100"/>
+  <copyField source="dct_identifier_sm"    dest="dct_identifier_tmi"    maxChars="100"/>
+  <copyField source="dct_publisher_sm"     dest="dct_publisher_tmi"     maxChars="1000"/>
+  <copyField source="dct_accessRights_s"        dest="dct_accessRights_ti"        maxChars="100"/>
   <copyField source="schema_provider_s"   dest="dct_provider_ti"   maxChars="1000"/>
-  <copyField source="dct_subject_sm"      dest="dc_subject_tmi"      maxChars="10000"/>
-  <copyField source="dct_title_s"         dest="dc_title_ti"         maxChars="1000"/>
+  <copyField source="dct_subject_sm"      dest="dct_subject_tmi"      maxChars="10000"/>
+  <copyField source="dct_title_s"         dest="dct_title_ti"         maxChars="1000"/>
   <copyField source="dct_isPartOf_sm"    dest="dct_isPartOf_tmi"    maxChars="1000"/>
-  <copyField source="locn_geometry_s"  dest="layer_geom_type_ti"  maxChars="100"/>
   <copyField source="id"       dest="layer_slug_ti"       maxChars="100"/>
 
   <!-- core text search -->
@@ -180,7 +175,6 @@
 
   <!-- for sorting text fields -->
   <copyField source="schema_provider_s"   dest="schema_provider_sort"/>
-  <copyField source="dct_publisher_sm"     dest="dc_publisher_sort"/>
   <copyField source="dct_title_s"         dest="dct_title_sort"/>
 
   <!-- for spell checking -->
@@ -200,5 +194,5 @@
   <copyField source="dct_spatial_sm" dest="suggest"/>
 
   <!-- for bbox value -->
-  <copyField source="locn_geometry" dest="solr_bboxtype"/>
+  <copyField source="dcat_bbox" dest="solr_bboxtype"/>
 </schema>

data/solr/conf/solrconfig.xml

@@ -70,9 +70,9 @@
        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
   <query>
     <maxBooleanClauses>1024</maxBooleanClauses>
-    <filterCache class="solr.FastLRUCache" size="512" initialSize="512" autowarmCount="0"/>
-    <queryResultCache class="solr.LRUCache" size="512" initialSize="512" autowarmCount="0"/>
-    <documentCache class="solr.LRUCache" size="512" initialSize="512" autowarmCount="0"/>
+    <filterCache class="solr.CaffeineCache" size="512" initialSize="512" autowarmCount="0" async="true"/>
+    <queryResultCache class="solr.CaffeineCache" size="512" initialSize="512" autowarmCount="0" async="true"/>
+    <documentCache class="solr.CaffeineCache" size="512" initialSize="512" autowarmCount="0" async="true"/>
     <enableLazyFieldLoading>true</enableLazyFieldLoading>
     <queryResultWindowSize>20</queryResultWindowSize>
     <queryResultMaxDocsCached>200</queryResultMaxDocsCached>
@@ -117,35 +117,35 @@
       <str name="q.alt">*:*</str>
       <str name="qf">
         text^1
-        dc_description_ti^2
-        dc_creator_tmi^3
-        dc_publisher_ti^3
+        dct_description_ti^2
+        dct_creator_tmi^3
+        dct_publisher_ti^3
         dct_isPartOf_tmi^4
-        dc_subject_tmi^5
+        dct_subject_tmi^5
         dct_spatial_tmi^5
         dct_temporal_tmi^5
-        dc_title_ti^6
-        dc_rights_ti^7
+        dct_title_ti^6
+        dct_accessRights_ti^7
         dct_provider_ti^8
         layer_geom_type_ti^9
         layer_slug_ti^10
-        dc_identifier_ti^10
+        dct_identifier_ti^10
       </str>
       <str name="pf"><!-- phrase boost within result set -->
         text^1
-        dc_description_ti^2
-        dc_creator_tmi^3
-        dc_publisher_ti^3
+        dct_description_ti^2
+        dct_creator_tmi^3
+        dct_publisher_ti^3
         dct_isPartOf_tmi^4
-        dc_subject_tmi^5
+        dct_subject_tmi^5
         dct_spatial_tmi^5
         dct_temporal_tmi^5
-        dc_title_ti^6
-        dc_rights_ti^7
+        dct_title_ti^6
+        dct_accessRights_ti^7
         dct_provider_ti^8
         layer_geom_type_ti^9
         layer_slug_ti^10
-        dc_identifier_ti^10
+        dct_identifier_ti^10
       </str>
       <bool name="facet">true</bool>
       <int name="facet.mincount">1</int>

data/spec/components/geoblacklight/icon_facet_item_component_spec.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+require 'spec_helper'
+
+RSpec.describe Geoblacklight::IconFacetItemComponent, type: :component do
+  subject(:rendered) do
+    render_inline_to_capybara_node(described_class.new(suppress_link: true, **kwargs))
+  end
+
+  let(:kwargs) { { facet_item: facet_item } }
+  let(:facet_item) { instance_double(Blacklight::FacetItemPresenter, label: 'Stanford', value: 'stanford', hits: 5, href: nil, selected?: false, facet_config: facet_config) }
+  let(:facet_config) { Blacklight::Configuration::FacetField.new(field: 'provider_facet', label: 'Provider') }
+
+  it 'prepends the icon to the facet item label' do
+    expect(rendered).to have_selector('span.facet-label', text: 'Stanford')
+    expect(rendered).to have_selector('span.facet-label svg title', text: 'Stanford University')
+  end
+end

data/spec/config/initializers/rails_config_spec.rb

@@ -10,6 +10,6 @@ describe 'Config' do
   end
 
   it 'Loads new v3.4 Settings.FIELDS defaults' do
-    expect(Settings.HOMEPAGE_MAP_GEOM).to eq nil
+    expect(Settings.HOMEPAGE_MAP_GEOM).to be_nil
   end
 end

data/spec/controllers/catalog_controller_spec.rb

@@ -5,7 +5,7 @@ describe CatalogController, type: :controller do
   describe '#web_services' do
     it 'returns a document based off an id' do
       get :web_services, params: { id: 'mit-f6rqs4ucovjk2' }
-      expect(response.status).to eq 200
+      expect(response).to have_http_status :ok
       expect(assigns(:documents)).not_to be_nil
     end
   end
@@ -13,14 +13,14 @@ describe CatalogController, type: :controller do
   describe '.default_solr_params' do
     it 'sets the number of rows returned by Solr to 10 and does not filter the results' do
       get :index
-      expect(response.status).to eq 200
+      expect(response).to have_http_status :ok
       expect(assigns(:response).docs).not_to be_empty
       expect(assigns(:response).docs.length).to eq 10
     end
 
     it 'sets the starting document index to 0' do
       get :index
-      expect(response.status).to eq 200
+      expect(response).to have_http_status :ok
       expect(assigns(:response).docs).not_to be_empty
       expect(assigns(:response).docs.first.id).to eq 'stanford-cg357zz0321'
     end
@@ -35,7 +35,7 @@ describe CatalogController, type: :controller do
       it 'sets the starting document index' do
         blacklight_config.default_solr_params = { start: 2, 'q.alt' => '*:*' }
         get :index
-        expect(response.status).to eq 200
+        expect(response).to have_http_status :ok
         expect(assigns(:response).docs).not_to be_empty
         expect(assigns(:response).docs.first.id).to eq 'mit-001145244'
       end
@@ -43,7 +43,7 @@ describe CatalogController, type: :controller do
       it 'filters using a default DisMax query when no query is provided by the client' do
         blacklight_config.default_solr_params = { start: 10, 'q.alt' => '{!dismax}id:nyu' }
         get :index
-        expect(response.status).to eq 200
+        expect(response).to have_http_status :ok
         expect(assigns(:response).docs).to be_empty
       end
     end
@@ -58,7 +58,7 @@ describe CatalogController, type: :controller do
       it 'alters the number of documents returned from Solr' do
         blacklight_config.default_per_page = 20
         get :index
-        expect(response.status).to eq 200
+        expect(response).to have_http_status :ok
         expect(assigns(:response).docs).not_to be_empty
         expect(assigns(:response).docs.length).to eq 20
       end
@@ -68,7 +68,7 @@ describe CatalogController, type: :controller do
   describe '#raw' do
     it 'returns a JSON representation of a Solr Document' do
       get :raw, params: { id: 'tufts-cambridgegrid100-04' }
-      expect(response.status).to eq 200
+      expect(response).to have_http_status :ok
       expect(response.body).not_to be_empty
       response_values = JSON.parse(response.body)
       expect(response_values).to include 'gbl_mdVersion_s' => 'Aardvark'
@@ -77,7 +77,7 @@ describe CatalogController, type: :controller do
       expect(response_values).to include Settings.FIELDS.ACCESS_RIGHTS => 'Public'
       expect(response_values).to include Settings.FIELDS.PROVIDER => 'Tufts'
       expect(response_values).to include Settings.FIELDS.ID => 'tufts-cambridgegrid100-04'
-      expect(response_values).to include Settings.FIELDS.SPATIAL_EXTENT => 'ENVELOPE(-71.163984,-71.052581,42.408316,42.34757)'
+      expect(response_values).to include Settings.FIELDS.GEOMETRY => 'ENVELOPE(-71.163984,-71.052581,42.408316,42.34757)'
     end
   end
 end