ddr-models 2.6.2 → 2.7.0.rc1

data/spec/utils_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module Ddr
   RSpec.describe Utils do
     describe "sanitize filename" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-models
 version: !ruby/object:Gem::Version
-  version: 2.6.2
+  version: 2.7.0.rc1
 platform: ruby
 authors:
 - Jim Coble
@@ -9,22 +9,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-01 00:00:00.000000000 Z
+date: 2017-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.7
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 4.2.7
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: activeresource
   requirement: !ruby/object:Gem::Requirement
@@ -41,18 +47,38 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: active-fedora
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 7.3.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 7.3.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
+- !ruby/object:Gem::Dependency
+  name: rubydora
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: hydra-core
   requirement: !ruby/object:Gem::Requirement
@@ -384,7 +410,6 @@ files:
 - Rakefile
 - app/controllers/users/omniauth_callbacks_controller.rb
 - app/controllers/users/sessions_controller.rb
-- app/helpers/models_helper.rb
 - app/models/.keep
 - app/models/attachment.rb
 - app/models/collection.rb
@@ -398,6 +423,7 @@ files:
 - config/initializers/active_fedora_datastream.rb
 - config/initializers/devise.rb
 - config/initializers/rsolr_monkey_patches.rb
+- config/initializers/rubydora_monkey_patch.rb
 - config/initializers/subscriptions.rb
 - config/locales/ddr-models.en.yml
 - config/routes.rb
@@ -450,11 +476,6 @@ files:
 - lib/ddr/auth/groups.rb
 - lib/ddr/auth/inherited_roles.rb
 - lib/ddr/auth/ldap_gateway.rb
-- lib/ddr/auth/legacy/abstract_legacy_permissions.rb
-- lib/ddr/auth/legacy/legacy_authorization.rb
-- lib/ddr/auth/legacy/legacy_default_permissions.rb
-- lib/ddr/auth/legacy/legacy_permissions.rb
-- lib/ddr/auth/legacy/legacy_roles.rb
 - lib/ddr/auth/permissions.rb
 - lib/ddr/auth/remote_groups.rb
 - lib/ddr/auth/resource_roles.rb
@@ -473,16 +494,22 @@ files:
 - lib/ddr/auth/web_auth_context.rb
 - lib/ddr/datastreams.rb
 - lib/ddr/datastreams/administrative_metadata_datastream.rb
+- lib/ddr/datastreams/content_datastream.rb
 - lib/ddr/datastreams/datastream_behavior.rb
+- lib/ddr/datastreams/delete_external_files.rb
 - lib/ddr/datastreams/descriptive_metadata_datastream.rb
+- lib/ddr/datastreams/external_file_datastream.rb
 - lib/ddr/datastreams/fits_datastream.rb
+- lib/ddr/datastreams/intermediate_file_datastream.rb
 - lib/ddr/datastreams/metadata_datastream.rb
+- lib/ddr/datastreams/multires_image_datastream.rb
 - lib/ddr/datastreams/plain_text_datastream.rb
 - lib/ddr/datastreams/structural_metadata_datastream.rb
 - lib/ddr/derivatives.rb
 - lib/ddr/derivatives/generator.rb
 - lib/ddr/derivatives/png_generator.rb
 - lib/ddr/derivatives/ptif_generator.rb
+- lib/ddr/derivatives/update_derivatives.rb
 - lib/ddr/events.rb
 - lib/ddr/events/creation_event.rb
 - lib/ddr/events/deaccession_event.rb
@@ -504,7 +531,6 @@ files:
 - lib/ddr/index/field_attribute.rb
 - lib/ddr/index/fields.rb
 - lib/ddr/index/filter.rb
-- lib/ddr/index/legacy_license_fields.rb
 - lib/ddr/index/query.rb
 - lib/ddr/index/query_builder.rb
 - lib/ddr/index/query_clause.rb
@@ -513,12 +539,6 @@ files:
 - lib/ddr/index/response.rb
 - lib/ddr/index/sort_order.rb
 - lib/ddr/index/unique_key_field.rb
