active-fedora 9.10.0.pre2 → 9.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9fa729bb22950bf6f1a5a8910eef83e17d699b6
-  data.tar.gz: 2230ceaf9cf100c0737997c5235c0a87364ec2df
+  metadata.gz: 8497f7de37069e9bfe075f4b7f9ac67a0e3c7d68
+  data.tar.gz: cb858eb8a45c08fec2dea7578b854cc51b4b5401
 SHA512:
-  metadata.gz: df06b4f7448346189c3ca49029200205eaf671a84854035fba131dc60d84f0954aaf79df54e29746118cac1074ca2241e7b5bc7e291f89b120e44340b034d250
-  data.tar.gz: 60a819b84ffd5f68bdb80436648621738e2b77b68e629265be3d3257efa566969d33c040660a561445c39a60d38742865afd0dd6b6681ef0aeb7bfc8cd08d961
+  metadata.gz: 6307a89a0b6417ef313efda00a37466cd0ef1f8a9bbb18dafb5f7fbbedc7dd87598f3213619604e6dac06f55eb985dc87c0b99b3f3e33369d213e038bbf56f02
+  data.tar.gz: d084f99333f8059f504b6735fde1bab7ace4868de441b2f48ced69d876a7271570007c9452acb4f10f22f05e39efa513130eb09562d1a8ad8d2151fbe7d60a0d

data/.rubocop.yml

@@ -86,6 +86,7 @@ Metrics/ClassLength:
     - 'lib/active_fedora/associations/builder/association.rb'
     - 'lib/active_fedora/associations/collection_proxy.rb'
     - 'lib/active_fedora/associations/collection_association.rb'
+    - 'lib/active_fedora/reflection.rb'
 
 Metrics/MethodLength:
   Enabled: false

data/History.txt

