active-fedora 9.9.1 → 9.10.0.pre1

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

@@ -1,8 +1,12 @@
 module ActiveFedora::Associations::Builder
   class DirectlyContainsOne < SingularAssociation #:nodoc:
-    self.macro = :directly_contains_one
-    self.valid_options += [:has_member_relation, :is_member_of_relation, :type, :through]
-    self.valid_options -= [:predicate]
+    def self.macro
+      :directly_contains_one
+    end
+
+    def self.valid_options(options)
+      super + [:has_member_relation, :is_member_of_relation, :type, :through] - [:predicate]
+    end
 
     def validate_options
       raise ArgumentError, "you must specify a :through option on #{name}.  #{name} will use the container from that directly_contains association." unless options[:through]
@@ -34,7 +38,7 @@ module ActiveFedora::Associations::Builder
       end
 
       def lookup_reflection(association_name)
-        model.reflect_on_association(association_name)
+        model._reflect_on_association(association_name)
       end
   end
 end

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

@@ -1,9 +1,13 @@
 module ActiveFedora::Associations::Builder
   class HasAndBelongsToMany < CollectionAssociation #:nodoc:
     extend Deprecation
-    self.macro = :has_and_belongs_to_many
+    def self.macro
+      :has_and_belongs_to_many
+    end
 
-    self.valid_options += [:inverse_of, :solr_page_size]
+    def self.valid_options(options)
+      super + [:inverse_of, :solr_page_size]
+    end
 
     def validate_options
       super

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

@@ -1,8 +1,12 @@
 module ActiveFedora::Associations::Builder
   class HasMany < CollectionAssociation #:nodoc:
-    self.macro = :has_many
+    def self.macro
+      :has_many
+    end
 
-    self.valid_options += [:as, :dependent, :inverse_of]
+    def self.valid_options(options)
+      super + [:as, :dependent, :inverse_of]
+    end
 
     def build
       reflection = super

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

@@ -1,8 +1,12 @@
 module ActiveFedora::Associations::Builder
   class IndirectlyContains < CollectionAssociation #:nodoc:
-    self.macro = :indirectly_contains
-    self.valid_options += [:has_member_relation, :is_member_of_relation, :inserted_content_relation, :foreign_key, :through]
-    self.valid_options -= [:predicate]
+    def self.macro
+      :indirectly_contains
+    end
+
+    def self.valid_options(options)
+      super + [:has_member_relation, :is_member_of_relation, :inserted_content_relation, :foreign_key, :through] - [:predicate]
+    end
 
     def build
       reflection = super

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

@@ -1,7 +1,12 @@
 module ActiveFedora::Associations::Builder
   class Property < Association
-    self.macro = :rdf
-    self.valid_options = [:class_name, :predicate, :type_validator]
+    def self.macro
+      :rdf
+    end
+
+    def self.valid_options(options)
+      super
+    end
 
     def initialize(model, name, options)
       super

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

@@ -1,6 +1,8 @@
 module ActiveFedora::Associations::Builder
   class SingularAssociation < Association #:nodoc:
-    self.valid_options += [:dependent, :inverse_of]
+    def self.valid_options(options)
+      super + [:dependent, :inverse_of]
+    end
 
     def self.constructable?
       true

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

@@ -1,6 +1,8 @@
 module ActiveFedora::Associations::Builder
   class SingularProperty < Property
-    self.macro = :singular_rdf
+    def self.macro
+      :singular_rdf
+    end
 
     def initialize(model, name, options)
       super

data/lib/active_fedora/associations/collection_association.rb

@@ -14,7 +14,13 @@ module ActiveFedora
           force_reload = opts
         end
         reload if force_reload || stale_target?
-        @proxy ||= CollectionProxy.new(self)
+        if null_scope?
+          # Cache the proxy separately before the owner has an id
+          # or else a post-save proxy will still lack the id
+          @null_proxy ||= CollectionProxy.new(self)
+        else
+          @proxy ||= CollectionProxy.new(self)
+        end
       end
 
       # Implements the writer method, e.g. foo.items= for Foo.has_many :items
@@ -27,9 +33,7 @@ module ActiveFedora
         if loaded?
           load_target.map(&:id)
         else
-          load_from_solr.map do |solr_record|
-            solr_record['id']
-          end
+          load_from_solr.map(&:id)
         end
       end
 
