Use rdf-vocab gem for DC vocab

samvera · Nov 24, 2015 · e82cf24 · e82cf24
1 parent a5c97ac
commit e82cf24
Show file tree

Hide file tree

Showing 41 changed files with 108 additions and 108 deletions.
diff --git a/lib/active_fedora/attributes/active_triple_attribute.rb b/lib/active_fedora/attributes/active_triple_attribute.rb
@@ -3,8 +3,8 @@ module ActiveFedora
   #
   # @example
   #   class Book < ActiveFedora::Base
-  #     property :title, predicate: ::RDF::DC.title
-  #     property :author, predicate: ::RDF::DC.creator
+  #     property :title, predicate: ::RDF::Vocab::DC.title
+  #     property :author, predicate: ::RDF::Vocab::DC.creator
   #   end
   #
   #   Book.attribute_names

diff --git a/lib/active_fedora/errors.rb b/lib/active_fedora/errors.rb
@@ -56,7 +56,7 @@ class IllegalOperation < ActiveFedoraError
   # Raised when the data has more than one statement for a predicate, but our constraints say it's singular
   # This helps to prevent overwriting multiple values with a single value when round tripping:
   #   class Book < ActiveFedora::Base
-  #     property :title, predicate: RDF::DC.title, multiple: false
+  #     property :title, predicate: RDF::Vocab::DC.title, multiple: false
   #   end
   #
   #   b = Book.new

diff --git a/lib/generators/active_fedora/model/templates/model.rb.erb b/lib/generators/active_fedora/model/templates/model.rb.erb
@@ -6,16 +6,16 @@ class <%= class_name %> < ActiveFedora::Base
   <% else %>
   # Define some properties to store:
   #
-  property :title, predicate: ::RDF::DC.title do |index|
+  property :title, predicate: ::RDF::Vocab::DC.title do |index|
     index.as :stored_searchable, :facetable
   end
-  property :creator, predicate: ::RDF::DC.creator do |index|
+  property :creator, predicate: ::RDF::Vocab::DC.creator do |index|
     index.as :stored_searchable, :facetable
   end
-  property :contributor, predicate: ::RDF::DC.contributor do |index|
+  property :contributor, predicate: ::RDF::Vocab::DC.contributor do |index|
     index.as :stored_searchable, :facetable
   end
-  property :description, predicate: ::RDF::DC.description do |index|
+  property :description, predicate: ::RDF::Vocab::DC.description do |index|
     index.as :stored_searchable
   end
   <%- end -%>

diff --git a/spec/integration/associations_spec.rb b/spec/integration/associations_spec.rb
@@ -4,7 +4,7 @@
   describe "use a URI as the property" do
     before do
       class Book < ActiveFedora::Base
-        belongs_to :author, predicate: ::RDF::DC.creator, class_name: 'Person'
+        belongs_to :author, predicate: ::RDF::Vocab::DC.creator, class_name: 'Person'
       end
 
       class Person < ActiveFedora::Base

diff --git a/spec/integration/attributes_spec.rb b/spec/integration/attributes_spec.rb
@@ -25,7 +25,7 @@ class RdfObject < ActiveFedora::Base
         end
         has_attributes :wrangler, datastream: :foo, multiple: true
       end
-      property :resource_type, predicate: ::RDF::DC.type do |index|
+      property :resource_type, predicate: ::RDF::Vocab::DC.type do |index|
         index.as :stored_searchable, :facetable
       end
     end

diff --git a/spec/integration/base_spec.rb b/spec/integration/base_spec.rb
@@ -82,7 +82,7 @@ class MockAFBaseRelationship < ActiveFedora::Base
     before do
       class Book < ActiveFedora::Base
         type [::RDF::URI("http://www.example.com/Book")]
-        property :title, predicate: ::RDF::DC.title
+        property :title, predicate: ::RDF::Vocab::DC.title
       end
     end
 
@@ -151,7 +151,7 @@ class Book < ActiveFedora::Base
   describe "#apply_schema" do
     before do
       class ExampleSchema < ActiveTriples::Schema
-        property :title, predicate: RDF::DC.title
+        property :title, predicate: RDF::Vocab::DC.title
       end
       class ExampleBase < ActiveFedora::Base
         apply_schema ExampleSchema, ActiveFedora::SchemaIndexingStrategy.new(ActiveFedora::Indexers::GlobalIndexer.new(:symbol))

