active-fedora 8.7.0 → 9.0.0.beta1

data/lib/active_fedora/persistence.rb

@@ -3,13 +3,12 @@ module ActiveFedora
   module Persistence
     extend ActiveSupport::Concern
 
-    ## Required by associations
     def new_record?
-      inner_object.new_record?
+      @ldp_source.new?
     end
 
     def persisted?
-      !(new_record? || destroyed?)
+      !(destroyed? || new_record?)
     end
 
     # Returns true if this object has been destroyed, otherwise returns false.
@@ -17,7 +16,7 @@ module ActiveFedora
       @destroyed
     end
 
-    # Saves a Base object, and any dirty datastreams, then updates 
+    # Saves a Base object, and any dirty attached files, then updates
     # the Solr index for this object, unless option :update_index=>false is present.
     # Indexing is also controlled by the `create_needs_index?' and `update_needs_index?' methods.
     #
@@ -25,61 +24,57 @@ module ActiveFedora
     # @option options [Boolean] :update_index (true) set false to skip indexing
     # @return [Boolean] true if save was successful, otherwise false
     def save(options={})
-      new_record? ? create(options) : update_record(options)
+      raise ReadOnlyRecord if readonly?
+      new_record? ? create_record(options) : update_record(options)
     end
 
     def save!(options={})
       save(options)
     end
 
-    # This can be overriden to assert a different model
-    # It's normally called once in the lifecycle, by #create#
-    def assert_content_model
-      add_relationship(:has_model, self.class.to_class_uri)
-    end
-
-    # Pushes the object and all of its new or dirty datastreams into Fedora
+    # Pushes the object and all of its new or dirty attached files into Fedora
     def update(attributes)
       self.attributes=attributes
       save
     end
 
     alias update_attributes update
-    
-    # Refreshes the object's info from Fedora
-    # Note: Currently just registers any new datastreams that have appeared in fedora
-    def refresh
-#      inner_object.load_attributes_from_fedora
-    end
 
-    #Deletes a Base object, also deletes the info indexed in Solr, and 
+    #Deletes a Base object, also deletes the info indexed in Solr, and
     #the underlying inner_object.  If this object is held in any relationships (ie inbound relationships
     #outside of this object it will remove it from those items rels-ext as well
     def delete
+      return self if new_record?
+
+      @destroyed = true
       reflections.each_pair do |name, reflection|
         if reflection.macro == :has_many
-          association(name).delete_all
+          association(name.to_sym).delete_all
         end
       end
 
-      @pid ||= self.pid ## cache so it's still available after delete
+      id = self.id ## cache so it's still available after delete
+      # Clear out the ETag
+      @ldp_source = LdpResource.new(conn, uri)
       begin
-        @inner_object.delete
-      rescue RestClient::ResourceNotFound => e
-        raise ObjectNotFoundError, "Unable to find #{pid} in the repository"
-      end
-      if ENABLE_SOLR_UPDATES
-        solr = ActiveFedora::SolrService.instance.conn
-        solr.delete_by_id(pid, params: {'softCommit' => true}) 
+        @ldp_source.delete
+      rescue Ldp::NotFound
+        raise ObjectNotFoundError, "Unable to find #{id} in the repository"
       end
-      @destroyed = true
+
+      ActiveFedora::SolrService.delete(id) if ENABLE_SOLR_UPDATES
       freeze
     end
 
     def destroy
+      raise ReadOnlyRecord if readonly?
       delete
     end
 
+    def eradicate
+      self.class.eradicate(self.id)
+    end
+
     module ClassMethods
       # Creates an object (or multiple objects) and saves it to the repository, if validations pass.
       # The resulting object is returned whether the object was saved successfully to the repository or not.
@@ -107,59 +102,88 @@ module ActiveFedora
         if attributes.is_a?(Array)
           attributes.collect { |attr| create(attr, &block) }
         else
-          object = new(attributes)
-          yield(object) if block_given?
+          object = new(attributes, &block)
           object.save
           object
         end
       end
-    end
 
-  protected
+      # Removes an object's tombstone so another object with the same uri may be created.
+      # NOTE: this is in violation of the linked data platform and is only here as a convience
+      # method. It shouldn't be used in the general course of repository operations.
+      def eradicate(uri)
+        gone?(uri) ? delete_tombstone(uri) : false
+      end
 
-    # Determines whether a create operation causes a solr index of this object by default.
-    # Override this if you need different behavior.
-    def create_needs_index?
-      ENABLE_SOLR_UPDATES
-    end
+      private
 
