active-fedora 9.4.3 → 9.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de5b5046afb1dd762565465806e9b98a67c21727
-  data.tar.gz: 46a49e17d79a44566e95a61403b233b61a37e556
+  metadata.gz: d20da0e6b44ea16a3ea8b082bf4d7ace579231c0
+  data.tar.gz: a0d115e8e0897dfac1ef208ee9b936b51c0f679b
 SHA512:
-  metadata.gz: fa2eec62f59fde87474c31cf72c28ba1f8bfbc3dc8377869d1d9f5bf2d26de643e834d4e34e5b9db1dfa432d3d5bc620791a92bedfcfff24ce2ed23646a99051
-  data.tar.gz: ad05b8ba63965874e5d56e8d2096954705088fc2b19f6fab47aaaaa7cf3fa300d523e2e27141dd78061246a66df7f94d9bdf938b0494013bc51c3aa1c5d5fb03
+  metadata.gz: 62cf90d783c51e26e1ff7ac3cb19a9ab5c3c5daff025900244c076d61b9f7a6533a9daab5951bd9225a445ccd3287a59ac0311673919338a0d6ffd17b6a5b7c2
+  data.tar.gz: a556f5e96eb8b20134a6b9e58c397717882a36184d6972ea3fb705e25a899845b36dfc0ddfd8d524d77828c979f1c8157895e628f2af1aa6015db975c1cffd0c

data/History.txt

@@ -1,3 +1,16 @@
+v9.5.0
+  2015-10-16: query for nil creates correct query [Justin Coyne]
+
+  2015-10-16: Support both Fedora and Premis fixity predicates [Adam Wead]
+
+  2015-10-12: AssociationHash - alias  to [David Chandek-Stark]
+
+  2015-10-12: Fixed syntax error in raise statement [David Chandek-Stark]
+
+  2015-10-02: Let autoload do its thing [Justin Coyne]
+
+  2015-09-28: Add support for contained RDF sources. [Trey Terrell]
+
 v9.4.3
   2015-09-30: Don't mark an attribute as changed if it's set to the same value
   [Justin Coyne]

data/lib/active_fedora.rb

@@ -38,6 +38,7 @@ module ActiveFedora #:nodoc:
   extend ActiveSupport::Autoload
 
   eager_autoload do
+    autoload :AssociationHash
     autoload :AssociationRelation
     autoload :Associations
     autoload :AttachedFiles

data/lib/active_fedora/association_hash.rb

@@ -0,0 +1,117 @@
+module ActiveFedora
+  ##
+  # Used as an access method for associations on a model, given some
+  # reflections.
+  class AssociationHash
+    def initialize (model, reflections)
+      @base = model
+      @reflections = reflections
+    end
+
+    def [] (name)
+      association(name).reader if association(name)
+    end
+
+    def []= (name, object)
+      association(name).writer(object) if association(name)
+    end
+
+    def association(name)
+      # Check to see if the key exists before casting to a symbol, because symbols
+      # are not garbage collected in earlier versions of Ruby
+      @base.association(name.to_sym) if key?(name)
+    end
+
+    def reflections
+      @reflections
+    end
+
+    def merge(other_hash)
+      Merged.new(self, other_hash)
+    end
+
+    def each
+      keys.each do |k|
+        yield k, self[k]
+      end
+    end
+
+    def keys
+      reflections.keys
+    end
+
+    # Check that the key exists with indifferent access (symbol or string) in a
+    # manner that avoids generating extra symbols. Symbols are not garbage collected
+    # in earlier versions of ruby.
+    def key?(key)
+      keys.include?(key) || keys.map(&:to_s).include?(key)
+    end
+    alias_method :include?, :key?
+
+    def values
+      keys.map { |k| self[k] }
+    end
+
+    def has_key?(key)
+      keys.include?(key)
+    end
+
+    def size
+      keys.size
+    end
+
+    def empty?
+      reflections.empty?
+    end
+
+    def each_value
+      keys.each do |k|
+        yield self[k]
+      end
+    end
+
+    def changed
+      select do |_, obj|
+        obj.changed?
+      end
+    end
+
+    def select
+      keys.each_with_object({}) do |k, h|
+        val = self[k]
+        h[k] = val if yield k, val
+      end
+    end
+
+    def freeze
+      keys.each do |name|
+        association(name).reader.freeze if association(name).loaded?
+      end
+      super
+    end
+  end
+  ##
+  # Represents the result of merging two association hashes.
+  # @note As the keys can come from multiple models, the attributes become
+  # unwritable.
+  class Merged < AssociationHash
+    attr_reader :first, :second
+
+    def initialize(first, second)
+      @first = first
+      @second = second
+    end
+
+    def [] (name)
+      first[name] || second[name]
+    end
+
+    def []= (name)
+      raise NotImplementedError, "Unable to set properties on a merged association hash."
+    end
+
+    def keys
+      first.keys + second.keys
+    end
+  end
+end

