ddr-core 0.3.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72f6e405acd06621c1a3f1001264c0d8d8bd5302c3e0f36b7ad5805f990eaa99
-  data.tar.gz: 826a0ae2eda2c5937b4c312e140e55672a4e55af807e2980082e0beae85342d0
+  metadata.gz: 60adcaf5e15fb5ddb0ec7163481f5eb858ced50f7937a64574582c68fe37fa3c
+  data.tar.gz: c5cc93ef14e694f2a30f7e63879cef2a2ac7d19b496526ea13c07f1351652e64
 SHA512:
-  metadata.gz: 03b21dcd66f1a220167fc421849d4a1f7996be806c310f92adfad14ee8f7f9cc0ca030f4d718a29be95586eac0b757d5d78e086ac9b5442d7865bab1d326a438
-  data.tar.gz: cf249bc22b8b381f20b3149ba421496098aa4576528460cbde047e7fdded8396ceb66f522428ed11677799c5bbd0ea53676bb199ea80c9b8c3d75d05508e1eab
+  metadata.gz: c7db02ca1d702c76c77327b877be521f6d894abcf209a0fa1d7cb65dc330b3bf192e046e3928a8acf4ba16b98fb474a45ce9db058ee98d4696b818fd25cb068d
+  data.tar.gz: ddb6721a92c1a73a69d7ef43a36445fb8fc94dfddfa0ede552bb2460f197e1ae053c7a861150b506ca3f5a4558a9154aece1c446065756c0d44d8a21ec39e5dd

data/app/models/concerns/ddr/has_admin_metadata.rb

@@ -54,47 +54,6 @@ module Ddr
       workflow_state == Ddr::Workflow::UNPUBLISHED
     end
 
-    ##############
-    # Move to dul-hydra?
-    ##############
-    # def lock
-    #   self.is_locked = true
-    # end
-    #
-    # def unlock
-    #   self.is_locked = false
-    # end
-    #
-    # def lock!
-    #   lock
-    #   save
-    # end
-    #
-    # def unlock!
-    #   unlock
-    #   save
-    # end
-    #
-    # Same with publish! and unpublish!, which is currently delegated to Ddr::Managers::WorkflowManager
-    #
-    ###############
-
-    ###############
-    # attribute defined in has_content, single-valued, stored in adminMetadata datastream
-    ###############
-    # property :original_filename,
-    #          predicate: Ddr::Vocab::PREMIS.hasOriginalName do |index|
-    #   index.as :stored_sortable
-    # end
-    #
-
-    # included do
-    #
-    #   delegate :publish!, :unpublish!, :published?, :unpublished?,
-    #            to: :workflow
-    # end
-    #
-
     def resource_roles
       roles.select(&:in_resource_scope?)
     end
@@ -107,36 +66,19 @@ module Ddr
       ( has_admin_policy? && admin_policy.policy_roles ) || []
     end
 
-    # def effective_roles(agents)
-    #   ( resource_roles | policy_roles ).select { |r| agents.include?(r.agent) }
-    # end
-
-    # def workflow
-    #   @workflow ||= Ddr::Managers::WorkflowManager.new(self)
-    # end
-    #
-    # def grant_roles_to_creator(creator)
-    #   roles.grant type: Ddr::Auth::Roles::EDITOR,
-    #               agent: creator,
-    #               scope: Ddr::Auth::Roles::RESOURCE_SCOPE
-    # end
-    #
-    # def copy_resource_roles_from(other)
-    #   roles.grant *(other.roles.in_resource_scope)
-    # end
-    #
+    def effective_roles(agents = nil)
+      Ddr::Auth::EffectiveRoles.call(self, agents)
+    end
 
     def effective_permissions(agents)
       Ddr::Auth::EffectivePermissions.call(self, agents)
     end
 
-    #
-    # def finding_aid
-    #   if ead_id
-    #     FindingAid.new(ead_id)
-    #   end
-    # end
-    #
+    def finding_aid
+      if ead_id
+        FindingAid.new(ead_id)
+      end
+    end
 
   end
 end

data/app/models/concerns/ddr/has_children.rb