@@ -1,3 +1,144 @@
+v9.10.0
+2016-03-24: Continued alignment of associations with upstream changes [Chris
+Beer]
+
+2016-03-24: ActiveFedora::File.mime_type should be updatable [Chris Colvard]
+
+2016-03-23: Update reflections and associations to reflect upstream changes
+[Chris Beer]
+
+2016-03-23: Generate default configs for fcrepo_wrapper [Justin Coyne]
+
+2016-03-23: Generate solr_wrapper config file [Justin Coyne]
+
+2016-03-22: Bump version to 9.10.0.pre2 [Justin Coyne]
+
+2016-03-19: Update scoping with latest upstream changes [Chris Beer]
+
+2016-03-22: Deprecate delegating attributes to associated objects [Justin Coyne]
+
+2016-03-22: Add AttributeAssignment module from upstream [Chris Beer]
+
+2016-03-21: Update AF::AttributeMethods with upstream changes [Chris Beer]
+
+2016-03-21: Extract ActiveFedora::Common to share methods between AF::Base and
+AF::File [Chris Beer]
+
+2016-03-18: Update AF::File update callbacks to align with Rails [Chris Beer]
+
+2016-03-18: Extract ActiveFedora::FilePersistence, so ActiveFedora::File can
+work with AF::Callbacks [Chris Beer]
+
+2016-03-18: Prefix internal create_ and update_record callbacks with an
+underscore [Chris Beer]
+
+2016-03-18: Add create_or_update to provide save callbacks [Chris Beer]
+
+2016-03-18: Add ActiveFedora::Persistence#destroy! [Chris Beer]
+
+2016-03-20: Correctly find the size of a collection in memory [Justin Coyne]
+
+2016-03-18: Bump version to 9.10.0.pre1 [Justin Coyne]
+
+2016-03-18: Update Validations with latest upstream changes [Chris Beer]
+
+2016-03-18: Delegate count to the scope [Justin Coyne]
+
+2016-03-18: Update nested attributes with upstream improvements [Chris Beer]
+
+2016-03-18: Update reflection methods to match new upstream names [Chris Beer]
+
+2016-03-18: Add explicit ActiveModel dependency [Chris Beer]
+
+2016-03-18: Update minimum versions of ruby and activesupport [Chris Beer]
+
+2016-03-17: Extract Builder::Association.create_reflection [Chris Beer]
+
+2016-03-17: Delegate responsibility for cleaning up dependencies to association
+instances [Chris Beer]
+
+2016-03-17: validate dependent options [Chris Beer]
+
+2016-03-17: Port .dangerous_attribute_method? from Rails [Chris Beer]
+
+2016-03-17: Migrate valid_options from a class attribute to a method [Chris
+Beer]
+
+2016-03-17: Convert Assocations::Builder.macro from a class variable to a class
+method [Chris Beer]
+
+2016-03-15: Add default scopes [Justin Coyne]
+
+2016-03-16: Unconditionally run coverage reports when running tests [Chris Beer]
+
+2016-03-16: Remove or deprecate unused code [Chris Beer]
+
+2016-03-16: Silence SolrQueryBuilder deprecation warnings when running tests
+[Chris Beer]
+
+2016-03-16: Update relation calculations to use SolrService.count [Chris Beer]
+
+2016-03-16: Extract SolrService.get to send requests to Solr and get the
+original response [Chris Beer]
+
+2016-03-16: Use field queries instead of raw queries [Chris Beer]
+
+2016-03-16: Deprecate ActiveFedora::SolrQueryBuilder.raw_query in favor of
+.construct_query [Chris Beer]
+
+2016-03-16: Deprecate ActiveFedora::SolrQueryBuilder.solr_name in favor of using
+ActiveFedora.index_field_mapper directly [Chris Beer]
+
+2016-03-15: Extract SolrHit class to wrap Solr response documents [Chris Beer]
+
+2016-03-15: Deprecate unused methods [Justin Coyne]
+
+2016-03-15: ActiveFedora depends on Solrizer [Justin Coyne]
+
+2016-03-15: Don't rely on exceptions for flow control [Justin Coyne]
+
+2016-03-15: Update testing versions of Ruby and Rails [Justin Coyne]
+
+2016-03-15: Push .search_by_id into ActiveFedora::FinderMethod [Chris Beer]
+
+2016-03-15: Rename find_with_conditions and find_in_batches to
+search_with_conditions and search_in_batches [Chris Beer]
+
+2016-03-11: Provide class-level accessors in place of global constants for
+configuration [Chris Beer]
+
+2016-03-11: Use ActiveFedora.index_field_mapper instead of accessing Solrizer
+directly [Chris Beer]
+
+2016-03-11: Use the same logic for lazy_reify_solr_results and
+reify_solr_results [Chris Beer]
+
+2016-03-10: Move indexer to a class attribute [Justin Coyne]
+
+2016-03-09: Decompose ActiveFedora::Model into a generic model mapper and a
+classifier [Chris Beer]
+
+2016-03-09: Add DefaultModelMapper class to encapsulate model selection logic
+[Chris Beer]
+
+2016-03-09: Use ActiveFedora.model_mapper accessor to get the type to class
+mapper [Chris Beer]
+
+2016-03-09: Unify class lookup for Fedora types to ActiveFedora models [Chris
+Beer]
+
+2016-03-09: Move ActiveFedora.class_from_string into ActiveFedora::Model [Chris
+Beer]
+
+2016-03-09: Remove require of rubocop-rspec [Justin Coyne]
+
+2016-03-09: Pin rake to ~> 10.0 [Justin Coyne]
+
+2016-03-09: Update test to support ActiveModel 4.2.6 [Justin Coyne]
+
+2016-03-08: Update to use ldp 0.5 [Chris Beer]
+
+
 v9.9.1
 2016-03-05: Restore autocommit in the update handler [Justin Coyne]
 

data/lib/active_fedora/associations/association.rb

@@ -76,7 +76,7 @@ module ActiveFedora
       # by scope.scoping { ... } or with_scope { ... } etc, which affects the scope which
       # actually gets built.
       def association_scope
-        @association_scope ||= AssociationScope.new(self).scope if klass
+        @association_scope ||= AssociationScope.scope(self) if klass
       end
 
       def reset_scope
@@ -115,12 +115,17 @@ module ActiveFedora
         @target = find_target if (@stale_state && stale_target?) || find_target?
         loaded! unless loaded?
         target
+      rescue ActiveFedora::ObjectNotFoundError
+        reset
       end
 
-      def initialize_attributes(record) #:nodoc:
+      def initialize_attributes(record, except_from_scope_attributes = nil) #:nodoc:
+        except_from_scope_attributes ||= {}
         skip_assign = [reflection.foreign_key].compact
-        attributes = create_scope.except(*(record.changed - skip_assign))
-        record.attributes = attributes
+        assigned_keys = record.changed
+        assigned_keys += except_from_scope_attributes.keys.map(&:to_s)
+        attributes = create_scope.except(*(assigned_keys - skip_assign))
+        record.assign_attributes(attributes)
         set_inverse_instance(record)
       end
 
@@ -130,6 +135,25 @@ module ActiveFedora
           !loaded? && (!owner.new_record? || foreign_key_present?) && klass
         end
 
