ddr-models 2.11.0 → 3.0.0.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c0cafdcf29bd75b099189bf2fecd845ad1c48c1
-  data.tar.gz: 73ad12db1e93d79a38cc79d7c32edf5d36b56fdc
+  metadata.gz: 4e01f1e7203428a8aa492b3233b2a2553dd288e7
+  data.tar.gz: 0ab1b89cd5aa345325aa2a3127573c2ba4353dd1
 SHA512:
-  metadata.gz: 2f8ce7356cb93d87c3dbb7e524ae56bfdc8407df47a807d1384e35dd3c1cfbf07690a51f9ba1dfc75280ef253784667d5273af26e255def99963ed8c95cf5692
-  data.tar.gz: a6d8d82f224a3cce762f4b93076fdd69b35f5f9fcc0686ce19028f58837a0a64add408a3eaf1607e906049b2800c140079218d6e87f27342a16a97d6e7431507
+  metadata.gz: 62c5980174044c9c9199d41c4b38085f4a049352415c2f934a391d9eb2ba764299f67fa497f3586fefa97762c2bb83750d4c85b82d48d84a93025cef5b33bf82
+  data.tar.gz: e8f92ceecd6aa506d8f88092469a8bcac6d788eeebc39542401e8e630d29522ad94a37d95d9f2bf9f6877710112117ae3ed9a5fd7d88884625a6fa994874d6a7

data/.gitignore