diff --git a/spec/integration/caching_spec.rb b/spec/integration/caching_spec.rb
@@ -3,7 +3,7 @@
 describe "Caching" do
   before do
     class TestClass < ActiveFedora::Base
-      property :title, predicate: ::RDF::DC.title
+      property :title, predicate: ::RDF::Vocab::DC.title
     end
   end
 

diff --git a/spec/integration/clean_connection_spec.rb b/spec/integration/clean_connection_spec.rb
@@ -7,14 +7,14 @@
       let(:uri) { asset.rdf_subject }
       let(:asset) do
         ActiveFedora::Base.create do |a|
-          a.resource << [a.rdf_subject, RDF::DC.title, "test"]
+          a.resource << [a.rdf_subject, RDF::Vocab::DC.title, "test"]
         end
       end
       let(:result) { subject.get(uri) }
       it "returns a clean graph" do
         graph = result.graph
         expect(graph.statements.to_a.length).to eq 1
-        expect(graph.statements.to_a.first).to eq [asset.rdf_subject, RDF::DC.title, "test"]
+        expect(graph.statements.to_a.first).to eq [asset.rdf_subject, RDF::Vocab::DC.title, "test"]
       end
     end
   end

diff --git a/spec/integration/collection_association_spec.rb b/spec/integration/collection_association_spec.rb
@@ -114,7 +114,7 @@ class SpecContainer < ActiveFedora::Base
     context "when classes are namespaced" do
       before do
         class Item < ActiveFedora::Base
-          has_and_belongs_to_many :container, predicate: ::RDF::DC.extent, class_name: 'Foo::Container'
+          has_and_belongs_to_many :container, predicate: ::RDF::Vocab::DC.extent, class_name: 'Foo::Container'
         end
         module Foo
           class Container < ActiveFedora::Base

diff --git a/spec/integration/complex_rdf_datastream_spec.rb b/spec/integration/complex_rdf_datastream_spec.rb
@@ -4,10 +4,10 @@
   describe "without type" do
     before do
       class SpecDatastream < ActiveFedora::NtriplesRDFDatastream
-        property :parts, predicate: ::RDF::DC.hasPart, class_name: 'Component'
+        property :parts, predicate: ::RDF::Vocab::DC.hasPart, class_name: 'Component'
 
         class Component < ActiveTriples::Resource
-          property :label, predicate: ::RDF::DC.title
+          property :label, predicate: ::RDF::Vocab::DC.title
         end
       end
     end
@@ -128,11 +128,11 @@ class Component < ActiveTriples::Resource
     describe "one class per assertion" do
       before(:each) do
         class SpecDatastream < ActiveFedora::NtriplesRDFDatastream
-          property :mediator, predicate: ::RDF::DC.mediator, class_name: 'MediatorUser'
+          property :mediator, predicate: ::RDF::Vocab::DC.mediator, class_name: 'MediatorUser'
 
           class MediatorUser < ActiveTriples::Resource
-            configure type: ::RDF::DC.AgentClass
-            property :title, predicate: ::RDF::DC.title
+            configure type: ::RDF::Vocab::DC.AgentClass
+            property :title, predicate: ::RDF::Vocab::DC.title
           end
         end
       end

diff --git a/spec/integration/contains_association_spec.rb b/spec/integration/contains_association_spec.rb
@@ -4,7 +4,7 @@
   before do
     class Source < ActiveFedora::Base
       contains :sub_resource, class_name: "Source"
-      property :title, predicate: ::RDF::DC.title, multiple: false
+      property :title, predicate: ::RDF::Vocab::DC.title, multiple: false
     end
   end
   after do

diff --git a/spec/integration/datastream_rdf_nested_attributes_spec.rb b/spec/integration/datastream_rdf_nested_attributes_spec.rb
@@ -27,7 +27,7 @@ class DummyMADS < RDF::Vocabulary("http://www.loc.gov/mads/rdf/v1#")
         class ComplexRDFDatastream < ActiveFedora::NtriplesRDFDatastream
           property :topic, predicate: DummyMADS.Topic, class_name: "Topic"
           property :personalName, predicate: DummyMADS.PersonalName, class_name: "PersonalName"
-          property :title, predicate: ::RDF::DC.title
+          property :title, predicate: ::RDF::Vocab::DC.title
 
           accepts_nested_attributes_for :topic, :personalName
 
