active-fedora 9.10.0.pre1 → 9.10.0.pre2

data/lib/active_fedora/attribute_methods/write.rb

@@ -1,18 +1,24 @@
 module ActiveFedora
   module AttributeMethods
     module Write
-      WriterMethodCache = Class.new(AttributeMethodCache) do
-                            private
+      module ClassMethods
+        protected
 
-        def method_body(method_name, const_name)
-          <<-EOMETHOD
-          def #{method_name}(value)
-            name = ::ActiveFedora::AttributeMethods::AttrNames::ATTR_#{const_name}
-            write_attribute(name, value)
+          def define_method_attribute=(name)
+            name = name.to_s
+            safe_name = name.unpack('h*'.freeze).first
+            ActiveFedora::AttributeMethods::AttrNames.set_name_cache safe_name, name
+
+            generated_attribute_methods.module_eval <<-STR, __FILE__, __LINE__ + 1
+              def __temp__#{safe_name}=(value)
+                name = ::ActiveRecord::AttributeMethods::AttrNames::ATTR_#{safe_name}
+                write_attribute(name, value)
+              end
+              alias_method #{(name + '=').inspect}, :__temp__#{safe_name}=
+              undef_method :__temp__#{safe_name}=
+            STR
           end
-          EOMETHOD
-        end
-      end.new
+      end
 
       extend ActiveSupport::Concern
 
@@ -33,15 +39,6 @@ module ActiveFedora
         def attribute=(attribute_name, value)
           write_attribute(attribute_name, value)
         end
-
-        module ClassMethods
-          def define_method_attribute=(name)
-            method = WriterMethodCache[name.to_s]
-            generated_attribute_methods.module_eval do
-              define_method "#{name}=", method
-            end
-          end
-        end
     end
   end
 end

data/lib/active_fedora/attributes.rb

@@ -19,12 +19,6 @@ module ActiveFedora
       end
     end
 
-    def attributes=(properties)
-      sanitize_for_mass_assignment(properties).each do |k, v|
-        respond_to?(:"#{k}=") ? send(:"#{k}=", v) : raise(UnknownAttributeError, "#{self.class} does not have an attribute `#{k}'")
-      end
-    end
-
     def attribute_names
       self.class.attribute_names
     end
@@ -33,13 +27,6 @@ module ActiveFedora
       attribute_names.each_with_object("id" => id) { |key, hash| hash[key] = self[key] }
     end
 
-    # Calling inspect may trigger a bunch of datastream loads, but it's mainly for debugging, so no worries.
-    def inspect
-      values = ["id: #{id.inspect}"]
-      values << self.class.attribute_names.map { |attr| "#{attr}: #{self[attr].inspect}" }
-      "#<#{self.class} #{values.flatten.join(', ')}>"
-    end
-
     def [](key)
       if assoc = association(key.to_sym)
         # This is for id attributes stored in the rdf graph.
@@ -93,14 +80,14 @@ module ActiveFedora
     private
 
       def array_reader(field, *args)
-        raise UnknownAttributeError, "#{self.class} does not have an attribute `#{field}'" unless self.class.delegated_attributes.key?(field)
+        raise UnknownAttributeError.new(self, field) unless self.class.delegated_attributes.key?(field)
 
         val = self.class.delegated_attributes[field].reader(self, *args)
         self.class.multiple?(field) ? val : val.first
       end
 
       def array_setter(field, args)
-        raise UnknownAttributeError, "#{self.class} does not have an attribute `#{field}'" unless self.class.delegated_attributes.key?(field)
+        raise UnknownAttributeError.new(self, field) unless self.class.delegated_attributes.key?(field)
         if self.class.multiple?(field)
           if args.present? && !args.respond_to?(:each)
             raise ArgumentError, "You attempted to set the attribute `#{field}' on `#{self.class}' to a scalar value. However, this attribute is declared as being multivalued."
@@ -156,8 +143,8 @@ module ActiveFedora
           options = fields.pop
           delegate_target = options.delete(:datastream)
           raise ArgumentError, "You must provide a datastream to has_attributes" if delegate_target.blank?
-          Deprecation.warn(Attributes, "has_attributes is deprecated and will be removed in ActiveFedora 10.0. Instead use:\n  property #{fields.first.inspect}, delegate_to: '#{delegate_target}', ...")
 
+          Deprecation.warn Attributes, "has_attributes is deprecated and will be removed in ActiveFedora 10.0. Consider using the Form pattern to save all related models or directly delegate the properties and save the target separately"
           define_delegated_accessor(fields, delegate_target, options, &block)
         end
 
@@ -172,7 +159,7 @@ module ActiveFedora
         # @param [Symbol] field the field to query
         # @return [Boolean]
         def multiple?(field)
-          raise UnknownAttributeError, "#{self} does not have an attribute `#{field}'" unless delegated_attributes.key?(field)
+          raise UnknownAttributeError.new(nil, field, self) unless delegated_attributes.key?(field)
           delegated_attributes[field].multiple
         end
 
@@ -180,6 +167,7 @@ module ActiveFedora
           if properties.key?(:predicate)
             define_active_triple_accessor(name, properties, &block)
           elsif properties.key?(:delegate_to)
