Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tidying up hash key access of AF::Model #151

Merged
merged 1 commit into from
Jul 11, 2013
Merged

Tidying up hash key access of AF::Model #151

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions lib/active_fedora/model.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@ def self.from_class_uri(uri)
# Returns a suitable uri object for :has_model
# Should reverse Model#from_class_uri
def to_class_uri(attrs = {})
unless self.respond_to? :pid_suffix
pid_suffix = attrs.has_key?(:pid_suffix) ? attrs[:pid_suffix] : ContentModel::CMODEL_PID_SUFFIX
else
if self.respond_to? :pid_suffix
pid_suffix = self.pid_suffix
end
unless self.respond_to? :pid_namespace
namespace = attrs.has_key?(:namespace) ? attrs[:namespace] : ContentModel::CMODEL_NAMESPACE
else
pid_suffix = attrs.fetch(:pid_suffix, ContentModel::CMODEL_PID_SUFFIX)
end
if self.respond_to? :pid_namespace
namespace = self.pid_namespace
else
namespace = attrs.fetch(:namespace, ContentModel::CMODEL_NAMESPACE)
end
"info:fedora/#{namespace}:#{ContentModel.sanitized_class_name(self)}#{pid_suffix}"
end
Expand Down