@@ -225,7 +229,7 @@ module ActiveFedora
       # Count all records using solr. Construct options and pass them with
       # scope to the target class's +count+.
       def count(_options = {})
-        @reflection.klass.count(conditions: construct_query)
+        scope.count
       end
 
       # Sets the target of this proxy to <tt>\target</tt>, and the \loaded flag to +true+.

data/lib/active_fedora/associations/collection_proxy.rb

@@ -38,7 +38,7 @@ module ActiveFedora
       def initialize(association)
         @association = association
         super association.klass
-        merge! association.scope
+        merge! association.scope(nullify: false)
       end
 
       def target

data/lib/active_fedora/associations/contained_finder.rb

@@ -42,8 +42,7 @@ module ActiveFedora::Associations
         query = ActiveFedora::SolrQueryBuilder.construct_query_for_rel(
           [[:has_model, proxy_class.to_class_uri], [:proxyFor, record.id]]
         )
-        results = ActiveFedora::SolrService.query(query, fl: 'id')
-        results.map { |res| ::RDF::URI(ActiveFedora::Base.id_to_uri(res['id'])) }
+        ActiveFedora::SolrService.query(query, fl: 'id').map(&:rdf_uri)
       end
   end
 end

data/lib/active_fedora/associations/directly_contains_one_association.rb

@@ -66,7 +66,7 @@ module ActiveFedora
 
         # Returns the Reflection corresponding to the direct container association that's being filtered
         def container_reflection
-          @container_reflection ||= @owner.class.reflect_on_association(@reflection.options[:through])
+          @container_reflection ||= @owner.class._reflect_on_association(@reflection.options[:through])
         end
 
         # Returns the DirectContainerAssociation corresponding to the direct container that's being filtered

data/lib/active_fedora/associations/has_many_association.rb

@@ -14,11 +14,7 @@ module ActiveFedora
       # If the collection is empty the target is set to an empty array and
       # the loaded flag is set to true as well.
       def count_records
-        count = if loaded?
-                  @target.size
-                else
-                  @reflection.klass.count(conditions: construct_query)
-                end
+        count = scope.count
 
         # If there's nothing in the database and @target has no new records
         # we are certain the current target is an empty array. This is a

data/lib/active_fedora/associations/rdf.rb

@@ -60,26 +60,7 @@ module ActiveFedora
           ids = candidate_uris.map { |uri| ActiveFedora::Base.uri_to_id(uri) }
           results = ActiveFedora::SolrService.query(ActiveFedora::SolrQueryBuilder.construct_query_for_ids(ids), rows: 10_000)
 
-          docs = results.select do |result|
-            ActiveFedora::QueryResultBuilder.classes_from_solr_document(result).any? do |klass|
-              class_ancestors(klass).include? reflection.klass
-            end
-          end
-
-          docs.map { |doc| ::RDF::URI.new(ActiveFedora::Base.id_to_uri(doc['id'])) }
-        end
-
-        ##
-        # Returns a list of all the ancestor classes up to ActiveFedora::Base including the class itself
-        # @param [Class] klass
-        # @return [Array<Class>]
-        # @example
-        #   class Car < ActiveFedora::Base; end
-        #   class SuperCar < Car; end
-        #   class_ancestors(SuperCar)
-        #   # => [SuperCar, Car, ActiveFedora::Base]
-        def class_ancestors(klass)
-          klass.ancestors.select { |k| k.instance_of?(Class) } - [Object, BasicObject]
+          results.select { |result| result.model? reflection.klass }.map(&:rdf_uri)
         end
     end
   end

data/lib/active_fedora/attached_files.rb

@@ -49,7 +49,7 @@ module ActiveFedora
     deprecation_deprecate :clear_datastreams
 
     def contains_assertions
-      resource.query(subject: resource, predicate: Ldp.contains).objects.map(&:to_s)
+      resource.query(subject: resource, predicate: ::RDF::Vocab::LDP.contains).objects.map(&:to_s)
     end
 
     def load_attached_files

data/lib/active_fedora/attribute_methods.rb

@@ -110,6 +110,24 @@ module ActiveFedora
         include @generated_attribute_methods
       end
 
