active-fedora 9.1.2 → 9.2.0.rc1

data/lib/active_fedora/file_relation.rb

@@ -0,0 +1,7 @@
+module ActiveFedora
+  class FileRelation < Relation
+    def load_from_fedora(id, _)
+      klass.new(klass.id_to_uri(id))
+    end
+  end
+end

data/lib/active_fedora/identifiable.rb

@@ -0,0 +1,87 @@
+module ActiveFedora
+  module Identifiable
+    extend ActiveSupport::Concern
+
+    included do
+      ##
+      # :singleton-method
+      #
+      # Accepts a proc that takes an id and transforms it to a URI
+      mattr_reader :translate_id_to_uri
+
+      # This method is mixed into ActiveFedora::Base and ActiveFedora::File, so don't
+      # overwrite the value if it's already set.
+      @@translate_id_to_uri ||= Core::FedoraIdTranslator
+
+      def self.translate_id_to_uri=(translator)
+        @@translate_id_to_uri = translator || Core::FedoraIdTranslator
+      end
+
+      ##
+      # :singleton-method
+      #
+      # Accepts a proc that takes a uri and transforms it to an id
+      mattr_reader :translate_uri_to_id
+
+      # This method is mixed into ActiveFedora::Base and ActiveFedora::File, so don't
+      # overwrite the value if it's already set.
+      @@translate_uri_to_id ||= Core::FedoraUriTranslator
+
+      def self.translate_uri_to_id=(translator)
+        @@translate_uri_to_id = translator || Core::FedoraUriTranslator
+      end
+    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
+
+    # @return [RDF::URI] the uri for this resource
+    def uri
+      @ldp_source.subject_uri
+    end
+
+
+    module ClassMethods
+      ##
+      # 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
+    end
+  end
+end

data/lib/active_fedora/inbound_relation_connection.rb

@@ -0,0 +1,21 @@
+module ActiveFedora
+  class InboundRelationConnection < SimpleDelegator
+    def get(*args)
+      result = __getobj__.get(*args) do |req|
+        prefer_headers = Ldp::PreferHeaders.new(req.headers["Prefer"])
+        prefer_headers.include = prefer_headers.include | include_uris
+        req.headers["Prefer"] = prefer_headers.to_s
+        yield req if block_given?
+      end
+      result
+    end
+
+    private
+
+    def include_uris
+      [
+        RDF::Fcrepo4.InboundReferences
+      ]
+    end
+  end
+end

data/lib/active_fedora/indexers.rb

@@ -0,0 +1,10 @@
+module ActiveFedora
+  module Indexers
+    extend ActiveSupport::Autoload
+
+    eager_autoload do
+      autoload :NullIndexer
+      autoload :GlobalIndexer
+    end
+  end
+end

data/lib/active_fedora/indexers/global_indexer.rb

@@ -0,0 +1,30 @@
+module ActiveFedora::Indexers
+  ##
+  # Applies indexing hints to any given property, independent of what that
+  # property
+  class GlobalIndexer
+    # @param [Array<Symbol>] index_types The indexing hints to use.
+    def initialize(index_types=nil)
+      @index_types = Array.wrap(index_types)
+    end
+
+
+    # The global indexer acts as both an indexer factory and an indexer, since
+    # the property doesn't matter.
+    def new(property)
+      self
+    end
+
+    # @param [ActiveFedora::Indexing::Map::IndexObject, #as] index_obj The indexing
+    #   object to call #as on.
+    def index(index_obj)
+      unless index_types.empty?
+        index_obj.as(*index_types)
+      end
+    end
+
+    private
+
+    attr_reader :index_types
+  end
+end

data/lib/active_fedora/indexers/null_indexer.rb

@@ -0,0 +1,12 @@
+module ActiveFedora::Indexers
+  ##
+  # An indexer which does nothing with the given index object.
+  class NullIndexer
+    include Singleton
+    def new(_)
+      self
+    end
+    def index(_)
+    end
+  end
+end

data/lib/active_fedora/indexing/map.rb

@@ -17,10 +17,12 @@ module ActiveFedora::Indexing
     # this enables a cleaner API for solr integration
     class IndexObject
       attr_accessor :data_type, :behaviors
+      attr_reader :key
 
-      def initialize(&block)
+      def initialize(name, &block)
         @behaviors = []
         @data_type = :string
+        @key = name
         yield self if block_given?
       end
 
@@ -33,14 +35,11 @@ module ActiveFedora::Indexing
       end
 
       def dup