@@ -142,11 +142,11 @@ class MadsTopicElement < ActiveTriples::Resource
     describe "with an existing object" do
       before(:each) do
         class SpecDatastream < ActiveFedora::NtriplesRDFDatastream
-          property :parts, predicate: ::RDF::DC.hasPart, class_name: 'Component'
+          property :parts, predicate: ::RDF::Vocab::DC.hasPart, class_name: 'Component'
           accepts_nested_attributes_for :parts, allow_destroy: true
 
           class Component < ActiveTriples::Resource
-            property :label, predicate: ::RDF::DC.title
+            property :label, predicate: ::RDF::Vocab::DC.title
           end
         end
       end

diff --git a/spec/integration/date_time_properties_spec.rb b/spec/integration/date_time_properties_spec.rb
@@ -4,7 +4,7 @@
   before do
     class Foo < ActiveFedora::Base
       # Date attributes are recognized by having index.type :Date or class_name: 'DateTime'
-      property :date, predicate: ::RDF::DC.date do |index|
+      property :date, predicate: ::RDF::Vocab::DC.date do |index|
         index.type :date
       end
       property :single_date, multiple: false, class_name: 'DateTime', predicate: ::RDF::URI.new('http://www.example.com/single_date')

diff --git a/spec/integration/field_to_solr_name_spec.rb b/spec/integration/field_to_solr_name_spec.rb
@@ -5,10 +5,10 @@
     class TestOne < ActiveFedora::Base
       class MyMetadata < ActiveFedora::NtriplesRDFDatastream
         Deprecation.silence(ActiveFedora::RDFDatastream) do
-          property :title, predicate: ::RDF::DC.title do |index|
+          property :title, predicate: ::RDF::Vocab::DC.title do |index|
             index.as :stored_searchable
           end
-          property :date_uploaded, predicate: ::RDF::DC.dateSubmitted do |index|
+          property :date_uploaded, predicate: ::RDF::Vocab::DC.dateSubmitted do |index|
             index.type :date
             index.as :stored_searchable, :sortable
           end

diff --git a/spec/integration/has_and_belongs_to_many_associations_spec.rb b/spec/integration/has_and_belongs_to_many_associations_spec.rb
@@ -326,7 +326,7 @@ class Book < ActiveFedora::Base
       end
 
       class Collection < ActiveFedora::Base
-        property :title, predicate: ::RDF::DC.title
+        property :title, predicate: ::RDF::Vocab::DC.title
       end
     end
 

diff --git a/spec/integration/has_many_associations_spec.rb b/spec/integration/has_many_associations_spec.rb
@@ -371,7 +371,7 @@ class Library < ActiveFedora::Base
 
         class Book < ActiveFedora::Base
           belongs_to :library, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.hasConstituent
-          property :title, predicate: ::RDF::DC.title
+          property :title, predicate: ::RDF::Vocab::DC.title
         end
       end
       after :all do

diff --git a/spec/integration/indirect_container_spec.rb b/spec/integration/indirect_container_spec.rb
@@ -3,7 +3,7 @@
 describe "Indirect containers" do
   before do
     class RelatedObject < ActiveFedora::Base
-      property :title, predicate: ::RDF::DC.title, multiple: false
+      property :title, predicate: ::RDF::Vocab::DC.title, multiple: false
     end
     class Proxy < ActiveFedora::Base
       belongs_to :proxy_for, predicate: ::RDF::URI.new('http://www.openarchives.org/ore/terms/proxyFor'), class_name: 'ActiveFedora::Base'
@@ -215,7 +215,7 @@ class FooHistory < ActiveFedora::Base
     context "when the class is provided" do
       before do
         class Different < ActiveFedora::Base
-          property :title, predicate: ::RDF::DC.title, multiple: false
+          property :title, predicate: ::RDF::Vocab::DC.title, multiple: false
         end
         class FooHistory < ActiveFedora::Base
           indirectly_contains :related_objects, has_member_relation: ::RDF::URI.new('http://www.openarchives.org/ore/terms/aggregates'), inserted_content_relation: ::RDF::URI.new('http://www.openarchives.org/ore/terms/proxyFor'), class_name: 'Different', through: 'Proxy', foreign_key: :proxy_for

