active-fedora 9.1.2 → 9.2.0.rc1

data/lib/active_fedora/attributes/active_triple_attribute.rb

@@ -0,0 +1,17 @@
+module ActiveFedora
+
+  # Attributes delegated to ActiveTriples. Allows ActiveFedora to track all attributes consistently.
+  #
+  # @example
+  #   class Book < ActiveFedora::Base
+  #     property :title, predicate: ::RDF::DC.title
+  #     property :author, predicate: ::RDF::DC.creator
+  #   end
+  #
+  #   Book.attribute_names
+  #   => ["title", "author"]
+
+  class ActiveTripleAttribute < DelegatedAttribute
+  end
+
+end

data/lib/active_fedora/attributes/om_attribute.rb

@@ -0,0 +1,29 @@
+module ActiveFedora
+
+  # Class for attributes that are delegated to an OmDatastream
+
+  class OmAttribute < StreamAttribute
+
+    # @param [ActiveFedora::Base] obj the object that has the attribute
+    # @param [Object] v value to write to the attribute
+    def writer(obj, v)
+      ds = file_for_attribute(obj, delegate_target)
+      obj.mark_as_changed(field) if obj.value_has_changed?(field, v)
+      terminology = at || [field]
+      ds.send(:update_indexed_attributes, {terminology => v})
+    end
+
+    # @param [ActiveFedora::Base] obj the object that has the attribute
+    # @param [Object] opts extra options that are passed to the target reader
+    def reader(obj, *opts)
+      ds = file_for_attribute(obj, delegate_target)
+      terminology = at || [field]
+      if terminology.length == 1 && opts.present?
+        ds.send(terminology.first, *opts)
+      else
+        ds.send(:term_values, *terminology)
+      end
+    end
+
+  end
+end

data/lib/active_fedora/attributes/rdf_datastream_attribute.rb

@@ -0,0 +1,47 @@
+module ActiveFedora
+
+  # Class for attributes that are delegated to a RDFDatastream
+
+  class RdfDatastreamAttribute < StreamAttribute
+
+    # @param [ActiveFedora::Base] obj the object that has the attribute
+    # @param [Object] v value to write to the attribute
+    def writer(obj, v)
+      node = file_for_attribute(obj, delegate_target)
+      obj.mark_as_changed(field) if obj.value_has_changed?(field, v)
+      term = if at
+        vals = at.dup
+        while vals.length > 1
+          node = node.send(vals.shift)
+          node = node.build if node.empty?
+          node = node.first
+        end
+        vals.first
+      else
+        field
+      end
+      node.send("#{term}=", v)
+    end
+
+    # @param [ActiveFedora::Base] obj the object that has the attribute
+    def reader(obj)
+      node = file_for_attribute(obj, delegate_target)
+      term = if at
+        vals = at.dup
+        while vals.length > 1
+          node = node.send(vals.shift)
+          node = if node.empty?
+            node.build
+          else
+            node.first
+          end
+        end
+        vals.first
+      else
+        field
+      end
+      node.send(term)
+    end
+
+  end
+end

data/lib/active_fedora/attributes/stream_attribute.rb

@@ -0,0 +1,46 @@
+module ActiveFedora
+
+  # Abstract class for attributes that are delegated to a serialized representation such as a NonRDFSource
+  # 
+  # @abstract
+  # @attr [String] delegate_target
+  # @attr [String] at
+  # @attr [String] target_class
+
+  class StreamAttribute < DelegatedAttribute
+
+    attr_accessor :delegate_target, :at, :target_class
+
+    # @param [Symbol] field the field to find or create
+    # @param [Hash] args 
+    # @option args [String] :delegate_target the path to the delegate
+    # @option args [Class] :klass the class to create
+    # @option args [true,false] :multiple (false) true for multi-value fields
+    # @option args [Array<Symbol>] :at path to a deep node 
+    def initialize(field, args={})
+      super
+      self.delegate_target  = args.fetch(:delegate_target)
+      self.target_class     = args.fetch(:klass)
+      self.at               = args.fetch(:at, nil)
+    end
+
+    # Gives the primary solr name for a column. If there is more than one indexer on the field definition, it gives the first
+    def primary_solr_name
+      @datastream ||= target_class.new
+      raise NoMethodError, "the file '#{target_class}' doesn't respond to 'primary_solr_name'" unless @datastream.respond_to?(:primary_solr_name)
+      @datastream.primary_solr_name(field, delegate_target)
+    end
+
+    def type
+      raise NoMethodError, "the file '#{target_class}' doesn't respond to 'type'" unless target_class.respond_to?(:type)
+      target_class.type(field)
+    end
+
+    private
+
+      def file_for_attribute(obj, delegate_target)
+        obj.attached_files[delegate_target] || raise(ArgumentError, "Undefined file: `#{delegate_target}' in property #{field}")
+      end
+
+  end
+end

data/lib/active_fedora/autosave_association.rb

@@ -75,7 +75,7 @@ module ActiveFedora
   module AutosaveAssociation
     extend ActiveSupport::Concern
 
