curation_concerns-models 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ee33d07e558f4b7b09fdfc143622e41c840deb7
-  data.tar.gz: b369d41f6e0e124d635812208b2b0c922d4626c0
+  metadata.gz: 751ba26c49fed8bea1d1370b62c9328c79557fc5
+  data.tar.gz: 02b5c38026d958d476706fa702cdf89ae387eb12
 SHA512:
-  metadata.gz: b8fd340a961cbcc0930b8344acd29d6aaad67ebe307db9bc3993e167ac72c4a81325ac10ab5c42ed8fb3399238eb7504cfd61df923857c854f79d9f313ca2302
-  data.tar.gz: 0841f2b19fc34d54970627258bb62ff4d8ab0c1f8fc3181209a9f80f3f8b106b788b96c698f511fb885cfd080dee01d97fea95641a27a1708ee67a102a8bef49
+  metadata.gz: aca555d737b66f5ea3edec7e932dff73e583e4603bc0d49f84a703078acf31c25eda5b26e6b6d57d4f4faba305a8b20b676ecd01fee3707c299edfd1eb553e91
+  data.tar.gz: d16af7b1638fd15f5ec147e36842334b3d2c159f3e2456357e37691f379ce513b63f1669e38e3af70ccf7e32ffcf3795ba0c5b8038abb1045cea226f131ff59c

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

@@ -18,8 +18,13 @@ module CurationConcerns
       # Destroy the list source first.  This prevents each file_set from attemping to
       # remove itself individually from the work. If hundreds of files are attached,
       # this would take too long.
+
+      # Get list of member file_sets from Solr
+      fs = file_sets
       list_source.destroy
-      file_sets.each(&:destroy)
+      # Remove Work from Solr after it was removed from Fedora
+      ActiveFedora::SolrService.delete(id)
+      fs.each(&:destroy)
     end
 
     def copy_visibility_to_files

data/app/models/curation_concerns/classify_concern.rb

@@ -25,7 +25,7 @@ module CurationConcerns
     end
 
     def curation_concern_class
-      if possible_curation_concern_types.detect do|_name, class_name|
+      if possible_curation_concern_types.detect do |_name, class_name|
         class_name == curation_concern_type
       end
         self.class.to_class(curation_concern_type)

data/curation_concerns-models.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'active_attr'
   spec.add_dependency 'hydra-collections', '~> 7.0'
   spec.add_dependency 'hydra-head', '~> 9.3'
-  spec.add_dependency 'hydra-works', '~> 0.6'
+  spec.add_dependency 'hydra-works', '~> 0.7'
   spec.add_dependency 'active_fedora-noid', '~> 1.0'
   spec.add_dependency 'resque', '~> 1.23'
   spec.add_dependency 'resque-pool', '~> 0.3'

data/lib/curation_concerns/configuration.rb

@@ -14,12 +14,16 @@ module CurationConcerns
   class Configuration
     include Callbacks
 
+    def initialize
+      @registered_concerns = []
+    end
+
     # An anonymous function that receives a path to a file
     # and returns AntiVirusScanner::NO_VIRUS_FOUND_RETURN_VALUE if no
     # virus is found; Any other returned value means a virus was found
     attr_writer :default_antivirus_instance
     def default_antivirus_instance
-      @default_antivirus_instance ||= lambda do|_file_path|
+      @default_antivirus_instance ||= lambda do |_file_path|
         AntiVirusScanner::NO_VIRUS_FOUND_RETURN_VALUE
       end
     end
@@ -119,19 +123,20 @@ module CurationConcerns
     # @param [Array<Symbol>,Symbol] curation_concern_types
     def register_curation_concern(*curation_concern_types)
       Array(curation_concern_types).flatten.compact.each do |cc_type|
-        class_name = normalize_concern_name(cc_type)
-        unless registered_curation_concern_types.include?(class_name)
-          registered_curation_concern_types << class_name
+        unless @registered_concerns.include?(cc_type)
+          @registered_concerns << cc_type
         end
       end
     end
 
-    # Returns the class names (strings) of the registered curation concerns
+    # The normalization done by this method must occur after the initialization process
+    # so it can take advantage of irregular inflections from config/initializers/inflections.rb
+    # @return [Array<String>] the class names of the registered curation concerns
     def registered_curation_concern_types
-      @registered_curation_concern_types ||= []
+      @registered_concerns.map { |cc_type| normalize_concern_name(cc_type) }
     end
 
-    # Returns the classes of the registered curation concerns
+    # @return [Array<Class>] the registered curation concerns
     def curation_concerns
       registered_curation_concern_types.map(&:constantize)
     end

data/lib/curation_concerns/models/version.rb

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

data/lib/tasks/migrate.rake

@@ -1,6 +1,5 @@
- namespace :curation_concerns do
+namespace :curation_concerns do
   namespace :migrate do
-
     desc "Migrate audit logs"
     task audit_logs: :environment do
       ChecksumAuditLog.all.each do |cs|
@@ -8,6 +7,5 @@
         cs.save
       end
     end
-
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: curation_concerns-models
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-26 00:00:00.000000000 Z
+date: 2016-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_attr
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: active_fedora-noid
   requirement: !ruby/object:Gem::Requirement
@@ -259,7 +259,6 @@ files:
 - lib/generators/curation_concerns/models/templates/migrations/create_checksum_audit_logs.rb
 - lib/generators/curation_concerns/models/templates/migrations/create_single_use_links.rb
 - lib/generators/curation_concerns/models/templates/migrations/create_version_committers.rb
-- lib/tasks/curation_concerns-models_tasks.rake
 - lib/tasks/migrate.rake
 - lib/tasks/resque.rake
 - lib/tasks/solr_reindex.rake

data/lib/tasks/curation_concerns-models_tasks.rake

@@ -1,17 +0,0 @@
-import File.join(Gem::Specification.find_by_name('hydra-works').gem_dir,
-                     'lib/tasks/hydra-works_tasks.rake')
-
-namespace :curation_concerns do
-  namespace :jetty do
-
-    desc 'Configure jetty with full-text indexing'
-    task config: :download_jars do
-      Rake::Task['jetty:config'].invoke
-    end
-
-    desc 'Download Solr full-text extraction jars using Hydra::Works'
-    task :download_jars do
-      Rake::Task['hydra_works:jetty:download_jars'].invoke
-    end
-  end
-end