-    # Determines whether an update operation causes a solr index of this object by default.
-    # Override this if you need different behavior
-    def update_needs_index?
-      ENABLE_SOLR_UPDATES
+      def gone? uri
+        ActiveFedora::Base.find(uri)
+        false
+      rescue Ldp::Gone
+        true
+      end
+
+      def delete_tombstone uri
+        tombstone = ActiveFedora::Base.id_to_uri(uri) + "/fcr:tombstone"
+        ActiveFedora.fedora.connection.delete(tombstone)
+        true
+      end
     end
 
   private
-    
-    # Deals with preparing new object to be saved to Fedora, then pushes it and its datastreams into Fedora. 
-    def create(options={})
-      assign_pid
-      assert_content_model
-      should_update_index = create_needs_index? && options.fetch(:update_index, true)
-      persist(should_update_index)
-    end
-
-    def update_record(options={})
-      should_update_index = update_needs_index? && options.fetch(:update_index, true)
-      persist(should_update_index)
-    end
-
-    # replace the unsaved digital object with a saved digital object
-    def assign_pid
-      @inner_object = @inner_object.save 
-    end
-    
-    def persist(should_update_index)
-      serialize_datastreams
-      result = @inner_object.save
-      ### Rubydora re-inits the datastreams after a save, so ensure our copy stays in synch
-      @inner_object.datastreams.each do |dsid, ds|
-        datastreams[dsid] = ds
-        ds.model = self if ds.kind_of? RelsExtDatastream
-      end 
+
+    # Deals with preparing new object to be saved to Fedora, then pushes it and its attached files into Fedora.
+    def create_record(options = {})
+      assign_rdf_subject
+      serialize_attached_files
+      @ldp_source = @ldp_source.create
+      @resource = nil
+      assign_uri_to_attached_files
+      save_attached_files
+      refresh
+    end
+
+    def update_record(options = {})
+      serialize_attached_files
+      execute_sparql_update
+      save_attached_files
       refresh
-      update_index if should_update_index
-      return !!result
+    end
+
+    def refresh
+      @ldp_source = LdpResource.new(conn, uri)
+      @resource = nil
+    end
+
+    def execute_sparql_update
+      change_set = ChangeSet.new(self, self.resource, self.changed_attributes.keys)
+      return true if change_set.empty?
+      SparqlInsert.new(change_set.changes).execute(uri)
+    end
+
+
+    def assign_id
+    end
+
+    def assign_rdf_subject
+      @ldp_source = if !id && new_id = assign_id
+        LdpResource.new(ActiveFedora.fedora.connection, self.class.id_to_uri(new_id), @resource)
+      else
+        LdpResource.new(ActiveFedora.fedora.connection, @ldp_source.subject, @resource, ActiveFedora.fedora.host + ActiveFedora.fedora.base_path)
+      end
+    end
+
+    def assign_uri_to_attached_files
+      attached_files.each do |name, ds|
+        ds.uri= "#{uri}/#{name}"
+      end
+    end
+
+    def save_attached_files
+      attached_files.select { |_, file| file.changed? }.each do |_, file|
+        file.save # Don't call save! because if the content_changed? returns false, it'll raise an error.
+      end
     end
   end
 end

data/lib/active_fedora/predicates.rb

@@ -17,7 +17,7 @@ module ActiveFedora
       #TODO, these could be cached
       case predicate
       when :has_model, "hasModel", :hasModel
-        xmlns="info:fedora/fedora-system:def/model#"
+        xmlns="http://fedora.info/definitions/v4/model#"
         begin
           rel_predicate = predicate_lookup(predicate,xmlns)
         rescue UnregisteredPredicateError
@@ -25,7 +25,7 @@ module ActiveFedora
           rel_predicate = nil
         end
       else
-        xmlns="info:fedora/fedora-system:def/relations-external#"
+        xmlns="http://fedora.info/definitions/v4/rels-ext#"
         begin
           rel_predicate = predicate_lookup(predicate,xmlns)
         rescue UnregisteredPredicateError
@@ -52,7 +52,7 @@ module ActiveFedora
     # If predicate is a symbol, looks up the predicate in the predicate_mappings
     # If predicate is not a Symbol, returns the predicate untouched
     # @raise UnregisteredPredicateError if the predicate is a symbol but is not found in the predicate_mappings
