hyrax 3.4.1 → 3.4.2

data/lib/generators/hyrax/collection_resource/collection_resource_generator.rb

@@ -0,0 +1,133 @@
+# frozen_string_literal: true
+require 'rails/generators'
+require 'rails/generators/model_helpers'
+
+class Hyrax::CollectionResourceGenerator < Rails::Generators::NamedBase # rubocop:disable Metrics/ClassLength
+  # ActiveSupport can interpret models as plural which causes
+  # counter-intuitive route paths. Pull in ModelHelpers from
+  # Rails which warns users about pluralization when generating
+  # new models or scaffolds.
+  include Rails::Generators::ModelHelpers
+
+  source_root File.expand_path('../templates', __FILE__)
+
+  argument :with_basic_metadata, type: :string, default: "", banner: 'with_basic_metadata'
+
+  desc 'This generator makes the following changes to your application:
+   1. Creates a collection model and model spec, optionally including basic metadata.
+   2. Creates a collection form and spec.
+   3. Creates a collection indexer and spec.
+   4. Creates a collection metadata config.
+   5. Sets this to be the collection class.
+'
+
+  def self.exit_on_failure?
+    true
+  end
+
+  def validate_name
+    return unless name.strip.casecmp("collection").zero?
+    raise Thor::MalformattedArgumentError,
+          set_color("Error: A collection resource with the name '#{name}' would cause name-space clashes. "\
+                    "Please use a different name.", :red)
+  end
+
+  def banner
+    if revoking?
+      say_status("info", "DESTROYING VALKYRIE COLLECTION MODEL: #{class_name}", :blue)
+    else
+      say_status("info", "GENERATING VALKYRIE COLLECTION MODEL: #{class_name}", :blue)
+    end
+  end
+
+  def create_metadata_config
+    template('collection_metadata.yaml', File.join('config/metadata/', "#{file_name}.yaml"))
+  end
+
+  def create_model
+    filepath = File.join('app/models', "#{file_name}.rb")
+    template('collection.rb.erb', filepath)
+    return unless include_basic_metadata?
+    inject_into_file filepath, before: /include Hyrax::Schema/ do
+      "include Hyrax::Schema(:basic_metadata)\n  "
+    end
+  end
+
+  def create_model_spec
+    return unless rspec_installed?
+    filepath = File.join('spec/models/', "#{file_name}_spec.rb")
+    template('collection_spec.rb.erb', filepath)
+
+    return unless include_basic_metadata?
+    inject_into_file filepath, after: /it_behaves_like 'a Hyrax::PcdmCollection'/ do
+      "\n  it_behaves_like 'a model with basic metadata'"
+    end
+  end
+
+  def create_form
+    filepath = File.join('app/forms/', "#{file_name}_form.rb")
+    template('collection_form.rb.erb', filepath)
+    return unless include_basic_metadata?
+    inject_into_file filepath, before: /include Hyrax::FormFields/ do
+      "include Hyrax::FormFields(:basic_metadata)\n  "
+    end
+  end
+
+  # @todo If shared specs are expanded to test for basic metadata, inject calling that test here.
+  def create_form_spec
+    return unless rspec_installed?
+    template('collection_form_spec.rb.erb', File.join('spec/forms/', "#{file_name}_form_spec.rb"))
+  end
+
+  def create_indexer
+    filepath = File.join('app/indexers/', "#{file_name}_indexer.rb")
+    template('collection_indexer.rb.erb', filepath)
+    return unless include_basic_metadata?
+    inject_into_file filepath, before: /include Hyrax::Indexer/ do
+      "include Hyrax::Indexer(:basic_metadata)\n  "
+    end
+  end
+
+  def create_indexer_spec
+    return unless rspec_installed?
+    filepath = File.join('spec/indexers/', "#{file_name}_indexer_spec.rb")
+    template('collection_indexer_spec.rb.erb', filepath)
+
+    return unless include_basic_metadata?
+    inject_into_file filepath, after: /it_behaves_like 'a Hyrax::Resource indexer'/ do
+      "\n  it_behaves_like 'a Basic metadata indexer'"
+    end
+  end
+
+  # Inserts after the last registered work, or at the top of the config block
+  def set_as_the_collection_class
+    config = 'config/initializers/hyrax.rb'
+    lastmatch = nil
+    in_root do
+      File.open(config).each_line do |line|
+        lastmatch = line if line.match?(/config.collection_model = /)
+      end
+      content = "  # Injected via `rails g hyrax:collection_resource #{class_name}`\n" \
+                "  config.collection_model = '#{class_name}'\n"
+
+      anchor = lastmatch || "Hyrax.config do |config|\n"
+      inject_into_file config, after: anchor do
+        content
+      end
+    end
+  end
+
+  private
+
+  def include_basic_metadata?
+    with_basic_metadata.present? && with_basic_metadata == "with_basic_metadata"
+  end
+
+  def rspec_installed?
+    defined?(RSpec) && defined?(RSpec::Rails)
+  end
+
+  def revoking?
+    behavior == :revoke
+  end
+end

