ddr-models 2.5.3 → 2.6.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b22fafd7e310b7f3d54f41a40c50cf219bdb1d8e
-  data.tar.gz: 90f815713bb8ae78c4b265192e729b13f758e103
+  metadata.gz: edadac3d26e329ebd8cd6ce67e3d92c10e2233da
+  data.tar.gz: 70aefbe23b138eedb961dd6cc24886a3ad4691ed
 SHA512:
-  metadata.gz: 38f710413a57cbae1f797ac9741c221e5ec364c254ac59fcff2c20da39bea086541599cfad173bac2b6fb52b20b68db5f6baf9aa52bdb5f6e7a27bb5c65ffc34
-  data.tar.gz: c7f14d40ffdd5992f39f4e8141aa7635213f612acc9602bd67677e2318f1b38a2e9103aca39f1fe8f0ac6a053505b5706fcbf4feb8b078894833d5b3648ced0c
+  metadata.gz: 73f1a830f3a2763d9a867505260286d5c50836d530551d758b92351339af451c67eb4572f5924501017d271bedbef692a1ff9981469f589c4fe796e187e05bbe
+  data.tar.gz: 1a2541c01cdf459f64ec0b9ee291479f77446b845da398c13038d721c48c69d9a3641a25f83a56ea7f673d555e096f99ff2c1a670705d298dc773b444389c51e

data/app/controllers/users/sessions_controller.rb

@@ -10,9 +10,4 @@ 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/config/initializers/devise.rb

@@ -218,14 +218,15 @@ Devise.setup do |config|
   # Explicit require is needed here for devise to find strategy
   require "omniauth-shibboleth"
   config.omniauth :shibboleth, {
-    uid_field: "eppn",
+    uid_field: lambda { |rpm| rpm.call("eppn") || rpm.call("duDukeID") },
     name_field: "displayName",
     info_fields: {
       email: "mail",
       first_name: "givenName",
       last_name: "sn",
       nickname: "eduPersonNickname"
-    }
+    },
+    extra_fields: ["duDukeID"],
   }
 
   # ==> Warden configuration

data/config/initializers/rsolr_monkey_patches.rb

@@ -0,0 +1,7 @@
+require 'rsolr'
+
+module RSolr
+  class << self
+    alias_method :escape, :solr_escape
+  end
+end

data/config/initializers/subscriptions.rb

