Skip to content

Commit

Permalink
Merge pull request #340 from samvera-labs/key_error
Browse files Browse the repository at this point in the history
Prefer KeyError to nil pointer error
  • Loading branch information
Trey Pendragon committed Jan 17, 2018
2 parents 0755256 + dcbfdd5 commit d0ec233
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions lib/valkyrie/persistence/solr/orm_converter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,23 +21,23 @@ 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
attribute_hash.merge("id" => id, internal_resource: internal_resource, created_at: created_at, updated_at: updated_at)
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
Expand All @@ -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
Expand Down Expand Up @@ -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

Expand All @@ -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

Expand All @@ -154,7 +154,7 @@ def result
end

def json
value.gsub(/^serialized-/, '')
value.sub(/^serialized-/, '')
end
end

Expand Down Expand Up @@ -230,7 +230,7 @@ def self.handles?(value)
end

def result
value.gsub(/^integer-/, '').to_i
value.sub(/^integer-/, '').to_i
end
end

Expand All @@ -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
Expand Down

0 comments on commit d0ec233

Please sign in to comment.