curation_concerns-models 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1dc6348bb2734470db744f9c7b4532f6410890c
-  data.tar.gz: 424331ad60e04ccad8f5bb7f3d917231707e8fa1
+  metadata.gz: 1ee33d07e558f4b7b09fdfc143622e41c840deb7
+  data.tar.gz: b369d41f6e0e124d635812208b2b0c922d4626c0
 SHA512:
-  metadata.gz: 5e4cb52ebf896972e4a735c237c913ddb8cadebb801f49ae4746fedcd15ce34c61d178ce1b577561dbd3504d8e53c55ad71ce8b582231b599d6d80099ec0bceb
-  data.tar.gz: 39528c6857a9c92c36e16119c3ec1d95a35f8969feeadde030b1ae97f86b9de6288400dc586e56f159862c030f0a042837e283de73876201655f33497f0b1c05
+  metadata.gz: b8fd340a961cbcc0930b8344acd29d6aaad67ebe307db9bc3993e167ac72c4a81325ac10ab5c42ed8fb3399238eb7504cfd61df923857c854f79d9f313ca2302
+  data.tar.gz: 0841f2b19fc34d54970627258bb62ff4d8ab0c1f8fc3181209a9f80f3f8b106b788b96c698f511fb885cfd080dee01d97fea95641a27a1708ee67a102a8bef49

data/app/actors/curation_concerns/base_actor.rb

@@ -70,11 +70,7 @@ module CurationConcerns
       # => { 'title' => ['first', 'second'] }
       def remove_blank_attributes!
         multivalued_form_attributes.each_with_object(attributes) do |(k, v), h|
-          if v.instance_of? Array
-            h[k] = v.select(&:present?)
-          else
-            h[k] = v
-          end
+          h[k] = v.instance_of?(Array) ? v.select(&:present?) : v
         end
       end
 

data/app/jobs/active_fedora_id_based_job.rb

@@ -7,7 +7,7 @@ class ActiveFedoraIdBasedJob < ActiveJob::Base
     @object ||= ActiveFedora::Base.find(id)
   end
 
-  alias_method :file_set, :object
+  alias file_set object
 
   def perform(_)
     fail 'Define #run in a subclass'

data/app/models/concerns/curation_concerns/collection_behavior.rb

@@ -13,20 +13,10 @@ module CurationConcerns
       validates :title, presence: true
     end
 
-    def add_member(collectible)
-      return unless can_add_to_members?(collectible)
-      members << collectible
-      save
-    end
-
     def to_s
       title.present? ? title : 'No Title'
     end
 
-    def can_be_member_of_collection?(collection)
-      collection != self
-    end
-
     module ClassMethods
       def indexer
         CurationConcerns::CollectionIndexer
@@ -61,16 +51,12 @@ module CurationConcerns
       # Field name to look up when locating the size of each file in Solr.
       # Override for your own installation if using something different
       def file_size_field
-        Solrizer.solr_name(:file_size, FileSetIndexer::STORED_INTEGER)
+        Solrizer.solr_name(:file_size, CurationConcerns::FileSetIndexer::STORED_INTEGER)
       end
 
       # Solr field name collections and works use to index member ids
       def member_ids_field
         Solrizer.solr_name('member_ids', :symbol)
       end
-
-      def can_add_to_members?(collectible)
-        collectible.try(:can_be_member_of_collection?, self)
-      end
   end
 end

data/app/models/concerns/curation_concerns/file_set/derivatives.rb

@@ -7,6 +7,7 @@ module CurationConcerns
         Hydra::Derivatives.source_file_service = CurationConcerns::LocalFileService
         Hydra::Derivatives.output_file_service = CurationConcerns::PersistDerivatives
         Hydra::Derivatives::FullTextExtract.output_file_service = CurationConcerns::PersistDirectlyContainedOutputFileService
+        after_destroy :cleanup_derivatives
       end
 
       # This completely overrides the version in Hydra::Works so that we
@@ -46,9 +47,19 @@ module CurationConcerns
         # The destination_name parameter has to match up with the file parameter
         # passed to the DownloadsController
         def derivative_url(destination_name)
-          path = DerivativePath.derivative_path_for_reference(self, destination_name)
+          path = derivative_path_factory.derivative_path_for_reference(self, destination_name)
           URI("file://#{path}").to_s
         end
+
+        def cleanup_derivatives
+          derivative_path_factory.derivatives_for_reference(self).each do |path|
+            FileUtils.rm_f(path)
+          end
+        end
+
+        def derivative_path_factory
+          DerivativePath
+        end
     end
   end
 end

data/app/models/concerns/curation_concerns/human_readable_type.rb

@@ -3,14 +3,10 @@ module CurationConcerns
     extend ActiveSupport::Concern
 
     included do
-      class_attribute :human_readable_short_description, :human_readable_type
+      class_attribute :human_readable_type
       self.human_readable_type = name.demodulize.titleize
     end
 
-    def human_readable_type
-      self.class.human_readable_type
-    end
-
     def to_solr(solr_doc = {})
       super(solr_doc).tap do |doc|
         doc[Solrizer.solr_name('human_readable_type', :facetable)] = human_readable_type

data/app/models/concerns/curation_concerns/work_behavior.rb

@@ -32,8 +32,4 @@ module CurationConcerns::WorkBehavior
       'No Title'
     end
   end
-
-  def can_be_member_of_collection?(_collection)
-    true
-  end
 end

data/app/services/curation_concerns/derivative_path.rb

@@ -7,16 +7,33 @@ module CurationConcerns
         derivative_path(object, extension_for(destination_name), destination_name)
       end
 
