From dcbfdd542e1df95e1401d070afd51c8183f0e14c Mon Sep 17 00:00:00 2001
From: Justin Coyne <jcoyne@justincoyne.com>
Date: Fri, 22 Dec 2017 09:34:47 -0600
Subject: [PATCH] Prefer KeyError to nil pointer error

Because the message on a key error is more useful for debugging.

Compare:
```
     KeyError:
       key not found: "internal_resource_ssim"
```

to

```
     NoMethodError:
       undefined method `first' for nil:NilClass
```

Also removed unnecessary cleaning of solr id field.
---
 .../persistence/solr/orm_converter.rb         | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/valkyrie/persistence/solr/orm_converter.rb b/lib/valkyrie/persistence/solr/orm_converter.rb
index 20dac3731..55ce325d7 100644
--- a/lib/valkyrie/persistence/solr/orm_converter.rb
+++ b/lib/valkyrie/persistence/solr/orm_converter.rb
@@ -21,7 +21,7 @@ def resource_klass
     end
 
     def internal_resource
-      solr_document[Valkyrie::Persistence::Solr::Queries::MODEL].first
+      solr_document.fetch(Valkyrie::Persistence::Solr::Queries::MODEL).first
     end
 
     def attributes
@@ -29,15 +29,15 @@ def attributes
     end
 
     def created_at
-      DateTime.parse(solr_document["created_at_dtsi"].to_s).utc
+      DateTime.parse(solr_document.fetch("created_at_dtsi").to_s).utc
     end
 
     def updated_at
-      DateTime.parse(solr_document["timestamp"] || solr_document["created_at_dtsi"].to_s).utc
+      DateTime.parse(solr_document["timestamp"] || solr_document.fetch("created_at_dtsi").to_s).utc
     end
 
     def id
-      solr_document["id"].gsub(/^id-/, '')
+      solr_document.fetch('id').sub(/^id-/, '')
     end
 
     def attribute_hash
@@ -49,7 +49,7 @@ def attribute_hash
     def strip_tsim(hsh)
       Hash[
         hsh.map do |k, v|
-          [k.gsub("_tsim", ""), v]
+          [k.sub("_tsim", ""), v]
         end
       ]
     end
@@ -126,7 +126,7 @@ def self.handles?(value)
       end
 
       def result
-        Valkyrie::ID.new(value.gsub(/^id-/, ''))
+        Valkyrie::ID.new(value.sub(/^id-/, ''))
       end
     end
 
@@ -138,7 +138,7 @@ def self.handles?(value)
       end
 
       def result
-        ::RDF::URI.new(value.gsub(/^uri-/, ''))
+        ::RDF::URI.new(value.sub(/^uri-/, ''))
       end
     end
 
@@ -154,7 +154,7 @@ def result
       end
 
       def json
-        value.gsub(/^serialized-/, '')
+        value.sub(/^serialized-/, '')
       end
     end
 
@@ -230,7 +230,7 @@ def self.handles?(value)
       end
 
       def result
-        value.gsub(/^integer-/, '').to_i
+        value.sub(/^integer-/, '').to_i
       end
     end
 
@@ -239,13 +239,13 @@ class DateTimeValue < ::Valkyrie::ValueMapper
       SolrValue.register(self)
       def self.handles?(value)
         return false unless value.to_s.start_with?("datetime-")
-        DateTime.iso8601(value.gsub(/^datetime-/, '')).utc
+        DateTime.iso8601(value.sub(/^datetime-/, '')).utc
       rescue
         false
       end
 
       def result
-        DateTime.parse(value.gsub(/^datetime-/, '')).utc
+        DateTime.parse(value.sub(/^datetime-/, '')).utc
       end
     end
   end