-- lib/ddr/jobs.rb
-- lib/ddr/jobs/fits_file_characterization.rb
-- lib/ddr/jobs/fixity_check.rb
-- lib/ddr/jobs/job.rb
-- lib/ddr/jobs/queue.rb
-- lib/ddr/jobs/update_index.rb
 - lib/ddr/managers.rb
 - lib/ddr/managers/derivatives_manager.rb
 - lib/ddr/managers/manager.rb
@@ -527,9 +547,9 @@ files:
 - lib/ddr/metadata.rb
 - lib/ddr/metadata/premis_event.rb
 - lib/ddr/models.rb
-- lib/ddr/models/access_controllable.rb
 - lib/ddr/models/admin_set.rb
 - lib/ddr/models/base.rb
+- lib/ddr/models/cache.rb
 - lib/ddr/models/contact.rb
 - lib/ddr/models/describable.rb
 - lib/ddr/models/engine.rb
@@ -544,6 +564,7 @@ files:
 - lib/ddr/models/has_attachments.rb
 - lib/ddr/models/has_children.rb
 - lib/ddr/models/has_content.rb
+- lib/ddr/models/has_intermediate_file.rb
 - lib/ddr/models/has_multires_image.rb
 - lib/ddr/models/has_struct_metadata.rb
 - lib/ddr/models/has_thumbnail.rb
@@ -555,8 +576,17 @@ files:
 - lib/ddr/models/licenses/parent_license.rb
 - lib/ddr/models/permanent_id.rb
 - lib/ddr/models/solr_document.rb
-- lib/ddr/models/struct_div.rb
 - lib/ddr/models/structure.rb
+- lib/ddr/models/structures/agent.rb
+- lib/ddr/models/structures/div.rb
+- lib/ddr/models/structures/f_locat.rb
+- lib/ddr/models/structures/file.rb
+- lib/ddr/models/structures/file_grp.rb
+- lib/ddr/models/structures/file_sec.rb
+- lib/ddr/models/structures/fptr.rb
+- lib/ddr/models/structures/mets_hdr.rb
+- lib/ddr/models/structures/mptr.rb
+- lib/ddr/models/structures/struct_map.rb
 - lib/ddr/models/version.rb
 - lib/ddr/models/with_content_file.rb
 - lib/ddr/models/year_facet.rb
@@ -580,8 +610,6 @@ files:
 - spec/auth/effective_roles_spec.rb
 - spec/auth/group_spec.rb
 - spec/auth/groups_spec.rb
-- spec/auth/legacy_default_permissions_spec.rb
-- spec/auth/legacy_permissions_spec.rb
 - spec/auth/roles/detached_role_set_spec.rb
 - spec/auth/roles/property_role_set_spec.rb
 - spec/auth/roles/role_set_query_spec.rb
@@ -593,6 +621,7 @@ files:
 - spec/controllers/application_controller_spec.rb
 - spec/controllers/including_role_based_access_controls_enforcement_spec.rb
 - spec/controllers/users/sessions_controller_spec.rb
+- spec/datastreams/external_file_datastream_spec.rb
 - spec/datastreams/fits_datastream_spec.rb
 - spec/derivatives/png_generator_spec.rb
 - spec/derivatives/ptif_generator_spec.rb
@@ -661,29 +690,27 @@ files:
 - spec/fixtures/extractedText3.txt
 - spec/fixtures/fits/document.xml
 - spec/fixtures/fits/image.xml
+- spec/fixtures/imageA.jpg
 - spec/fixtures/imageA.tif
+- spec/fixtures/imageB.jpg
 - spec/fixtures/imageB.tif
 - spec/fixtures/imageC.tif
 - spec/fixtures/sample.docx
 - spec/fixtures/sample.pdf
 - spec/fixtures/target.png
-- spec/helpers/models_helper_spec.rb
 - spec/index/csv_query_result_spec.rb
 - spec/index/fields_spec.rb
 - spec/index/filter_spec.rb
 - spec/index/query_builder_spec.rb
 - spec/index/query_clause_spec.rb
 - spec/index/query_spec.rb
-- spec/jobs/fits_file_characterization_spec.rb
-- spec/jobs/fixity_check_spec.rb
-- spec/jobs/job_spec.rb
-- spec/jobs/update_index_spec.rb
 - spec/managers/derivatives_manager_spec.rb
 - spec/managers/technical_metadata_manager_spec.rb
 - spec/models/active_fedora_base_spec.rb
 - spec/models/active_fedora_datastream_spec.rb
 - spec/models/admin_set_spec.rb
 - spec/models/attachment_spec.rb