+      # A method name is 'dangerous' if it is already (re)defined by Active Fedora, but
+      # not by any ancestors. (So 'puts' is not dangerous but 'save' is.)
+      def dangerous_attribute_method?(name) # :nodoc:
+        method_defined_within?(name, Base)
+      end
+
+      def method_defined_within?(name, klass, superklass = klass.superclass) # :nodoc:
+        if klass.method_defined?(name) || klass.private_method_defined?(name)
+          if superklass.method_defined?(name) || superklass.private_method_defined?(name)
+            klass.instance_method(name).owner != superklass.instance_method(name).owner
+          else
+            true
+          end
+        else
+          false
+        end
+      end
+
       private
 
         # @param name [Symbol] name of the attribute to generate

data/lib/active_fedora/attributes.rb

@@ -239,7 +239,7 @@ module ActiveFedora
           # @param [String] dsid the datastream id
           # @return [Class] the class of the datastream
           def datastream_class_for_name(dsid)
-            reflection = reflect_on_association(dsid.to_sym)
+            reflection = _reflect_on_association(dsid.to_sym)
             reflection ? reflection.klass : ActiveFedora::File
           end
 

data/lib/active_fedora/autosave_association.rb

@@ -75,24 +75,20 @@ module ActiveFedora
   module AutosaveAssociation
     extend ActiveSupport::Concern
 
-    ASSOCIATION_TYPES = %w( HasMany BelongsTo HasAndBelongsToMany DirectlyContains IndirectlyContains).freeze
+    ASSOCIATION_TYPES = [:has_many, :belongs_to, :has_and_belongs_to_many, :directly_contains, :indirectly_contains].freeze
 
     module AssociationBuilderExtension #:nodoc:
-      def self.included(base)
-        base.valid_options << :autosave
+      def self.valid_options
+        [:autosave]
       end
 
-      def build
-        reflection = super
-        model.send(:add_autosave_association_callbacks, reflection)
-        reflection
+      def self.build(model, reflection)
+        model.send(:define_autosave_association_callbacks, reflection) if ASSOCIATION_TYPES.include? reflection.macro
       end
     end
 
     included do
-      ASSOCIATION_TYPES.each do |type|
-        Associations::Builder.const_get(type).send(:include, AssociationBuilderExtension)
-      end
+      Associations::Builder::Association.extensions << AssociationBuilderExtension
     end
 
     module ClassMethods
@@ -127,7 +123,7 @@ module ActiveFedora
         # the callbacks to get defined multiple times, there are guards that
         # check if the save or validation methods have already been defined
         # before actually defining them.
-        def add_autosave_association_callbacks(reflection)
+        def define_autosave_association_callbacks(reflection)
           save_method = :"autosave_associated_records_for_#{reflection.name}"
           validation_method = :"validate_associated_records_for_#{reflection.name}"
           collection = reflection.collection?
@@ -287,7 +283,7 @@ module ActiveFedora
           end
 
           # reconstruct the scope now that we know the owner's id
-          association.send(:construct_scope) if association.respond_to?(:construct_scope)
+          association.send(:reset_scope) if association.respond_to?(:reset_scope)
         end
       end
 

data/lib/active_fedora/base.rb

@@ -1,5 +1,3 @@
-SOLR_DOCUMENT_ID = "id".freeze unless defined?(SOLR_DOCUMENT_ID) && !SOLR_DOCUMENT_ID.nil?
-ENABLE_SOLR_UPDATES = true unless defined?(ENABLE_SOLR_UPDATES)
 require 'active_support/descendants_tracker'
 require 'active_fedora/errors'
 require 'active_fedora/log_subscriber'

data/lib/active_fedora/caching_connection.rb

@@ -1,6 +1,6 @@
 module ActiveFedora
   class CachingConnection < Ldp::Client
-    def initialize(host)
+    def initialize(host, options = {})
       super
       @cache = {}
       @cache_enabled = false

data/lib/active_fedora/default_model_mapper.rb

@@ -0,0 +1,24 @@
+module ActiveFedora
+  # Create model classifiers for resources or solr documents
+  class DefaultModelMapper
+    attr_reader :classifier_class, :solr_field, :predicate
+
+    def initialize(classifier_class: ActiveFedora::ModelClassifier, solr_field: ActiveFedora::QueryResultBuilder::HAS_MODEL_SOLR_FIELD, predicate: ActiveFedora::RDF::Fcrepo::Model.hasModel)
+      @classifier_class = classifier_class
+      @solr_field = solr_field
+      @predicate = predicate
+    end
+
+    def classifier(resource)
+      models = if resource.respond_to? :graph
+                 resource.graph.query([nil, predicate, nil]).map { |rg| rg.object.to_s }
+               elsif resource.respond_to? :[]
+                 resource[solr_field] || []
+               else
+                 []
+               end
+
+      classifier_class.new(models)
+    end
+  end
+end