@@ -6,5 +6,13 @@ module Ddr
       Ddr.query_service.find_inverse_references_by(resource: self, property: 'parent_id')
     end
 
+    def first_child
+      sorted_children.first
+    end
+
+    def sorted_children
+      children.sort_by{ |e| [ e.local_id || '', e.ingestion_date ] }
+    end
+
   end
 end

data/app/models/concerns/ddr/has_content.rb

@@ -66,6 +66,7 @@ module Ddr
     def content_human_size
       ActiveSupport::NumberHelper.number_to_human_size(content_size) if content_size
     end
+    alias_method :content_size_human, :content_human_size
 
     def content_type
       content&.media_type

data/app/models/concerns/ddr/solr_document_behavior.rb

@@ -54,29 +54,9 @@ module Ddr
     end
 
     def resource
-      @resource = Valkyrie::MetadataAdapter.find(:index_solr).query_service.find_by(id: id)
+      @resource ||= Valkyrie::MetadataAdapter.find(:index_solr).query_service.find_by(id: id)
     end
 
-    ### DDRevo: Not sure if / where this is used
-    def to_partial_path
-      'document'
-    end
-
-    ### DDRevo: This is probably no longer needed
-    def safe_id
-      id.sub(/:/, "-")
-    end
-
-    ### DDRevo: No longer relevant
-    # def object_profile
-    #   @object_profile ||= get_json(Ddr::Index::Fields::OBJECT_PROFILE)
-    # end
-
-    ### DDRevo: No longer relevant
-    # def object_state
-    #   object_profile["objState"]
-    # end
-
     def object_create_date
       parse_date(self[Ddr::Index::Fields::RESOURCE_CREATE_DATE])
     end
@@ -93,23 +73,13 @@ module Ddr
       get_date(Ddr::Index::Fields::LAST_VIRUS_CHECK_ON)
     end
 
-    ### DDRevo: No longer relevant
-    # def datastreams
-    #   object_profile["datastreams"]
-    # end
-
-    ### DDRevo: No longer relevant
-    # def has_datastream?(dsID)
-    #   datastreams[dsID].present?
-    # end
-
     def has_admin_policy?
       admin_policy_id.present?
     end
 
     def admin_policy
       if has_admin_policy?
-        self.class.find(admin_policy_id)
+        self.class.find(admin_policy_id.gsub(/^id-/,''))
       end
     end
 
@@ -117,11 +87,6 @@ module Ddr
       resource.children.present?
     end
 
-    ### DDRevo: No longer relevant
-    # def label
-    #   object_profile["objLabel"]
-    # end
-
     def title_display
       title
     end
@@ -151,11 +116,6 @@ module Ddr
       resource.has_extracted_text?
     end
 
-    ### DDRevo: Not relevant as coded.  Not sure if comparable functionality is needed
-    # def content_ds
-    #   datastreams[Ddr::Datastreams::CONTENT]
-    # end
-
     def content_mime_type
       resource.content_type
     end
@@ -166,11 +126,6 @@ module Ddr
       resource.content_human_size
     end
 
-    ### DDRevo: Not relevant as coded.  Not sure if comparable functionality is needed
-    # def content_checksum
-    #   content_ds["dsChecksum"] rescue nil
-    # end
-
     def targets
       @targets ||= query_service.find_inverse_references_by(resource: resource, property: 'for_collection_id')
     end
@@ -183,11 +138,6 @@ module Ddr
       targets_count > 0
     end
 
-    ### DDRevo Still relevant?
-    # def association(name)
-    #   get_pid(ActiveFedora::SolrService.solr_name(name, :symbol))
-    # end
-
     def tableized_name
       resource_model.tableize
     end
@@ -197,7 +147,6 @@ module Ddr
     end
 
     def roles
-      # @roles ||= Ddr::Auth::Roles::Role.from_json(access_role)
       @roles ||= resource.roles
     end
 
@@ -246,11 +195,8 @@ module Ddr
       end
     end
 
-    # DRY HasAdminMetadata
     def finding_aid
-      if ead_id
-        FindingAid.new(ead_id)
-      end
+      resource.finding_aid
     end
 
     def intermediate_type