+- spec/models/cache_spec.rb
 - spec/models/collection_spec.rb
 - spec/models/component_spec.rb
 - spec/models/contact_spec.rb
@@ -701,15 +728,23 @@ files:
 - spec/models/license_spec.rb
 - spec/models/permanent_id_spec.rb
 - spec/models/solr_document_spec.rb
-- spec/models/struct_div_spec.rb
 - spec/models/structure_spec.rb
+- spec/models/structures/agent_spec.rb
+- spec/models/structures/div_spec.rb
+- spec/models/structures/f_locat_spec.rb
+- spec/models/structures/file_grp_spec.rb
+- spec/models/structures/file_sec_spec.rb
+- spec/models/structures/file_spec.rb
+- spec/models/structures/fptr_spec.rb
+- spec/models/structures/mets_hdr_spec.rb
+- spec/models/structures/mptr_spec.rb
+- spec/models/structures/struct_map_spec.rb
 - spec/models/target_spec.rb
 - spec/models/with_content_file_spec.rb
 - spec/models/year_facet_spec.rb
 - spec/routing/user_routing_spec.rb
 - spec/spec_helper.rb
 - spec/support/ezid_mock_identifier.rb
-- spec/support/shared_examples_for_access_controllables.rb
 - spec/support/shared_examples_for_associations.rb
 - spec/support/shared_examples_for_auth_contexts.rb
 - spec/support/shared_examples_for_ddr_models.rb
@@ -717,6 +752,7 @@ files:
 - spec/support/shared_examples_for_events.rb
 - spec/support/shared_examples_for_governables.rb
 - spec/support/shared_examples_for_has_content.rb
+- spec/support/shared_examples_for_has_intermediate_spec.rb
 - spec/support/shared_examples_for_indexing.rb
 - spec/support/shared_examples_for_non_collection_models.rb
 - spec/support/shared_examples_for_publication.rb
@@ -739,12 +775,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Models used in the Duke Digital Repository
@@ -758,8 +794,6 @@ test_files:
 - spec/auth/effective_roles_spec.rb
 - spec/auth/group_spec.rb
 - spec/auth/groups_spec.rb
-- spec/auth/legacy_default_permissions_spec.rb
-- spec/auth/legacy_permissions_spec.rb
 - spec/auth/roles/detached_role_set_spec.rb
 - spec/auth/roles/property_role_set_spec.rb
 - spec/auth/roles/role_set_query_spec.rb
@@ -771,6 +805,7 @@ test_files:
 - spec/controllers/application_controller_spec.rb
 - spec/controllers/including_role_based_access_controls_enforcement_spec.rb
 - spec/controllers/users/sessions_controller_spec.rb
+- spec/datastreams/external_file_datastream_spec.rb
 - spec/datastreams/fits_datastream_spec.rb
 - spec/derivatives/png_generator_spec.rb
 - spec/derivatives/ptif_generator_spec.rb
@@ -839,29 +874,27 @@ test_files:
 - spec/fixtures/extractedText3.txt
 - spec/fixtures/fits/document.xml
 - spec/fixtures/fits/image.xml
+- spec/fixtures/imageA.jpg
 - spec/fixtures/imageA.tif
+- spec/fixtures/imageB.jpg
 - spec/fixtures/imageB.tif
 - spec/fixtures/imageC.tif
 - spec/fixtures/sample.docx
 - spec/fixtures/sample.pdf
 - spec/fixtures/target.png
-- spec/helpers/models_helper_spec.rb
 - spec/index/csv_query_result_spec.rb
 - spec/index/fields_spec.rb
 - spec/index/filter_spec.rb
 - spec/index/query_builder_spec.rb
 - spec/index/query_clause_spec.rb
 - spec/index/query_spec.rb
-- spec/jobs/fits_file_characterization_spec.rb
-- spec/jobs/fixity_check_spec.rb
-- spec/jobs/job_spec.rb
-- spec/jobs/update_index_spec.rb
 - spec/managers/derivatives_manager_spec.rb
 - spec/managers/technical_metadata_manager_spec.rb
 - spec/models/active_fedora_base_spec.rb
 - spec/models/active_fedora_datastream_spec.rb
 - spec/models/admin_set_spec.rb
 - spec/models/attachment_spec.rb