data/lib/generators/hyrax/collection_resource/templates/collection.rb.erb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+# Generated via
+#  `rails generate hyrax:collection_resource <%= class_name %>`
+class <%= class_name %> < Hyrax::PcdmCollection
+  # @note Do not directly update `basic_metadata.yaml`.  It is also used by works.
+  #
+  # To change metadata for collections
+  # * extend by adding fields to `/config/metadata/<%= file_name %>.yaml`
+  # * remove all basic metadata
+  #   * if you generated `with_basic_metadata` and now don't want any basic metadata,
+  #       comment out or delete the schema include statement for `:basic_metadata`
+  #   * update form and indexer classes to also remove the `:basic_metadata` schema include
+  # * remove some basic metadata
+  #   * comment out or delete the schema include statement for `:basic_metadata`
+  #   * update form and indexer classes to also remove the `:basic_metadata` schema include
+  #   * copy fields you want to keep from `/config/metadata/basic_metadata.yaml`
+  #       to `/config/metadata/<%= file_name %>.yaml`
+  # * override some basic metadata
+  #   * fields are not allowed to repeat, so to override any basic metadata, you
+  #       must first comment out or delete the schema include statement for `:basic_metadata`
+  #   * update form and indexer classes to also remove the `:basic_metadata` schema include
+  #   * copy all fields you want to keep unchanged or to override from `/config/metadata/basic_metadata.yaml`
+  #       to `/config/metadata/<%= file_name %>.yaml`
+  #   * update them in `config/metadata/<%= file_name %>.yaml to have the desired
+  #       characteristics
+  #
+  # Alternative:
+  # * comment out or delete schema include statements
+  # * add Valkyrie attributes to this class
+  # * update form and indexer to process the attributes
+  #
+  include Hyrax::Schema(:<%= file_name %>)
+end

data/lib/generators/hyrax/collection_resource/templates/collection_form.rb.erb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+# Generated via
+#  `rails generate hyrax:collection_resource <%= class_name %>`
+class <%= class_name %>Form < Hyrax::Forms::PcdmCollectionForm
+  include Hyrax::FormFields(:<%= file_name %>)
+end

data/lib/generators/hyrax/collection_resource/templates/collection_form_spec.rb.erb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# Generated via
+#  `rails generate hyrax:collection_resource <%= class_name %>`
+require 'rails_helper'
+require 'valkyrie/specs/shared_specs'
+
+RSpec.describe <%= class_name %>Form do
+  let(:change_set) { described_class.new(resource) }
+  let(:resource)   { <%= class_name %>.new }
+
+  it_behaves_like 'a Valkyrie::ChangeSet'
+end

data/lib/generators/hyrax/collection_resource/templates/collection_indexer.rb.erb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+# Generated via
+#  `rails generate hyrax:collection_resource <%= class_name %>`
+class <%= class_name %>Indexer < Hyrax::PcdmCollectionIndexer
+  include Hyrax::Indexer(:<%= file_name %>)
+end

data/lib/generators/hyrax/collection_resource/templates/collection_indexer_spec.rb.erb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# Generated via
+#  `rails generate hyrax:collection_resource <%= class_name %>`
+require 'rails_helper'
+require 'hyrax/specs/shared_specs/indexers'
+
+RSpec.describe <%= class_name %>Indexer do
+  let(:indexer_class) { described_class }
+  let(:resource)      { <%= class_name %>.new }
+
+  it_behaves_like 'a Hyrax::Resource indexer'
+end