+      # @return [Array<String>] Array of paths to derivatives for this object.
+      def derivatives_for_reference(object)
+        Dir.glob(root_path(object).join("*")).select do |path|
+          path.start_with?(path_prefix(object).to_s)
+        end
+      end
+
       private
 
+        # @param [#id] object Object whose ID is used to generate root path
+        # @return [String] Returns the root path where derivatives will be generated into.
+        def root_path(object)
+          Pathname.new(derivative_path(object, "", "")).dirname
+        end
+
+        # @return <Pathname> Full prefix of the path for object.
+        def path_prefix(object)
+          Pathname.new(CurationConcerns.config.derivatives_path).join(pair_path(object.id))
+        end
+
         def derivative_path(object, extension, destination_name)
           file_name = destination_name + extension
-          File.join(CurationConcerns.config.derivatives_path, pair_path(object.id, file_name))
+          "#{path_prefix(object)}-#{file_name}"
         end
 
-        def pair_path(id, file_name)
-          pair = id.split('').each_slice(2).map(&:join).join('/')
-          "#{pair}-#{file_name}"
+        def pair_path(id)
+          id.split('').each_slice(2).map(&:join).join('/')
         end
 
         def extension_for(destination_name)

data/app/services/curation_concerns/file_set_audit_service.rb

@@ -19,7 +19,7 @@ module CurationConcerns
     # Use this when a file_set is loaded from solr instead of fedora
     def logged_audit_status
       audit_results = ChecksumAuditLog.logs_for(file_set.id, "original_file")
-                      .collect { |result| result["pass"] }
+                                      .collect { |result| result["pass"] }
 
       if audit_results.length > 0
         stat_to_string(audit_results.reduce(true) { |sum, value| sum && value })

data/app/services/curation_concerns/lock_manager.rb

@@ -17,11 +17,8 @@ module CurationConcerns
     def lock(key)
       returned_from_block = nil
       client.lock(key, @ttl) do |locked|
-        if locked
-          returned_from_block = yield
-        else
-          raise UnableToAcquireLockError
-        end
+        raise UnableToAcquireLockError unless locked
+        returned_from_block = yield
       end
       returned_from_block
     end

data/curation_concerns-models.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'active_attr'
-  spec.add_dependency 'hydra-collections', '~> 6.0.0'
+  spec.add_dependency 'hydra-collections', '~> 7.0'
   spec.add_dependency 'hydra-head', '~> 9.3'
   spec.add_dependency 'hydra-works', '~> 0.6'
   spec.add_dependency 'active_fedora-noid', '~> 1.0'

data/lib/curation_concerns/models/utils.rb

@@ -7,12 +7,12 @@ module CurationConcerns
     end
 
     module ClassMethods
-      def retry_unless(number_of_tries, condition, &block)
+      def retry_unless(number_of_tries, condition, &_block)
         fail ArgumentError, 'First argument must be an enumerator' unless number_of_tries.is_a? Enumerator
         fail ArgumentError, 'Second argument must be a lambda' unless condition.respond_to? :call
         fail ArgumentError, 'Must pass a block of code to retry' unless block_given?
         number_of_tries.each do
-          result = block.call
+          result = yield
           return result unless condition.call
         end
         fail 'retry_unless could not complete successfully. Try upping the # of tries?'

data/lib/curation_concerns/models/version.rb

@@ -1,5 +1,5 @@
 module CurationConcerns
   module Models
-    VERSION = "0.5.0"
+    VERSION = "0.6.0".freeze
   end
 end

data/lib/generators/curation_concerns/models/abstract_migration_generator.rb

@@ -12,11 +12,11 @@ class CurationConcerns::Models::AbstractMigrationGenerator < Rails::Generators::
       @prev_migration_nr += 1
     else
       last_migration = Dir[File.join(path, '*.rb')].sort.last
-      if last_migration
-        @prev_migration_nr = last_migration.sub(File.join(path, '/'), '').to_i + 1
-      else
-        @prev_migration_nr = Time.now.utc.strftime('%Y%m%d%H%M%S').to_i
-      end
+      @prev_migration_nr = if last_migration
+                             last_migration.sub(File.join(path, '/'), '').to_i + 1
+                           else
+                             Time.now.utc.strftime('%Y%m%d%H%M%S').to_i
+                           end
     end
     @prev_migration_nr.to_s
   end

data/lib/generators/curation_concerns/models/clamav_generator.rb

@@ -4,10 +4,10 @@ require 'rails/generators'
 class CurationConcerns::Models::ClamavGenerator < Rails::Generators::Base
   source_root File.expand_path('../templates', __FILE__)
 
-  desc ''"
+  desc '
 This generator makes the following changes to your application:
  1. Generates clamav initializer
-       "''
+       '
 
   def banner
     say_status('info', 'Generating clamav initializers', :blue)

data/lib/generators/curation_concerns/models/install_generator.rb

@@ -3,12 +3,12 @@ require_relative 'abstract_migration_generator'
 class CurationConcerns::Models::InstallGenerator < CurationConcerns::Models::AbstractMigrationGenerator
   source_root File.expand_path('../templates', __FILE__)
   argument :model_name, type: :string, default: 'user'
-  desc ''"
+  desc '
 This generator makes the following changes to your application:
  1. Creates several database migrations if they do not exist in /db/migrate
  2. Creates the curation_concerns.rb configuration file and several others
  3. Creates the file_set.rb and collection.rb models
-       "''
+       '
   def banner
     say_status('warning', 'GENERATING CURATION_CONCERNS MODELS', :yellow)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: curation_concerns-models
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-04 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_attr
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: hydra-head
   requirement: !ruby/object:Gem::Requirement