-        self.class.new do |idx|
+        self.class.new(@key) do |idx|
           idx.behaviors = @behaviors.dup
         end
       end
 
-      def defaults
-        :noop
-      end
     end
   end
 end

data/lib/active_fedora/indexing_service.rb

@@ -1,15 +1,9 @@
 module ActiveFedora
   class IndexingService
     attr_reader :object
-    # Object must respond to
-    #   create_date
-    #   modified_date
-    #   has_model
-    #   id
-    #   to_json
-    #   attached_files
-    #   []
-    # and it's class must respond to
+
+    # @param [#create_date, #modified_date, #has_model, #id, #to_json, #attached_files, #[]] obj
+    # The class of obj must respond to these methods:
     #   inspect
     #   outgoing_reflections
     def initialize(obj)
@@ -42,7 +36,6 @@ module ActiveFedora
       object.attached_files.each do |name, file|
         solr_doc.merge! file.to_solr(solr_doc, name: name.to_s)
       end
-      solr_doc = solrize_relationships(solr_doc)
       solr_doc = solrize_rdf_assertions(solr_doc)
       yield(solr_doc) if block_given?
       solr_doc
@@ -62,18 +55,6 @@ module ActiveFedora
       m_time
     end
 
-    # Serialize the datastream's RDF relationships to solr
-    # @param [Hash] solr_doc @deafult an empty Hash
-    def solrize_relationships(solr_doc = Hash.new)
-      object.class.outgoing_reflections.values.each do |reflection|
-        solr_key = reflection.solr_key
-        Array(object[reflection.foreign_key]).compact.each do |v|
-          ::Solrizer::Extractor.insert_solr_field_value(solr_doc, solr_key, v )
-        end
-      end
-      solr_doc
-    end
-
     # Serialize the resource's RDF relationships to solr
     # @param [Hash] solr_doc @deafult an empty Hash
     def solrize_rdf_assertions(solr_doc = Hash.new)

data/lib/active_fedora/loadable_from_json.rb

@@ -54,10 +54,16 @@ module ActiveFedora
 
       # FakeQuery exists to adapt the hash to the RDF interface used by RDF associations in ActiveFedora
       class FakeQuery
+        include ::Enumerable
+
         def initialize(values)
           @values = values || []
         end
 
+        def each(&block)
+          enum_statement.each(&block)
+        end
+
         def enum_statement
           @values.map {|v| FakeStatement.new(v) }
         end
@@ -87,6 +93,8 @@ module ActiveFedora
         ::RDF::URI.new(nil)
       end
 
+      # Called by Associations::RDF#replace to add data to this resource represenation
+      # @param [Array] vals an array of 3 elements (subject, predicate, object) to insert
       def insert(vals)
         _, pred, val = vals
         set_value(reflection(pred), [val])

data/lib/active_fedora/pathing.rb

@@ -0,0 +1,24 @@
+module ActiveFedora
+  module Pathing
+    extend ActiveSupport::Concern
+
+    included do
+      def uri_prefix
+        nil
+      end
+
+      def has_uri_prefix?
+        !uri_prefix.nil?
+      end
+
+      def root_resource_path
+        if has_uri_prefix?
+          ActiveFedora.fedora.base_path + "/" + self.uri_prefix
+        else
+          ActiveFedora.fedora.base_path
+        end
+      end
+    end
+
+  end
+end

data/lib/active_fedora/persistence.rb

@@ -47,11 +47,6 @@ module ActiveFedora
       return self if new_record?
 
       @destroyed = true
-      reflections.each_pair do |name, reflection|
-        if reflection.macro == :has_many
-          association(name.to_sym).delete_all
-        end
-      end
 
       id = self.id ## cache so it's still available after delete
       # Clear out the ETag
@@ -141,7 +136,8 @@ module ActiveFedora
 
     def create_or_update(*args)
       raise ReadOnlyRecord if readonly?
-      new_record? ? create_record(*args) : update_record(*args)
+      result = new_record? ? create_record(*args) : update_record(*args)
+      result != false
     end
 
     # Deals with preparing new object to be saved to Fedora, then pushes it and its attached files into Fedora.
@@ -149,7 +145,6 @@ module ActiveFedora
       assign_rdf_subject
       serialize_attached_files
       @ldp_source = @ldp_source.create
-      @resource = nil
       assign_uri_to_attached_files
       save_attached_files
       refresh
@@ -184,10 +179,22 @@ module ActiveFedora
       @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)