-    def self.predicate_lookup(predicate,namespace="info:fedora/fedora-system:def/relations-external#")
+    def self.predicate_lookup(predicate,namespace="http://fedora.info/definitions/v4/rels-ext#")
       if predicate.class == Symbol 
         if predicate_mappings[namespace].has_key?(predicate)
           return predicate_mappings[namespace][predicate]
@@ -100,7 +100,7 @@ module ActiveFedora
     # @example
     #  ActiveFedora::Predicates.set_predicates({
     #                                              "http://projecthydra.org/ns/relations#"=>{has_profile:"hasProfile"},
-    #                                              "info:fedora/fedora-system:def/relations-external#"=>{
+    #                                              "http://fedora.info/definitions/v4/rels-ext#"=>{
     #                                                  references:"references",
     #                                                  has_derivation: "cameFrom"
     #                                              },

data/lib/active_fedora/qualified_dublin_core_datastream.rb

@@ -1,27 +1,26 @@
 module ActiveFedora
-  #This class represents a Qualified Dublin Core Datastream. A special case of ActiveFedora::MetdataDatastream
+  #This class represents a Qualified Dublin Core Datastream. A special case of ActiveFedora::OmDatastream
   #The implementation of this class defines the terms from the Qualified Dublin Core specification.
-  #This implementation features customized xml generators and deserialization routines to handle the 
+  #This implementation features customized xml generators and deserialization routines to handle the
   #Fedora Dublin Core XML datastreams structure.
   #
-  #Fields can still be overridden if more specificity is desired (see ActiveFedora::Datastream#fields method).
+  #Fields can still be overridden if more specificity is desired (see ActiveFedora::File#fields method).
   class QualifiedDublinCoreDatastream < OmDatastream
 
     attr_accessor :fields
     class_attribute :class_fields
     self.class_fields = []
-    
-    
-     set_terminology do |t|
-       t.root(:path=>"dc", :xmlns=>"http://purl.org/dc/terms/")
-     end
+
+    set_terminology do |t|
+      t.root(:path=>"dc", :xmlns=>"http://purl.org/dc/terms/")
+    end
 
     define_template :creator do |xml,name|
       xml.creator() do
         xml.text(name)
       end
     end