@@ -280,14 +226,18 @@ module Ddr
       resource.captionable?
     end
 
+    def captioned?
+      resource.captioned?
+    end
+
     def caption_type
-      if captionable?
+      if captioned?
         resource.caption_type
       end
     end
 
     def caption_extension
-      if captionable?
+      if captioned?
         extensions = Ddr.preferred_file_extensions
         if extensions.include? caption_type
           extensions[caption_type]
@@ -298,7 +248,7 @@ module Ddr
     end
 
     def caption_path
-      if captionable?
+      if captioned?
         resource.caption_path
       end
     end
@@ -336,9 +286,8 @@ module Ddr
       end
     end
 
-    # FIXME - Probably need a more general solution mapping object reader methods to index field names.
     def rights
-      self["rights_tesim"]
+      resource.rights
     end
 
     def children
@@ -351,14 +300,6 @@ module Ddr
       @query_service ||= Valkyrie::MetadataAdapter.find(:index_solr).query_service
     end
 
-    # def targets_query
-    #   "#{Ddr::Index::Fields::IS_EXTERNAL_TARGET_FOR}:#{internal_uri_for_query}"
-    # end
-    #
-    # def internal_uri_for_query
-    #   ActiveFedora::SolrService.escape_uri_for_query(internal_uri)
-    # end
-    #
     def get_date(field)
       parse_date(self[field])
     end
@@ -371,10 +312,6 @@ module Ddr
       Time.parse(date).localtime if date
     end
 
-    # def get_pid(field)
-    #   ActiveFedora::Base.pid_from_uri(self[field]) rescue nil
-    # end
-    #
     def inherited_research_help_contact
       if doc = admin_policy
         doc.research_help_contact
@@ -398,32 +335,16 @@ module Ddr
     end
 
     def intermediate_extension_default
-      # datastreams[Ddr::Datastreams::INTERMEDIATE_FILE].default_file_extension
       resource.intermediate_file.default_file_extension
     end
 
     def caption_extension_default
-      # datastreams[Ddr::Datastreams::CAPTION].default_file_extension
       resource.caption.default_file_extension
     end
 
     def streamable_media_extension_default
-      # datastreams[Ddr::Datastreams::STREAMABLE_MEDIA].default_file_extension
       resource.streamable_media.default_file_extension
     end
 
-    ### DDRevo: Using resource.children rather than this query
-    # def children_query
-    #   case self[Ddr::Index::Fields::RESOURCE_MODEL]
-    #   when 'Ddr::Collection'
-    #     Ddr::Index::Query.build(self) do |parent|
-    #       is_member_of_collection parent.id
-    #     end
-    #   when 'Ddr::Item'
-    #     Ddr::Index::Query.build(self) do |parent|
-    #       is_part_of parent.id
-    #     end
-    #   end
-    # end
   end
 end

data/app/models/ddr/admin_set.rb

@@ -1,9 +1,5 @@
-require "active_resource"
-
 module Ddr
-  class AdminSet < ActiveResource::Base
-
-    self.site = ENV["DDR_AUX_API_URL"]
+  class AdminSet < AuxiliaryResource
 
     def self.call(obj)
       find_by_code(obj.admin_set)
@@ -13,11 +9,11 @@ module Ddr
 
     def self.find_by_code(code)
       return unless code
-      new get(:find, code: code)
+      fetch(code) { new get(:find, code: code) }
     end
 
     def self.keys
-      all.map(&:code)
+      fetch("codes") { all.map(&:code) }
     end
 
     def to_s

data/app/models/ddr/alert.rb

@@ -0,0 +1,16 @@
+module Ddr
+  class Alert < AuxiliaryResource
+
+    ADMIN_SITE = 'admin'
+    PUBLIC_SITE = 'public'
+
+    # @param [String] the application ('admin' or 'public') for which to return active alerts
+    # @return [Array] the active alerts for the requested application site
+    def self.call(site)
+      get(:active, site: site).map { |resp| new(resp) }
+    rescue ActiveResource::ServerError => e
+      []
+    end
+
+  end
+end

data/app/models/ddr/auxiliary_resource.rb