+        LdpResource.new(ActiveFedora.fedora.connection, @ldp_source.subject, @resource, ActiveFedora.fedora.host + base_path_for_resource)
       end
     end
 
+    def base_path_for_resource
+      init_root_path if self.has_uri_prefix?
+      self.root_resource_path
+    end
+
+    def init_root_path
+      path = self.root_resource_path.gsub(/^\//,"")
+      ActiveFedora.fedora.connection.head(path)
+    rescue Ldp::NotFound
+      ActiveFedora.fedora.connection.put(path, "")
+    end
+
     def assign_uri_to_attached_files
       attached_files.each do |name, ds|
         ds.uri= "#{uri}/#{name}"

data/lib/active_fedora/rdf.rb

@@ -9,5 +9,7 @@ module ActiveFedora
     autoload :Identifiable
     autoload :Persistence
     autoload :ProjectHydra
+    autoload :FieldMap
+    autoload :FieldMapEntry
   end
 end

data/lib/active_fedora/rdf/fcrepo4.rb

@@ -8,5 +8,6 @@ module ActiveFedora::RDF
     property :lastModified
     property :status
     property :ServerManaged
+    property :InboundReferences
   end
 end

data/lib/active_fedora/rdf/field_map.rb

@@ -0,0 +1,90 @@
+module ActiveFedora::RDF
+  # Transient class that maps solr field names, without their suffixes, to the values and behaviors that
+  # are used to transforming them for insertion into the solr document.
+  # It partially extends Ruby's Hash class, similar to the way ActiveFedora::Indexing::Map does,
+  # but only with selected methods as outlined in def_delegators.
+  class FieldMap
+    extend Forwardable
+    
+    def_delegators :@hash, :[], :[]=, :each, :keys
+    
+    def initialize(hash = {}, &block)
+      @hash = hash
+      yield self if block_given?
+    end
+
+    # Inserts each solr field map configuration into the FieldMap class
+    # @param [Symbol] name the name of the property on the object that we're indexing
+    # @param [Object] index_field_config an instance of ActiveFedora::Indexing::Map::IndexObject
+    # @param [Object] object the instance of ActiveFedora::Base which is being indexed into Solr
+    def insert(name, index_field_config, object)
+      self[index_field_config.key.to_s] ||= FieldMapEntry.new
+      PolymorphicBuilder.new(self[index_field_config.key.to_s], index_field_config, object, name).build
+    end
+
+    # Supports assigning the delegate class that calls .build to insert the fields into the solr document.
+    # @attr [Object] entry instance of ActiveFedora::RDF::FieldMapEntry which will contain the values of the solr field
+    # @attr [Object] index_field_config an instance of ActiveFedora::Indexing::Map::IndexObject
+    # @attr [Object] object the instance of ActiveFedora::Base which is being indexed into Solr
+    # @attr [Symbol] name the name of the property on the object that we're indexing
+    class PolymorphicBuilder
+
+      attr_accessor :entry, :index_field_config, :object, :name
+
+      def initialize(entry, index_field_config, object, name)
+        @entry              = entry
+        @index_field_config = index_field_config
+        @object             = object
+        @name               = name
+        self
+      end
+
+      def build
+        delegate_class.new(entry, index_field_config, object, name).build
+      end
+
+      private
+
+        def delegate_class
+          kind_of_af_base? ? ResourceBuilder : PropertyBuilder
+        end
+
+        def kind_of_af_base?
+          config = properties[name.to_s]
+          config && config[:class_name] && config[:class_name] < ActiveFedora::Base
+        end
+
+        def properties
+          object.class.properties
+        end
+
+    end
+
+    # Abstract class that implements the PolymorphicBuilder interface and is used for
+    # for building FieldMap entries. You can extend this object to create your own
+    # builder for creating the values in your solr fields.
+    class Builder < PolymorphicBuilder
+      def build
+        type = index_field_config.data_type
+        behaviors = index_field_config.behaviors
+        return unless type and behaviors
+        entry.merge!(type, behaviors, find_values)
+      end
+    end
+
+    # Builds a FieldMap entry for a resource such as an ActiveFedora::Base object and returns the uri as the value.
+    class ResourceBuilder < Builder
+      def find_values
+        object.send(name).map(&:uri)
+      end
+    end
+
+    # Builds a FieldMap entry for a rdf property and returns the values
+    class PropertyBuilder < Builder
+      def find_values
+        Array(object.send(name))
+      end
+    end
+
+  end
+end