+        def creation_attributes
+          attributes = {}
+
+          if (reflection.has_one? || reflection.collection?) && !options[:through]
+            attributes[reflection.foreign_key] = owner[reflection.active_record_primary_key]
+
+            if reflection.options[:as]
+              attributes[reflection.type] = owner.class.base_class.name
+            end
+          end
+
+          attributes
+        end
+
+        # Sets the owner attributes on the given record
+        def set_owner_attributes(record)
+          creation_attributes.each { |key, value| record[key] = value }
+        end
+
         # Returns true if there is a foreign key present on the owner which
         # references the target. This is used to determine whether we can load
         # the target if the owner is currently a new record (and therefore
@@ -144,10 +168,16 @@ module ActiveFedora
         # Raises ActiveFedora::AssociationTypeMismatch unless +record+ is of
         # the kind of the class of the associated objects. Meant to be used as
         # a sanity check when you are about to assign an associated record.
-        def raise_on_type_mismatch(record)
-          return if record.is_a?(@reflection.klass) || record.is_a?(@reflection.class_name.constantize)
-          message = "#{@reflection.class_name}(##{@reflection.klass.object_id}) expected, got #{record.class}(##{record.class.object_id})"
-          raise ActiveFedora::AssociationTypeMismatch, message
+        def raise_on_type_mismatch!(record)
+          unless record.is_a?(reflection.klass)
+            fresh_class = reflection.class_name.safe_constantize
+            unless fresh_class && record.is_a?(fresh_class)
+              message = "#{reflection.class_name}(##{reflection.klass.object_id}) expected, got #{record.class}(##{record.class.object_id})"
+              raise ActiveFedora::AssociationTypeMismatch, message
+            end
+          end
+
+          type_validator.validate!(self, record)
         end
 
         def type_validator
@@ -180,10 +210,6 @@ module ActiveFedora
             initialize_attributes(record)
           end
         end
-
-        def run_type_validator(record)
-          type_validator.validate!(self, record)
-        end
     end
   end
 end

data/lib/active_fedora/associations/association_scope.rb

@@ -1,6 +1,10 @@
 module ActiveFedora
   module Associations
     class AssociationScope #:nodoc:
+      def self.scope(association)
+        new(association).scope
+      end
+
       attr_reader :association
 
       delegate :klass, :owner, :reflection, :interpolate, to: :association
@@ -19,10 +23,10 @@ module ActiveFedora
 
         def add_constraints(scope)
           chain.each_with_index do |reflection, i|
-            if reflection.source_macro == :belongs_to
+            if reflection.macro == :belongs_to
               # Create a partial solr query using the ids. We may add additional filters such as class_name later
               scope = scope.where(ActiveFedora::SolrQueryBuilder.construct_query_for_ids([owner[reflection.foreign_key]]))
-            elsif reflection.source_macro == :has_and_belongs_to_many
+            elsif reflection.macro == :has_and_belongs_to_many
             else
               scope = scope.where(ActiveFedora::SolrQueryBuilder.construct_query_for_rel(association.send(:find_reflection) => owner.id))
             end

data/lib/active_fedora/associations/basic_contains_association.rb

@@ -18,7 +18,7 @@ module ActiveFedora
 
       private
 
-        def raise_on_type_mismatch(record)
+        def raise_on_type_mismatch!(record)
           return if record.is_a? LoadableFromJson::SolrBackedMetadataFile
           super
         end
@@ -35,8 +35,7 @@ module ActiveFedora
 
         def replace(record)
           if record
-            raise_on_type_mismatch(record)
-            run_type_validator(record)
+            raise_on_type_mismatch!(record)
             @updated = true
           end
 

data/lib/active_fedora/associations/belongs_to_association.rb

@@ -1,16 +1,19 @@
 module ActiveFedora
   module Associations
     class BelongsToAssociation < SingularAssociation #:nodoc:
+      def handle_dependency
+        target.send(options[:dependent]) if load_target
+      end
+
       def replace(record)
         if record
-          raise_on_type_mismatch(record)
-          run_type_validator(record)
-          # update_counters(record)
+          raise_on_type_mismatch!(record)
+          update_counters_on_replace(record)
           replace_keys(record)
           set_inverse_instance(record)
           @updated = true
         else
-          # decrement_counters
+          decrement_counters
           remove_keys
         end
 
@@ -26,8 +29,24 @@ module ActiveFedora
         @updated
       end
 
+      def decrement_counters # :nodoc:
+        # noop
+      end
+
+      def increment_counters # :nodoc:
+        # noop
+      end
+
       private
 