+            Deprecation.warn Attributes, "delegated properties are deprecated and will be removed in ActiveFedora 10.0. Consider using the Form pattern to save all related models or directly delegate the properties and save the target separately"
             define_delegated_accessor([name], properties.delete(:delegate_to), properties.reverse_merge(multiple: true), &block)
           else
             raise "You must provide `:delegate_to' or `:predicate' options to property"

data/lib/active_fedora/base.rb

@@ -26,8 +26,10 @@ module ActiveFedora
     extend ActiveSupport::DescendantsTracker
     extend LdpCache::ClassMethods
 
+    include AttributeAssignment
     include Core
     include Identifiable
+    include Inheritance
     include Persistence
     include Indexing
     include Scoping

data/lib/active_fedora/callbacks.rb

@@ -227,21 +227,21 @@ module ActiveFedora
     end
 
     def destroy(*) #:nodoc:
-      run_callbacks(:destroy) { super }
+      _run_destroy_callbacks { super }
     end
 
     private
 
-      def create_record(*) #:nodoc:
-        run_callbacks(:create) do
-          run_callbacks(:save) { super }
-        end
+      def create_or_update(*)
+        _run_save_callbacks { super }
       end
 
-      def update_record(*) #:nodoc:
-        run_callbacks(:update) do
-          run_callbacks(:save) { super }
-        end
+      def _create_record(*) #:nodoc:
+        _run_create_callbacks { super }
+      end
+
+      def _update_record(*) #:nodoc:
+        _run_update_callbacks { super }
       end
   end
 end

data/lib/active_fedora/common.rb

@@ -0,0 +1,67 @@
+module ActiveFedora
+  module Common
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      def initialize_generated_modules # :nodoc:
+        generated_association_methods
+      end
+
+      def generated_association_methods
+        @generated_association_methods ||= begin
+          mod = const_set(:GeneratedAssociationMethods, Module.new)
+          include mod
+          mod
+        end
+      end
+    end
+
+    def ldp_source
+      @ldp_source
+    end
+
+    # Returns true if +comparison_object+ is the same exact object, or +comparison_object+
+    # is of the same type and +self+ has an ID and it is equal to +comparison_object.id+.
+    #
+    # Note that new records are different from any other record by definition, unless the
+    # other record is the receiver itself.
+    #
+    # Note also that destroying a record preserves its ID in the model instance, so deleted
+    # models are still comparable.
+    def ==(other)
+      other.equal?(self) ||
+        (other.instance_of?(self.class) &&
+          !id.nil? &&
+          other.id == id)
+    end
+
+    # Allows sort on objects
+    def <=>(other)
+      if other.is_a?(self.class)
+        to_key <=> other.to_key
+      else
+        super
+      end
+    end
+
+    # Freeze datastreams such that they can be loaded from Fedora, but can't be changed
+    def freeze
+      @frozen = true
+    end
+
+    def frozen?
+      @frozen.present?
+    end
+
+    # Returns +true+ if the record is read only. Records loaded through joins with piggy-back
+    # attributes will be marked as read only since they cannot be saved.
+    def readonly?
+      @readonly
+    end
+
+    # Marks this record as read only.
+    def readonly!
+      @readonly = true
+    end
+  end
+end

data/lib/active_fedora/core.rb

@@ -2,6 +2,7 @@ module ActiveFedora
   module Core
     extend ActiveSupport::Autoload
     extend ActiveSupport::Concern
+    include ActiveFedora::Common
 
     autoload :FedoraIdTranslator
     autoload :FedoraUriTranslator
@@ -15,10 +16,6 @@ module ActiveFedora
       mattr_accessor :logger, instance_writer: false
     end
 
-    def ldp_source
-      @ldp_source
-    end
-
     # Constructor.  You may supply a custom +:id+, or we call the Fedora Rest API for the
     # next available Fedora id, and mark as new object.
     # Also, if +attrs+ does not contain +:id+ but does contain +:namespace+ it will pass the
@@ -31,7 +28,7 @@ module ActiveFedora
       raise IllegalOperation, "Attempting to recreate existing ldp_source: `#{ldp_source.subject}'" unless ldp_source.new?
       assert_content_model
       load_attached_files
-      self.attributes = attributes
+      assign_attributes(attributes) if attributes
 
       yield self if block_given?
       run_callbacks :initialize
@@ -77,13 +74,6 @@ module ActiveFedora
       self
     end
 
-    def ==(other)
-      other.equal?(self) ||
-        (other.instance_of?(self.class) &&
-          other.id == id &&
-          !other.new_record?)
-    end
-
     def freeze
       @resource.freeze
       # @attributes = @attributes.clone.freeze
@@ -93,15 +83,14 @@ module ActiveFedora
 
     delegate :frozen?, to: :attached_files
 
-    # Returns +true+ if the record is read only. Records loaded through joins with piggy-back
-    # attributes will be marked as read only since they cannot be saved.
-    def readonly?
-      @readonly
-    end
+    # Returns the contents of the record as a nicely formatted string.
+    def inspect
+      inspection = ["id: #{id.inspect}"]
+      inspection += self.class.attribute_names.collect do |name|
+        "#{name}: #{attribute_for_inspect(name)}" if has_attribute?(name)
+      end
 