@@ -17,8 +17,6 @@ ActiveSupport::Notifications.subscribe(Ddr::Notifications::UPDATE, Ddr::Events::
 # Deletion
 ActiveSupport::Notifications.subscribe(Ddr::Notifications::DELETION, Ddr::Events::DeletionEvent)
 ActiveSupport::Notifications.subscribe(/destroy\.\w+/, Ddr::Events::DeletionEvent)
-ActiveSupport::Notifications.subscribe(/destroy\.\w+/, Ddr::Jobs::PermanentId::MakeUnavailable)
 
 # Deaccession
 ActiveSupport::Notifications.subscribe(/deaccession\.\w+/, Ddr::Events::DeaccessionEvent)
-ActiveSupport::Notifications.subscribe(/deaccession\.\w+/, Ddr::Jobs::PermanentId::MakeUnavailable)

data/ddr-models.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
 
   s.require_paths = ["lib", "app/models"]
 
-  s.add_dependency "rails", "~> 4.1.6"
+  s.add_dependency "rails", "~> 4.1"
   s.add_dependency "activeresource"
   s.add_dependency "active-fedora", "~> 7.0"
   s.add_dependency "hydra-core", "~> 7.2"
@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
   s.add_dependency "ddr-antivirus", "~> 2.1.1"
   s.add_dependency "virtus", "~> 1.0.5"
   s.add_dependency "hashie", "~> 3.4", "< 3.4.4"
+  s.add_dependency "edtf", "~> 3.0"
 
   s.add_development_dependency "bundler", "~> 1.11"
   s.add_development_dependency "rake"

data/lib/ddr/actions/virus_check.rb

@@ -1,4 +1,3 @@
-require "open3"
 require "ostruct"
 require "shellwords"
 

data/lib/ddr/auth.rb

@@ -91,10 +91,6 @@ module Ddr
       false
     end
 
-    mattr_accessor :sso_logout_url do
-      "/Shibboleth.sso/Logout?return=https://shib.oit.duke.edu/cgi-bin/logout.pl"
-    end
-
     # Grouper gateway implementation
     mattr_accessor :grouper_gateway do
       GrouperGateway

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

@@ -12,19 +12,20 @@ module Ddr
 
       private
 
-      def has_permission?(permission, obj)
-        permissions(obj).include? permission
+      def has_permission?(permission, object_or_id)
+        permissions(object_or_id).include? permission
       end
 
-      def permissions(obj)
-        case obj
+      def permissions(object_or_id)
+        case object_or_id
         when Ddr::Models::Base, SolrDocument
-          cached_permissions obj.pid do
-            obj.effective_permissions(agents)
+          cached_permissions(object_or_id.id) do
+            object_or_id.effective_permissions(agents)
           end
         when String
-          cached_permissions obj do
-            permissions_doc(obj).effective_permissions(agents)
+          cached_permissions(object_or_id) do
+            doc = SolrDocument.find(object_or_id) # raises SolrDocument::NotFound
+            doc.effective_permissions(agents)
           end
         end
       end
@@ -33,14 +34,6 @@ module Ddr
         cache[pid] ||= block.call
       end
 
-      def permissions_doc(pid)
-        roles_query_result = ActiveFedora::SolrService.query("id:\"#{pid}\"", rows: 1).first
-        if roles_query_result.nil?
-          raise "Solr document not found for PID \"#{pid}\"."
-        end
-        SolrDocument.new roles_query_result
-      end
-
     end
   end
 end

data/lib/ddr/derivatives/generator.rb

@@ -5,8 +5,6 @@ module Ddr
 
       attr_reader :source, :output, :options
 
-      GeneratorResult = Struct.new(:stdout, :stderr, :status)
-
       def initialize source, output, options=nil
         raise ArgumentError, "Source must be a File or path to a file" unless Ddr::Utils.file_or_path?(source)
         raise ArgumentError, "Output must be a File or path to a file" unless Ddr::Utils.file_or_path?(output)

data/lib/ddr/derivatives/png_generator.rb

@@ -1,5 +1,3 @@
-require 'open3'
-
 module Ddr
   module Derivatives
     class PngGenerator < Generator
@@ -10,8 +8,8 @@ module Ddr
 
       def generate
         command = "convert #{Ddr::Utils.file_path(source)}[0] #{options} png:#{Ddr::Utils.file_path(output)}"
-        out, err, s = Open3.capture3(command)
-        GeneratorResult.new(out, err, s)
+        `#{command}`
+        $?.exitstatus
       end
 
     end

data/lib/ddr/derivatives/ptif_generator.rb

@@ -1,5 +1,3 @@
-require 'open3'
-
 module Ddr
   module Derivatives
     class PtifGenerator < Generator
@@ -27,19 +25,20 @@ module Ddr
 
       def run_generator(source_to_use)
         command = "vips im_vips2tiff #{Ddr::Utils.file_path(source_to_use)} #{Ddr::Utils.file_path(output)}:#{options}"
-        out, err, s = Open3.capture3(command)
-        GeneratorResult.new(out, err, s)
+        `#{command}`
+        $?.exitstatus
       end
 
       def make_8_bit(tempdir)
         temp_8_bit = File.new(File.join(tempdir, "temp_8_bit.v"), 'wb')
         command = "vips im_msb #{Ddr::Utils.file_path(source)} #{Ddr::Utils::file_path(temp_8_bit)}"
-        out, err, s = Open3.capture3(command)
-        if s.success?
+        `#{command}`
+        exitstatus = $?.exitstatus
+        if exitstatus == 0
           return temp_8_bit
         else
           raise Ddr::Models::DerivativeGenerationFailure,
-                  "Error converting #{Ddr::Utils.file_path(source)} to 8-bit: #{err}"
+                  "Error converting #{Ddr::Utils.file_path(source)} to 8-bit"
         end
       end
 

data/lib/ddr/index/fields.rb

@@ -10,6 +10,7 @@ module Ddr::Index
     ADMIN_SET_FACET             = Field.new :admin_set_facet, :facetable
     ADMIN_SET_TITLE             = Field.new :admin_set_title, :stored_sortable
     ALL_TEXT                    = Field.new :all_text, solr_name: "all_text_timv"
+    ARRANGER_FACET              = Field.new :arranger_facet, :facetable
     ASPACE_ID                   = Field.new :aspace_id, :stored_sortable
     ATTACHED_FILES_HAVING_CONTENT =
       Field.new :attached_files_having_content, :symbol
@@ -19,6 +20,7 @@ module Ddr::Index
     COLLECTION_TITLE            = Field.new :collection_title, :stored_sortable
     COLLECTION_URI              = Field.new :collection_uri, :symbol
     COMPANY_FACET               = Field.new :company_facet, :facetable
+    COMPOSER_FACET              = Field.new :composer_facet, :facetable
     CONTENT_CONTROL_GROUP       = Field.new :content_control_group, :searchable, type: :string
     CONTENT_CREATE_DATE         = Field.new :content_create_date, :stored_sortable, type: :date
     CONTENT_SIZE                = Field.new :content_size, solr_name: "content_size_lsi"
@@ -31,12 +33,18 @@ module Ddr::Index
     DISPLAY_FORMAT              = Field.new :display_format, :stored_sortable
     DOI                         = Field.new :doi, :symbol
     EAD_ID                      = Field.new :ead_id, :stored_sortable
+    ENGRAVER_FACET              = Field.new :engraver_facet, :facetable
     EXTRACTED_TEXT              = Field.new :extracted_text, solr_name: "extracted_text_tsm"
     FOLDER_FACET                = Field.new :folder_facet, :facetable
     FORMAT_FACET                = Field.new :format_facet, :facetable
+    GENRE_FACET                 = Field.new :genre_facet, :facetable
     HAS_MODEL                   = Field.new :has_model, :symbol
     IDENTIFIER_ALL              = Field.new :identifier_all, :symbol
+    ILLUSTRATED_FACET           = Field.new :illustrated_facet, :facetable
+    ILLUSTRATOR_FACET           = Field.new :illustrator_facet, :facetable
+    INSTRUMENTATION_FACET       = Field.new :instrumentation_facet, :facetable
     INTERNAL_URI                = Field.new :internal_uri, :stored_sortable
+    INTERVIEWER_NAME_FACET      = Field.new :interviewer_name_facet, :facetable
     IS_ATTACHED_TO              = Field.new :is_attached_to, :symbol
     IS_EXTERNAL_TARGET_FOR      = Field.new :is_external_target_for, :symbol
     IS_GOVERNED_BY              = Field.new :is_governed_by, :symbol
@@ -49,7 +57,9 @@ module Ddr::Index
     LAST_VIRUS_CHECK_ON         = Field.new :last_virus_check_on, :stored_sortable, type: :date
     LAST_VIRUS_CHECK_OUTCOME    = Field.new :last_virus_check_outcome, :symbol
     LICENSE                     = Field.new :license, :stored_sortable
+    LITHOGRAPHER_FACET          = Field.new :lithographer_facet, :facetable
     LOCAL_ID                    = Field.new :local_id, :stored_sortable
+    LYRICIST_FACET              = Field.new :lyricist_facet, :facetable
     MEDIA_SUB_TYPE              = Field.new :content_media_sub_type, :facetable
     MEDIA_MAJOR_TYPE            = Field.new :content_media_major_type, :facetable
     MEDIA_TYPE                  = Field.new :content_media_type, :symbol
@@ -59,20 +69,24 @@ module Ddr::Index
     OBJECT_STATE                = Field.new :object_state, :stored_sortable
     OBJECT_CREATE_DATE          = Field.new :system_create, :stored_sortable, type: :date
     OBJECT_MODIFIED_DATE        = Field.new :system_modified, :stored_sortable, type: :date
+    PERFORMER_FACET             = Field.new :performer_facet, :facetable
     PERMANENT_ID                = Field.new :permanent_id, :stored_sortable, type: :string
     PERMANENT_URL               = Field.new :permanent_url, :stored_sortable, type: :string
     PLACEMENT_COMPANY_FACET     = Field.new :placement_company_facet, :facetable
     POLICY_ROLE                 = Field.new :policy_role, :symbol
+    PRODUCER_FACET              = Field.new :producer_facet, :facetable
     PRODUCT_FACET               = Field.new :product_facet, :facetable
     PUBLICATION_FACET           = Field.new :publication_facet, :facetable
     PUBLISHER_FACET             = Field.new :publisher_facet, :facetable
     RESEARCH_HELP_CONTACT       = Field.new :research_help_contact, :stored_sortable
     RESOURCE_ROLE               = Field.new :resource_role, :symbol
+    ROLL_NUMBER_FACET           = Field.new :roll_number_facet, :facetable
     SERIES_FACET                = Field.new :series_facet, :facetable
     SETTING_FACET               = Field.new :setting_facet, :facetable
     SPATIAL_FACET               = Field.new :spatial_facet, :facetable
     STRUCT_MAPS                 = Field.new :struct_maps, :stored_sortable
     SUBJECT_FACET               = Field.new :subject_facet, :facetable
+    SUBSERIES_FACET             = Field.new :subseries_facet, :facetable
     TECHMD_COLOR_SPACE          = Field.new :techmd_color_space, :symbol
     TECHMD_CREATING_APPLICATION = Field.new :techmd_creating_application, :symbol
     TECHMD_CREATION_TIME        = Field.new :techmd_creation_time, :stored_searchable, type: :date
@@ -90,9 +104,11 @@ module Ddr::Index
     TECHMD_PRONOM_IDENTIFIER    = Field.new :techmd_pronom_identifier, :symbol
     TECHMD_VALID                = Field.new :techmd_valid, :symbol
     TECHMD_WELL_FORMED          = Field.new :techmd_well_formed, :symbol
+    TEMPORAL_FACET              = Field.new :temporal_facet, :facetable
     TITLE                       = Field.new :title, :stored_sortable
     TONE_FACET                  = Field.new :tone_facet, :facetable
     TYPE_FACET                  = Field.new :type_facet, :facetable
+    VOLUME_FACET                = Field.new :volume_facet, :facetable
     WORKFLOW_STATE              = Field.new :workflow_state, :stored_sortable
     YEAR_FACET                  = Field.new :year_facet, solr_name: "year_facet_iim"
 
@@ -101,13 +117,13 @@ module Ddr::Index
     end
 
     def self.techmd
-      @techmd ||= constants(false).select { |c| c =~ /\ATECHMD_/ }.map { |c| const_get(c) }
+      @techmd ||= constants(false).select { |c| c =~ /\ATECHMD_/ }.map { |c| const_get(c) }.freeze
     end
 
     def self.descmd
       @descmd ||= Ddr::Datastreams::DescriptiveMetadataDatastream.properties.map do |base, config|
         Field.new base, *(config.behaviors)
-      end
+      end.freeze
     end
 
     def self.const_missing(name)

data/lib/ddr/jobs.rb

@@ -5,12 +5,8 @@ module Ddr
     autoload :FitsFileCharacterization
     autoload :FixityCheck
     autoload :Job
-    autoload :PermanentId
     autoload :Queue
     autoload :UpdateIndex
 
-    autoload_at 'ddr/jobs/permanent_id' do
-      autoload :MakeUnavailable
-    end
   end
 end

data/lib/ddr/managers.rb

@@ -4,7 +4,6 @@ module Ddr
 
     autoload :Manager
     autoload :DerivativesManager
-    autoload :PermanentIdManager
     autoload :TechnicalMetadataManager
     autoload :WorkflowManager
 

data/lib/ddr/managers/derivatives_manager.rb

@@ -56,17 +56,16 @@ module Ddr
           tempdir = FileUtils.mkdir(tempdir_path).first
           generator_source = create_source_file(tempdir)
           generator_output = File.new(File.join(tempdir, "output.out"), 'wb')
-          results = derivative.generator.new(generator_source.path, generator_output.path, derivative.options).generate
+          exitstatus = derivative.generator.new(generator_source.path, generator_output.path, derivative.options).generate
           generator_source.close unless generator_source.closed?
-          if results.status.success?
+          if exitstatus == 0
             generator_output = File.open(generator_output, 'rb')
             object.reload if object.persisted?
             object.add_file generator_output, derivative.datastream, mime_type: derivative.generator.output_mime_type
             object.save!
           else
-            Rails.logger.error results.stderr
             raise Ddr::Models::DerivativeGenerationFailure,
-                    "Failure generating #{derivative.name} for #{object.pid}: #{results.stderr}"
+                    "Failure generating #{derivative.name} for #{object.pid}"
           end
           generator_output.close unless generator_output.closed?
         ensure

data/lib/ddr/managers/workflow_manager.rb

@@ -9,6 +9,9 @@ module Ddr
         object.workflow_state == PUBLISHED
       end
 
+      def unpublished?
+        object.workflow_state == UNPUBLISHED
+      end
 
       def publish!(include_descendants: true)
         unless published?

data/lib/ddr/models.rb

@@ -89,9 +89,6 @@ module Ddr
     # Image server URL
     mattr_accessor :image_server_url
 
-    # Whether permanent IDs should be automatically assigned on create
-    mattr_accessor :auto_assign_permanent_ids
-
     mattr_accessor :permanent_id_target_url_base do
       "https://repository.duke.edu/id/"
     end
@@ -116,6 +113,12 @@ module Ddr
       Dir.tmpdir
     end
 
+    # Is repository locked?  Default is false.
+    # A locked repository behaves as though each object in the repository is locked.
+    mattr_accessor :repository_locked do
+      false
+    end
+
     # Yields an object with module configuration accessors
     def self.configure
       yield self

data/lib/ddr/models/base.rb

@@ -23,6 +23,8 @@ module Ddr
       deprecation_deprecate *(Hydra::AccessControls::Permissions.public_instance_methods)
 
       around_save :notify_save
+      around_save :notify_workflow_change, if: [:workflow_state_changed?, :persisted?]
+      after_create :notify_create
       around_deaccession :notify_deaccession
       around_destroy :notify_destroy
 
@@ -128,6 +130,17 @@ module Ddr
         end
       end
 
+      def notify_workflow_change
+        ActiveSupport::Notifications.instrument("#{workflow_state}.workflow.#{self.class.to_s.underscore}", pid: pid) do |payload|
+          yield
+        end
+      end
+
+      def notify_create
+        ActiveSupport::Notifications.instrument("create.#{self.class.to_s.underscore}",
+                                                pid: pid)
+      end
+
       def notify_deaccession
         ActiveSupport::Notifications.instrument("deaccession.#{self.class.to_s.underscore}",
                                                 pid: pid,

data/lib/ddr/models/has_admin_metadata.rb

@@ -22,16 +22,12 @@ module Ddr::Models
                      :ead_id,
                      :aspace_id,
                      :is_locked,
+                     :doi,
                      datastream: "adminMetadata",
                      multiple: false
 
-      delegate :publish!, :unpublish!, :published?, to: :workflow
-
-      after_create :assign_permanent_id!, if: "Ddr::Models.auto_assign_permanent_ids"
-    end
-
-    def permanent_id_manager
-      @permanent_id_manager ||= Ddr::Managers::PermanentIdManager.new(self)
+      delegate :publish!, :unpublish!, :published?, :unpublished?,
+               to: :workflow
     end
 
     def roles
@@ -46,10 +42,6 @@ module Ddr::Models
       @workflow ||= Ddr::Managers::WorkflowManager.new(self)
     end
 
-    def assign_permanent_id!
-      permanent_id_manager.assign_later
-    end
-
     def grant_roles_to_creator(creator)
       roles.grant type: Ddr::Auth::Roles::EDITOR,
                   agent: creator,
@@ -83,7 +75,7 @@ module Ddr::Models
     end
 
     def locked?
-      !!is_locked
+      !!is_locked || Ddr::Models.repository_locked
     end
 
     def lock
@@ -104,13 +96,5 @@ module Ddr::Models
       save
     end
 
-    private
-
-    def update_permanent_id_on_destroy
-      @permanent_id = permanent_id
-      yield
-      Resque.enqueue(Ddr::Jobs::PermanentId::MakeUnavailable, @permanent_id, "deleted")
-    end
-
   end
 end