diff --git a/spec/integration/json_serialization_spec.rb b/spec/integration/json_serialization_spec.rb
@@ -16,7 +16,7 @@ class Foo < ActiveFedora::Base
           has_attributes :foo, datastream: 'descMetadata', multiple: true
           has_attributes :bar, datastream: 'descMetadata', multiple: false
         end
-        property :title, predicate: ::RDF::DC.title
+        property :title, predicate: ::RDF::Vocab::DC.title
       end
     end
 
@@ -41,12 +41,12 @@ class Foo < ActiveFedora::Base
   context "with nested nodes" do
     before do
       class DummySubnode < ActiveTriples::Resource
-        property :relation, predicate: ::RDF::DC[:relation]
+        property :relation, predicate: ::RDF::Vocab::DC[:relation]
       end
 
       class DummyResource < ActiveFedora::RDFDatastream
         Deprecation.silence(ActiveFedora::RDFDatastream) do
-          property :license, predicate: ::RDF::DC[:license], class_name: DummySubnode do |index|
+          property :license, predicate: ::RDF::Vocab::DC[:license], class_name: DummySubnode do |index|
             index.as :searchable, :displayable
           end
         end

diff --git a/spec/integration/nested_hash_resources_spec.rb b/spec/integration/nested_hash_resources_spec.rb
@@ -3,7 +3,7 @@
 describe "nested hash resources" do
   before do
     class NestedResource < ActiveTriples::Resource
-      property :title, predicate: ::RDF::DC.title
+      property :title, predicate: ::RDF::Vocab::DC.title
       ## Necessary to get AT to create hash URIs.
       def initialize(uri, parent)
         if uri.try(:node?)
@@ -19,7 +19,7 @@ def final_parent
       end
     end
     class ExampleOwner < ActiveFedora::Base
-      property :relation, predicate: ::RDF::DC.relation, class_name: NestedResource
+      property :relation, predicate: ::RDF::Vocab::DC.relation, class_name: NestedResource
       accepts_nested_attributes_for :relation
     end
   end