-    # Marks this record as read only.
-    def readonly!
-      @readonly = true
+      "#<#{self.class} #{inspection.compact.join(', ')}>"
     end
 
     protected
@@ -113,8 +102,6 @@ module ActiveFedora
       end
 
       module ClassMethods
-        SLASH = '/'.freeze
-
         def generated_association_methods
           @generated_association_methods ||= begin
             mod = const_set(:GeneratedAssociationMethods, Module.new)

data/lib/active_fedora/errors.rb

@@ -9,6 +9,13 @@ module ActiveFedora #:nodoc:
 
   # Raised when attempting to access an attribute that has not been defined
   class UnknownAttributeError < NoMethodError
+    attr_reader :record, :attribute
+
+    def initialize(record, attribute, klass = nil)
+      @record = record
+      @attribute = attribute
+      super("unknown attribute '#{attribute}' for #{klass || @record.class}.")
+    end
   end
 
   # Raised when there is an error with the configuration files.
@@ -34,6 +41,9 @@ module ActiveFedora #:nodoc:
   class AssociationTypeMismatch < ActiveFedoraError
   end
 
+  class AssociationNotFoundError < ConfigurationError #:nodoc:
+  end
+
   # Raised when ActiveFedora cannot find the predicate corresponding to the given property
   # in the predicate registy
   class UnregisteredPredicateError < ActiveFedoraError
@@ -44,6 +54,25 @@ module ActiveFedora #:nodoc:
   class RecordNotSaved < ActiveFedoraError
   end
 
+  # Raised by {ActiveFedora::Base#destroy!}[rdoc-ref:Persistence#destroy!]
+  # when a call to {#destroy}[rdoc-ref:Persistence#destroy!]
+  # would return false.
+  #
+  #   begin
+  #     complex_operation_that_internally_calls_destroy!
+  #   rescue ActiveFedora::RecordNotDestroyed => invalid
+  #     puts invalid.record.errors
+  #   end
+  #
+  class RecordNotDestroyed < ActiveFedoraError
+    attr_reader :record
+
+    def initialize(message = nil, record = nil)
+      @record = record
+      super(message)
+    end
+  end
+
   # Raised on attempt to update record that is instantiated as read only.
   class ReadOnlyRecord < ActiveFedoraError
   end

data/lib/active_fedora/file.rb

@@ -12,13 +12,16 @@ module ActiveFedora
     autoload :Streaming
     autoload :Attributes
 
+    include Common
     include ActiveFedora::File::Attributes
     include ActiveFedora::File::Streaming
-    include ActiveFedora::Persistence
+    include ActiveFedora::FilePersistence
     include ActiveFedora::Versionable
     include ActiveModel::Dirty
+    include ActiveFedora::Callbacks
     include AttributeMethods # allows 'content' to be tracked
     include Identifiable
+    include Inheritance
     include Scoping
 
     generate_method 'content'
@@ -55,23 +58,11 @@ module ActiveFedora
         end
 
         @attributes = {}.with_indifferent_access
+        @readonly = false
         yield self if block_given?
       end
     end
 
-    # @return [true, false] true if the objects are equal or when the objects have uris
-    #   and the uris are equal
-    def ==(other)
-      super ||
-        other.instance_of?(self.class) &&
-          uri.value.present? &&
-          other.uri == uri
-    end
-
-    def ldp_source
-      @ldp_source || raise("NO source")
-    end
-
     def described_by
       raise "#{self} isn't persisted yet" if new_record?
       links['describedby'].first
@@ -160,15 +151,6 @@ module ActiveFedora
       false
     end
 
-    # Freeze datastreams such that they can be loaded from Fedora, but can't be changed
-    def freeze
-      @frozen = true
-    end
-
-    def frozen?
-      @frozen.present?
-    end
-
     # serializes any changed data into the content field
     def serialize!
     end
@@ -186,14 +168,6 @@ module ActiveFedora
       local_or_remote_content(true)
     end
 
-    def readonly?
-      false
-    end
-
-    def destroy(*)
-      run_callbacks(:destroy) { super }
-    end
-
     def self.relation
       FileRelation.new(self)
     end
@@ -224,32 +198,6 @@ module ActiveFedora
         headers
       end
 
-      def create_record(_options = {})
-        run_callbacks(:create) do
-          run_callbacks(:save) do
-            return false if content.nil?
-            ldp_source.content = content
-            ldp_source.create do |req|
-              req.headers.merge!(ldp_headers)
-            end
-            refresh
-          end
-        end
-      end
-
-      def update_record(_options = {})
-        run_callbacks(:update) do
-          run_callbacks(:save) do
-            return true unless content_changed?
-            ldp_source.content = content
-            ldp_source.update do |req|
-              req.headers.merge!(ldp_headers)
-            end
-            refresh
-          end
-        end
-      end
-
       def build_ldp_resource(id)
         build_ldp_resource_via_uri self.class.id_to_uri(id)
       end