-    ASSOCIATION_TYPES = %w{ HasMany BelongsTo HasAndBelongsToMany }
+    ASSOCIATION_TYPES = %w{ HasMany BelongsTo HasAndBelongsToMany DirectlyContains IndirectlyContains}
 
     module AssociationBuilderExtension #:nodoc:
       def self.included(base)
@@ -305,7 +305,7 @@ module ActiveFedora
           saved = record.save(:validate => !autosave) if record.new_record? || (autosave && record.changed_for_autosave?)
 
           if association.updated?
-            self[reflection.name.to_s + "_id"] = record.id #TODO use primary_key here
+            self[reflection.foreign_key] = record.id
             association.loaded!
           end
 

data/lib/active_fedora/base.rb

@@ -30,6 +30,7 @@ module ActiveFedora
     extend LdpCache::ClassMethods
 
     include Core
+    include Identifiable
     include Persistence
     include Indexing
     include Scoping
@@ -49,6 +50,8 @@ module ActiveFedora
     include Attributes
     include Versionable
     include LoadableFromJson
+    include Schema
+    include Pathing
   end
 
   ActiveSupport.run_load_hooks(:active_fedora, Base)

data/lib/active_fedora/containers/container.rb

@@ -0,0 +1,38 @@
+module ActiveFedora
+  # This is the base class for ldp containers, it is not an ldp:BasicContainer
+  class Container < ActiveFedora::Base
+
+    property :membership_resource, predicate: ::RDF::Vocab::LDP.membershipResource
+    property :has_member_relation, predicate: ::RDF::Vocab::LDP.hasMemberRelation
+    property :is_member_of_relation, predicate: ::RDF::Vocab::LDP.isMemberOfRelation
+    property :contained, predicate: ::RDF::Vocab::LDP.contains
+
+    def parent
+      @parent || raise("Parent hasn't been set on #{self.class}")
+    end
+
+    def parent=(parent)
+      @parent = parent
+      self.membership_resource = [::RDF::URI(parent.uri)]
+    end
+
+    def mint_id
+      "#{id}/#{SecureRandom.uuid}"
+    end
+
+    def self.find_or_initialize(id)
+      find(id)
+    rescue ActiveFedora::ObjectNotFoundError
+      new(id)
+    end
+
+    private
+
+    # Don't allow directly setting contained
+    def contained=(*args)
+    end
+
+  end
+end
+
+

data/lib/active_fedora/containers/direct_container.rb

@@ -0,0 +1,5 @@
+module ActiveFedora
+  class DirectContainer < Container
+    type ::RDF::Vocab::LDP.DirectContainer
+  end
+end

data/lib/active_fedora/containers/indirect_container.rb

@@ -0,0 +1,7 @@
+module ActiveFedora
+  class IndirectContainer < Container
+    type ::RDF::Vocab::LDP.IndirectContainer
+
+    property :inserted_content_relation, predicate: ::RDF::Vocab::LDP.insertedContentRelation
+  end
+end

data/lib/active_fedora/core.rb

@@ -1,7 +1,11 @@
 module ActiveFedora
   module Core
+    extend ActiveSupport::Autoload
     extend ActiveSupport::Concern
 
+    autoload :FedoraIdTranslator
+    autoload :FedoraUriTranslator
+
     included do
       ##
       # :singleton-method:
@@ -9,30 +13,6 @@ module ActiveFedora
       # Accepts a logger conforming to the interface of Log4r which can be
       # retrieved on both a class and instance level by calling +logger+.
       mattr_accessor :logger, instance_writer: false
-
-      ##
-      # :singleton-method
-      #
-      # Accepts a proc that takes an id and transforms it to a URI
-      mattr_reader :translate_id_to_uri do
-        FedoraIdTranslator
-      end
-
-      def self.translate_id_to_uri=(translator)
-        @@translate_id_to_uri = translator || FedoraIdTranslator
-      end
-
-      ##
-      # :singleton-method
-      #
-      # Accepts a proc that takes a uri and transforms it to an id
-      mattr_reader :translate_uri_to_id do
-        FedoraUriTranslator
-      end
-
-      def self.translate_uri_to_id=(translator)
-        @@translate_uri_to_id = translator || FedoraUriTranslator
-      end
     end
 
     def ldp_source
@@ -141,30 +121,6 @@ module ActiveFedora
         name
       end
 
-      ##
-      # Transforms an id into a uri
-      # if translate_id_to_uri is set it uses that proc, otherwise just the default
-      def id_to_uri(id)
-        translate_id_to_uri.call(id)
-      end
-
-      ##
-      # Transforms a uri into an id
-      # if translate_uri_to_id is set it uses that proc, otherwise just the default
-      def uri_to_id(uri)
-        translate_uri_to_id.call(uri)
-      end
-
-      ##
-      # Provides the common interface for ActiveTriples::Identifiable
-      def from_uri(uri,_)
-        begin
-          self.find(uri_to_id(uri))
-        rescue ActiveFedora::ObjectNotFoundError, Ldp::Gone
-          ActiveTriples::Resource.new(uri)
-        end
-      end
-
       private
 
       def relation

data/lib/active_fedora/delegated_attribute.rb

@@ -1,106 +1,13 @@
 module ActiveFedora
