Skip to content

Commit

Permalink
Using ActiveFedora::WithMetadata::DefaultMetadataClassFactory
Browse files Browse the repository at this point in the history
Add our custom properties to Hydra::PCDM::File and opens the way for additional properties to be added downstream.
  • Loading branch information
awead committed May 12, 2016
1 parent 31127a3 commit f0a0e33
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 30 deletions.
2 changes: 1 addition & 1 deletion hydra-pcdm.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
spec.require_paths = ['lib']

spec.add_dependency 'active-fedora', '>= 9.11', '< 11'
spec.add_dependency 'active-fedora', '~> 10.0.0.beta2'
spec.add_dependency 'mime-types', '>= 1'

spec.add_development_dependency 'bundler', '~> 1.6'
Expand Down
1 change: 0 additions & 1 deletion lib/hydra/pcdm.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ module Vocab
extend ActiveSupport::Autoload
eager_autoload do
autoload :PCDMTerms
autoload :SweetJPLTerms
end
end

Expand Down
12 changes: 0 additions & 12 deletions lib/hydra/pcdm/models/file.rb
Original file line number Diff line number Diff line change
@@ -1,21 +1,9 @@
module Hydra::PCDM
class File < ActiveFedora::File
include ActiveFedora::WithMetadata
include ActiveFedora::Schema

metadata do
configure type: Vocab::PCDMTerms.File
property :label, predicate: ::RDF::RDFS.label

property :file_name, predicate: RDF::Vocab::EBUCore.filename
property :file_size, predicate: RDF::Vocab::EBUCore.fileSize
property :date_created, predicate: RDF::Vocab::EBUCore.dateCreated
property :has_mime_type, predicate: RDF::Vocab::EBUCore.hasMimeType
property :date_modified, predicate: RDF::Vocab::EBUCore.dateModified
property :byte_order, predicate: Vocab::SweetJPLTerms.byteOrder

# This is a server-managed predicate which means Fedora does not let us change it.
property :file_hash, predicate: RDF::Vocab::PREMIS.hasMessageDigest
end
end
end
12 changes: 0 additions & 12 deletions lib/hydra/pcdm/vocab/sweet_jpl_terms.rb

This file was deleted.

7 changes: 3 additions & 4 deletions spec/hydra/pcdm/models/file_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,8 @@
end
end

describe 'using schemas' do
it 'can apply user-defined schemas to the File' do
expect(described_class).to respond_to(:apply_schema)
end
describe '::metadata_class_factory' do
subject { described_class.metadata_class_factory }
it { is_expected.to eq(ActiveFedora::WithMetadata::DefaultMetadataClassFactory) }
end
end

0 comments on commit f0a0e33

Please sign in to comment.