@@ -0,0 +1,24 @@
+require 'active_resource'
+
+module Ddr
+  #
+  # Abstract superclass for resources bound to ddr-aux API data
+  #
+  class AuxiliaryResource < ActiveResource::Base
+
+    # ActiveResource freezes `site` in subclasses
+    self.site = Ddr.ddr_aux_api_url
+
+    class_attribute :cache_expiry, instance_accessor: false
+    self.cache_expiry = 1.hour
+    
+    def self.fetch(value_key, &block)
+      Rails.cache.fetch(cache_key(value_key), expires_in: cache_expiry, &block)
+    end
+    
+    def self.cache_key(suffix)
+      [ model_name.cache_key, suffix ].join('/')
+    end
+
+  end
+end

data/app/models/ddr/contact.rb

@@ -1,9 +1,5 @@
-require 'activeresource'
-
 module Ddr
-  class Contact < ActiveResource::Base
-
-    self.site = ENV["DDR_AUX_API_URL"]
+  class Contact < AuxiliaryResource
 
     def self.call(slug)
       new get(:find, slug: slug)

data/app/models/ddr/finding_aid.rb

@@ -0,0 +1,62 @@
+# TODO: 'https://duldev.atlassian.net/browse/DDR-1755'
+
+module Ddr
+  class FindingAid
+    attr_reader :ead_id
+
+    EAD_XMLNS = "urn:isbn:1-931666-22-9"
+
+    def initialize(ead_id)
+      @ead_id = ead_id
+    end
+
+    def url
+      doc.css("eadid").attr("url").text
+    end
+
+    # The finding aid title
+    def title
+      doc.css("titleproper").children.first.text.strip
+    end
+
+    def repository
+      collection.xpath('ead:did/ead:repository/ead:corpname', ead: EAD_XMLNS).text
+    end
+
+    def collection_date_span
+      collection.xpath('ead:did/ead:unitdate[@type="inclusive"]', ead: EAD_XMLNS).text
+    end
+
+    def collection_number
+      collection.xpath('ead:did/ead:unitid', ead: EAD_XMLNS).text
+    end
+
+    def collection_title
+      collection.xpath('ead:did/ead:unittitle', ead: EAD_XMLNS).text
+    end
+
+    def extent
+      collection.xpath('ead:did/ead:physdesc/ead:extent', ead: EAD_XMLNS).map(&:text).join("; ")
+    end
+
+    def abstract
+      collection.xpath('ead:did/ead:abstract', ead: EAD_XMLNS).text
+    end
+
+    private
+
+    def collection
+      doc.xpath('//ead:archdesc[@level="collection"]', ead: EAD_XMLNS)
+    end
+
+    # @raise [OpenURI::HTTPError] if 404, etc.
+    def doc
+      @doc ||= Nokogiri::XML(open(ead_xml_url))
+    end
+
+    def ead_xml_url
+      Ddr::Models.ead_xml_base_url + ead_id + ".xml"
+    end
+    
+  end
+end

data/app/models/ddr/item.rb

@@ -12,25 +12,11 @@ module Ddr
 
     self.parent_class = Ddr::Collection
 
-    ### DDRevo #####################
-    # TODO: We may want to revisit this alternate implementation once ddr-core is more fully baked
-    # or it may be fine just as it is
-    ### DDRevo #####################
     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
       children.select { |child| child.attached_files_having_content.include?(:extracted_text) }
     end
 
-    ### DDRevo #####################
-    # TODO: We may want to revisit this alternate implementation once ddr-core is more fully baked
-    # or it may be fine just as it is
-    ### DDRevo #####################
     def all_text
-      # children_having_extracted_text.docs.map(&:extracted_text).flatten
       children_having_extracted_text.map { |child| child.extracted_text.content }.to_a.flatten
     end
 

data/app/models/ddr/language.rb

@@ -1,9 +1,5 @@
-require "active_resource"
-
 module Ddr
-  class Language < ActiveResource::Base
-
-    self.site = ENV["DDR_AUX_API_URL"]
+  class Language < AuxiliaryResource
 
     def self.call(obj)
       obj.language.map do |lang|
@@ -28,4 +24,3 @@ module Ddr
 
   end
 end
-

data/app/models/ddr/resource.rb

