active-fedora 3.1.6 → 3.2.0.pre1

data/lib/active_fedora/relationships_helper.rb

@@ -1,4 +1,3 @@
-require 'active_support/core_ext/class/inheritable_attributes'
 module ActiveFedora
   # This module is meant to extend semantic node to add functionality based on a relationship's name
   # It is meant to turn a relationship into just another attribute in a model.
@@ -25,16 +24,10 @@ module ActiveFedora
   module RelationshipsHelper
     extend ActiveSupport::Concern
 
-#    ms_inheritable_attributes :class_relationships_desc
     included do
-      class_inheritable_accessor  :class_relationships_desc
-#    self.class_relationships_desc = {}
+      class_attribute  :class_relationships_desc
     end
 
-    # def self.included(klass)
-    #   klass.extend(ClassMethods)
-    # end
-    
 
     # ** EXPERIMENTAL **
     # 
@@ -103,7 +96,7 @@ module ActiveFedora
           rels[:self] = {}
           names.each_pair do |name, predicate|
             set = []
-            res = relationships.query(:predicate => find_graph_predicate(predicate))
+            res = relationships.query(:predicate => Predicates.find_graph_predicate(predicate))
             res.each_object do |o|
               set << o.to_s
             end
@@ -285,8 +278,6 @@ module ActiveFedora
             (assert_conforms_to 'object', object, klass)
           end
         end
-        #r = ActiveFedora::Relationship.new({:subject=>:self,:predicate=>outbound_relationship_predicates[name],:object=>object})
-        #add_relationship(r)
         add_relationship(outbound_relationship_predicates[name],object)
       else
         false
@@ -330,7 +321,7 @@ module ActiveFedora
     def conforms_to?(model_class)
       if self.kind_of?(model_class)
         #check has model and class match
-        mod = relationships.first(:predicate=>find_graph_predicate(:has_model))
+        mod = relationships.first(:predicate=>Predicates.find_graph_predicate(:has_model))
         if mod
           expected = ActiveFedora::ContentModel.pid_from_ruby_class(self.class)
           if mod.object.to_s == expected
@@ -429,121 +420,121 @@ module ActiveFedora
 
     # @deprecated Please use {#find_relationship_by_name} instead.
     def named_relationship(name)
-      logger.warn("Deprecation: named_relationship has been deprecated.  Please call find_relationship_by_name instead.")
+      ActiveSupport::Deprecation.warn("Deprecation: named_relationship has been deprecated.  Please call find_relationship_by_name instead.")
       find_relationship_by_name(name)
     end
 
     # @deprecated Please use {#register_relationship_desc_subject} instead.
     def register_named_subject(subject)
-      logger.warn("Deprecation: register_named_subject has been deprecated.  Please call register_relationship_desc_subject instead.")
+      ActiveSupport::Deprecation.warn("Deprecation: register_named_subject has been deprecated.  Please call register_relationship_desc_subject instead.")
       register_relationship_desc_subject(subject)
     end 
     
     # @deprecated Please use {#register_relationship_desc} instead.
     def register_named_relationship(subject, name, predicate, opts)
-      logger.warn("Deprecation: register_named_relationship has been deprecated.  Please call register_relationship_desc instead.")
+      ActiveSupport::Deprecation.warn("Deprecation: register_named_relationship has been deprecated.  Please call register_relationship_desc instead.")
       register_relationship_desc(subject, name, predicate, opts)
     end 
 
     # @deprecated Please use {#relationships_by_name} instead.
     def named_relationships(outbound_only=true)
-      logger.warn("Deprecation: named_relationships has been deprecated.  Please call relationships_by_name instead.")
+      ActiveSupport::Deprecation.warn("Deprecation: named_relationships has been deprecated.  Please call relationships_by_name instead.")
       relationships_by_name(outbound_only)
     end 
 
     # @deprecated Please use {#relationships_by_name_from_class} instead.
     def named_relationships_from_class
-      logger.warn("Deprecation: named_relationships_from_class has been deprecated.  Please call relationships_by_name_from_class instead.")
+      ActiveSupport::Deprecation.warn("Deprecation: named_relationships_from_class has been deprecated.  Please call relationships_by_name_from_class instead.")
       relationships_by_name_from_class
     end 
 
     # @deprecated Please use {#inbound_relationships_by_name} instead.
     def named_inbound_relationships