-  # Represents the mapping between a model attribute and a field in a datastream
+  # Represents the mapping between a model attribute and a property
   class DelegatedAttribute
 
-    attr_accessor :dsid, :field, :datastream_class, :at, :multiple
+    attr_accessor :field, :multiple
 
-    def initialize(field, dsid, datastream_class, args={})
+    def initialize(field, args={})
       self.field = field
-      self.dsid = dsid
-      self.datastream_class = datastream_class
-      self.multiple = args[:multiple].nil? ? false : args[:multiple]
-      self.at = args[:at]
+      self.multiple = args.fetch(:multiple, false)
     end
-
-    # Gives the primary solr name for a column. If there is more than one indexer on the field definition, it gives the first
-    def primary_solr_name
-      @datastream ||= datastream_class.new
-      if @datastream.respond_to?(:primary_solr_name)
-        @datastream.primary_solr_name(field, dsid)
-      else
-        raise NoMethodError, "the datastream '#{datastream_class}' doesn't respond to 'primary_solr_name'"
-      end
-    end
-
-    def type
-      if datastream_class.respond_to?(:type)
-        datastream_class.type(field)
-      else
-        raise NoMethodError, "the datastream '#{datastream_class}' doesn't respond to 'type'"
-      end
-    end
-
-    def writer(obj, v)
-      ds = datastream_for_attribute(obj, dsid)
-      obj.mark_as_changed(field) if obj.value_has_changed?(field, v)
-      if ds.kind_of?(ActiveFedora::RDFDatastream)
-        write_rdf(ds, v)
-      else
-        write_om(ds, v)
-      end
-    end
-
-    def reader(obj, *opts)
-      ds = datastream_for_attribute(obj, dsid)
-      if ds.kind_of?(ActiveFedora::RDFDatastream)
-        read_rdf(ds)
-      else
-        read_om(ds, *opts)
-      end
-    end
-
-    private
-
-    def write_om(ds, v)
-      terminology = at || [field]
-      ds.send(:update_indexed_attributes, {terminology => v})
-    end
-
-    def read_om(ds, *opts)
-      terminology = at || [field]
-      if terminology.length == 1 && opts.present?
-        ds.send(terminology.first, *opts)
-      else
-        ds.send(:term_values, *terminology)
-      end
-    end
-
-    def write_rdf(node, v)
-      term = if at
-        vals = at.dup
-        while vals.length > 1
-          node = node.send(vals.shift)
-          node = node.build if node.empty?
-          node = node.first
-        end
-        vals.first
-      else
-        field
-      end
-      node.send("#{term}=", v)
-    end
-
-    def read_rdf(node)
-      term = if at
-        vals = at.dup
-        while vals.length > 1
-          node = node.send(vals.shift)
-          node = if node.empty?
-            node.build
-          else
-            node.first
-          end
-        end
-        vals.first
-      else
-        field
-      end
-      node.send(term)
-    end
-
-    def datastream_for_attribute(obj, dsid)
-      obj.attached_files[dsid] || raise(ArgumentError, "Undefined datastream id: `#{dsid}' in has_attributes")
-    end
-
+    
   end
 end

data/lib/active_fedora/fedora.rb

@@ -22,7 +22,7 @@ module ActiveFedora
     end
 
     def connection
-      @connection ||= CachingConnection.new(authorized_connection)
+      @connection ||= InboundRelationConnection.new(CachingConnection.new(authorized_connection))
     end
 
     def clean_connection

data/lib/active_fedora/fedora_attributes.rb

@@ -29,31 +29,6 @@ module ActiveFedora
       resource.set_value(*args)
     end
 
-    def id
-      if uri.kind_of?(::RDF::URI) && uri.value.blank?
-        nil
-      elsif uri.present?
-        self.class.uri_to_id(URI.parse(uri))
-      end
-    end
-
-    def id=(id)
-      raise "ID has already been set to #{self.id}" if self.id
-      @ldp_source = build_ldp_resource(id.to_s)
-    end
-
-
-    # TODO: Remove after we no longer support #pid.
-    def pid
-      Deprecation.warn FedoraAttributes, "#{self.class}#pid is deprecated and will be removed in active-fedora 10.0. Use #{self.class}#id instead."
-      id
-    end
-
-    def uri
-      # TODO could we return a RDF::URI instead?
-      uri = @ldp_source.try(:subject_uri)
-      uri.value == '' ? uri : uri.to_s
-    end
 
     ##
     # The resource is the RdfResource object that stores the graph for
@@ -62,7 +37,10 @@ module ActiveFedora
     #
     # set_value, get_value, and property accessors are delegated to this object.
     def resource
-      @resource ||= self.class.resource_class.new(@ldp_source.graph.rdf_subject, @ldp_source.graph)
+      # Appending the graph at the end is necessary because adding it as the
+      # parent leaves behind triples not related to the ldp_source's rdf
+      # subject.
+      @resource ||= self.class.resource_class.new(@ldp_source.graph.rdf_subject, @ldp_source.graph) << @ldp_source.graph
     end
 
     # You can set the URI to use for the rdf_label on ClassMethods.rdf_label, then on