@@ -47,6 +47,10 @@ module Ddr
       can_have_streamable_media?
     end
 
+    def self.canonical_model_name(model_name)
+      model_name.starts_with?('Ddr::') ? model_name : "Ddr::#{model_name}"
+    end
+
     def self.common_model_name
       name.split('::').last
     end
@@ -65,6 +69,10 @@ module Ddr
     alias_method :new_record?, :new_record
     alias_method :resource_model, :internal_resource
 
+    def rights_statement
+      RightsStatement.call(self)
+    end
+
     def title_display
       return title.first if title.present?
       return identifier.first if identifier.present?

data/app/models/ddr/rights_statement.rb

@@ -1,9 +1,5 @@
-require "active_resource"
-
 module Ddr
-  class RightsStatement < ActiveResource::Base
-
-    self.site = ENV["DDR_AUX_API_URL"]
+  class RightsStatement < AuxiliaryResource
 
     def self.call(obj)
       if obj.rights.present?
@@ -22,4 +18,4 @@ module Ddr
     end
 
   end
-end
+end

data/config/locales/ddr-core.en.yml

@@ -16,7 +16,8 @@ en:
         aspace_id:
           label: "ArchivesSpace ID"
         common_model_name:
-          label: "Common Model Name"
+          label: Model
+          heading: model
         doi:
           label: DOI
         ead_id:

data/lib/ddr/auth/ability_definitions/role_based_ability_definitions.rb

@@ -30,8 +30,8 @@ module Ddr
         end
       end
 
-      def cached_permissions(pid, &block)
-        cache[pid] ||= block.call
+      def cached_permissions(id, &block)
+        cache[id] ||= block.call
       end
 
     end

data/lib/ddr/auth/effective_permissions.rb

@@ -1,7 +1,8 @@
 module Ddr::Auth
   class EffectivePermissions
 
-    # @param obj [Object] an object that receives :roles and returns a RoleSet
+    # @param obj [Object] an object that receives :roles and returns an Array
+    # of Ddr::Auth::Roles::Role.
     # @param agents [String, Array<String>] agent(s) to match roles
     # @return [Array<Symbol>]
     def self.call(obj, agents)

data/lib/ddr/auth/effective_roles.rb

@@ -1,8 +1,12 @@
 module Ddr::Auth
   class EffectiveRoles
 
-    def self.call(obj, agents)
-      ( obj.resource_roles | obj.inherited_roles ).select { |r| agents.include?(r.agent) }
+    def self.call(obj, agents = nil)
+      ( obj.resource_roles | obj.inherited_roles ).tap do |roles|
+        if agents
+          roles.select! { |r| agents.include?(r.agent) }
+        end
+      end
     end
 
   end

data/lib/ddr/auth/failure_app.rb

@@ -5,7 +5,7 @@ module Ddr
       def respond
         if scope == :user && Ddr::Auth.require_shib_user_authn
           store_location!
-          redirect_to user_omniauth_authorize_path(:shibboleth)
+          redirect_to user_shibboleth_omniauth_authorize_path
         else
           super
         end

data/lib/ddr/auth/grouper_gateway.rb

@@ -25,7 +25,7 @@ module Ddr
 
       # List of all grouper groups for the repository
       def repository_groups(raw = false)
-        repo_groups = groups(REPOSITORY_GROUP_FILTER)
+        repo_groups = groups(Ddr::Auth.repository_group_filter)
         if ok?
           return repo_groups if raw
           repo_groups.map do |g|
@@ -52,7 +52,7 @@ module Ddr
             result = response["WsGetGroupsResults"]["results"].first
             # Have to manually filter results b/c Grouper WS version 1.5 does not support filter parameter
             if result && result["wsGroups"]