-      logger.warn("Deprecation: named_inbound_relationships has been deprecated.  Please call inbound_relationships_by_name instead.")
+      ActiveSupport::Deprecation.warn("Deprecation: named_inbound_relationships has been deprecated.  Please call inbound_relationships_by_name instead.")
       inbound_relationships_by_name
     end 
 
     # @deprecated Please use {#outbound_relationships_by_name} instead.
     def named_outbound_relationships
-      logger.warn("Deprecation: named_outbound_relationships has been deprecated.  Please call outbound_relationships_by_name instead.")
+      ActiveSupport::Deprecation.warn("Deprecation: named_outbound_relationships has been deprecated.  Please call outbound_relationships_by_name instead.")
       outbound_relationships_by_name
     end 
 
     # @deprecated Please use {#outbound_relationship_predicates} instead.
     def outbound_named_relationship_predicates
-      logger.warn("Deprecation: outbound_named_relationship_predicates has been deprecated.  Please call outbound_relationship_predicates instead.")
+      ActiveSupport::Deprecation.warn("Deprecation: outbound_named_relationship_predicates has been deprecated.  Please call outbound_relationship_predicates instead.")
       outbound_relationship_predicates
     end 
 
     # @deprecated Please use {#inbound_relationship_predicates} instead.
     def inbound_named_relationship_predicates
-      logger.warn("Deprecation: inbound_named_relationship_predicates has been deprecated.  Please call inbound_relationship_predicates instead.")
+      ActiveSupport::Deprecation.warn("Deprecation: inbound_named_relationship_predicates has been deprecated.  Please call inbound_relationship_predicates instead.")
       inbound_relationship_predicates
     end 
 
     # @deprecated Please use {#relationship_predicates} instead.
     def named_relationship_predicates
-      logger.warn("Deprecation: named_relationship_predicates has been deprecated.  Please call relationship_predicates instead.")
+      ActiveSupport::Deprecation.warn("Deprecation: named_relationship_predicates has been deprecated.  Please call relationship_predicates instead.")
       relationship_predicates
     end 
 
     # @deprecated Please use {#relationship_predicates_from_class} instead.
     def named_relationship_predicates_from_class
-      logger.warn("Deprecation: named_relationship_predicates_from_class has been deprecated.  Please call relationship_predicates_from_class instead.")
+      ActiveSupport::Deprecation.warn("Deprecation: named_relationship_predicates_from_class has been deprecated.  Please call relationship_predicates_from_class instead.")
       relationship_predicates_from_class
     end 
 
     # @deprecated Please use {#is_relationship_name?} instead.
     def is_named_relationship?(name, outbound_only=true)
-      logger.warn("Deprecation: is_named_relationship? has been deprecated.  Please call is_relationship_name? instead.")
+      ActiveSupport::Deprecation.warn("Deprecation: is_named_relationship? has been deprecated.  Please call is_relationship_name? instead.")
       is_relationship_name?(name,outbound_only)
     end 
 
     # @deprecated Please use {#relationships_desc} instead.
     def named_relationships_desc
-      logger.warn("Deprecation: named_relationships_desc has been deprecated.  Please call relationships_desc instead.")
+      ActiveSupport::Deprecation.warn("Deprecation: named_relationships_desc has been deprecated.  Please call relationships_desc instead.")
       relationships_desc
     end 
 
     # @deprecated Please use {#relationships_desc_from_class} instead.
     def named_relationships_desc_from_class
-      logger.warn("Deprecation: named_relationships_desc_from_class has been deprecated.  Please call relationships_desc_from_class instead.")
+      ActiveSupport::Deprecation.warn("Deprecation: named_relationships_desc_from_class has been deprecated.  Please call relationships_desc_from_class instead.")
       relationships_desc_from_class
     end 
 
     # @deprecated Please use {#relationship_model_type} instead.
     def named_relationship_type(name)
-      logger.warn("Deprecation: named_relationship_type has been deprecated.  Please call relationship_model_type instead.")
+      ActiveSupport::Deprecation.warn("Deprecation: named_relationship_type has been deprecated.  Please call relationship_model_type instead.")
       relationship_model_type(name)
     end 
 
     # @deprecated Please use {#add_relationship_by_name} instead.
     def add_named_relationship(name,object)