data/lib/active_fedora/associations.rb

@@ -10,31 +10,30 @@ module ActiveFedora
   end
 
   module Associations
-
     extend ActiveSupport::Concern
+    extend ActiveSupport::Autoload
 
-    autoload :Association,           'active_fedora/associations/association'
-    autoload :AssociationScope,      'active_fedora/associations/association_scope'
-    autoload :SingularAssociation,   'active_fedora/associations/singular_association'
-    autoload :RDF,                   'active_fedora/associations/rdf'
-    autoload :SingularRDF,           'active_fedora/associations/singular_rdf'
-    autoload :CollectionAssociation, 'active_fedora/associations/collection_association'
-    autoload :CollectionProxy,       'active_fedora/associations/collection_proxy'
-    autoload :ContainerProxy,        'active_fedora/associations/container_proxy'
+    autoload :Association
+    autoload :SingularAssociation
+    autoload :RDF
+    autoload :SingularRDF
+    autoload :CollectionAssociation
+    autoload :CollectionProxy
+    autoload :ContainerProxy
 
-    autoload :HasManyAssociation,             'active_fedora/associations/has_many_association'
-    autoload :BelongsToAssociation,           'active_fedora/associations/belongs_to_association'
-    autoload :HasAndBelongsToManyAssociation, 'active_fedora/associations/has_and_belongs_to_many_association'
-    autoload :BasicContainsAssociation,       'active_fedora/associations/basic_contains_association'
-    autoload :DirectlyContainsAssociation,    'active_fedora/associations/directly_contains_association'
-    autoload :DirectlyContainsOneAssociation, 'active_fedora/associations/directly_contains_one_association'
-    autoload :IndirectlyContainsAssociation,  'active_fedora/associations/indirectly_contains_association'
-    autoload :ContainsAssociation,            'active_fedora/associations/contains_association'
-    autoload :DeleteProxy,                    'active_fedora/associations/delete_proxy'
-    autoload :ContainedFinder,                'active_fedora/associations/contained_finder'
-    autoload :RecordComposite,                'active_fedora/associations/record_composite'
-    autoload :IDComposite,                    'active_fedora/associations/id_composite'
-    autoload :NullValidator,                  'active_fedora/associations/null_validator'
+    autoload :HasManyAssociation
+    autoload :BelongsToAssociation
+    autoload :HasAndBelongsToManyAssociation
+    autoload :BasicContainsAssociation
+    autoload :DirectlyContainsAssociation
+    autoload :DirectlyContainsOneAssociation
+    autoload :IndirectlyContainsAssociation
+    autoload :ContainsAssociation
+    autoload :DeleteProxy
+    autoload :ContainedFinder
+    autoload :RecordComposite
+    autoload :IDComposite
+    autoload :NullValidator
 
     module Builder
       autoload :Association,             'active_fedora/associations/builder/association'
@@ -53,6 +52,10 @@ module ActiveFedora
       autoload :SingularProperty, 'active_fedora/associations/builder/singular_property'
     end
 
+    eager_autoload do
+      autoload :AssociationScope
+    end
+
     # Clears out the association cache.
     def clear_association_cache #:nodoc:
       @association_cache.clear if persisted?
@@ -162,13 +165,13 @@ module ActiveFedora
       # This method is used to specify the details of a contained resource.
       # Pass the name as the first argument and a hash of options as the second argument
       # Note that this method doesn't actually execute the block, but stores it, to be executed