-              groups = result["wsGroups"].select { |g| g["name"] =~ /^#{REPOSITORY_GROUP_FILTER}/ }
+              groups = result["wsGroups"].select { |g| g["name"] =~ /^#{Ddr::Auth.repository_group_filter}/ }
             end
           end
         rescue StandardError => e

data/lib/ddr/auth/role_based_access_controls_enforcement.rb

@@ -1,11 +1,5 @@
 module Ddr
   module Auth
-    #
-    # Hydra controller mixin for role-based access control
-    #
-    # Overrides Hydra::AccessControlsEnforcement#gated_discovery_filters
-    # to apply role filters instead of permissions filters.
-    #
     module RoleBasedAccessControlsEnforcement
 
       def self.included(controller)
@@ -17,36 +11,6 @@ module Ddr
         @current_ability ||= AbilityFactory.call(current_user, request.env)
       end
 
-      # List of URIs for policies on which any of the current user's agent has a role in policy scope
-      def policy_role_policies
-        @policy_role_policies ||= Array.new.tap do |uris|
-          filters = current_ability.agents.map do |agent|
-            "#{Ddr::Index::Fields::POLICY_ROLE}:\"#{agent}\""
-          end.join(" OR ")
-          query = "#{Ddr::Index::Fields::ACTIVE_FEDORA_MODEL}:Collection AND (#{filters})"
-          results = ActiveFedora::SolrService.query(query, rows: Collection.count, fl: Ddr::Index::Fields::INTERNAL_URI)
-          results.each_with_object(uris) { |r, memo| memo << r[Ddr::Index::Fields::INTERNAL_URI] }
-        end
-      end
-
-      def policy_role_filters
-        if policy_role_policies.present?
-          rels = policy_role_policies.map { |pid| [:is_governed_by, pid] }
-          ActiveFedora::SolrService.construct_query_for_rel(rels, "OR")
-        end
-      end
-
-      def resource_role_filters
-        current_ability.agents.map do |agent|
-          ActiveFedora::SolrService.raw_query(Ddr::Index::Fields::RESOURCE_ROLE, agent)
-        end.join(" OR ")
-      end
-
-      def gated_discovery_filters
-        [resource_role_filters, policy_role_filters].compact
-      end
-
-      # Overrides Hydra::AccessControlsEnforcement
       def enforce_show_permissions
         authorize! :read, params[:id]
       end

data/lib/ddr/auth/roles/role.rb

@@ -36,38 +36,6 @@ module Ddr
             end
           end
 
-          ###############
-          # FIXME or remove serialization/deserialization
-          ###############
-          #
-          # # Deserialize a Role from JSON
-          # # @param json [String] the JSON string
-          # # @return [Role] the role
-          # def from_json(json)
-          #   build JSON.parse(json)
-          # end
-
-          # alias_method :deserialize, :from_json
-
-          private
-
-          #
-          # DELETEME
-          #
-          # def build_attributes(args={})
-          #   # symbolize keys and stringify values
-          #   attrs = args.each_with_object({}) do |(k, v), memo|
-          #     memo[k.to_sym] = Array(v).first.to_s
-          #   end
-          #   # set default scope if necessary
-          #   attrs[:scope] ||= DEFAULT_SCOPE
-          #   # accept :type key for role_type attribute
-          #   if attrs.key?(:type)
-          #     attrs[:role_type] = attrs.delete(:type)
-          #   end
-          #   attrs
-          # end
-
         end # class << self
 
         # Roles are considered equal (==) if they
@@ -96,19 +64,6 @@ module Ddr
           "agent=#{agent.inspect}, scope=#{scope.inspect}>"
         end
 
-        # TODO refactor up?
-        def proper_attributes
-          attributes.slice(self.class.fields - self.class.reserved_attributes)
-        end
-
-        ###############
-        # FIXME or remove serialization/deserialization
-        ###############
-        #
-        # delegate :to_json, to: :proper_attributes
-        #
-        # alias_method :serialize, :to_json
-
         # Returns the permissions associated with the role
         # @return [Array<Symbol>] the permissions
         def permissions

data/lib/ddr/core.rb

@@ -9,6 +9,7 @@ module Ddr
   autoload :Files
   autoload :NotFoundError, 'ddr/error'
   autoload :Fits
+  autoload :FindingAid
   autoload :Index
   autoload :Managers
   autoload :Utils
@@ -103,6 +104,10 @@ module Ddr
     false
   end
 
+  mattr_accessor :ddr_aux_api_url do
+    ENV["DDR_AUX_API_URL"]
+  end
+
   module Core
 
   end

data/lib/ddr/core/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Core
-    VERSION = '0.3.0'
+    VERSION = '1.0.0'
   end
 end

data/lib/ddr/fits.rb

@@ -94,96 +94,5 @@ module Ddr
       xpath('//fits:fits', fits: FITS_XMLNS).first
     end
 
-    ### DDRevo ##########################################
-    # From Ddr::Datastreams::FitsDatastream.  Code above accounts for proxy terms from below and has a private 'root'
-    # method but does not (yet) provide methods for all the terms in the terminology.  Thought it was better to wait
-    # and see which ones are actually needed.
-    ### DDRevo ##########################################
-    # set_terminology do |t|
-    #   t.root(path: "fits",
-    #          xmlns: FITS_XMLNS,
-    #          schema: FITS_SCHEMA)
-    #   t.version(path: {attribute: "version"})
-    #   t.timestamp(path: {attribute: "timestamp"})
-    #   t.identification {
-    #     t.identity {
-    #       t.mimetype(path: {attribute: "mimetype"})
-    #       t.format_label(path: {attribute: "format"})
-    #       t.version
-    #       t.externalIdentifier
-    #       t.pronom_identifier(path: "externalIdentifier", attributes: {type: "puid"})
-    #     }
-    #   }
-    #   t.fileinfo {
-    #     t.created
-    #     t.creatingApplicationName
-    #     t.creatingos
-    #     t.filename
-    #     t.filepath
-    #     t.fslastmodified
-    #     t.lastmodified
-    #     t.md5checksum
-    #     t.size
-    #   }
-    #   t.filestatus {
-    #     t.valid
-    #     t.well_formed(path: "well-formed")
-    #   }
-    #   t.metadata {
-    #     t.image {
-    #       t.imageWidth
-    #       t.imageHeight
-    #       t.colorSpace
-    #       t.iccProfileName
-    #       t.iccProfileVersion
-    #     }
-    #     t.document {
-    #       # TODO - configure to get from Tika?
-    #       # t.encoding
-    #     }
-    #     t.text
-    #     t.audio
-    #     t.video
-    #   }
-    #
-    #   ## proxy terms
-    #
-    #   # identification / identity
-    #   t.format_label         proxy: [:identification, :identity, :format_label]
-    #   t.format_version       proxy: [:identification, :identity, :version]
-    #   t.media_type           proxy: [:identification, :identity, :mimetype]
-    #   t.pronom_identifier    proxy: [:identification, :identity, :pronom_identifier]
-    #
-    #   # filestatus
-    #   t.valid                proxy: [:filestatus, :valid]
-    #   t.well_formed          proxy: [:filestatus, :well_formed]
-    #
-    #   # fileinfo
-    #   t.created              proxy: [:fileinfo, :created]
-    #   t.creating_application proxy: [:fileinfo, :creatingApplicationName]
-    #   t.extent               proxy: [:fileinfo, :size]
-    #   t.md5                  proxy: [:fileinfo, :md5checksum]
-    #
-    #   # image metadata
-    #   t.color_space          proxy: [:metadata, :image, :colorSpace]
-    #   t.icc_profile_name     proxy: [:metadata, :image, :iccProfileName]
-    #   t.icc_profile_version  proxy: [:metadata, :image, :iccProfileVersion]
-    #   t.image_height         proxy: [:metadata, :image, :imageHeight]
-    #   t.image_width          proxy: [:metadata, :image, :imageWidth]
-    # end
-    #
-    # def self.xml_template
-    #   builder = Nokogiri::XML::Builder.new do |xml|
-    #     xml.fits("xmlns"=>FITS_XMLNS,
-    #              "xmlns:xsi"=>"http://www.w3.org/2001/XMLSchema-instance",
-    #              "xsi:schemaLocation"=>"http://hul.harvard.edu/ois/xml/ns/fits/fits_output http://hul.harvard.edu/ois/xml/xsd/fits/fits_output.xsd")
-    #   end
-    #   builder.doc
-    # end
-    #
-    # def prefix
-    #   "fits__"
-    # end
-
   end
 end

data/lib/ddr/index.rb

@@ -19,10 +19,10 @@ module Ddr
     autoload :SortOrder
     autoload :UniqueKeyField
 
-    def self.pids
+    def self.ids
       builder = QueryBuilder.new { field UniqueKeyField.instance }
       query = builder.query
-      query.pids
+      query.ids
     end
 
   end

data/lib/ddr/index/fields.rb

@@ -38,6 +38,7 @@ module Ddr::Index
     DISPLAY_FORMAT                = Field.new :display_format, :stored_sortable
     DOI                           = Field.new :doi, :symbol
     EAD_ID                        = Field.new :ead_id, :stored_sortable
+    EFFECTIVE_ROLE                = Field.new :effective_role, :symbol
     ENGRAVER_FACET                = Field.new :engraver_facet, :facetable
     EXTRACTED_TEXT                = Field.new :extracted_text, solr_name: "extracted_text_tsm"
     FCREPO3_PID                   = Field.new :fcrepo3_pid, :stored_sortable

data/lib/ddr/managers/technical_metadata_manager.rb

@@ -2,7 +2,9 @@ module Ddr
   module Managers
     class TechnicalMetadataManager < Manager
 
-      FITS_TIMESTAMP_FORMAT = "%D %l:%M %p" # Ex. 7/3/15 8:29 PM
+      FITS_141_TIMESTAMP_FORMAT = "%D %l:%M %p" # Ex. 7/3/15 8:29 PM
+      FITS_150_TIMESTAMP_FORMAT = "%D, %l:%M %p" # Ex. 7/3/15, 8:29 PM
+      FITS_TIMESTAMP_FORMATS = [ FITS_141_TIMESTAMP_FORMAT, FITS_150_TIMESTAMP_FORMAT ]
 
       delegate :content, to: :object
 
@@ -43,9 +45,12 @@ module Ddr
 
       def fits_datetime
         if fits_timestamp = fits.timestamp.first
-          # no_zone = DateTime.strptime(fits_timestamp, FITS_TIMESTAMP_FORMAT)
-          # no_zone.change(offset: no_zone.to_time.zone)
-          Time.zone.strptime(fits_timestamp, FITS_TIMESTAMP_FORMAT)
+          parsed = nil
+          FITS_TIMESTAMP_FORMATS.each do |format|
+            parsed = Time.zone.strptime(fits_timestamp, format) rescue nil
+            break if parsed
+          end
+          parsed
         end
       end
 

data/lib/ddr/structure.rb

@@ -82,6 +82,7 @@ module Ddr
 
     def add_filesec(id:nil)
       filesec = Ddr::Structures::FileSec.build(id: id, document: as_xml_document)
+      
       root.add_child(filesec)
       filesec
     end
@@ -92,7 +93,7 @@ module Ddr
       filegrp
     end
 
-    def add_file(parent:, id:SecureRandom.uuid, use:nil)
+    def add_file(parent:, id: "id_" + SecureRandom.uuid, use:nil)
       file = Ddr::Structures::File.build(id: id, use: use, document: as_xml_document)
       parent.add_child(file)
       file

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-core
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Jim Coble
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-05 00:00:00.000000000 Z
+date: 2019-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
@@ -209,6 +209,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: equivalent-xml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
@@ -308,12 +322,15 @@ files:
 - app/models/concerns/ddr/solr_document_behavior.rb
 - app/models/concerns/ddr/streamable.rb
 - app/models/ddr/admin_set.rb
+- app/models/ddr/alert.rb
 - app/models/ddr/attachment.rb
+- app/models/ddr/auxiliary_resource.rb
 - app/models/ddr/collection.rb
 - app/models/ddr/component.rb
 - app/models/ddr/contact.rb
 - app/models/ddr/digest.rb
 - app/models/ddr/file.rb
+- app/models/ddr/finding_aid.rb
 - app/models/ddr/item.rb
 - app/models/ddr/language.rb
 - app/models/ddr/media_type.rb
@@ -419,7 +436,8 @@ files:
 homepage: https://gitlab.oit.duke.edu/ddr/ddr-core
 licenses:
 - BSD-3-Clause
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -435,8 +453,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.9
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Models used in the Duke Digital Repository