active-fedora 9.0.0.rc3 → 9.0.0

data/active-fedora.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_dependency "rdf-rdfxml", '~> 1.1.0'
   s.add_dependency "linkeddata"
   s.add_dependency "deprecation"
-  s.add_dependency "ldp", '~> 0.2.0'
+  s.add_dependency "ldp", '~> 0.2.1'
   s.add_dependency "rdf-ldp"
 
   s.add_development_dependency "rdoc"

data/config/predicate_mappings.yml

@@ -1,5 +1,5 @@
 # The default namespace maps to the default namespace for generating relationships from solr
-:default_namespace: http://fedora.info/definitions/v4/rels-ext#
+:default_namespace: info:fedora/fedora-system:def/relations-external#
 
 # namespace mappings--- 
 # you can add specific mappings for your institution by providing the following:
@@ -14,7 +14,7 @@
 #   :oai_item_id => ["info:fedora/oai:example.edu:changeme:500"]
 #
 :predicate_mapping:
-  http://fedora.info/definitions/v4/rels-ext#:
+  info:fedora/fedora-system:def/relations-external#:
     :conforms_to: conformsTo
     :has_annotation: hasAnnotation
     :has_collection_member: hasCollectionMember

data/lib/active_fedora.rb

@@ -46,6 +46,7 @@ module ActiveFedora #:nodoc:
     autoload :Attributes
     autoload :AutosaveAssociation
     autoload :Base
+    autoload :CachingConnection
     autoload :Callbacks
     autoload :ChangeSet
     autoload :Config
@@ -62,7 +63,9 @@ module ActiveFedora #:nodoc:
     autoload :FixityService
     autoload :Indexing
     autoload :IndexingService
+    autoload :LdpCache
     autoload :LdpResource
+    autoload :LdpResourceService
     autoload :LoadableFromJson
     autoload :Model
     autoload :NestedAttributes

data/lib/active_fedora/attached_files.rb

@@ -41,20 +41,20 @@ module ActiveFedora
     end
     deprecation_deprecate :clear_datastreams
 
-    def datastream_assertions
+    def contains_assertions
       resource.query(subject: resource, predicate: Ldp.contains).objects.map(&:to_s)
     end
 
     def load_attached_files
-      datastream_assertions.each do |ds_uri|
-        dsid = ds_uri.to_s.sub(uri + '/', '')
-        next if association(dsid.to_sym)
-        create_singleton_association(dsid)
+      contains_assertions.each do |file_uri|
+        path = file_uri.to_s.sub(uri + '/', '')
+        next if association(path.to_sym)
+        create_singleton_association(path)
       end
     end
 
     # Adds datastream to the object.
-    # @return [String] dsid of the added datastream
+    # @return [String] path of the added datastream
     def attach_file(file, file_path, opts={})
       create_singleton_association(file_path)
       attached_files[file_path] = file
@@ -75,19 +75,36 @@ module ActiveFedora
     # File Management
     #
 
+    def add_file_datastream(file, opts={})
+      Deprecation.warn AttachedFiles, "add_file_datastream is deprecated and will be removed in active-fedora 10.0. Use add_file instead"
+      add_file(file, opts)
+    end
+
     # Attach the given file to object
     #
     # @param [File] file the file to add
     # @param [Hash] opts options: :dsid, :prefix, :mime_type
-    # @option opts [String] :dsid The datastream id
-    # @option opts [String] :prefix The datastream prefix (for auto-generated dsid)
+    # @option opts [String] :path The file path
+    # @option opts [String] :prefix The path prefix (for auto-generated path)
     # @option opts [String] :mime_type The Mime-Type of the file
     # @option opts [String] :original_name The original name of the file (used for Content-Disposition)
-    def add_file_datastream(file, opts={})
-      find_or_create_child_resource(opts).tap do |node|
+    def add_file(file, *args)
+      opts = if args.size == 1
+        args.first
+      else
+        Deprecation.warn AttachedFiles, "The second option to add_file should be a hash. Passing the file path is deprecated and will be removed in active-fedora 10.0.", caller
+        { path: args[0], original_name: args[1], mime_type: args[2] }
+      end
+
+      if opts[:dsid]
+        Deprecation.warn AttachedFiles, "The :dsid option to add_file is deprecated and will be removed in active-fedora 10.0. Use :path instead", caller
+        opts[:path] = opts[:dsid]
+      end
+
+      find_or_create_child_resource(opts[:path], opts[:prefix]).tap do |node|
         node.content = file
         node.mime_type = if opts[:mimeType]