+        def find_target?
+          !loaded? && foreign_key_present? && klass
+        end
+
+        def update_counters_on_replace(_record)
+          # noop
+        end
+
         def replace_keys(record)
           owner[reflection.foreign_key] = record.id
         end

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

@@ -7,20 +7,6 @@ module ActiveFedora::Associations::Builder
 
     VALID_OPTIONS = [:class_name, :predicate, :type_validator].freeze
 
-    def self.macro
-      raise NotImplementedError
-    end
-
-    def self.valid_options(_options)
-      VALID_OPTIONS + Association.extensions.flat_map(&:valid_options)
-    end
-
-    def self.validate_options(options)
-      options.assert_valid_keys(valid_options(options))
-    end
-
-    attr_reader :model, :name, :options, :mixin
-
     # configure_dependency
     def self.build(model, name, options, &block)
       if model.dangerous_attribute_method?(name)
@@ -37,42 +23,58 @@ module ActiveFedora::Associations::Builder
       reflection
     end
 
-    def self.create_reflection(model, name, _scope, options, _extension = nil)
+    def self.create_reflection(model, name, scope, options, extension = nil)
       unless name.is_a?(Symbol)
         name = name.to_sym
         Deprecation.warn(ActiveFedora::Base, "association names must be a Symbol")
       end
-
       validate_options(options)
+      translate_property_to_predicate(options)
+
+      scope = build_scope(scope, extension)
+      name = better_name(name)
 
-      new(model, name, options).build
+      ActiveFedora::Reflection.create(macro, name, scope, options, model)
     end
 
-    def initialize(model, name, options)
-      @model = model
-      @name = name
-      @options = options
-      translate_property_to_predicate
-      validate_options
+    def self.build_scope(scope, extension)
+      new_scope = scope
+
+      new_scope = proc { instance_exec(&scope) } if scope && scope.arity == 0
+
+      new_scope = wrap_scope new_scope, extension if extension
+
+      new_scope
     end
 
-    def build
-      configure_dependency if options[:dependent] # see https://github.com/rails/rails/commit/9da52a5e55cc665a539afb45783f84d9f3607282
-      model.create_reflection(self.class.macro, name, options, model)
+    def self.wrap_scope(scope, _extension)
+      scope
     end
 
-    def translate_property_to_predicate
+    def self.macro
+      raise NotImplementedError
+    end
+
+    def self.valid_options(_options)
+      VALID_OPTIONS + Association.extensions.flat_map(&:valid_options)
+    end
+
+    def self.validate_options(options)
+      options.assert_valid_keys(valid_options(options))
+    end
+
+    def self.better_name(name)
+      name
+    end
+
+    def self.translate_property_to_predicate(options)
       return unless options[:property]
       Deprecation.warn Association, "the :property option to `#{model}.#{macro} :#{name}' is deprecated and will be removed in active-fedora 10.0. Use :predicate instead", caller(5)
       options[:predicate] = predicate(options.delete(:property))
     end
 
-    def validate_options
-      self.class.validate_options(options)
-    end
-
     # Returns the RDF predicate as defined by the :property attribute
-    def predicate(property)
+    def self.predicate(property)
       return property if property.is_a? RDF::URI
       ActiveFedora::Predicates.find_graph_predicate(property)
     end
@@ -124,14 +126,6 @@ module ActiveFedora::Associations::Builder
       # noop
     end
 
-    def self.add_destroy_callbacks(model, reflection)
-      name = reflection.name
-      model.before_destroy lambda do |o|
-        a = o.association(name)
-        a.handle_dependency if a.respond_to? :handle_dependency
-      end
-    end
-
     def self.valid_dependent_options
       raise NotImplementedError
     end
@@ -142,22 +136,9 @@ module ActiveFedora::Associations::Builder
       end
     end
 
-    def configure_dependency
-      return unless options[:dependent]
-      return if model.association(name).respond_to? :handle_dependency
-
-      unless [:destroy, :delete].include?(options[:dependent])
-        raise ArgumentError, "The :dependent option expects either :destroy or :delete (#{options[:dependent].inspect})"
-      end
-
-      method_name = "belongs_to_dependent_#{options[:dependent]}_for_#{name}"
-      model.send(:class_eval, <<-eoruby, __FILE__, __LINE__ + 1)
-        def #{method_name}
-          association = #{name}
-          association.#{options[:dependent]} if association
-        end
-      eoruby
-      model.after_destroy method_name
+    def self.add_destroy_callbacks(model, reflection)
+      name = reflection.name
+      model.before_destroy ->(o) { o.association(name).handle_dependency }
     end
   end
 end