-      logger.warn("Deprecation: add_named_relationship has been deprecated.  Please call add_relationship_by_name instead.")
+      ActiveSupport::Deprecation.warn("Deprecation: add_named_relationship has been deprecated.  Please call add_relationship_by_name instead.")
       add_relationship_by_name(name,object)
     end 
 
     # @deprecated Please use {#remove_relationship_by_name} instead.
     def remove_named_relationship(name,object)
-      logger.warn("Deprecation: remove_named_relationship has been deprecated.  Please call remove_relationship_by_name instead.")
+      ActiveSupport::Deprecation.warn("Deprecation: remove_named_relationship has been deprecated.  Please call remove_relationship_by_name instead.")
       remove_relationship_by_name(name,object)
     end 
 
     # @deprecated Please use {#assert_conforms_to} instead.
     def assert_kind_of_model(name,object,model_class)
-      logger.warn("Deprecation: assert_kind_of_model has been deprecated.  Please call assert_conforms_to instead.")
+      ActiveSupport::Deprecation.warn("Deprecation: assert_kind_of_model has been deprecated.  Please call assert_conforms_to instead.")
       assert_conforms_to(name,object,model_class)
     end 
 
     # @deprecated Please use {#conforms_to?} instead.
     def kind_of_model?(model_class)
-      logger.warn("Deprecation: kind_of_model? has been deprecated.  Please call conforms_to? instead.")
+      ActiveSupport::Deprecation.warn("Deprecation: kind_of_model? has been deprecated.  Please call conforms_to? instead.")
       conforms_to?(model_class)
     end 
 
     # @deprecated Please use {#relationship_query} instead.
     def named_relationship_query(relationship_name)
-      logger.warn("Deprecation: named_relationship_query has been deprecated.  Please call relationship_query instead.")
+      ActiveSupport::Deprecation.warn("Deprecation: named_relationship_query has been deprecated.  Please call relationship_query instead.")
       relationship_query(relationship_name)
     end 
 
@@ -834,55 +825,55 @@ module ActiveFedora
 
       # @deprecated Please use {#relationships_desc} instead.
       def named_relationships_desc
-        logger.warn("Deprecation: named_relationships_desc has been deprecated.  Please call relationships_desc instead.")
+        ActiveSupport::Deprecation.warn("Deprecation: named_relationships_desc has been deprecated.  Please call relationships_desc instead.")
         relationships_desc
       end
 
       # @deprecated Please use {#register_relationship_desc_subject} instead.
       def register_named_subject(subject)
-        logger.warn("Deprecation: register_named_subject has been deprecated.  Please call register_relationship_desc_subject instead.")
+        ActiveSupport::Deprecation.warn("Deprecation: register_named_subject has been deprecated.  Please call register_relationship_desc_subject instead.")
         register_relationship_desc_subject(subject)
       end
 
       # @deprecated Please use {#register_relationship_desc} instead.
       def register_named_relationship(subject, name, predicate, opts)
-        logger.warn("Deprecation: register_named_relationship has been deprecated.  Please call register_relationship_desc instead.")
+        ActiveSupport::Deprecation.warn("Deprecation: register_named_relationship has been deprecated.  Please call register_relationship_desc instead.")
         register_relationship_desc(subject, name, predicate, opts)
       end
 
       # @deprecated Please use {#create_relationship_name_methods} instead.
       def create_named_relationship_methods(name)
-        logger.warn("Deprecation: create_named_relationship_methods has been deprecated.  Please call create_relationship_name_methods instead.")
+        ActiveSupport::Deprecation.warn("Deprecation: create_named_relationship_methods has been deprecated.  Please call create_relationship_name_methods instead.")
         create_relationship_name_methods(name)
       end
 
       # @deprecated Please use {#create_bidirectional_relationship_name_methods} instead.
       def create_bidirectional_named_relationship_methods(name,outbound_name)
-        logger.warn("Deprecation: create_bidirectional_named_relationship_methods has been deprecated.  Please call create_bidirectional_relationship_name_methods instead.")
+        ActiveSupport::Deprecation.warn("Deprecation: create_bidirectional_named_relationship_methods has been deprecated.  Please call create_bidirectional_relationship_name_methods instead.")
         create_bidirectional_relationship_name_methods(name,outbound_name)
       end
 
       # @deprecated Please use {#outbound_relationship_query} instead.
       def outbound_named_relationship_query(relationship_name,outbound_pids)