-          Deprecation.warn AttachedFiles, "The :mimeType option to add_file_datastream is deprecated and will be removed in active-fedora 10.0. Use :mime_type instead", caller
+          Deprecation.warn AttachedFiles, "The :mimeType option to add_file is deprecated and will be removed in active-fedora 10.0. Use :mime_type instead", caller
           opts[:mimeType]
         else
           opts[:mime_type]
@@ -113,10 +130,10 @@ module ActiveFedora
         association
       end
 
-      def find_or_create_child_resource(opts)
-        association = association(opts[:dsid].to_sym) if opts[:dsid]
+      def find_or_create_child_resource(path, prefix)
+        association = association(path.to_sym) if path
         association ||= begin
-          file_path = FilePathBuilder.build(self, opts[:dsid], opts[:prefix])
+          file_path = FilePathBuilder.build(self, path, prefix)
           create_singleton_association(file_path)
         end
         association.reader

data/lib/active_fedora/base.rb

@@ -2,6 +2,7 @@ SOLR_DOCUMENT_ID = "id" unless (defined?(SOLR_DOCUMENT_ID) && !SOLR_DOCUMENT_ID.
 ENABLE_SOLR_UPDATES = true unless defined?(ENABLE_SOLR_UPDATES)
 require 'active_support/descendants_tracker'
 require 'active_fedora/errors'
+require 'active_fedora/log_subscriber'
 
 module ActiveFedora
 
@@ -26,6 +27,7 @@ module ActiveFedora
   class Base
     extend ActiveModel::Naming
     extend ActiveSupport::DescendantsTracker
+    extend LdpCache::ClassMethods
 
     include Core
     include Persistence

data/lib/active_fedora/caching_connection.rb

@@ -0,0 +1,80 @@
+module ActiveFedora
+  class CachingConnection < Ldp::Client
+    def initialize(host)
+      super
+      @cache = {}
+      @cache_enabled = false
+    end
+
+    def get(url, options = {})
+      if @cache_enabled
+        cache_resource(url) { super }
+      else
+        super
+      end
+    end
+
+    def post(*)
+      clear_cache if @cache_enabled
+      super
+    end
+
+    def put(*)
+      clear_cache if @cache_enabled
+      super
+    end
+
+    def patch(*)
+      clear_cache if @cache_enabled
+      super
+    end
+
+    # Enable the cache within the block.
+    def cache
+      old, @cache_enabled = @cache_enabled, true
+      yield
+    ensure
+      @cache_enabled = old
+      clear_cache unless @cache_enabled
+    end
+
+    def enable_cache!
+      @cache_enabled = true
+    end
+
+    def disable_cache!
+      @cache_enabled = false
+    end
+
+    # Disable the query cache within the block.
+    def uncached
+      old, @cache_enabled = @cache_enabled, false
+      yield
+    ensure
+      @cache_enabled = old
+    end
+
+    def clear_cache
+      @cache.clear
+    end
+
+    private
+
+      def log(url)
+        ActiveSupport::Notifications.instrument("ldp.active_fedora",
+                 id: url, name: "Load LDP", ldp_service: object_id) { yield }
+      end
+
+      def cache_resource(url, &block)
+        result =
+          if @cache.key?(url)
+             ActiveSupport::Notifications.instrument("ldp.active_fedora",
+                                                     id: url, name: "CACHE", ldp_service: object_id)
+             @cache[url]
+          else
+            @cache[url] = log(url) { yield }
+          end
+        result.dup
+      end
+  end
+end

data/lib/active_fedora/callbacks.rb

@@ -18,7 +18,7 @@ module ActiveFedora
   # * (5) <tt>after_create</tt>
   # * (6) <tt>after_save</tt>
   #
-  # Lastly an <tt>after_find</tt> and <tt>after_initialize</tt> callback is triggered for each object that 
+  # Lastly an <tt>after_find</tt> and <tt>after_initialize</tt> callback is triggered for each object that
   # is found and instantiated by a finder, with <tt>after_initialize</tt> being triggered after new objects
   # are instantiated as well.
   #
@@ -191,23 +191,23 @@ module ActiveFedora
   # methods on the model, which are called last.
   #
   # == Debugging callbacks
-  # 
-  # The callback chain is accessible via the <tt>_*_callbacks</tt> method on an object. ActiveModel Callbacks support 
+  #
+  # The callback chain is accessible via the <tt>_*_callbacks</tt> method on an object. ActiveModel Callbacks support
   # <tt>:before</tt>, <tt>:after</tt> and <tt>:around</tt> as values for the <tt>kind</tt> property. The <tt>kind</tt> property
   # defines what part of the chain the callback runs in.
-  # 
-  # To find all callbacks in the before_save callback chain: 
-  # 
+  #
+  # To find all callbacks in the before_save callback chain:
+  #
   #   Topic._save_callbacks.select { |cb| cb.kind.eql?(:before) }
-  # 
+  #
   # Returns an array of callback objects that form the before_save chain.
-  # 
+  #
   # To further check if the before_save chain contains a proc defined as <tt>rest_when_dead</tt> use the <tt>filter</tt> property of the callback object:
-  # 
+  #
   #   Topic._save_callbacks.select { |cb| cb.kind.eql?(:before) }.collect(&:filter).include?(:rest_when_dead)
-  # 
+  #
   # Returns true or false depending on whether the proc is contained in the before_save callback chain on a Topic model.
-  # 
+  #
   module Callbacks
     extend ActiveSupport::Concern
 
@@ -226,7 +226,7 @@ module ActiveFedora
       define_model_callbacks :save, :create, :update, :destroy
     end
 
-    def destroy #:nodoc:
+    def destroy(*) #:nodoc:
       run_callbacks(:destroy) { super }
     end
 
@@ -239,10 +239,9 @@ module ActiveFedora
     end
 
     def update_record(*) #:nodoc:
-      run_callbacks(:update) { 
+      run_callbacks(:update) {
         run_callbacks(:save) { super }
       }
     end
   end
 end
-

data/lib/active_fedora/core.rb

@@ -50,8 +50,7 @@ module ActiveFedora
       check_persistence unless persisted?
       clear_association_cache
       clear_attached_files
-      @ldp_source = LdpResource.new(conn, uri)
-      @resource = nil
+      refresh
       load_attached_files
       self
     end
@@ -103,10 +102,6 @@ module ActiveFedora
       @readonly = true
     end
 
-    def to_uri(id)
-      self.class.id_to_uri(id)
-    end
-
     protected
 
       # This can be overriden to assert a different model
@@ -116,6 +111,9 @@ module ActiveFedora
       end
 
     module ClassMethods
+
+      SLASH = '/'.freeze
+
       def generated_association_methods
         @generated_association_methods ||= begin
           mod = const_set(:GeneratedAssociationMethods, Module.new)
@@ -138,8 +136,10 @@ module ActiveFedora
         if translate_id_to_uri
           translate_id_to_uri.call(id)
         else
-          id = "/#{id}" unless id.start_with? '/'
-          id = ActiveFedora.fedora.base_path + id unless id.start_with? "#{ActiveFedora.fedora.base_path}/"
+          id = "/#{id}" unless id.start_with? SLASH
+          unless ActiveFedora.fedora.base_path == SLASH || id.start_with?("#{ActiveFedora.fedora.base_path}/")
+            id = ActiveFedora.fedora.base_path + id 
+          end
           ActiveFedora.fedora.host + id
         end
       end
@@ -181,16 +181,8 @@ module ActiveFedora
         @association_cache = {}
       end
 
-      def conn
-        ActiveFedora.fedora.connection
-      end
-
       def build_ldp_resource(id=nil)
-        if id
-          LdpResource.new(conn, to_uri(id))
-        else
-          LdpResource.new(conn, nil, nil, ActiveFedora.fedora.host + ActiveFedora.fedora.base_path)
-        end
+        ActiveFedora.fedora.ldp_resource_service.build(self.class, id)
       end
 
       def check_persistence

data/lib/active_fedora/errors.rb

@@ -27,7 +27,7 @@ module ActiveFedora #:nodoc:
   #   end
   #
   #   class Patch < ActiveFedora::Base
-  #     belongs_to :ticket, predicate: ActiveFedora::RDF::RelsExt.isComponentOf
+  #     belongs_to :ticket, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isComponentOf
   #   end
   #
   #   # Comments are not patches, this assignment raises AssociationTypeMismatch.

data/lib/active_fedora/fedora.rb

@@ -14,7 +14,11 @@ module ActiveFedora
     end
 
     def connection
-      @connection ||= Ldp::Client.new(host)
+      @connection ||= CachingConnection.new(host)
+    end
+
+    def ldp_resource_service
+      @service ||= LdpResourceService.new(connection)
     end
 
     SLASH = '/'.freeze

data/lib/active_fedora/file.rb

@@ -12,12 +12,10 @@ module ActiveFedora
     define_model_callbacks :save, :create, :destroy
     define_model_callbacks :initialize, only: :after
 
-    attr_accessor :last_modified
-
     # @param parent_or_url [ActiveFedora::Base, String, Hash, NilClass] the parent resource or the URI of this resource
     # @param path_name [String] the path partial relative to the resource
     # @param options [Hash]
-    def initialize(parent_or_url_or_hash = nil, dsid=nil, options={})
+    def initialize(parent_or_url_or_hash = nil, path=nil, options={})
       case parent_or_url_or_hash
       when Hash
         content = ''
@@ -31,7 +29,7 @@ module ActiveFedora
         uri = if parent_or_url_or_hash.uri.kind_of?(::RDF::URI) && parent_or_url_or_hash.uri.value.empty?
           nil
         else
-          "#{parent_or_url_or_hash.uri}/#{dsid}"
+          "#{parent_or_url_or_hash.uri}/#{path}"
         end
         @ldp_source = Ldp::Resource::BinarySource.new(ldp_connection, uri, nil, ActiveFedora.fedora.host + ActiveFedora.fedora.base_path)
 
@@ -174,13 +172,6 @@ module ActiveFedora
       "#<#{self.class} uri=\"#{uri}\" >"
     end
 
-    #compatibility method for rails' url generators. This method will
-    #urlescape escape dots, which are apparently
-    #invalid characters in a dsid.
-    def to_param
-      dsid.gsub(/\./, '%2e')
-    end
-
     # @abstract Override this in your concrete datastream class.
     # @return [boolean] does this datastream contain metadata (not file data)
     def metadata?
@@ -212,14 +203,14 @@ module ActiveFedora
 
     # The string to prefix all solr fields with. Override this method if you want
     # a prefix other than the default
-    def prefix(dsid)
-      dsid ? "#{dsid.underscore}__" : ''
+    def prefix(path)
+      path ? "#{path.underscore}__" : ''
     end
 
     def fetch_original_name_from_headers
       return if new_record?
       m = ldp_source.head.headers['Content-Disposition'].match(/filename="(?<filename>[^"]*)";/)
-      m[:filename]
+      URI.decode(m[:filename])
     end
 
     def fetch_mime_type
@@ -251,13 +242,10 @@ module ActiveFedora
 
       def save(*)
         return unless content_changed?
-        payload = behaves_like_io?(content) ? content.read : content
-        headers = { 'Content-Type' => mime_type }
-        headers['Content-Disposition'] = "attachment; filename=\"#{@original_name}\"" if @original_name
-        # Setting the content-length is required until we figure out why Faraday 
-        # is not doing this automatically for files uploaded via ActionDispatch.
-        headers['Content-Length'] = payload.size.to_s if uploaded_file?(payload)
-        ldp_source.content = payload
+        headers = { 'Content-Type'.freeze => mime_type, 'Content-Length'.freeze => content.size.to_s }
+        headers['Content-Disposition'.freeze] = "attachment; filename=\"#{URI.encode(@original_name)}\"" if @original_name
+
+        ldp_source.content = content
         if new_record?
           ldp_source.create do |req|
             req.headers = headers
@@ -275,24 +263,6 @@ module ActiveFedora
         ldp_source.get.body
       end
 
-      # @param range [String] the Range HTTP header
-      # @yield [chunk] a block that receives chunked content
-      def stream(range = nil, &block)
-        uri = URI.parse(self.uri)
-
-        headers = {}
-        headers['Range'] = range if range
-        Net::HTTP.start(uri.host, uri.port) do |http|
-          request = Net::HTTP::Get.new uri, headers
-          http.request request do |response|
-            raise "Couldn't get data from Fedora (#{uri}). Response: #{response.code}" unless response.is_a?(Net::HTTPSuccess)
-            response.read_body do |chunk|
-              block.call(chunk)
-            end
-          end
-        end
-      end
-
       private
 
       def uploaded_file?(payload)
@@ -318,7 +288,40 @@ module ActiveFedora
       end
     end
 
+    module Streaming
+      # @param range [String] the Range HTTP header
+      # @returns [Stream] an object that responds to each
+      def stream(range = nil)
+        uri = URI.parse(self.uri)
+        headers = {}
+        headers['Range'] = range if range
+        FileBody.new(uri, headers)
+      end
+
+      class FileBody
+        attr_reader :uri, :headers
+        def initialize(uri, headers)
+          @uri = uri
+          @headers = headers
+        end
+
+        def each
+          Net::HTTP.start(uri.host, uri.port) do |http|
+            request = Net::HTTP::Get.new uri, headers
+            http.request request do |response|
+
+              raise "Couldn't get data from Fedora (#{uri}). Response: #{response.code}" unless response.is_a?(Net::HTTPSuccess)
+              response.read_body do |chunk|
+                yield chunk
+              end
+            end
+          end
+        end
+      end
+    end
+
     include ActiveFedora::File::Persistence
+    include ActiveFedora::File::Streaming
     include ActiveFedora::Versionable
   end