@@ -6,4 +6,3 @@ spec/dummy/db/*.sqlite3
 spec/dummy/db/*.sqlite3-journal
 spec/dummy/log/*
 tmp
-.byebug_history

data/.travis.yml

@@ -1,11 +1,12 @@
 language: ruby
 before_install:
-  - sudo apt-get update -qq
   - sudo apt-get install libvips-dev
-  - gem install bundler
-bundler_args: --without production
 rvm:
-  - 2.3.1
+  - 2.1
 script: "bundle exec rake ci"
-env:
-  - DDR_AUX_API_URL=http://localhost:3000/api
+cache:
+  - bundler
+  - apt
+notifications:
+  email:
+    - lib-drs@duke.edu

data/Gemfile

@@ -1,8 +1,7 @@
 source 'https://rubygems.org'
-ruby '2.3.1'
 
 gemspec
 
 gem "devise"
-gem "rails", "4.2.7"
-gem "blacklight", "5.19.2"
+
+gem "active-fedora", github: "projecthydra/active_fedora", ref: "f85b4eab16f45cb4c1491a27bb20b05821bd9c44"

data/Rakefile

@@ -9,11 +9,11 @@ Bundler::GemHelper.install_tasks
 APP_ROOT = File.dirname(__FILE__)
 
 JETTY_CONFIG = { 
-	jetty_home: File.join(APP_ROOT, "jetty"),
-	jetty_port: 8983,
-	startup_wait: 60,
-	quiet: true,
-	java_opts: ["-Xmx256m", "-XX:MaxPermSize=128m"]
+  jetty_home: File.join(APP_ROOT, "jetty"),
+  jetty_port: 8983,
+  startup_wait: 60,
+  quiet: true,
+  java_opts: ["-Xmx256m", "-XX:MaxPermSize=128m"]
 }
 
 require 'rspec/core/rake_task'

data/app/controllers/users/sessions_controller.rb

@@ -10,4 +10,9 @@ class Users::SessionsController < Devise::SessionsController
     end
   end
 
+  def after_sign_out_path_for(scope)
+    return Ddr::Auth.sso_logout_url if Ddr::Auth.require_shib_user_authn
+    super
+  end
+
 end

data/app/helpers/models_helper.rb

@@ -0,0 +1,7 @@
+module ModelsHelper
+
+  def admin_set_full_name(slug)
+    I18n.t("ddr.admin_set.#{slug}")
+  end
+
+end

data/app/models/attachment.rb

@@ -7,10 +7,8 @@ class Attachment < Ddr::Models::Base
 
   include Ddr::Models::HasContent
 
-  belongs_to :attached_to, property: :is_attached_to, class_name: 'ActiveFedora::Base'
-
-  def publishable?
-    false
-  end
+  belongs_to :attached_to,
+             predicate: ::RDF::URI("http://projecthydra.org/ns/relations#isAttachedTo"),
+             class_name: "ActiveFedora::Base"
 
 end

data/app/models/collection.rb

@@ -1,4 +1,3 @@
-require 'htmlentities'
 #
 # A Collection is a conceptual and administrative entity containing a set of items.
 #
@@ -6,23 +5,25 @@ class Collection < Ddr::Models::Base
 
   include Ddr::Models::HasChildren
   include Ddr::Models::HasAttachments
-  include Ddr::Models::HasStructMetadata
 
-  has_many :children, property: :is_member_of_collection, class_name: 'Item'
-  has_many :targets, property: :is_external_target_for, class_name: 'Target'
+  has_many :children,
+           predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isMemberOfCollection,
+           class_name: "Item",
+           as: :parent
 
-  alias_method :items, :children
-  alias_method :item_ids, :child_ids
+  has_many :targets,
+           predicate: ::RDF::URI("http://www.loc.gov/mix/v20/externalTarget#isExternalTargetFor"),
+           class_name: "Target"
 
-  after_create :set_admin_policy, unless: :admin_policy
+  after_create :set_admin_policy
 
-  validates_presence_of :admin_set, :title
+  validates_presence_of :dc_title
 
   # Returns the SolrDocuments for Components associated with the Collection.
   #
   # @return A lazy enumerator of SolrDocuments.
   def components_from_solr
-    query = "#{Ddr::Index::Fields::COLLECTION_URI}:#{RSolr.solr_escape(internal_uri)}"
+    query = "#{Ddr::Index::Fields::COLLECTION_URI}:#{RSolr.solr_escape(id)}"
     filter = ActiveFedora::SolrService.construct_query_for_rel(:has_model => Component.to_class_uri)
     results = ActiveFedora::SolrService.query(query, fq: filter, rows: 100000)
     results.lazy.map {|doc| SolrDocument.new(doc)}
@@ -45,83 +46,15 @@ class Collection < Ddr::Models::Base
   end
 
   def grant_roles_to_creator(creator)
+    roles.grant type: Ddr::Auth::Roles::CURATOR, agent: creator.agent, scope: Ddr::Auth::Roles::RESOURCE_SCOPE
     roles.grant type: Ddr::Auth::Roles::CURATOR, agent: creator.agent, scope: Ddr::Auth::Roles::POLICY_SCOPE
   end
 
-  def publishable?
-    true
-  end
-
-  def default_structure
-    build_default_structure
-  end
-
   private
 
-  def default_roles
-    super.tap do |roles|
-      if Ddr::Auth.metadata_managers_group
-        roles << { type: Ddr::Auth::Roles::METADATA_EDITOR,
-                   agent: Ddr::Auth.metadata_managers_group,
-                   scope: Ddr::Auth::Roles::POLICY_SCOPE }
-      end
-    end
-  end
-
   def set_admin_policy
-    reload
     self.admin_policy = self
-    save!
-  end
-
-  def build_default_structure
-    document = Ddr::Models::Structure.xml_template
-    structure = Ddr::Models::Structure.new(document)
-    metshdr = structure.add_metshdr
-    structure.add_agent(parent: metshdr, role: Ddr::Models::Structures::Agent::ROLE_CREATOR,
-                        name: Ddr::Models::Structures::Agent::NAME_REPOSITORY_DEFAULT)
-    structmap = structure.add_structmap(type: Ddr::Models::Structure::TYPE_DEFAULT)
-    add_items_to_structure(structure, structmap)
-    structure
-  end
-
-  def add_items_to_structure(structure, structmap)
-    sorted_items_for_structure.each do |item|
-      if path = item[Ddr::Index::Fields::NESTED_PATH]
-        nest = path.split(File::SEPARATOR)
-      else
-        nest = []
-      end
-      find_or_create_div(structure, structmap, nest, item[Ddr::Index::Fields::PERMANENT_ID])
-    end
-  end
-
-  def find_or_create_div(structure, parent, nest, permanent_id)
-    label = nest.shift
-    order = parent.elements.count + 1
-    if nest.empty?
-      div = structure.add_div(parent: parent, order: order)
-      add_mptr(structure, div, permanent_id)
-    else
-      label = HTMLEntities.new.encode(label)
-      div = parent.xpath(%Q[xmlns:div[@LABEL="#{label}"]]).first ||
-            structure.add_div(parent: parent, type: 'Directory', label: label, order: order)
-      find_or_create_div(structure, div, nest, permanent_id)
-    end
-  end
-
-  def add_mptr(structure, div, permanent_id)
-    structure.add_mptr(parent: div, href: permanent_id)
-  end
-
-  def sorted_items_for_structure
-    ActiveFedora::SolrService.query(association_query(:children), sort: item_sort_for_structure, rows: 999999)
-  end
-
-  def item_sort_for_structure
-    "#{Ddr::Index::Fields::NESTED_PATH} ASC,
-     #{Ddr::Index::Fields::LOCAL_ID} ASC,
-     #{Ddr::Index::Fields::OBJECT_CREATE_DATE} ASC"
+    self.save
   end
 
 end

data/app/models/component.rb

@@ -5,83 +5,24 @@
 #
 class Component < Ddr::Models::Base
 
-  include Ddr::Models::Captionable
   include Ddr::Models::HasContent
-  include Ddr::Models::HasIntermediateFile
   include Ddr::Models::HasMultiresImage
   include Ddr::Models::HasStructMetadata
-  include Ddr::Models::Streamable
 
-  belongs_to :parent, :property => :is_part_of, :class_name => 'Item'
-  belongs_to :target, :property => :has_external_target, :class_name => 'Target'
+  belongs_to :parent,
+             predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf,
+             class_name: "Item"
 
-  alias_method :item, :parent
-  alias_method :item=, :parent=
-
-  STRUCTURALLY_RELEVANT_DATASTREAMS = [ Ddr::Datastreams::CAPTION, Ddr::Datastreams::CONTENT,
-                                        Ddr::Datastreams::INTERMEDIATE_FILE, Ddr::Datastreams::MULTIRES_IMAGE,
-                                        Ddr::Datastreams::STREAMABLE_MEDIA, Ddr::Datastreams::THUMBNAIL ]
+  belongs_to :target,
+             predicate: ::RDF::URI("http://www.loc.gov/mix/v20/externalTarget#hasExternalTarget"),
+             class_name: "Target"
 
   def collection
     self.parent.parent rescue nil
   end
 
-  def collection_uri
-    self.collection.internal_uri rescue nil
-  end
-
-  def publishable?
-    parent.present? && parent.published?
-  end
-
-  def default_structure
-    build_default_structure
-  end
-
-  private
-
-  def build_default_structure
-    document = Ddr::Models::Structure.xml_template
-    structure = Ddr::Models::Structure.new(document)
-    metshdr = structure.add_metshdr
-    structure.add_agent(parent: metshdr, role: Ddr::Models::Structures::Agent::ROLE_CREATOR,
-                        name: Ddr::Models::Structures::Agent::NAME_REPOSITORY_DEFAULT)
-    structmap = structure.add_structmap(type: Ddr::Models::Structure::TYPE_DEFAULT)
-    if has_content?
-      filesec = structure.add_filesec
-      div = structure.add_div(parent: structmap)
-      filegrp = structure.add_filegrp(parent: filesec)
-      add_use_to_structure(structure, filegrp, div, Ddr::Models::Structure::USE_ORIGINAL_FILE,
-                           Ddr::Datastreams::CONTENT)
-      add_use_to_structure(structure, filegrp, div, Ddr::Models::Structure::USE_PRESERVATION_MASTER_FILE,
-                           Ddr::Datastreams::CONTENT)
-      add_use_to_structure(structure, filegrp, div, Ddr::Models::Structure::USE_INTERMEDIATE_FILE,
-                           Ddr::Datastreams::INTERMEDIATE_FILE) if has_intermediate_file?
-      add_service_file_uses_to_default_structure(structure, filegrp, div)
-      add_use_to_structure(structure, filegrp, div, Ddr::Models::Structure::USE_THUMBNAIL_IMAGE,
-                           Ddr::Datastreams::THUMBNAIL) if has_thumbnail?
-      add_use_to_structure(structure, filegrp, div, Ddr::Models::Structure::USE_TRANSCRIPT,
-                           Ddr::Datastreams::CAPTION) if captioned?
-
-    end
-    structure
-  end
-
-  def add_service_file_uses_to_default_structure(structure, filegrp, div)
-    add_use_to_structure(structure, filegrp, div, Ddr::Models::Structure::USE_SERVICE_FILE,
-                         Ddr::Datastreams::MULTIRES_IMAGE) if has_multires_image?
-    add_use_to_structure(structure, filegrp, div, Ddr::Models::Structure::USE_SERVICE_FILE,
-                         Ddr::Datastreams::STREAMABLE_MEDIA) if streamable?
-    if !has_multires_image? && !streamable?
-      add_use_to_structure(structure, filegrp, div, Ddr::Models::Structure::USE_SERVICE_FILE,
-                           Ddr::Datastreams::CONTENT)
-    end
-  end
-
-  def add_use_to_structure(structure, filegrp, div, use, datastream_name)
-    file = structure.add_file(parent: filegrp, use: use)
-    structure.add_flocat(parent: file, loctype: 'OTHER', otherloctype: 'AttachedFile', href: datastream_name)
-    structure.add_fptr(parent: div, fileid: file['ID'])
+  def collection_id
+    collection.id rescue nil
   end
 
 end

data/app/models/item.rb

@@ -8,78 +8,13 @@ class Item < Ddr::Models::Base
   include Ddr::Models::HasChildren
   include Ddr::Models::HasStructMetadata
 
-  has_many :children, property: :is_part_of, class_name: 'Component'
-  belongs_to :parent, property: :is_member_of_collection, class_name: 'Collection'
-
-  alias_method :components, :children
-  alias_method :component_ids, :child_ids
-
-  alias_method :parts, :children
-  alias_method :part_ids, :child_ids
-
-  alias_method :collection, :parent
-  alias_method :collection_id, :parent_id
-  alias_method :collection=, :parent=
-
-  def publishable?
-    parent.present? && parent.published?
-  end
-
-  def children_having_extracted_text
-    Ddr::Index::Query.build(self) do |item|
-      is_part_of item
-      where attached_files_having_content: "extractedText"
-      fields :id, :extracted_text
-    end
-  end
-
-  def all_text
-    children_having_extracted_text.docs.map(&:extracted_text).flatten
-  end
-
-  def default_structure
-    build_default_structure
-  end
-
-  private
-
-  def build_default_structure
-    document = Ddr::Models::Structure.xml_template
-    structure = Ddr::Models::Structure.new(document)
-    metshdr = structure.add_metshdr
-    structure.add_agent(parent: metshdr, role: Ddr::Models::Structures::Agent::ROLE_CREATOR,
-                        name: Ddr::Models::Structures::Agent::NAME_REPOSITORY_DEFAULT)
-    structmap = structure.add_structmap(type: Ddr::Models::Structure::TYPE_DEFAULT)
-    add_components_to_structure(structure, structmap)
-    structure
-  end
-
-  def add_components_to_structure(structure, structmap)
-    component_structure_types(sorted_children).each do |type_term, children|
-      div = structure.add_div(parent: structmap, type: type_term)
-      children.each_with_index do |child, index|
-        sub_div = structure.add_div(parent: div, order: index + 1)
-        structure.add_mptr(parent: sub_div, href: child[Ddr::Index::Fields::PERMANENT_ID])
-      end
-    end
-  end
-
-  def component_structure_types(sorted_children)
-    type_divs = {}
-    sorted_children.each do |child|
-      term = type_term(child) || "Other"
-      if type_divs.has_key?(term)
-        type_divs[term] << child
-      else
-        type_divs[term] = [ child ]
-      end
-    end
-    type_divs
-  end
-
-  def type_term(component_doc)
-    media_type = component_doc[Ddr::Index::Fields::MEDIA_TYPE].first
-    Ddr::Models::Structures::ComponentTypeTerm.term(media_type)
-  end
+  has_many :children,
+           predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf,
+           class_name: "Component",
+           as: :parent
+
+  belongs_to :parent,
+             predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isMemberOfCollection,
+             class_name: "Collection"
 
 end

data/app/models/target.rb

@@ -9,11 +9,12 @@ class Target < Ddr::Models::Base
 
   include Ddr::Models::HasContent
 
-  has_many :components, property: :has_external_target, class_name: 'Component'
-  belongs_to :collection, property: :is_external_target_for, class_name: 'Collection'
+  has_many :components,
+           predicate: ::RDF::URI("http://www.loc.gov/mix/v20/externalTarget#hasExternalTarget"),
+           class_name: "Component"
 
-  def publishable?
-    false
-  end
+  belongs_to :collection,
+             predicate: ::RDF::URI("http://www.loc.gov/mix/v20/externalTarget#isExternalTargetFor"),
+             class_name: "Collection"
 
 end

data/config/initializers/active_fedora_base.rb

@@ -18,7 +18,7 @@ module ActiveFedora
     end
 
     def can_have_content?
-      datastreams.include? "content"
+      datastreams.key? "content"
     end
 
     def has_content?
@@ -37,54 +37,35 @@ module ActiveFedora
       governable? && admin_policy.present?
     end
 
+    def has_rights_metadata?
+      ds = self.datastreams[Ddr::Datastreams::RIGHTS_METADATA]
+      ds && ds.size && ds.size > 0
+    end
+
     def can_have_struct_metadata?
-      datastreams.include? Ddr::Datastreams::STRUCT_METADATA
+      datastreams.key? Ddr::Datastreams::STRUCT_METADATA
     end
 
     def has_struct_metadata?
       can_have_struct_metadata? && structMetadata.has_content?
     end
 
-    def can_have_intermediate_file?
-      datastreams.include? Ddr::Datastreams::INTERMEDIATE_FILE
-    end
-
-    def has_intermediate_file?
-      can_have_intermediate_file? && datastreams[Ddr::Datastreams::INTERMEDIATE_FILE].has_content?
-    end
-
     def can_have_multires_image?
-      datastreams.include? Ddr::Datastreams::MULTIRES_IMAGE
+      respond_to? :multires_image_file_path
     end
 
     def has_multires_image?
-      can_have_multires_image? && datastreams[Ddr::Datastreams::MULTIRES_IMAGE].has_content?
+      can_have_multires_image? && multires_image_file_path.present?
     end
-
+    
     def can_have_thumbnail?
-      datastreams.include? "thumbnail"
+      datastreams.key? "thumbnail"
     end
 
     def has_thumbnail?
       can_have_thumbnail? && thumbnail.has_content?
     end
 
-    def captionable?
-      datastreams.include? Ddr::Datastreams::CAPTION
-    end
-
-    def captioned?
-      captionable? && datastreams[Ddr::Datastreams::CAPTION].has_content?
-    end
-
-    def can_be_streamable?
-      datastreams.include? Ddr::Datastreams::STREAMABLE_MEDIA
-    end
-
-    def streamable?
-      can_be_streamable? && datastreams[Ddr::Datastreams::STREAMABLE_MEDIA].has_content?
-    end
-
     def safe_id
       id.sub(/:/, "-")
     end