-        logger.warn("Deprecation: outbound_named_relationship_query has been deprecated.  Please call outbound_relationship_query instead.")
+        ActiveSupport::Deprecation.warn("Deprecation: outbound_named_relationship_query has been deprecated.  Please call outbound_relationship_query instead.")
         outbound_relationship_query(relationship_name,outbound_pids)
       end
 
       # @deprecated Please use {#inbound_relationship_query} instead.
       def inbound_named_relationship_query(pid,relationship_name)
-        logger.warn("Deprecation: inbound_named_relationship_query has been deprecated.  Please call inbound_relationship_query instead.")
+        ActiveSupport::Deprecation.warn("Deprecation: inbound_named_relationship_query has been deprecated.  Please call inbound_relationship_query instead.")
         inbound_relationship_query(pid,relationship_name)
       end
 
       # @deprecated Please use {#bidirectional_relationship_query} instead.
       def bidirectional_named_relationship_query(pid,relationship_name,outbound_pids)
-        logger.warn("Deprecation: bidirectional_named_relationship_query has been deprecated.  Please call bidirectional_relationship_query instead.")
+        ActiveSupport::Deprecation.warn("Deprecation: bidirectional_named_relationship_query has been deprecated.  Please call bidirectional_relationship_query instead.")
         bidirectional_relationship_query(pid,relationship_name,outbound_pids)
       end
 
       # @deprecated Please use {#predicate_exists_with_different_relationship_name?} instead.
       def named_predicate_exists_with_different_name?(subject,name,predicate)
-        logger.warn("Deprecation: named_predicate_exists_with_different_name? has been deprecated.  Please call predicate_exists_with_different_relationship_name? instead.")
+        ActiveSupport::Deprecation.warn("Deprecation: named_predicate_exists_with_different_name? has been deprecated.  Please call predicate_exists_with_different_relationship_name? instead.")
         predicate_exists_with_different_relationship_name?(subject,name,predicate)
       end
     end

data/lib/active_fedora/rels_ext_datastream.rb

@@ -1,4 +1,3 @@
-require 'active_support/core_ext/class/inheritable_attributes'
 require 'solrizer/field_name_mapper'
 require 'uri'
 require 'rdf/rdfxml'
@@ -61,10 +60,10 @@ module ActiveFedora
     end
 
     def self.short_predicate(predicate)
