Merge curation_concerns-models into curation_concerns

samvera-deprecated · Apr 5, 2016 · abc7659 · abc7659
1 parent 8163803
commit abc7659
Show file tree

Hide file tree

Showing 110 changed files with 131 additions and 509 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -9,7 +9,7 @@ AllCops:
     - 'script/**/*'
     - 'vendor/**/*'
     - '.internal_test_app/**/*'
-    - 'curation_concerns-models/app/models/concerns/curation_concerns/file_set/export.rb'
+    - 'app/models/concerns/curation_concerns/file_set/export.rb'
 
 Rails:
   Enabled: true
@@ -18,15 +18,15 @@ Performance/RedundantBlockCall:
   # We can remove this exclusion when this commit is released:
   # https://github.com/bbatsov/rubocop/commit/7df382531db4f66cd9872a4f478bd486d6ce6712
   Exclude:
-    - 'curation_concerns-models/lib/curation_concerns/null_logger.rb'
+    - 'lib/curation_concerns/null_logger.rb'
 
 Performance/RedundantMerge:
   Enabled: false
 
 Lint/AssignmentInCondition:
   Exclude:
-    - 'curation_concerns-models/app/services/curation_concerns/persist_derivatives.rb'
-    - 'curation_concerns-models/app/actors/curation_concerns/file_set_actor.rb'
+    - 'app/services/curation_concerns/persist_derivatives.rb'
+    - 'app/actors/curation_concerns/file_set_actor.rb'
 
 Metrics/LineLength:
   Enabled: false
@@ -36,29 +36,29 @@ Metrics/AbcSize:
 
 Metrics/CyclomaticComplexity:
   Exclude:
-    - 'curation_concerns-models/app/services/curation_concerns/file_set_audit_service.rb'
+    - 'app/services/curation_concerns/file_set_audit_service.rb'
     - 'app/controllers/concerns/curation_concerns/file_sets_controller_behavior.rb'
     - 'app/helpers/curation_concerns/curation_concerns_helper_behavior.rb'
     - 'app/helpers/curation_concerns/attribute_helper.rb'
-    - 'curation_concerns-models/app/actors/curation_concerns/file_set_actor.rb'
-    - 'curation_concerns-models/app/actors/curation_concerns/work_actor_behavior.rb'
+    - 'app/actors/curation_concerns/file_set_actor.rb'
+    - 'app/actors/curation_concerns/work_actor_behavior.rb'
 
 Metrics/PerceivedComplexity:
   Exclude:
-    - 'curation_concerns-models/app/services/curation_concerns/file_set_audit_service.rb'
+    - 'app/services/curation_concerns/file_set_audit_service.rb'
     - 'app/controllers/concerns/curation_concerns/file_sets_controller_behavior.rb'
     - 'app/helpers/curation_concerns/curation_concerns_helper_behavior.rb'
     - 'app/helpers/curation_concerns/attribute_helper.rb'
-    - 'curation_concerns-models/app/actors/curation_concerns/file_set_actor.rb'
+    - 'app/actors/curation_concerns/file_set_actor.rb'
 
 Metrics/MethodLength:
   Enabled: false
 
 Metrics/ClassLength:
   Exclude:
-    - curation_concerns-models/lib/curation_concerns/configuration.rb
+    - lib/curation_concerns/configuration.rb
     - 'lib/generators/curation_concerns/templates/catalog_controller.rb'
-    - 'curation_concerns-models/app/actors/curation_concerns/file_set_actor.rb'
+    - 'app/actors/curation_concerns/file_set_actor.rb'
 
 Metrics/ModuleLength:
   Exclude:
@@ -67,7 +67,7 @@ Metrics/ModuleLength:
     - 'app/controllers/concerns/curation_concerns/catalog_controller.rb'
     - 'app/controllers/concerns/curation_concerns/file_sets_controller_behavior.rb'
     - 'app/helpers/curation_concerns/curation_concerns_helper_behavior.rb'
-    - 'curation_concerns-models/app/models/concerns/curation_concerns/solr_document_behavior.rb'
+    - 'app/models/concerns/curation_concerns/solr_document_behavior.rb'
 
 Style/ZeroLengthPredicate:
   Enabled: false
@@ -141,17 +141,17 @@ Style/SingleLineBlockParams:
 
 Style/ClassVars:
   Exclude:
-    - 'curation_concerns-models/lib/curation_concerns/models.rb'
-    - 'curation_concerns-models/lib/curation_concerns/models/engine.rb'
-    - 'curation_concerns-models/app/models/concerns/curation_concerns/file_set/versions.rb'
+    - 'lib/curation_concerns/models.rb'
+    - 'lib/curation_concerns/models/engine.rb'
+    - 'app/models/concerns/curation_concerns/file_set/versions.rb'
 
 Style/SignalException:
   Enabled: false
 
 Rails/Output:
   Exclude:
     - 'lib/generators/**/*'
-    - 'curation_concerns-models/lib/generators/**/*'
+    - 'lib/generators/**/*'
 
 Rails/Date:
   Enabled: false

diff --git a/Gemfile b/Gemfile
@@ -3,8 +3,6 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in curation_concerns.gemspec
 gemspec
 
-gem 'curation_concerns-models', path: './curation_concerns-models'
-
 group :development, :test do
   gem 'rubocop', '~> 0.37.0', require: false
   gem 'rubocop-rspec', '~> 1.3.1', require: false

diff --git a/README.md b/README.md
@@ -40,6 +40,20 @@ Then run the install generator.  You will be prompted if you want to overwrite t
     $ rails generate curation_concerns:install
     $ rake db:migrate
 
+### FITS 0.6.2
+
+To install FITS:
+ * Go to http://projects.iq.harvard.edu/fits/downloads, download __fits-0.6.2.zip__, and unpack it somewhere on your machine. You can also install FITS on OSX with homebrew: `brew install fits` (you may also have to create a symlink from fits.sh -> fits in the next step).
+ * Mark fits.sh as executable (chmod a+x fits.sh)
+ * Run "fits.sh -h" from the command line and see a help message to ensure FITS is properly installed
+ * Give your app access to FITS by:
+     * Adding the full fits.sh path to your PATH (e.g., in your .bash_profile), OR
+     * Changing config/initializers/sufia.rb to point to your FITS location: config.fits_path = "/<your full path>/fits.sh"
+
+### Redis 2.6
+
+The redlock gem requires Redis >= 2.6.
+
 ## Usage
 
 ### Generator

diff --git a/Rakefile b/Rakefile
@@ -9,6 +9,8 @@ require 'active_fedora/rake_support'
 
 Dir.glob('tasks/*.rake').each { |r| import r }
 
+Bundler::GemHelper.install_tasks
+
 namespace :curation_concerns do
   desc 'Run style checker'
   RuboCop::RakeTask.new(:rubocop) do |task|