data/lib/generators/hyrax/collection_resource/templates/collection_metadata.yaml

@@ -0,0 +1,22 @@
+# Simple yaml config-driven schema which is used to define model attributes,
+# index key names, and form properties.
+#
+# Attributes must have a type but all other configuration options are optional.
+#
+# attributes:
+#   attribute_name:
+#     type: string
+#     multiple: false
+#     index_keys:
+#       - "attribute_name_sim"
+#     form:
+#       required: true
+#       primary: true
+#       multiple: false
+#
+# @see config/metadata/basic_metadata.yaml for an example configuration
+#
+# Generated via
+#  `rails generate hyrax:collection_resource <%= class_name %>`
+
+attributes: {}

data/lib/generators/hyrax/collection_resource/templates/collection_spec.rb.erb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+# Generated via
+#  `rails generate hyrax:collection_resource <%= class_name %>`
+require 'rails_helper'
+require 'hyrax/specs/shared_specs/hydra_works'
+
+RSpec.describe <%= class_name %> do
+  subject(:collection) { described_class.new }
+
+  it_behaves_like 'a Hyrax::PcdmCollection'
+end

data/lib/generators/hyrax/install_generator.rb

@@ -35,6 +35,15 @@ module Hyrax
   18. Generates RIIIF image server implementation
          """
 
+    # browse-everything 1.2.0 is not compatible with Ruby 2.5
+    def pin_browse_everything
+      return unless Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.6')
+      gem 'browse-everything', '~> 1.1.2'
+      Bundler.with_clean_env do
+        run "bundle update browse-everything"
+      end
+    end
+
     def run_required_generators
       say_status('info', '[Hyrax] GENERATING BLACKLIGHT', :blue)
       generate 'blacklight:install --devise'

data/lib/hyrax/configuration.rb

@@ -427,6 +427,18 @@ module Hyrax
       @branding_storage_adapter = Valkyrie::StorageAdapter.find(adapter.to_sym)
     end
 
+    ##
+    # @return [Valkyrie::StorageAdapter]
+    def derivatives_storage_adapter
+      @derivatives_storage_adapter ||= Valkyrie::StorageAdapter.find(:derivatives_disk)
+    end
+
+    ##
+    # @param [#to_sym] adapter
+    def derivatives_storage_adapter=(adapter)
+      @derivatives_storage_adapter = Valkyrie::StorageAdapter.find(adapter.to_sym)
+    end
+
     ##
     # @return [#save, #save_all, #delete, #wipe!] an indexing adapter
     def index_adapter

data/lib/hyrax/publisher.rb

@@ -119,6 +119,10 @@ module Hyrax
     #     unique id), AND a `:user` (the ::User responsible for the update).
     register_event('collection.membership.updated')
 
+    # @since 3.5.0
+    # @macro a_registered_event
+    register_event('file.characterized')
+
     # @since 3.3.0
     # @macro a_registered_event
     register_event('file.downloaded')

data/lib/hyrax/specs/shared_specs/hydra_works.rb

@@ -135,7 +135,6 @@ RSpec.shared_examples 'a Hyrax::PcdmCollection' do
 
   it_behaves_like 'a Hyrax::Resource'
   it_behaves_like 'a model with core metadata'
-  it_behaves_like 'a model with basic metadata'
   it_behaves_like 'has members'
 
   describe '#collection_type_gid' do

data/lib/hyrax/transactions/collection_update.rb

@@ -9,6 +9,8 @@ module Hyrax
     # @since 3.2.0
     class CollectionUpdate < Transaction
       DEFAULT_STEPS = ['change_set.apply',
+                       'collection_resource.save_collection_banner',
+                       'collection_resource.save_collection_logo',
                        'collection_resource.save_acl'].freeze
 
       ##

data/lib/hyrax/transactions/container.rb

@@ -42,6 +42,8 @@ module Hyrax
       require 'hyrax/transactions/steps/remove_file_set_from_work'
       require 'hyrax/transactions/steps/save'
       require 'hyrax/transactions/steps/save_access_control'
+      require 'hyrax/transactions/steps/save_collection_banner'
+      require 'hyrax/transactions/steps/save_collection_logo'
       require 'hyrax/transactions/steps/set_default_admin_set'
       require 'hyrax/transactions/steps/set_modified_date'
       require 'hyrax/transactions/steps/set_uploaded_date_unless_present'
@@ -195,6 +197,14 @@ module Hyrax
         ops.register 'save_acl' do
           Steps::SaveAccessControl.new
         end
+
+        ops.register 'save_collection_banner' do
+          Steps::SaveCollectionBanner.new
+        end
+
+        ops.register 'save_collection_logo' do
+          Steps::SaveCollectionLogo.new
+        end
       end
 
       namespace 'work_resource' do |ops| # Hyrax::Work resource

data/lib/hyrax/transactions/steps/save_collection_banner.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+module Hyrax
+  module Transactions
+    module Steps
+      ##
+      # Adds banner info via `ChangeSet`.
+      #
+      # During the update collection process this step is called to update the file
+      # to be used as a the banner for the collection.
+      #
+      class SaveCollectionBanner
+        include Dry::Transaction::Operation
+
+        ##
+        # @param [Hyrax::ChangeSet] change_set
+        # @param [Array<Integer>] update_banner_file_ids
+        # @param [Boolean] banner_unchanged_indicator
+        #
+        # @return [Dry::Monads::Result] `Failure` if the banner info fails to save;
+        #   `Success(input)`, otherwise.
+        def call(collection_resource, update_banner_file_ids: nil, banner_unchanged_indicator: true)
+          return Success(collection_resource) if ActiveModel::Type::Boolean.new.cast(banner_unchanged_indicator)
+          collection_id = collection_resource.id.to_s
+          process_banner_input(collection_id: collection_id, update_banner_file_ids: update_banner_file_ids)
+          Success(collection_resource)
+        end
+
+        private
+
+        def process_banner_input(collection_id:, update_banner_file_ids:)
+          remove_banner(collection_id: collection_id)
+          add_new_banner(collection_id: collection_id, uploaded_file_ids: update_banner_file_ids) if update_banner_file_ids
+        end
+
+        def remove_banner(collection_id:)
+          banner_info = CollectionBrandingInfo.where(collection_id: collection_id).where(role: "banner")
+          banner_info&.delete_all
+        end
+
+        def add_new_banner(collection_id:, uploaded_file_ids:)
+          f = uploaded_files(uploaded_file_ids).first
+          banner_info = CollectionBrandingInfo.new(
+            collection_id: collection_id,
+            filename: File.split(f.file_url).last,
+            role: "banner",
+            alt_txt: "",
+            target_url: ""
+          )
+          banner_info.save f.file_url
+        end
+
+        def uploaded_files(uploaded_file_ids)
+          return [] if uploaded_file_ids.empty?
+          UploadedFile.find(uploaded_file_ids)
+        end
+      end
+    end
+  end
+end

data/lib/hyrax/transactions/steps/save_collection_logo.rb

@@ -0,0 +1,109 @@
+# frozen_string_literal: true
+module Hyrax
+  module Transactions
+    module Steps
+      ##
+      # Adds logo info via `ChangeSet`.
+      #
+      # During the update collection process this step is called to update the file(s)
+      # to be used as logo(s) for the collection.
+      #
+      class SaveCollectionLogo
+        include Dry::Transaction::Operation
+
+        ##
+        # @param [Hyrax::ChangeSet] change_set
+        # @param [Array<#Integer>] update_logo_file_ids
+        # @param [Array<String>] alttext_values
+        # @param [Array<String>] linkurl_values
+        #
+        # @return [Dry::Monads::Result] `Failure` if the work fails to save;
+        #   `Success(input)`, otherwise.
+        def call(collection_resource, update_logo_file_ids: nil, alttext_values: nil, linkurl_values: nil)
+          collection_id = collection_resource.id.to_s
+          process_logo_input(collection_id: collection_id, update_logo_file_ids: update_logo_file_ids, alttext_values: alttext_values, linkurl_values: linkurl_values)
+          Success(collection_resource)
+        end
+
+        private
+
+        def process_logo_input(collection_id:, update_logo_file_ids:, alttext_values:, linkurl_values:)
+          uploaded_file_ids = update_logo_file_ids
+          public_files = []
+
+          if uploaded_file_ids.nil?
+            # all logo files were removed, so delete all files previously uploaded
+            remove_redundant_files(collection_id: collection_id, public_files: public_files)
+            return
+          end
+
+          public_files = process_logo_records(collection_id: collection_id, uploaded_file_ids: uploaded_file_ids, alttext_values: alttext_values, linkurl_values: linkurl_values)
+          remove_redundant_files(collection_id: collection_id, public_files: public_files)
+        end
+
+        def process_logo_records(collection_id:, uploaded_file_ids:, alttext_values:, linkurl_values:)
+          public_files = []
+          uploaded_file_ids.each_with_index do |ufi, i|
+            # If the user has chosen a new logo, the ufi will be an integer
+            # If the logo was previously chosen, the ufi will be a path
+            # If it is a path, update the rec, else create a new rec
+            if !ufi.match(/\D/).nil?
+              update_logo_info(collection_id: collection_id, uploaded_file_id: ufi, alttext: alttext_values[i], linkurl: verify_linkurl(linkurl_values[i]))
+              public_files << ufi
+            else # brand new one, insert in the database
+              logo_info = create_logo_info(collection_id: collection_id, uploaded_file_id: ufi, alttext: alttext_values[i], linkurl: verify_linkurl(linkurl_values[i]))
+              public_files << logo_info.local_path
+            end
+          end
+          public_files
+        end
+
+        def update_logo_info(collection_id:, uploaded_file_id:, alttext:, linkurl:)
+          logo_info = CollectionBrandingInfo.where(collection_id: collection_id).where(role: "logo").where(local_path: uploaded_file_id.to_s).first
+          logo_info.alt_text = alttext
+          logo_info.target_url = linkurl
+          logo_info.local_path = uploaded_file_id
+          logo_info.save(uploaded_file_id, false)
+        end
+
+        def create_logo_info(collection_id:, uploaded_file_id:, alttext:, linkurl:)
+          file = uploaded_files(uploaded_file_id)
+          logo_info = CollectionBrandingInfo.new(
+            collection_id: collection_id,
+            filename: File.split(file.file_url).last,
+            role: "logo",
+            alt_txt: alttext,
+            target_url: linkurl
+          )
+          logo_info.save file.file_url
+          logo_info
+        end
+
+        def uploaded_files(uploaded_file_ids)
+          return [] if uploaded_file_ids.empty?
+          UploadedFile.find(uploaded_file_ids)
+        end
+
+        def remove_redundant_files(collection_id:, public_files:)
+          # remove any public ones that were not included in the selection.
+          logos_info = CollectionBrandingInfo.where(collection_id: collection_id).where(role: "logo")
+          logos_info.each do |logo_info|
+            logo_info.delete(logo_info.local_path) unless public_files.include? logo_info.local_path
+            logo_info.destroy unless public_files.include? logo_info.local_path
+          end
+        end
+
+        # Only accept HTTP|HTTPS urls;
+        # @return <String> the url
+        def verify_linkurl(linkurl)
+          url = Loofah.scrub_fragment(linkurl, :prune).to_s
+          url if valid_url?(url)
+        end
+
+        def valid_url?(url)
+          (url =~ URI.regexp(['http', 'https']))
+        end
+      end
+    end
+  end
+end

data/lib/hyrax/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Hyrax
-  VERSION = '3.4.1'
+  VERSION = '3.4.2'
 end

data/lib/wings/active_fedora_converter/file_metadata_node.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module Wings
+  class ActiveFedoraConverter
+    def self.FileMetadataNode(resource_class) # rubocop:disable Naming/MethodName
+      class_cache[resource_class] ||= Class.new(FileMetadataNode) do
+        self.valkyrie_class = resource_class
+
+        # skip reserved attributes, we assume we don't need to translate valkyrie internals
+        schema = resource_class.schema.reject do |key|
+          resource_class.reserved_attributes.include?(key.name) ||
+            key.name == :size
+        end
+
+        Wings::ActiveFedoraConverter.apply_properties(self, schema)
+      end
+    end
+  end
+
+  class FileMetadataNode < ActiveFedora::Base
+    property :file_set_id, predicate: ::RDF::URI.intern("http://hyrax.samvera.org/ns/wings#file_set_id")
+    property :file_identifier, predicate: ::RDF::URI.intern("http://hyrax.samvera.org/ns/wings#file_identifier")
+
+    class_attribute :valkyrie_class
+
+    class << self
+      def model_name(*)
+        Hyrax::Name.new(valkyrie_class)
+      end
+
+      def to_rdf_representation
+        "Wings(#{valkyrie_class})"
+      end
+      alias inspect to_rdf_representation
+      alias to_s inspect
+    end
+
+    def indexing_service
+      Hyrax::ValkyrieIndexer.for(resource: valkyrie_resource)
+    end
+
+    def to_solr
+      super.tap do |doc|
+        doc[:file_identifier_ssim] = file_identifier
+      end
+    end
+  end
+end

data/lib/wings/active_fedora_converter/instance_builder.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+module Wings
+  class ActiveFedoraConverter
+    ##
+    # Constructs an instance for the given converter. +converter+ must provide
+    # an +id+, +resource+, and +active_fedora_class+.
+    #
+    # This interface allows handling for special cases based on the target
+    # class, instance data for +resource+, or the id format. This originated as
+    # an extraction of some such special handling from the converter code.
+    class InstanceBuilder
+      ##
+      # @!attribute [r] converter
+      #   @return [#active_fedora_class, #id, #resource]
+      # @!attribute [r] resource
+      #   @return [Valkyrie::Resource]
+      attr_reader :converter, :resource
+
+      ##
+      # @param [#active_fedora_class, #id, #resource]
+      def initialize(converter)
+        @converter = converter
+        @resource = converter.resource
+      end
+
+      ##
+      # @return [ActiveFedora::Common]
+      def build
+        if builds_file_metadata? && !builds_metadata_for_active_fedora_file?
+          # convert to a generic/generated FileMetadataNode class with
+          # properties matching the source class
+          Wings::ActiveFedoraConverter::FileMetadataNode(resource.class)
+                                      .new(file_identifier: Array(resource.file_identifier)
+            .map(&:to_s))
+        elsif converter.id.present?
+          converter.active_fedora_class.find(converter.id)
+        else
+          converter.active_fedora_class.new
+        end
+      rescue ActiveFedora::ObjectNotFoundError
+        converter.active_fedora_class.new
+      end
+
+      ##
+      # @return [Boolean]
+      def builds_file_metadata?
+        resource.try(:file_identifier).present?
+      end
+
+      ##
+      # @return [Boolean]
+      def builds_metadata_for_active_fedora_file?
+        return false unless builds_file_metadata?
+
+        adapter_for_file = begin
+                             ::Valkyrie::StorageAdapter.adapter_for(id: resource.file_identifier)
+                           rescue ::Valkyrie::StorageAdapter::AdapterNotFoundError => err
+                             Hyrax.logger.warn "Processing a FileMetadata (id: #{converter.id}) referencing " \
+                                               "a file #{resource.file_identifier}; could not find a " \
+                                               "storage adapter to handle that file.\n\t#{err.message}"
+                           end
+
+        adapter_for_file.is_a?(::Valkyrie::Storage::Fedora)
+      end
+    end
+  end
+end

data/lib/wings/active_fedora_converter.rb

@@ -2,6 +2,8 @@
 
 require 'wings/converter_value_mapper'
 require 'wings/active_fedora_converter/default_work'
+require 'wings/active_fedora_converter/file_metadata_node'
+require 'wings/active_fedora_converter/instance_builder'
 require 'wings/active_fedora_converter/nested_resource'
 
 module Wings
@@ -100,9 +102,7 @@ module Wings
     private
 
     def instance
-      id.present? ? active_fedora_class.find(id) : active_fedora_class.new
-    rescue ActiveFedora::ObjectNotFoundError
-      active_fedora_class.new
+      InstanceBuilder.new(self).build
     end
 
     def attributes_class