-      if match = /^(#{ActiveFedora::Base.predicate_mappings.keys.join('|')})(.+)$/.match(predicate.to_str)
+      if match = /^(#{Predicates.predicate_mappings.keys.join('|')})(.+)$/.match(predicate.to_str)
         namespace = match[1]
         predicate = match[2]
-        pred = ActiveFedora::Base.predicate_mappings[namespace].invert[predicate]
+        pred = Predicates.predicate_mappings[namespace].invert[predicate]
         pred
       else
         raise "Unable to parse predicate: #{predicate}"
@@ -84,21 +83,15 @@ module ActiveFedora
     def from_solr(solr_doc)
       #cycle through all possible predicates
       model.relationships_loaded = true
-      ActiveFedora::Base.predicate_mappings[ActiveFedora::Base.default_predicate_namespace].keys.each do |predicate|
+      Predicates.predicate_mappings[Predicates.default_predicate_namespace].keys.each do |predicate|
         predicate_symbol = ActiveFedora::SolrService.solr_name(predicate, :symbol)
         value = (solr_doc[predicate_symbol].nil? ? solr_doc[predicate_symbol.to_s]: solr_doc[predicate_symbol]) 
         unless value.nil? 
           if value.is_a? Array
             value.each do |obj|
-              #o_uri = URI.parse(obj)
-              #literal = o_uri.scheme.nil?
-              #r = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>predicate, :object=>obj, :is_literal=>literal)
               model.add_relationship(predicate, obj)
             end
           else
-            #o_uri = URI.parse(value)
-            #literal = o_uri.scheme.nil?
-            #r = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>predicate, :object=>value, :is_literal=>literal)
             model.add_relationship(predicate, value)
           end
         end

data/lib/active_fedora/semantic_node.rb

@@ -1,31 +1,35 @@
 require 'rdf'
-require 'active_support/core_ext/class/inheritable_attributes'
 module ActiveFedora
   module SemanticNode 
     extend ActiveSupport::Concern
     included do
-      class_inheritable_accessor  :class_relationships, :internal_uri, :class_named_relationships_desc
+      class_attribute  :class_relationships, :internal_uri
       self.class_relationships = {}
-      self.class_named_relationships_desc = {}
     end
-    attr_accessor :named_relationship_desc, :relationships_are_dirty, :relationships_loaded, :load_from_solr, :subject #:internal_uri
-
-    #TODO I think we can remove named_relationship_desc from attr_accessor  - jcoyne
+    attr_accessor :relationships_loaded, :load_from_solr, :subject
 
     def assert_kind_of(n, o,t)
       raise "Assertion failure: #{n}: #{o} is not of type #{t}" unless o.kind_of?(t)
     end
+
+    def object_relations
+      load_relationships if !relationships_loaded
+      @object_relations ||= RelationshipGraph.new
+    end
     
+    def relationships_are_dirty
+      object_relations.dirty
+    end
+    def relationships_are_dirty=(val)
+      object_relations.dirty = val
+    end
+
     # Add a relationship to the Object.
     # @param predicate
     # @param object Either a string URI or an object that is a kind of ActiveFedora::Base 
     def add_relationship(predicate, target, literal=false)
-      stmt = build_statement(internal_uri, predicate, target, literal)
-      unless relationships.has_statement? stmt
-        relationships.insert stmt
-        @relationships_are_dirty = true
-        rels_ext.dirty = true
-      end
+      object_relations.add(predicate, target, literal)
+      rels_ext.dirty = true
     end
 
     # Create an RDF statement
@@ -33,6 +37,7 @@ module ActiveFedora
     # @param predicate a predicate symbol
     # @param target an object to store
     def build_statement(uri, predicate, target, literal=false)
+      ActiveSupport::Deprecation.warn("ActiveFedora::Base#build_statement has been deprecated.")
       raise "Not allowed anymore" if uri == :self
       target = target.internal_uri if target.respond_to? :internal_uri
       subject =  RDF::URI.new(uri)  #TODO cache
@@ -60,42 +65,15 @@ module ActiveFedora
     
     end
                   
-    def find_graph_predicate(predicate)
-        #TODO, these could be cached
-        case predicate
-        when :has_model, "hasModel", :hasModel
-          xmlns="info:fedora/fedora-system:def/model#"
-          begin
-            rel_predicate = ActiveFedora::Base.predicate_lookup(predicate,xmlns)
-          rescue UnregisteredPredicateError
-            xmlns = nil
-            rel_predicate = nil
-          end
-        else
-          xmlns="info:fedora/fedora-system:def/relations-external#"
-          begin
-            rel_predicate = ActiveFedora::Base.predicate_lookup(predicate,xmlns)
-          rescue UnregisteredPredicateError
-            xmlns = nil
-            rel_predicate = nil
-          end
-        end
-        
-        unless xmlns && rel_predicate
-          rel_predicate, xmlns = ActiveFedora::Base.find_predicate(predicate)
-        end
-        self.class.vocabularies[xmlns][rel_predicate] 
-    end
     
 
-    # ** EXPERIMENTAL **
     #
     # Remove a Rels-Ext relationship from the Object.
     # @param predicate
     # @param object Either a string URI or an object that responds to .pid 
     def remove_relationship(predicate, obj, literal=false)
-      relationships.delete build_statement(internal_uri, predicate, obj)
-      @relationships_are_dirty = true
+      object_relations.delete(predicate, obj)
+      self.relationships_are_dirty = true
       rels_ext.dirty = true
     end
 
@@ -106,10 +84,8 @@ module ActiveFedora
         items = []
         objects.each do |object|
           if (response_format == :uri)    
-            #create a Relationship object so that it generates the appropriate uri
             #inbound relationships are always object properties
-            r = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>predicate, :object=>object)
-            items.push(r.object)
+            items.push(object.internal_uri)
           else
             items.push(object)
           end
@@ -128,19 +104,14 @@ module ActiveFedora
     # If no arguments are supplied, return the whole RDF::Graph.
     # if a predicate is supplied as a parameter, then it returns the result of quering the graph with that predicate
     def relationships(*args)
-      unless @subject 
-        raise "Must have internal_uri" unless internal_uri
-        @subject =  RDF::URI.new(internal_uri)
-      end
-      @relationships ||= RDF::Graph.new
       load_relationships if !relationships_loaded
 
-      return @relationships if args.empty?
-      rels = @relationships.query(:predicate => find_graph_predicate(args.first))
-      results = []
-      rels.each_object {|o| results << o.to_s }
-      results
-      
+      if args.empty?
+        raise "Must have internal_uri" unless internal_uri
+        return object_relations.to_graph(internal_uri)
+      end
+      rels = object_relations[args.first] || []
+      rels.map {|o| o.respond_to?(:internal_uri) ? o.internal_uri : o }   #TODO, could just return the object
     end
 
     def load_relationships
@@ -185,12 +156,10 @@ module ActiveFedora
 
 
     def ids_for_outbound(predicate)
-      id_array = []
-      res = relationships.query(:predicate => find_graph_predicate(predicate))
-      relationships(predicate).each do |o|
-        id_array << o.gsub("info:fedora/", "")
+      (object_relations[predicate] || []).map do |o|
+        o = o.to_s if o.kind_of? RDF::Literal
+        o.kind_of?(String) ? o.gsub("info:fedora/", "") : o.pid
       end
-      id_array
     end
 
     def load_bidirectional(name, inbound_method_name, outbound_method_name, opts) 
@@ -219,7 +188,7 @@ module ActiveFedora
       if opts[:response_format] == :id_array  && !self.class.relationship_has_solr_filter_query?(:self,"#{name}")
         return id_array
       else
-        query = self.class.outbound_relationship_query("#{name}",id_array)
+        query = self.class.outbound_relationship_query(name,id_array)
         solr_result = SolrService.instance.conn.query(query)
         if opts[:response_format] == :solr
           return solr_result
@@ -238,13 +207,6 @@ module ActiveFedora
     end
     
     module ClassMethods
-      def vocabularies
-        return @vocabularies if @vocabularies
-        @vocabularies = {}
-        predicate_mappings.keys.each { |ns| @vocabularies[ns] = RDF::Vocabulary.new(ns)}
-        @vocabularies
-      end
-
       # Allows for a relationship to be treated like any other attribute of a model class. You define
       # relationships in your model class using this method.  You then have access to several
       # helper methods to list, append, and remove objects from the list of relationships. 
@@ -320,91 +282,29 @@ module ActiveFedora
         create_bidirectional_relationship_finders(name, outbound_predicate, inbound_predicate, opts)
       end
       
-      # ** EXPERIMENTAL **
-      # 
-      # Check to make sure a subject,name, and predicate triple does not already exist
-      # with the same subject but different name.
-      # This method is used to ensure conflicting has_relationship calls are not made because
-      # predicates cannot be reused across relationship names.  Otherwise, the mapping of relationship name
-      # to predicate in RELS-EXT would be broken.
-      def named_predicate_exists_with_different_name?(subject,name,predicate)
-        if named_relationships_desc.has_key?(subject)
-          named_relationships_desc[subject].each_pair do |existing_name, args|
-            return true if !args[:predicate].nil? && args[:predicate] == predicate && existing_name != name 
-          end
-        end
-        return false
-      end
-      
-      # ** EXPERIMENTAL **
-      #  
-      # Return hash that stores named relationship metadata defined by has_relationship calls
-      # ====Example
-      # For the following relationship
-      #
-      #  has_relationship "audio_records", :has_part, :type=>AudioRecord
-      # Results in the following returned by named_relationships_desc
-      #  {:self=>{"audio_records"=>{:type=>AudioRecord, :singular=>nil, :predicate=>:has_part, :inbound=>false}}}
-      def named_relationships_desc
-        @class_named_relationships_desc ||= Hash[:self => {}]
-        #class_named_relationships_desc
+    
+      # relationships are tracked as a hash of structure 
+      # @example
+      #   ds.relationships # => {:self=>{:has_model=>["afmodel:SimpleThing"],:has_part=>["demo:20"]},:inbound=>{:is_part_of=>["demo:6"]} 
+      def relationships
+        @class_relationships ||= Hash[:self => {}]
       end
-      
-      # ** EXPERIMENTAL **
-      #   
-      # Internal method that ensures a relationship subject such as :self and :inbound
-      # exist within the named_relationships_desc hash tracking named relationships metadata. 
-      def register_named_subject(subject)
-        unless named_relationships_desc.has_key?(subject) 
-          named_relationships_desc[subject] = {} 
+    
+    
+      def register_subject(subject)
+        if !relationships.has_key?(subject) 
+            relationships[subject] = {} 
         end
       end
-  
-      # ** EXPERIMENTAL **
-      # 
-      # Internal method that adds relationship name and predicate pair to either an outbound (:self)
-      # or inbound (:inbound) relationship types.
-      def register_named_relationship(subject, name, predicate, opts)
-        register_named_subject(subject)
-        opts.merge!({:predicate=>predicate})
-        named_relationships_desc[subject][name] = opts
+    
+      def register_predicate(subject, predicate)
+        register_subject(subject)
+        if !relationships[subject].has_key?(predicate) 
+          relationships[subject][predicate] = []
+        end
       end
-      
-      # ** EXPERIMENTAL **
-      #   
-      # Used in has_relationship call to create dynamic helper methods to 
-      # append and remove objects to and from a named relationship
-      # ====Example
-      # For the following relationship
-      #
-      #  has_relationship "audio_records", :has_part, :type=>AudioRecord
-      #
-      # Methods audio_records_append and audio_records_remove are created.
-      # Boths methods take an object that is kind_of? ActiveFedora::Base as a parameter
-      def create_named_relationship_methods(name)
-        append_method_name = "#{name.to_s.downcase}_append"
-        remove_method_name = "#{name.to_s.downcase}_remove"
-        self.send(:define_method,:"#{append_method_name}") {|object| add_named_relationship(name,object)}
-        self.send(:define_method,:"#{remove_method_name}") {|object| remove_named_relationship(name,object)}
-      end 
 
-      #  ** EXPERIMENTAL **
-      #  Similar to +create_named_relationship_methods+ except we are merely creating an alias for outbound portion of bidirectional
-      #
-      #  ====Example
-      #    has_bidirectional_relationship "members", :has_collection_member, :is_member_of_collection
-      #    
-      #    Method members_outbound_append and members_outbound_remove added
-      #    This method will create members_append which does same thing as members_outbound_append
-      #    and will create members_remove which does same thing as members_outbound_remove
-      def create_bidirectional_named_relationship_methods(name,outbound_name)
-        append_method_name = "#{name.to_s.downcase}_append"
-        remove_method_name = "#{name.to_s.downcase}_remove"
-        self.send(:define_method,:"#{append_method_name}") {|object| add_named_relationship(outbound_name,object)}
-        self.send(:define_method,:"#{remove_method_name}") {|object| remove_named_relationship(outbound_name,object)}
-      end
 
-    
       def create_inbound_relationship_finders(name, predicate, opts = {})
         class_eval <<-END, __FILE__, __LINE__
         def #{name}(opts={})
@@ -472,62 +372,6 @@ module ActiveFedora
         end
         END
       end
-    
-      # relationships are tracked as a hash of structure 
-      # @example
-      #   ds.relationships # => {:self=>{:has_model=>["afmodel:SimpleThing"],:has_part=>["demo:20"]},:inbound=>{:is_part_of=>["demo:6"]} 
-      def relationships
-        @class_relationships ||= Hash[:self => {}]
-      end
-    
-    
-      def register_subject(subject)
-        if !relationships.has_key?(subject) 
-            relationships[subject] = {} 
-        end
-      end
-    
-      def register_predicate(subject, predicate)
-        register_subject(subject)
-        if !relationships[subject].has_key?(predicate) 
-          relationships[subject][predicate] = []
-        end
-      end
-
-      # 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 predicate_lookup(predicate,namespace="info:fedora/fedora-system:def/relations-external#")
-        if predicate.class == Symbol 
-          if predicate_mappings[namespace].has_key?(predicate)
-            return predicate_mappings[namespace][predicate]
-          else
-            raise ActiveFedora::UnregisteredPredicateError
-          end
-        end
-        return predicate
-      end
-
-      def predicate_config
-        @@predicate_config ||= YAML::load(File.open(ActiveFedora.predicate_config)) if File.exist?(ActiveFedora.predicate_config)
-      end
-
-      def predicate_mappings
-        predicate_config[:predicate_mapping]
-      end
-
-      def default_predicate_namespace
-        predicate_config[:default_namespace]
-      end
-
-      def find_predicate(predicate)
-        predicate_mappings.each do |namespace,predicates|
-          if predicates.fetch(predicate,nil)
-            return predicates[predicate], namespace
-          end
-        end
-        raise ActiveFedora::UnregisteredPredicateError, "Unregistered predicate: #{predicate.inspect}"
-      end
 
       
     end