-      # by any the implementation of the datastream(specified as :class_name)
+      # by any the implementation of the resource(specified as :class_name)
       #
       # @param [String] name the handle to refer to this child as
       # @param [Hash] options
-      # @option options [Class] :class_name The class that will represent this child, should extend ``ActiveFedora::File''
+      # @option options [Class] :class_name The class that will represent this child, should extend ``ActiveFedora::File'' or ``ActiveFedora::Base''
       # @option options [String] :url
-      # @option options [Boolean] :autocreate Always create this datastream on new objects
+      # @option options [Boolean] :autocreate Always create this resource on new objects
       # @yield block executed by some types of child resources
       def contains(name, options = {}, &block)
         options[:block] = block if block

data/lib/active_fedora/associations/basic_contains_association.rb

@@ -7,13 +7,13 @@ module ActiveFedora
       end
 
       def find_target
-        reflection.build_association(target_uri) do |record|
+        find_or_initialize_target do |record|
           configure_datastream(record) if reflection.options[:block]
         end
       end
 
       def target_uri
-        "#{owner.uri}/#{reflection.name}"
+        "#{owner.id}/#{reflection.name}"
       end
 
       private
@@ -23,6 +23,18 @@ module ActiveFedora
         super
       end
 
+      def find_or_initialize_target(&block)
+        begin
+          if reflection.klass < ActiveFedora::File
+            reflection.build_association(target_uri, &block)
+          else
+            reflection.klass.find(target_uri)
+          end
+        rescue ActiveFedora::ObjectNotFoundError
+          reflection.build_association(target_uri, &block)
+        end
+      end
+
       def replace(record)
         if record
           raise_on_type_mismatch(record)

data/lib/active_fedora/associations/builder/contains.rb

@@ -21,7 +21,12 @@ module ActiveFedora::Associations::Builder
           set_uri = uri.kind_of?(RDF::URI) ? uri.value.present? : uri.present?
           if set_uri
             file_uri = "#{uri}/#{name}"
-            file.uri = file_uri
+            begin
+              file.uri = file_uri
+            rescue ActiveFedora::AlreadyPersistedError
+            end
+          end
+          if file.respond_to?(:exists!)
             file.exists! if contains_assertions.include?(file_uri)
           end
         end

data/lib/active_fedora/associations/id_composite.rb

@@ -5,6 +5,9 @@ module ActiveFedora::Associations
   class IDComposite
     attr_reader :ids, :id_translator
     include Enumerable
+    # @param [Array<#to_s>] ids An array of ids or URIs to convert to IDs.
+    # @param [#call] id_translator An object to handle the conversion of a URI
+    #   to an ID.
     def initialize(ids, id_translator)
       @ids = ids
       @id_translator = id_translator
@@ -20,7 +23,7 @@ module ActiveFedora::Associations
     private
 
     def convert(id)
-      if id.start_with?("http")
+      if id.to_s.start_with?("http")
         id_translator.call(id)
       else
         id

data/lib/active_fedora/core.rb

@@ -37,6 +37,18 @@ module ActiveFedora
       run_callbacks :initialize
     end
 
+    ##
+    # @param [#to_s] uri a full fedora URI or relative ID to set this resource
+    #   to.
+    # @note This can only be run on an unpersisted resource.
+    def uri=(uri)
+      if persisted?
+        raise AlreadyPersistedError, "You can not set a URI for a persisted ActiveFedora object."
+      else
+        @ldp_source = build_ldp_resource(self.class.uri_to_id(uri))
+      end
+    end
+
     # Reloads the object from Fedora.
     def reload
       check_persistence unless persisted?

data/lib/active_fedora/errors.rb

@@ -76,4 +76,8 @@ module ActiveFedora #:nodoc:
   # Raised when Fedora returns a version without a create date
   class VersionLacksCreateDate < ActiveFedoraError
   end
+  
+  # Raised when you try to set a URI to an already persisted Base object.
+  class AlreadyPersistedError < ActiveFedoraError
+  end
 end

data/lib/active_fedora/file.rb