-    
+
     #A frozen array of Dublincore Terms.
     DCTERMS = [
                :abstract,
@@ -113,8 +112,8 @@ module ActiveFedora
     #
     #There is quite a good example of this class in use in spec/examples/oral_history.rb
     #
-    #!! Careful: If you declare two fields that correspond to the same xml node without any qualifiers to differentiate them, 
-    #you will end up replicating the values in the underlying datastream, resulting in mysterious dubling, quadrupling, etc. 
+    #!! Careful: If you declare two fields that correspond to the same xml node without any qualifiers to differentiate them,
+    #you will end up replicating the values in the underlying datastream, resulting in mysterious dubling, quadrupling, etc.
     #whenever you edit the field's values.
     def field(name, tupe=nil, opts={})
       fields ||= {}
@@ -128,9 +127,9 @@ module ActiveFedora
         self.class.terminology.add_term(term)
         term.generate_xpath_queries!
       end
-      
+
     end
-    
+
     def update_indexed_attributes(params={}, opts={})
       # if the params are just keys, not an array, make then into an array.
       new_params = {}
@@ -143,19 +142,19 @@ module ActiveFedora
       end
       super(new_params, opts)
     end
-    
+
 
     def self.xml_template
        Nokogiri::XML::Document.parse("<dc xmlns:dcterms='http://purl.org/dc/terms/' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'/>")
     end
 
-    def to_solr(solr_doc = Hash.new) # :nodoc:
+    def to_solr(solr_doc = Hash.new, opts = {}) # :nodoc:
       @fields.each do |field_key, field_info|
         things = send(field_key)
-        if things 
+        if things
           field_symbol = ActiveFedora::SolrService.solr_name(field_key, type: field_info[:type])
-          things.val.each do |val|    
-            ::Solrizer::Extractor.insert_solr_field_value(solr_doc, field_symbol, val )         
+          things.val.each do |val|
+            ::Solrizer::Extractor.insert_solr_field_value(solr_doc, field_symbol, val )
           end
         end
       end

data/lib/active_fedora/querying.rb

@@ -1,8 +1,7 @@
 module ActiveFedora
   module Querying
-
-    delegate :find, :first, :exists?, :where, :limit, :offset, :order, :delete_all, 
-      :destroy_all, :count, :last, :find_with_conditions, :find_in_batches, :find_each, :to=>:all
+    delegate :find, :first, :exists?, :where, :limit, :offset, :order, :delete_all,
+      :destroy_all, :count, :last, :find_with_conditions, :find_in_batches, :find_each, to: :all
 
     def self.extended(base)
       base.class_attribute  :solr_query_handler
@@ -10,7 +9,7 @@ module ActiveFedora
     end
 
     def default_sort_params
-      [ActiveFedora::SolrService.solr_name(:system_create, :stored_sortable, type: :date)+' asc'] 
+      [ActiveFedora::SolrService.solr_name(:system_create, :stored_sortable, type: :date)+' asc']
     end
 
   end

data/lib/active_fedora/railtie.rb

@@ -1,14 +1,11 @@
 module ActiveFedora
   class Railtie < Rails::Railtie
-    rake_tasks do
-      load "tasks/active_fedora.rake"
-    end
 
-   initializer 'active_fedora.autoload', :before => :set_autoload_paths do |app|
-     app.config.autoload_paths += ['app/models/datastreams']
+    initializer 'active_fedora.autoload', before: :set_autoload_paths do |app|
+      app.config.autoload_paths << 'app/models/datastreams'
     end
 
-   initializer "active_fedora.logger" do
+    initializer "active_fedora.logger" do
       ActiveSupport.on_load(:active_fedora) { self.logger ||= ::Rails.logger }
     end
 

data/lib/active_fedora/rdf.rb

@@ -1,11 +1,13 @@
 module ActiveFedora
   module RDF
     extend ActiveSupport::Autoload
+    autoload :DatastreamIndexing
     autoload :Fcrepo
+    autoload :Ldp
     autoload :Indexing
     autoload :Identifiable
     autoload :ObjectResource
     autoload :Persistence
-    autoload :ProjectHydra
+    autoload :RelsExt
   end
 end

data/lib/active_fedora/rdf/datastream_indexing.rb

@@ -0,0 +1,11 @@
+module ActiveFedora::RDF
+  module DatastreamIndexing
+    extend ActiveSupport::Concern
+    include Indexing
+
+    def apply_prefix(name, file_path)
+      prefix(file_path) + name.to_s
+    end
+  end
+end
+

data/lib/active_fedora/rdf/fcrepo.rb

@@ -1,326 +1,12 @@
-# -*- encoding: utf-8 -*-
-# This file generated automatically using vocab-fetch from github.com:fcrepo3/fcrepo/master/fcrepo-server/src/main/resources/rdfs/fedora_relsext_ontology.rdfs
-# and edited for clarity and additional terms published in different serializations of the voabularies
 require 'rdf'
-module ActiveFedora::RDF
-  module Fcrepo
-    class System < ::RDF::StrictVocabulary("info:fedora/fedora-system:")
-      term :"ContentModel-3.0",
-        comment: %(Base Fedora 3 CModel cModel).freeze,
-        label: "Fedora 3 Content Model".freeze,
-        subClassOf: "info:fedora/fedora-system:def/model#FedoraObject".freeze,
-        type: "info:fedora/fedora-system:def/model#FedoraObject".freeze
-      term :"FedoraObject-3.0",
-        comment: %(Base Fedora 3 Object cModel).freeze,
-        label: "Fedora 3 Object".freeze,
-        subClassOf: "info:fedora/fedora-system:def/model#FedoraObject".freeze,
-        type: "info:fedora/fedora-system:def/model#FedoraObject".freeze
-      term :"ServiceDefinition-3.0",
-        comment: %(Fedora 3 Service Definition/BDef cModel).freeze,
-        label: "Fedora 3 Service Definition".freeze,
-        subClassOf: "info:fedora/fedora-system:def/model#FedoraObject".freeze,
-        type: "info:fedora/fedora-system:def/model#FedoraObject".freeze
-      term :"ServiceDeployment-3.0",
-        comment: %(Fedora 3 Service Deployment/BMech cModel).freeze,
-        label: "Fedora 3 Service Deployment".freeze,
-        subClassOf: "info:fedora/fedora-system:def/model#FedoraObject".freeze,
-        type: "info:fedora/fedora-system:def/model#FedoraObject".freeze
-    end
-    class Model < ::RDF::StrictVocabulary("info:fedora/fedora-system:def/model#")
-      # Class definitions
-      term :FedoraObject,
-        comment: %(The base type of all objects in Fedora).freeze,
-        label: "FedoraObject".freeze,
-        subClassOf: "rdfs:Resource".freeze,
-        type: "rdfs:Class".freeze
-      term :Datastream,
-        comment: %(Binary data associated with a Fedora object).freeze,
-        label: "Datastream".freeze,
-        subClassOf: "rdfs:Resource".freeze,
-        type: "rdfs:Class".freeze
-      term :ExtProperty,
-        comment: %(Reification of an extension property of a Fedora object used in messaging).freeze,
-        label: "ExtProperty".freeze,
-        subClassOf: "rdf:Property".freeze,
-        type: "rdfs:Class".freeze
-      term :State,
-        comment: %(The state of a Fedora object or datastream).freeze,
-        label: "State".freeze,
-        subClassOf: "rdfs:Resource".freeze,
-        type: "rdfs:Class".freeze
-      term :Active,
-        comment: %(State of an object available in the repository).freeze,
-        label: "Active".freeze,
-        subClassOf: "rdfs:Resource".freeze,
-        type: "info:fedora/fedora-system:def/model#State".freeze
-      term :Deleted,
-        comment: %(State of an object that should be considered deleted, but is not purged).freeze,
-        label: "Deleted".freeze,
-        subClassOf: "rdfs:Resource".freeze,
-        type: "info:fedora/fedora-system:def/model#State".freeze
-      term :Inactive,
-        comment: %(State of an object that should be considered temporarily unavailable).freeze,
-        label: "Inactive".freeze,
-        subClassOf: "rdfs:Resource".freeze,
-        type: "info:fedora/fedora-system:def/model#State".freeze
-      # Property definitions
-      property :altIds,
-        comment: %(The alternate IDs for a datastream).freeze,
-        label: "Alternate IDs".freeze,
-        domain: "info:fedora/fedora-system:def/model#Datastream",
-        range: "xsd:string".freeze,
-        type: "rdf:Property".freeze
-      property :controlGroup,
-        comment: %(indicates whether a Datastream's content is inline XML (X), Managed (M), Referenced (R) or External (E)).freeze,
-        label: "controlGroup".freeze,
-        domain: "info:fedora/fedora-system:def/model#Datastream",
-        range: "xsd:string".freeze,
-        type: "rdf:Property".freeze
-      property :createdDate,
-        comment: %(The UTC datetime an object was created).freeze,
-        label: "createdDate".freeze,
-        domain: "info:fedora/fedora-system:def/model#FedoraObject",
-        range: "xsd:dateTimeStamp".freeze,
-        type: "rdf:Property".freeze
-      property :definesMethod,
-        comment: %(indicates the name of a service method defined in this interface).freeze,
-        label: "definesMethod".freeze,
-        domain: "info:fedora/fedora-system:ServiceDefinition-3.0".freeze,
-        range: "xsd:NCName".freeze,
-        type: "rdf:Property".freeze
-      property :digest,
-        comment: %(indicates the checksum digest of a datastream's contents or the keyword 'none').freeze,
-        label: "digest".freeze,
-        domain: "info:fedora/fedora-system:def/model#Datastream",
-        range: "xsd:string".freeze,
-        type: "rdf:Property".freeze
-      property :digestType,
-        comment: %(indicates either the checksum algorithm or the keyword DISABLED).freeze,
-        label: "digestType".freeze,
-        domain: "info:fedora/fedora-system:def/model#Datastream",
-        range: "xsd:string".freeze,
-        type: "rdf:Property".freeze
-      property :downloadFilename,
-        comment: %(indicates the name to be used when downloading a datastream's contents).freeze,
-        label: "downloadFilename".freeze,
-        domain: "info:fedora/fedora-system:def/model#Datastream",
-        range: "xsd:string".freeze,
-        type: "rdf:Property".freeze
-      property :extProperty,
-        comment: %(indicates an extension property of an object in Fedora in messaging).freeze,
-        label: "extProperty".freeze,
-        domain: "info:fedora/fedora-system:def/model#FedoraObject".freeze,
-        range: "info:fedora/fedora-system:def/model#ExtProperty".freeze,
-        type: "rdf:Property".freeze
-      property :formatURI,
-        comment: %(A URI indicating the format of a datastream's content).freeze,
-        label: "formatURI".freeze,
-        type: "rdf:Property".freeze
-      property :hasModel,
-        comment: %(Indicates the Fedora 3 CModels for this object).freeze,
-        label: "hasModel".freeze,
-        subPropertyOf: "rdf:type".freeze,
-        domain: "info:fedora/fedora-system:FedoraObject-3.0".freeze,
-        range: "info:fedora/fedora-system:ContentModel-3.0".freeze,
-        type: "rdf:Property".freeze
-      property :hasService,
-        comment: %(indicates the Fedora 3 Service Definitions applicable to this CModel).freeze,
-        label: "hasService".freeze,
-        domain: "info:fedora/fedora-system:ContentModel-3.0".freeze,
-        range: "info:fedora/fedora-system:ServiceDefinition-3.0".freeze,
-        type: "rdf:Property".freeze
-      property :isContractorOf,
-        comment: %(indicates the Fedora 3 Content Models this deployment applies to).freeze,
-        label: "".freeze,
-        domain: "info:fedora/fedora-system:ServiceDeployment-3.0".freeze,
-        range: "info:fedora/fedora-system:ContentModel-3.0".freeze,
-        type: "rdf:Property".freeze
-      property :isDeploymentOf,
-        comment: %(indicates the Fedora 3 Service Definitions this deployment implements).freeze,
-        label: "isDeploymentOf".freeze,
-        domain: "info:fedora/fedora-system:ServiceDeployment-3.0".freeze,
-        range: "info:fedora/fedora-system:ServiceDefinition-3.0".freeze,
-        type: "rdf:Property".freeze
-      property :label,
-        comment: %(The label applied to a Fedora object).freeze,
-        label: "label".freeze,
-        domain: "info:fedora/fedora-system:def/model#FedoraObject".freeze,
-        range: "xsd:string".freeze,
-        type: "rdf:Property".freeze
-      property :length,
-        comment: %(indicates the length of a datastream's contents).freeze,
-        label: "length".freeze,
-        domain: "info:fedora/fedora-system:def/model#Datastream".freeze,
-        range: "xsd:nonNegativeInteger".freeze,
-        type: "rdf:Property".freeze
-      property :ownerId,
-        comment: %(indicates the owner of an object).freeze,
-        label: "ownerId".freeze,
-        type: "rdf:Property".freeze
-      property :state,
-        comment: %(indicates the state of the object or datastream).freeze,
-        label: "state".freeze,
-        domain: ["info:fedora/fedora-system:def/model#FedoraObject".freeze,"info:fedora/fedora-system:def/model#Datastream".freeze],
-        range: "info:fedora/fedora-system:def/model#State".freeze,
-        type: "rdf:Property".freeze
-      property :versionable,
-        comment: %(indicates whether a datastream's property and contents changes are being tracked as versions).freeze,
-        label: "versionable".freeze,
-        domain: "info:fedora/fedora-system:def/model#Datastream".freeze,
-        range: "xsd:boolean".freeze,
-        type: "rdf:Property".freeze
-    end
-    class RelsExt < ::RDF::StrictVocabulary("info:fedora/fedora-system:def/relations-external#")
+class ActiveFedora::RDF::Fcrepo < RDF::StrictVocabulary("http://fedora.info/definitions/v4/repository#")
 
-      # Property definitions
-      property :fedoraRelationship,
-        comment: %(The primitive property for all object-to-object relationships in the fedora ontology).freeze,
-        label: "Fedora Relationship".freeze,
-        type: "rdf:Property".freeze
-      property :hasAnnotation,
-        comment: %(A refinement of the generic descriptive relationship indicating a commentary relationship between fedora objects.  The subject is a fedora object that is being commented on and the predicate is a fedora object that represents an annotation or comment about the subject. ).freeze,
-        label: "Has Annotation".freeze,
-        subPropertyOf: "info:fedora/fedora-system:def/relations-external#hasDescription".freeze,
-        "owl:inverseOf" => %(info:fedora/fedora-system:def/relations-external#isAnnotationOf).freeze,
-        type: "rdf:Property".freeze
-      property :hasCollectionMember,
-        label: "Has Collection Member".freeze,
-        subPropertyOf: "info:fedora/fedora-system:def/relations-external#hasMember".freeze,
-        "owl:inverseOf" => %(info:fedora/fedora-system:def/relations-external#isMemberOfCollection).freeze,
-        type: "rdf:Property".freeze
-      property :hasConstituent,
-        label: "Has Constituent".freeze,
-        subPropertyOf: "info:fedora/fedora-system:def/relations-external#hasPart".freeze,
-        "owl:inverseOf" => %(info:fedora/fedora-system:def/relations-external#isConstituentOf).freeze,
-        type: "rdf:Property".freeze
-      property :hasDependent,
-        label: "Has Dependent".freeze,
-        subPropertyOf: "info:fedora/fedora-system:def/relations-external#fedoraRelationship".freeze,
-        "owl:inverseOf" => %(info:fedora/fedora-system:def/relations-external#isDependentOf).freeze,
-        type: "rdf:Property".freeze
-      property :hasDerivation,
-        label: "Has Derivation".freeze,
-        subPropertyOf: "info:fedora/fedora-system:def/relations-external#fedoraRelationship".freeze,
-        "owl:inverseOf" => %(info:fedora/fedora-system:def/relations-external#isDerivationOf).freeze,
-        type: "rdf:Property".freeze
-      property :hasDescription,
-        comment: %(A generic descriptive relationship between fedora objects.  The subject is a fedora object that is being described in some manner and the predicate is a fedora object that represents a descriptive entity that is about the subject. ).freeze,
-        label: "Has Description".freeze,
-        subPropertyOf: "info:fedora/fedora-system:def/relations-external#fedoraRelationship".freeze,
-        "owl:inverseOf" => %(info:fedora/fedora-system:def/relations-external#isDescriptionOf).freeze,
-        type: "rdf:Property".freeze
-      property :hasEquivalent,
-        label: "Has Equivalent".freeze,
-        subPropertyOf: "info:fedora/fedora-system:def/relations-external#fedoraRelationship".freeze,
-        type: "rdf:Property".freeze
-      property :hasMember,
-        label: "Has Member".freeze,
-        subPropertyOf: "info:fedora/fedora-system:def/relations-external#hasPart/".freeze,
-        "owl:inverseOf" => %(info:fedora/fedora-system:def/relations-external#isMemberOf).freeze,
-        type: "rdf:Property".freeze
-      property :hasMetadata,
-        comment: %(A refinement of the generic descriptive relationship indicating a metadata relationship between fedora objects.  The subject is a fedora object and the predicate is a fedora object that represents metadata about the subject. ).freeze,
-        label: "Has Metadata".freeze,
-        subPropertyOf: "info:fedora/fedora-system:def/relations-external#hasDescription".freeze,
-        "owl:inverseOf" => %(info:fedora/fedora-system:def/relations-external#isMetadataFor).freeze,
-        type: "rdf:Property".freeze
-      property :hasPart,
-        label: "Has Part".freeze,
-        subPropertyOf: "info:fedora/fedora-system:def/relations-external#fedoraRelationship".freeze,
-        "owl:inverseOf" => %(info:fedora/fedora-system:def/relations-external#isPartOf).freeze,
-        type: "rdf:Property".freeze
-      property :hasSubset,
-        label: "Has Subset".freeze,
-        subPropertyOf: "info:fedora/fedora-system:def/relations-external#hasMember".freeze,
-        "owl:inverseOf" => %(info:fedora/fedora-system:def/relations-external#isSubsetOf).freeze,
-        type: "rdf:Property".freeze
-      property :isAnnotationOf,
-        comment: %(A refinement of the generic descriptive relationship indicating a commentary relationship between fedora objects.  The subject is a fedora object that represents an annotation or comment and the predicate is a fedora object that is being commented upon by the subject.).freeze,
-        label: "Is Annotation Of".freeze,
-        subPropertyOf: "info:fedora/fedora-system:def/relations-external#isDescriptionOf".freeze,
-        "owl:inverseOf" => %(info:fedora/fedora-system:def/relations-external#hasAnnotation).freeze,
-        type: "rdf:Property".freeze
-      property :isConstituentOf,
-        label: "Is Constituent Of".freeze,
-        subPropertyOf: "info:fedora/fedora-system:def/relations-external#isPartOf".freeze,
-        "owl:inverseOf" => %(info:fedora/fedora-system:def/relations-external#hasConstituent).freeze,
-        type: "rdf:Property".freeze
-      property :isDependentOf,
-        label: "Is Dependent Of".freeze,
-        subPropertyOf: "info:fedora/fedora-system:def/relations-external#fedoraRelationship".freeze,
-        "owl:inverseOf" => %(info:fedora/fedora-system:def/relations-external#hasDependent).freeze,
-        type: "rdf:Property".freeze
-      property :isDerivationOf,
-        label: "Is Derivation Of".freeze,
-        subPropertyOf: "info:fedora/fedora-system:def/relations-external#fedoraRelationship".freeze,
-        "owl:inverseOf" => %(info:fedora/fedora-system:def/relations-external#hasDerivation).freeze,
-        type: "rdf:Property".freeze
-      property :isDescriptionOf,
-        comment: %(A generic descriptive relationship between fedora objects.  The subject is a fedora object that represents a descriptive entity and the predicate is a fedora object that is being described in some manner by the subject.).freeze,
-        label: "Is Description Of".freeze,
-        subPropertyOf: "info:fedora/fedora-system:def/relations-external#fedoraRelationship".freeze,
-        "owl:inverseOf" => %(info:fedora/fedora-system:def/relations-external#hasDescription).freeze,
-        type: "rdf:Property".freeze
-      property :isMemberOf,
-        label: "Is Member Of".freeze,
-        subPropertyOf: "info:fedora/fedora-system:def/relations-external#isPartOf".freeze,
-        "owl:inverseOf" => %(info:fedora/fedora-system:def/relations-external#hasMember).freeze,
-        type: "rdf:Property".freeze
-      property :isMemberOfCollection,
-        label: "Is Member Of Collection".freeze,
-        subPropertyOf: "info:fedora/fedora-system:def/relations-external#isMemberOf".freeze,
-        "owl:inverseOf" => %(info:fedora/fedora-system:def/relations-external#hasCollectionMember).freeze,
-        type: "rdf:Property".freeze
-      property :isMetadataFor,
-        comment: %(A refinement of the generic descriptive relationship indicating a metadata relationship between fedora objects.  The subject is a fedora object that represents metadata and the predicate is a fedora object for which the subject serves as metadata.).freeze,
-        label: "Is Metadata For".freeze,
-        subPropertyOf: "info:fedora/fedora-system:def/relations-external#isDescriptionOf".freeze,
-        "owl:inverseOf" => %(info:fedora/fedora-system:def/relations-external#hasMetadata).freeze,
-        type: "rdf:Property".freeze
-      property :isPartOf,
-        label: "Is Part Of".freeze,
-        subPropertyOf: "info:fedora/fedora-system:def/relations-external#fedoraRelationship".freeze,
-        "owl:inverseOf" => %(info:fedora/fedora-system:def/relations-external#hasPart).freeze,
-        type: "rdf:Property".freeze
-      property :isSubsetOf,
-        label: "Is Subset Of".freeze,
-        subPropertyOf: "info:fedora/fedora-system:def/relations-external#isMemberOf".freeze,
-        "owl:inverseOf" => %(info:fedora/fedora-system:def/relations-external#hasSubset).freeze,
-        type: "rdf:Property".freeze
-    end
-    class View < ::RDF::StrictVocabulary("info:fedora/fedora-system:def/view#")
-      property :disseminates,
-        comment: %(A property used to indicate that an object contains a datastream).freeze,
-        label: "disseminates".freeze,
-        domain: "info:fedora/fedora-system:FedoraObject-3.0".freeze,
-        range: "info:fedora/fedora-system:def/model#Datastream".freeze,
-        type: "rdf:Property".freeze      
-      property :disseminationType,
-        comment: %(A property whose object is common to all Datastreams of a given DSID).freeze,
-        label: "dissemination type".freeze,
-        type: "rdf:Property".freeze
-      property :isVolatile,
-        comment: %(A property indicating that a datastream's content is a reference to content external to the repository).freeze,
-        label: "isVolatile".freeze,
-        domain: "info:fedora/fedora-system:def/model#Datastream".freeze,
-        range: "xsd:boolean".freeze,
-        type: "rdf:Property".freeze
-      property :lastModifiedDate,
-        comment: %(UTC datetime of the last change to an object or most recent version of this datastream).freeze,
-        label: "lastModifiedDate".freeze,
-        domain: ["info:fedora/fedora-system:def/model#FedoraObject".freeze,"info:fedora/fedora-system:def/model#Datastream".freeze],
-        range: "xsd:dateTimeStamp".freeze,
-        type: "rdf:Property".freeze
-      property :mimeType,
-        comment: %(The MIME type of this datastream's content).freeze,
-        label: "mimeType".freeze,
-        domain: "info:fedora/fedora-system:def/model#Datastream".freeze,
-        range: "xsd:string".freeze,
-        type: "rdf:Property".freeze
-      property :version,
-        comment: %(indicates Fedora server version in messaging).freeze,
-        label: "Server version".freeze,
-        type: "rdf:Property".freeze
-    end
-  end
-end
+    # Property definitions
+    property :hasContent, comment: %(Defining where the fedora object has content.)
+    property :mimeType
+
+    property :created
+    property :lastModified
+    property :hasChild
+
+end