diff --git a/...ation_concerns/manages_embargoes_actor.rb → ...ation_concerns/manages_embargoes_actor.rb b/...ation_concerns/manages_embargoes_actor.rb → ...ation_concerns/manages_embargoes_actor.rb
diff --git a/...ctors/curation_concerns/abstract_actor.rb → ...ctors/curation_concerns/abstract_actor.rb b/...ctors/curation_concerns/abstract_actor.rb → ...ctors/curation_concerns/abstract_actor.rb
diff --git a/...ation_concerns/add_to_collection_actor.rb → ...ation_concerns/add_to_collection_actor.rb b/...ation_concerns/add_to_collection_actor.rb → ...ation_concerns/add_to_collection_actor.rb
diff --git a/...rs/curation_concerns/apply_order_actor.rb → ...rs/curation_concerns/apply_order_actor.rb b/...rs/curation_concerns/apply_order_actor.rb → ...rs/curation_concerns/apply_order_actor.rb
diff --git a/...ation_concerns/assign_identifier_actor.rb → ...ation_concerns/assign_identifier_actor.rb b/...ation_concerns/assign_identifier_actor.rb → ...ation_concerns/assign_identifier_actor.rb
diff --git a/...n_concerns/assign_representative_actor.rb → ...n_concerns/assign_representative_actor.rb b/...n_concerns/assign_representative_actor.rb → ...n_concerns/assign_representative_actor.rb
diff --git a/...s/curation_concerns/attach_files_actor.rb → ...s/curation_concerns/attach_files_actor.rb b/...s/curation_concerns/attach_files_actor.rb → ...s/curation_concerns/attach_files_actor.rb
diff --git a/...pp/actors/curation_concerns/base_actor.rb → app/actors/curation_concerns/base_actor.rb b/...pp/actors/curation_concerns/base_actor.rb → app/actors/curation_concerns/base_actor.rb
diff --git a/...actors/curation_concerns/embargo_actor.rb → ...actors/curation_concerns/embargo_actor.rb b/...actors/curation_concerns/embargo_actor.rb → ...actors/curation_concerns/embargo_actor.rb
diff --git a/...pp/actors/curation_concerns/file_actor.rb → app/actors/curation_concerns/file_actor.rb b/...pp/actors/curation_concerns/file_actor.rb → app/actors/curation_concerns/file_actor.rb
diff --git a/...ctors/curation_concerns/file_set_actor.rb → ...ctors/curation_concerns/file_set_actor.rb b/...ctors/curation_concerns/file_set_actor.rb → ...ctors/curation_concerns/file_set_actor.rb
diff --git a/...on_concerns/interpret_visibility_actor.rb → ...on_concerns/interpret_visibility_actor.rb b/...on_concerns/interpret_visibility_actor.rb → ...on_concerns/interpret_visibility_actor.rb
diff --git a/...p/actors/curation_concerns/lease_actor.rb → app/actors/curation_concerns/lease_actor.rb b/...p/actors/curation_concerns/lease_actor.rb → app/actors/curation_concerns/lease_actor.rb
diff --git a/...pp/actors/curation_concerns/root_actor.rb → app/actors/curation_concerns/root_actor.rb b/...pp/actors/curation_concerns/root_actor.rb → app/actors/curation_concerns/root_actor.rb
diff --git a/.../curation_concerns/work_actor_behavior.rb → .../curation_concerns/work_actor_behavior.rb b/.../curation_concerns/work_actor_behavior.rb → .../curation_concerns/work_actor_behavior.rb
diff --git a/...s/curation_concerns/collection_indexer.rb → ...s/curation_concerns/collection_indexer.rb b/...s/curation_concerns/collection_indexer.rb → ...s/curation_concerns/collection_indexer.rb
diff --git a/...ers/curation_concerns/file_set_indexer.rb → ...ers/curation_concerns/file_set_indexer.rb b/...ers/curation_concerns/file_set_indexer.rb → ...ers/curation_concerns/file_set_indexer.rb
diff --git a/...ndexers/curation_concerns/work_indexer.rb → ...ndexers/curation_concerns/work_indexer.rb b/...ndexers/curation_concerns/work_indexer.rb → ...ndexers/curation_concerns/work_indexer.rb
diff --git a/...ion_concerns-models/app/jobs/audit_job.rb → app/jobs/audit_job.rb b/...ion_concerns-models/app/jobs/audit_job.rb → app/jobs/audit_job.rb
diff --git a/...cerns-models/app/jobs/characterize_job.rb → app/jobs/characterize_job.rb b/...cerns-models/app/jobs/characterize_job.rb → app/jobs/characterize_job.rb
diff --git a/...models/app/jobs/create_derivatives_job.rb → app/jobs/create_derivatives_job.rb b/...models/app/jobs/create_derivatives_job.rb → app/jobs/create_derivatives_job.rb
diff --git a/...oncerns-models/app/jobs/import_url_job.rb → app/jobs/import_url_job.rb b/...oncerns-models/app/jobs/import_url_job.rb → app/jobs/import_url_job.rb
diff --git a/...ncerns-models/app/jobs/ingest_file_job.rb → app/jobs/ingest_file_job.rb b/...ncerns-models/app/jobs/ingest_file_job.rb → app/jobs/ingest_file_job.rb
diff --git a/...-models/app/jobs/ingest_local_file_job.rb → app/jobs/ingest_local_file_job.rb b/...-models/app/jobs/ingest_local_file_job.rb → app/jobs/ingest_local_file_job.rb
diff --git a/...concerns-models/app/jobs/resolrize_job.rb → app/jobs/resolrize_job.rb b/...concerns-models/app/jobs/resolrize_job.rb → app/jobs/resolrize_job.rb
diff --git a/...s-models/app/models/checksum_audit_log.rb → app/models/checksum_audit_log.rb b/...s-models/app/models/checksum_audit_log.rb → app/models/checksum_audit_log.rb
diff --git a/...els/concerns/curation_concerns/ability.rb → ...els/concerns/curation_concerns/ability.rb b/...els/concerns/curation_concerns/ability.rb → ...els/concerns/curation_concerns/ability.rb
diff --git a/...cerns/curation_concerns/basic_metadata.rb → ...cerns/curation_concerns/basic_metadata.rb b/...cerns/curation_concerns/basic_metadata.rb → ...cerns/curation_concerns/basic_metadata.rb
diff --git a/.../curation_concerns/collection_behavior.rb → .../curation_concerns/collection_behavior.rb b/.../curation_concerns/collection_behavior.rb → .../curation_concerns/collection_behavior.rb
diff --git a/...ion_concerns/file_set/belongs_to_works.rb → ...ion_concerns/file_set/belongs_to_works.rb b/...ion_concerns/file_set/belongs_to_works.rb → ...ion_concerns/file_set/belongs_to_works.rb
diff --git a/...curation_concerns/file_set/derivatives.rb → ...curation_concerns/file_set/derivatives.rb b/...curation_concerns/file_set/derivatives.rb → ...curation_concerns/file_set/derivatives.rb
diff --git a/...n_concerns/file_set/full_text_indexing.rb → ...n_concerns/file_set/full_text_indexing.rb b/...n_concerns/file_set/full_text_indexing.rb → ...n_concerns/file_set/full_text_indexing.rb
diff --git a/...ns/curation_concerns/file_set/indexing.rb → ...ns/curation_concerns/file_set/indexing.rb b/...ns/curation_concerns/file_set/indexing.rb → ...ns/curation_concerns/file_set/indexing.rb
diff --git a/...ns/curation_concerns/file_set/querying.rb → ...ns/curation_concerns/file_set/querying.rb b/...ns/curation_concerns/file_set/querying.rb → ...ns/curation_concerns/file_set/querying.rb
diff --git a/...ns/curation_concerns/file_set_behavior.rb → ...ns/curation_concerns/file_set_behavior.rb b/...ns/curation_concerns/file_set_behavior.rb → ...ns/curation_concerns/file_set_behavior.rb
diff --git a/...s/curation_concerns/has_representative.rb → ...s/curation_concerns/has_representative.rb b/...s/curation_concerns/has_representative.rb → ...s/curation_concerns/has_representative.rb
diff --git a/.../curation_concerns/human_readable_type.rb → .../curation_concerns/human_readable_type.rb b/.../curation_concerns/human_readable_type.rb → .../curation_concerns/human_readable_type.rb
diff --git a/...dels/concerns/curation_concerns/naming.rb → ...dels/concerns/curation_concerns/naming.rb b/...dels/concerns/curation_concerns/naming.rb → ...dels/concerns/curation_concerns/naming.rb
diff --git a/...concerns/curation_concerns/permissions.rb → ...concerns/curation_concerns/permissions.rb b/...concerns/curation_concerns/permissions.rb → ...concerns/curation_concerns/permissions.rb
diff --git a/...curation_concerns/permissions/readable.rb → ...curation_concerns/permissions/readable.rb b/...curation_concerns/permissions/readable.rb → ...curation_concerns/permissions/readable.rb
diff --git a/...curation_concerns/permissions/writable.rb → ...curation_concerns/permissions/writable.rb b/...curation_concerns/permissions/writable.rb → ...curation_concerns/permissions/writable.rb
diff --git a/...ns/curation_concerns/required_metadata.rb → ...ns/curation_concerns/required_metadata.rb b/...ns/curation_concerns/required_metadata.rb → ...ns/curation_concerns/required_metadata.rb
diff --git a/...concerns/curation_concerns/serializers.rb → ...concerns/curation_concerns/serializers.rb b/...concerns/curation_concerns/serializers.rb → ...concerns/curation_concerns/serializers.rb
diff --git a/...ration_concerns/solr_document_behavior.rb → ...ration_concerns/solr_document_behavior.rb b/...ration_concerns/solr_document_behavior.rb → ...ration_concerns/solr_document_behavior.rb
diff --git a/...models/concerns/curation_concerns/user.rb → ...models/concerns/curation_concerns/user.rb b/...models/concerns/curation_concerns/user.rb → ...models/concerns/curation_concerns/user.rb
diff --git a/...cerns/curation_concerns/with_file_sets.rb → ...cerns/curation_concerns/with_file_sets.rb b/...cerns/curation_concerns/with_file_sets.rb → ...cerns/curation_concerns/with_file_sets.rb
diff --git a/...ncerns/curation_concerns/work_behavior.rb → ...ncerns/curation_concerns/work_behavior.rb b/...ncerns/curation_concerns/work_behavior.rb → ...ncerns/curation_concerns/work_behavior.rb
diff --git a/...els/curation_concerns/classify_concern.rb → ...els/curation_concerns/classify_concern.rb b/...els/curation_concerns/classify_concern.rb → ...els/curation_concerns/classify_concern.rb
diff --git a/...on_concerns/quick_classification_query.rb → ...on_concerns/quick_classification_query.rb b/...on_concerns/quick_classification_query.rb → ...on_concerns/quick_classification_query.rb
diff --git a/...erns-models/app/models/single_use_link.rb → app/models/single_use_link.rb b/...erns-models/app/models/single_use_link.rb → app/models/single_use_link.rb
diff --git a/...ns-models/app/models/version_committer.rb → app/models/version_committer.rb b/...ns-models/app/models/version_committer.rb → app/models/version_committer.rb
diff --git a/...ices/curation_concerns/derivative_path.rb → ...ices/curation_concerns/derivative_path.rb b/...ices/curation_concerns/derivative_path.rb → ...ices/curation_concerns/derivative_path.rb
diff --git a/...ration_concerns/file_set_audit_service.rb → ...ration_concerns/file_set_audit_service.rb b/...ration_concerns/file_set_audit_service.rb → ...ration_concerns/file_set_audit_service.rb
diff --git a/...s/curation_concerns/indexes_thumbnails.rb → ...s/curation_concerns/indexes_thumbnails.rb b/...s/curation_concerns/indexes_thumbnails.rb → ...s/curation_concerns/indexes_thumbnails.rb
diff --git a/...s/curation_concerns/local_file_service.rb → ...s/curation_concerns/local_file_service.rb b/...s/curation_concerns/local_file_service.rb → ...s/curation_concerns/local_file_service.rb
diff --git a/...ervices/curation_concerns/lock_manager.rb → ...ervices/curation_concerns/lock_manager.rb b/...ervices/curation_concerns/lock_manager.rb → ...ervices/curation_concerns/lock_manager.rb
diff --git a/...pp/services/curation_concerns/lockable.rb → app/services/curation_concerns/lockable.rb b/...pp/services/curation_concerns/lockable.rb → app/services/curation_concerns/lockable.rb
diff --git a/...ls/app/services/curation_concerns/noid.rb → app/services/curation_concerns/noid.rb b/...ls/app/services/curation_concerns/noid.rb → app/services/curation_concerns/noid.rb
diff --git a/.../curation_concerns/persist_derivatives.rb → .../curation_concerns/persist_derivatives.rb b/.../curation_concerns/persist_derivatives.rb → .../curation_concerns/persist_derivatives.rb
diff --git a/...directly_contained_output_file_service.rb → ...directly_contained_output_file_service.rb b/...directly_contained_output_file_service.rb → ...directly_contained_output_file_service.rb
diff --git a/...tion_concerns/repository_audit_service.rb → ...tion_concerns/repository_audit_service.rb b/...tion_concerns/repository_audit_service.rb → ...tion_concerns/repository_audit_service.rb
diff --git a/...ration_concerns/thumbnail_path_service.rb → ...ration_concerns/thumbnail_path_service.rb b/...ration_concerns/thumbnail_path_service.rb → ...ration_concerns/thumbnail_path_service.rb
diff --git a/...ervices/curation_concerns/time_service.rb → ...ervices/curation_concerns/time_service.rb b/...ervices/curation_concerns/time_service.rb → ...ervices/curation_concerns/time_service.rb
diff --git a/...s/curation_concerns/versioning_service.rb → ...s/curation_concerns/versioning_service.rb b/...s/curation_concerns/versioning_service.rb → ...s/curation_concerns/versioning_service.rb
diff --git a/...app/validators/has_one_title_validator.rb → app/validators/has_one_title_validator.rb b/...app/validators/has_one_title_validator.rb → app/validators/has_one_title_validator.rb
diff --git a/config/locales/curation_concerns.en.yml b/config/locales/curation_concerns.en.yml
@@ -1,5 +1,7 @@
 en:
   curation_concerns:
+    product_name: "Repository"
+    institution_name:  &INSTITUTION_NAME "Institution Name"
     catalog:
       index:
         type_tabs:
@@ -12,7 +14,6 @@ en:
     institution:
       name: "Your Institution"
       homepage_url: "#"
-    product_name: "Repository"
     search:
       form:
         q:
@@ -101,17 +102,29 @@ en:
         property: keywords
       title:
         property: name
+
     visibility:
       open:
+        text: "Open Access"
+        class: "label-success"
         label_html: <span class="label label-success">Open Access</span> Visible to the world.
       authenticated:
+        text: *INSTITUTION_NAME
+        class: "label-info"
         label_html: "<span class=\"label label-info\">%{institution}</span> Visible to all %{institution} users."
       embargo:
+        text: "Embargo"
+        class: "label-warning"
         label_html: <span class="label label-warning">Embargo</span>
       lease:
+        text: "Lease"
+        class: "label-warning"
         label_html: <span class="label label-warning">Lease</span>
       private:
         label_html: <span class="label label-danger">Private</span> Only visible to you and your delegates.
+      restricted:
+        text: "Private"
+        class: "label-danger"
   blacklight:
     search:
       fields:

diff --git a/curation_concerns-models/.gitignore b/curation_concerns-models/.gitignore
diff --git a/curation_concerns-models/Gemfile b/curation_concerns-models/Gemfile
diff --git a/curation_concerns-models/LICENSE.md b/curation_concerns-models/LICENSE.md