data/lib/active_fedora/fedora.rb

@@ -30,7 +30,7 @@ module ActiveFedora
       # things like ldp:IndirectContainers, but it's imposes a significant
       # performance penalty on every request
       #   @connection ||= InboundRelationConnection.new(CachingConnection.new(authorized_connection))
-      @connection ||= CachingConnection.new(authorized_connection)
+      @connection ||= CachingConnection.new(authorized_connection, omit_ldpr_interaction_model: true)
     end
 
     def clean_connection

data/lib/active_fedora/file/attributes.rb

@@ -21,7 +21,7 @@ module ActiveFedora::File::Attributes
   end
 
   def persisted_size
-    ldp_source.head.headers['Content-Length'].to_i unless new_record?
+    ldp_source.head.content_length unless new_record?
   end
 
   def dirty_size
@@ -60,7 +60,7 @@ module ActiveFedora::File::Attributes
     end
 
     def links
-      @links ||= Ldp::Response.links(ldp_source.head)
+      @links ||= ldp_source.head.links
     end
 
     def default_mime_type
@@ -69,12 +69,11 @@ module ActiveFedora::File::Attributes
 
     def fetch_mime_type
       return default_mime_type if new_record?
-      ldp_source.head.headers['Content-Type']
+      ldp_source.head.content_type
     end
 
     def fetch_original_name
       return if new_record?
-      m = ldp_source.head.headers['Content-Disposition'].match(/filename="(?<filename>[^"]*)";/)
-      URI.decode(m[:filename])
+      ldp_source.head.content_disposition_filename
     end
 end

data/lib/active_fedora/identifiable.rb

@@ -78,6 +78,11 @@ module ActiveFedora
       rescue ActiveFedora::ObjectNotFoundError, Ldp::Gone
         ActiveTriples::Resource.new(uri)
       end
+
+      # Abstract classes can't have default scopes.
+      def abstract_class?
+        self == Base
+      end
     end
   end
 end

data/lib/active_fedora/indexing.rb

@@ -15,6 +15,16 @@ module ActiveFedora
       autoload :Map
     end
 
+    included do
+      # Because the previous method of setting indexer was to override
+      # the class method, we must ensure that we aren't using the instance
+      # reader so that the old method still works.
+      class_attribute :indexer, instance_accessor: false
+
+      # This is the default indexer class to use for this model.
+      self.indexer = IndexingService
+    end
+
     # Return a Hash representation of this object where keys in the hash are appropriate Solr field names.
     # @param [Hash] _solr_doc (optional) Hash to insert the fields into
     # @param [Hash] _opts (optional)
@@ -37,13 +47,13 @@ module ActiveFedora
       # Determines whether a create operation causes a solr index of this object by default.
       # Override this if you need different behavior.
       def create_needs_index?
-        ENABLE_SOLR_UPDATES
+        ActiveFedora.enable_solr_updates?
       end
 
       # Determines whether an update operation causes a solr index of this object by default.
       # Override this if you need different behavior
       def update_needs_index?
-        ENABLE_SOLR_UPDATES
+        ActiveFedora.enable_solr_updates?
       end
 
     private
@@ -72,10 +82,6 @@ module ActiveFedora
                             end
         end
 
-        def indexer
-          IndexingService
-        end
-
         def reindex_everything
           descendants = descendant_uris(ActiveFedora::Base.id_to_uri(''))
           descendants.shift # Discard the root uri
@@ -104,7 +110,7 @@ module ActiveFedora
           resource = Ldp::Resource::RdfSource.new(ActiveFedora.fedora.connection, uri)
           # GET could be slow if it's a big resource, we're using HEAD to avoid this problem,
           # but this causes more requests to Fedora.
-          return [] unless Ldp::Response.rdf_source?(resource.head)
+          return [] unless resource.head.rdf_source?
           immediate_descendant_uris = resource.graph.query(predicate: ::RDF::Vocab::LDP.contains).map { |descendant| descendant.object.to_s }
           all_descendants_uris = [uri]
           immediate_descendant_uris.each do |descendant_uri|