+- spec/models/cache_spec.rb
 - spec/models/collection_spec.rb
 - spec/models/component_spec.rb
 - spec/models/contact_spec.rb
@@ -879,15 +912,23 @@ test_files:
 - spec/models/license_spec.rb
 - spec/models/permanent_id_spec.rb
 - spec/models/solr_document_spec.rb
-- spec/models/struct_div_spec.rb
 - spec/models/structure_spec.rb
+- spec/models/structures/agent_spec.rb
+- spec/models/structures/div_spec.rb
+- spec/models/structures/f_locat_spec.rb
+- spec/models/structures/file_grp_spec.rb
+- spec/models/structures/file_sec_spec.rb
+- spec/models/structures/file_spec.rb
+- spec/models/structures/fptr_spec.rb
+- spec/models/structures/mets_hdr_spec.rb
+- spec/models/structures/mptr_spec.rb
+- spec/models/structures/struct_map_spec.rb
 - spec/models/target_spec.rb
 - spec/models/with_content_file_spec.rb
 - spec/models/year_facet_spec.rb
 - spec/routing/user_routing_spec.rb
 - spec/spec_helper.rb
 - spec/support/ezid_mock_identifier.rb
-- spec/support/shared_examples_for_access_controllables.rb
 - spec/support/shared_examples_for_associations.rb
 - spec/support/shared_examples_for_auth_contexts.rb
 - spec/support/shared_examples_for_ddr_models.rb
@@ -895,6 +936,7 @@ test_files:
 - spec/support/shared_examples_for_events.rb
 - spec/support/shared_examples_for_governables.rb
 - spec/support/shared_examples_for_has_content.rb
+- spec/support/shared_examples_for_has_intermediate_spec.rb
 - spec/support/shared_examples_for_indexing.rb
 - spec/support/shared_examples_for_non_collection_models.rb
 - spec/support/shared_examples_for_publication.rb

data/app/helpers/models_helper.rb

@@ -1,10 +0,0 @@
-module ModelsHelper
-  extend Deprecation
-
-  def admin_set_full_name(slug)
-    Deprecation.warn(self, "admin_set_full_name helper method is deprecated and will be removed in v3." \
-                           " Retrieve admin set title from AdminSet ActiveResource instead.")
-    I18n.t("ddr.admin_set.#{slug}")
-  end
-
-end

data/lib/ddr/auth/legacy/abstract_legacy_permissions.rb

@@ -1,17 +0,0 @@
-require "delegate"
-
-module Ddr::Auth
-  class AbstractLegacyPermissions < SimpleDelegator
-
-    def to_roles
-      source.each_with_object(Roles::DetachedRoleSet.new) do |perm, role_set|
-        role_set.grant(role(perm))
-      end
-    end
-
-    def role(permission)
-      Roles::Role.build type: role_type(permission[:access]), agent: permission[:name], scope: scope
-    end
-
-  end
-end

data/lib/ddr/auth/legacy/legacy_authorization.rb

@@ -1,44 +0,0 @@
-require "delegate"
-
-module Ddr::Auth
-  class LegacyAuthorization < SimpleDelegator
-
-    def to_roles
-      sources.map(&:to_roles).reduce(&:merge)
-    end
-
-    def clear
-      sources.each(&:clear)
-    end
-
-    def clear?
-      sources.all? { |auth| auth.source.empty? }
-    end
-
-    def migrate
-      migrated = inspect
-      roles.replace *to_roles
-      clear
-      ["LEGACY AUTHORIZATION DATA", migrated, "ROLES", roles.serialize.inspect].join("\n\n")
-    end
-
-    def inspect
-      sources.map { |auth| auth.inspect }.join("\n")
-    end
-
-    private
-
-    def sources
-      wrappers.map { |wrapper| wrapper.new(self) }
-    end
-
-    def wrappers
-      classes = [ LegacyPermissions, LegacyRoles ]
-      if respond_to? :default_permissions
-        classes << LegacyDefaultPermissions
-      end
-      classes
-    end
-
-  end
-end