diff --git a/spec/integration/ntriples_datastream_spec.rb b/spec/integration/ntriples_datastream_spec.rb
@@ -8,18 +8,18 @@ class FileVocabulary < RDF::Vocabulary("http://downlode.org/Code/RDF/File_Proper
 
     Deprecation.silence(ActiveFedora::RDFDatastream) do
       class MyDatastream < ActiveFedora::NtriplesRDFDatastream
-        property :title, predicate: ::RDF::DC.title do |index|
+        property :title, predicate: ::RDF::Vocab::DC.title do |index|
           index.as :stored_searchable, :facetable
         end
-        property :date_uploaded, predicate: ::RDF::DC.dateSubmitted do |index|
+        property :date_uploaded, predicate: ::RDF::Vocab::DC.dateSubmitted do |index|
           index.type :date
           index.as :stored_searchable, :sortable
         end
         property :filesize, predicate: FileVocabulary.size do |index|
           index.type :integer
           index.as :stored_sortable
         end
-        property :part, predicate: ::RDF::DC.hasPart
+        property :part, predicate: ::RDF::Vocab::DC.hasPart
         property :based_near, predicate: ::RDF::FOAF.based_near
         property :related_url, predicate: ::RDF::RDFS.seeAlso
       end
@@ -159,7 +159,7 @@ class RdfTest < ActiveFedora::Base
       # reopening existing class
       class MyDatastream < ActiveFedora::NtriplesRDFDatastream
         rdf_subject { |ds| RDF::URI.new("http://oregondigital.org/ns/#{parent_uri(ds).split('/')[-1].split(':')[1]}") }
-        property :dctype, predicate: ::RDF::DC.type
+        property :dctype, predicate: ::RDF::Vocab::DC.type
       end
       subject.rdf.dctype = "Frog"
       subject.save!
@@ -213,7 +213,7 @@ class MyDatastream < ActiveFedora::NtriplesRDFDatastream
   describe "term proxy methods" do
     before(:each) do
       class TitleDatastream < ActiveFedora::NtriplesRDFDatastream
-        property :title, predicate: ::RDF::DC.title
+        property :title, predicate: ::RDF::Vocab::DC.title
       end
       class Foobar < ActiveFedora::Base
         has_metadata 'rdf', type: TitleDatastream

diff --git a/spec/integration/rdf_nested_attributes_spec.rb b/spec/integration/rdf_nested_attributes_spec.rb
@@ -10,7 +10,7 @@ class ComplexResource < ActiveFedora::Base
       property :topic, predicate: DummyMADS.Topic, class_name: "ComplexResource::Topic"
 
       class Topic < ActiveTriples::Resource
-        property :subject, predicate: ::RDF::DC.subject
+        property :subject, predicate: ::RDF::Vocab::DC.subject
       end
     end
   end

diff --git a/spec/integration/solr_instance_loader_spec.rb b/spec/integration/solr_instance_loader_spec.rb
@@ -11,10 +11,10 @@ class Foo < ActiveFedora::Base
         has_attributes :foo, datastream: 'descMetadata', multiple: true
         has_attributes :bar, datastream: 'descMetadata', multiple: false
       end
-      property :title, predicate: ::RDF::DC.title, multiple: false
-      property :description, predicate: ::RDF::DC.description
+      property :title, predicate: ::RDF::Vocab::DC.title, multiple: false
+      property :description, predicate: ::RDF::Vocab::DC.description
       belongs_to :another, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, class_name: 'Foo'
-      has_and_belongs_to_many :dates, predicate: ::RDF::DC.date, class_name: 'Bar'
+      has_and_belongs_to_many :dates, predicate: ::RDF::Vocab::DC.date, class_name: 'Bar'
       accepts_nested_attributes_for :dates, reject_if: :all_blank, allow_destroy: true
     end
     class Bar < ActiveFedora::Base

diff --git a/spec/integration/versionable_spec.rb b/spec/integration/versionable_spec.rb
@@ -4,7 +4,7 @@
   context "For ActiveFedora::Base" do
     before do
       class WithVersions < ActiveFedora::Base
-        property :title, predicate: ::RDF::DC.title
+        property :title, predicate: ::RDF::Vocab::DC.title
       end
     end
 
@@ -140,7 +140,7 @@ class WithVersions < ActiveFedora::Base
   describe ActiveFedora::NtriplesRDFDatastream do
     before(:all) do
       class VersionableDatastream < ActiveFedora::NtriplesRDFDatastream
-        property :title, predicate: ::RDF::DC.title
+        property :title, predicate: ::RDF::Vocab::DC.title
       end
 
       class MockAFBase < ActiveFedora::Base

diff --git a/spec/integration/with_metadata_spec.rb b/spec/integration/with_metadata_spec.rb
@@ -6,7 +6,7 @@ class SampleFile < ActiveFedora::File
       include ActiveFedora::WithMetadata
 
       metadata do
-        property :title, predicate: ::RDF::DC.title
+        property :title, predicate: ::RDF::Vocab::DC.title
       end
     end
   end

diff --git a/spec/unit/attributes_spec.rb b/spec/unit/attributes_spec.rb
@@ -376,8 +376,8 @@ class BarHistory3 < BarHistory2
   context "with a RDF datastream" do
     before :all do
       class BarRdfDatastream < ActiveFedora::NtriplesRDFDatastream
-        property :title, predicate: ::RDF::DC.title
-        property :description, predicate: ::RDF::DC.description
+        property :title, predicate: ::RDF::Vocab::DC.title
+        property :description, predicate: ::RDF::Vocab::DC.description
       end
       class BarHistory4 < ActiveFedora::Base
         has_metadata 'rdfish', type: BarRdfDatastream
@@ -468,8 +468,8 @@ class BarHistory4 < ActiveFedora::Base
   context "when a datastream is specified as a symbol" do
     before :all do
       class BarRdfDatastream < ActiveFedora::NtriplesRDFDatastream
-        property :title, predicate: ::RDF::DC.title
-        property :description, predicate: ::RDF::DC.description
+        property :title, predicate: ::RDF::Vocab::DC.title
+        property :description, predicate: ::RDF::Vocab::DC.description
       end
       class BarHistory4 < ActiveFedora::Base
         has_metadata 'rdfish', type: BarRdfDatastream
@@ -494,10 +494,10 @@ class BarHistory4 < ActiveFedora::Base
   context "when properties are defined on an object" do
     before :all do
       class BarHistory4 < ActiveFedora::Base
-        property :title, predicate: ::RDF::DC.title do |index|
+        property :title, predicate: ::RDF::Vocab::DC.title do |index|
           index.as :symbol
         end
-        property :abstract, predicate: ::RDF::DC.abstract, multiple: false
+        property :abstract, predicate: ::RDF::Vocab::DC.abstract, multiple: false
       end
     end