@@ -35,8 +35,11 @@ module ActiveFedora
       case parent_or_url_or_hash
       when Hash
         @ldp_source = build_ldp_resource_via_uri
-      when nil, String, ::RDF::URI
-        @ldp_source = build_ldp_resource_via_uri parent_or_url_or_hash
+      when nil
+        @ldp_source = build_ldp_resource_via_uri nil
+      when String, ::RDF::URI
+        id = ActiveFedora::Associations::IDComposite.new([parent_or_url_or_hash], translate_uri_to_id).first
+        @ldp_source = build_ldp_resource id
       when ActiveFedora::Base
         Deprecation.warn File, "Initializing a file by passing a container is deprecated. Initialize with a uri instead. This capability will be removed in active-fedora 10.0"
         uri = if parent_or_url_or_hash.uri.kind_of?(::RDF::URI) && parent_or_url_or_hash.uri.value.empty?

data/lib/active_fedora/files_hash.rb

@@ -1,82 +1,15 @@
-require 'forwardable'
-
 module ActiveFedora
-  class FilesHash
-    extend Forwardable
-
+  class FilesHash < AssociationHash
     def initialize (model)
       @base = model
     end
 
-    def [] (name)
-      association(name).reader if association(name)
-    end
-
-    def []= (name, object)
-      association(name).writer(object) if association(name)
-    end
-
-    def association(name)
-      # Check to see if the key exists before casting to a symbol, because symbols
-      # are not garbage collected in earlier versions of Ruby
-      @base.association(name.to_sym) if key?(name)
-    end
-
     def reflections
       @base.class.child_resource_reflections
     end
 
-    def each
-      keys.each do |k|
-        yield k, self[k]
-      end
-    end
-
     def keys
       reflections.keys + @base.undeclared_files
     end
-
-    # Check that the key exists with indifferent access (symbol or string) in a
-    # manner that avoids generating extra symbols. Symbols are not garbage collected
-    # in earlier versions of ruby.
-    def key?(key)
-      keys.include?(key) || keys.map(&:to_s).include?(key)
-    end
-
-    def values
-      keys.map { |k| self[k] }
-    end
-
-    def has_key?(key)
-      keys.include?(key)
-    end
-
-    def size
-      keys.size
-    end
-
-    def empty?
-      reflections.empty?
-    end
-
-    def each_value
-      keys.each do |k|
-        yield self[k]
-      end
-    end
-
-    def select
-      keys.each_with_object({}) do |k, h|
-        val = self[k]
-        h[k] = val if yield k, val
-      end
-    end
-
-    def freeze
-      keys.each do |name|
-        association(name).reader.freeze if association(name).loaded?
-      end
-      super
-    end
   end
 end

data/lib/active_fedora/fixity_service.rb

@@ -11,26 +11,35 @@ module ActiveFedora
     end
 
     # Executes a fixity check on Fedora and saves the Faraday::Response.
-    # Returns true when the fixity check was successfully.
+    # @return true or false
     def check
       @response = get_fixity_response_from_fedora
-      status.match("SUCCESS") ? true : false
+      status.include?(success)
     end
 
     def status
-      fixity_graph.query(predicate: status_predicate).map(&:object).first.to_s
+      fixity_graph.query(predicate: premis_status_predicate).map(&:object) +
+        fixity_graph.query(predicate: fedora_status_predicate).map(&:object)
     end
 
     private
 
+      def premis_status_predicate
+        ::RDF::Vocab::PREMIS.hasEventOutcome
+      end
+
       # Fcrepo4.status was used by Fedora < 4.3, but it was removed
       # from the 2015-07-24 version of the fedora 4 ontology
       # http://fedora.info/definitions/v4/2015/07/24/repository and
       # from rdf-vocab in version 0.8.5
-      def status_predicate
+      def fedora_status_predicate
         ::RDF::URI("http://fedora.info/definitions/v4/repository#status")
       end
 
+      def success
+        ::RDF::Literal.new("SUCCESS")
+      end
+
       def get_fixity_response_from_fedora
         uri = target + "/fcr:fixity"
         ActiveFedora.fedora.connection.get(encoded_url(uri))