ddr-core 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e6c137f90ad664cc8d8a0842070a881e2a2327b514f1f312c25c441803a8bdd
-  data.tar.gz: 2ccb2e205769df0f7279eaf1d0d785c6751926d1c662799f1915e1619b679668
+  metadata.gz: 72f6e405acd06621c1a3f1001264c0d8d8bd5302c3e0f36b7ad5805f990eaa99
+  data.tar.gz: 826a0ae2eda2c5937b4c312e140e55672a4e55af807e2980082e0beae85342d0
 SHA512:
-  metadata.gz: 5f27e125f0e21d6585941a612f7efcf6b56aebed98cd4e1747cfcbfe79012a3866b624b72acb158a5dcee225675c88bb1286b82698a5637c5d1d64083e6deb5b
-  data.tar.gz: b3d1a4b44540f0b3d84c120f28826c2999e2836259fb8974410782c8ca00e084694e8a6fa0f9090b0b2b0ef9f10cf47daae174f05a380f61e708709e417c93cd
+  metadata.gz: 03b21dcd66f1a220167fc421849d4a1f7996be806c310f92adfad14ee8f7f9cc0ca030f4d718a29be95586eac0b757d5d78e086ac9b5442d7865bab1d326a438
+  data.tar.gz: cf249bc22b8b381f20b3149ba421496098aa4576528460cbde047e7fdded8396ceb66f522428ed11677799c5bbd0ea53676bb199ea80c9b8c3d75d05508e1eab

data/README.md

@@ -6,22 +6,24 @@ A port of ddr-models based on Valkyrie.
 
 Install docker (Docker for Mac includes all the required components).
 
-Start the stack:
+Change to the `.docker`  directory.
 
-    $ docker-compose up -d --build
+Start the *development* stack:
+
+    $ ./dev.sh up -d --build
 
 To run a Bash shell on the app server:
 
-    $ docker-compose run --rm app bash
+    $ ./dev.sh run --rm app bash
 
-To connect to the development database:
+To connect to the *development* database:
 
-    $ docker-compose run --rm app psql -U postgres -h db -d ddr_core_development
+    $ ./dev.sh run --rm app psql -U postgres -h db -d ddr_core
 
-To run the test suite:
+To run the *test suite*:
 
-    $ docker-compose run --rm -e RAILS_ENV=test app bundle exec rake spec
+    $ ./run_test_suite.sh
 
-Stop the stack:
+Stop the *development* stack:
 
-    $ docker-compose down
+    $ ./dev.sh down

data/app/models/concerns/ddr/has_admin_metadata.rb

@@ -11,6 +11,7 @@ module Ddr
               display_format:         Valkyrie::Types::Strict::String.optional,
               doi:                    Valkyrie::Types::Strict::String.optional,
               ead_id:                 Valkyrie::Types::Strict::String.optional,
+              fcrepo3_pid:            Valkyrie::Types::Strict::String.optional,
               ingested_by:            Valkyrie::Types::Strict::String.optional,
               ingestion_date:         Valkyrie::Types::DateTime.optional,
               is_locked:              Valkyrie::Types::Strict::Bool.optional,

data/app/models/concerns/ddr/has_parent.rb

@@ -3,6 +3,7 @@ module Ddr
     extend ActiveSupport::Concern
 
     included do
+      class_attribute :parent_class
       attribute :parent_id, Valkyrie::Types::ID.optional
     end
 

data/app/models/concerns/ddr/solr_document_behavior.rb

@@ -188,7 +188,7 @@ module Ddr
     #   get_pid(ActiveFedora::SolrService.solr_name(name, :symbol))
     # end
 
-    def controller_name
+    def tableized_name
       resource_model.tableize
     end
 

data/app/models/ddr/component.rb

@@ -15,6 +15,8 @@ module Ddr
 
     attribute :target_id, Valkyrie::Types::ID.optional
 
+    self.parent_class = Ddr::Item
+
     def collection
       self.parent.parent rescue nil
     end

data/app/models/ddr/file.rb

@@ -20,6 +20,10 @@ module Ddr
       ::File::Stat.new(Ddr.storage_adapter.file_path(file_identifier)).ctime
     end
 
+    def file_path
+      Ddr.storage_adapter.file_path(file_identifier)
+    end
+
     def file_size
       file.size
     end
@@ -36,5 +40,21 @@ module Ddr
       end
     end
 
+    def stored_checksums_valid?
+      checksums = digest.each_with_object({}) { |dgst, memo| memo[dgst.type] = dgst.value }
+      file.valid? digests: checksums
+    end
+
+    def validate_checksum!(checksum_value, checksum_type)
+      raise Ddr::Error, I18n.t('ddr.checksum.validation.must_be_stored') unless file_identifier.present?
+      raise Ddr::ChecksumInvalid, I18n.t('ddr.checksum.validation.internal_check_failed') unless stored_checksums_valid?
+      if file.valid? digests: { checksum_type => checksum_value }
+        I18n.t('ddr.checksum.validation.valid', type: checksum_type, value: checksum_value)
+      else
+        raise Ddr::ChecksumInvalid,
+              I18n.t('ddr.checksum.validation.invalid', type: checksum_type, value: checksum_value)
+      end
+    end
+
   end
 end

data/app/models/ddr/item.rb

@@ -10,6 +10,8 @@ module Ddr
 
     alias_method :components, :children
 
+    self.parent_class = Ddr::Collection
+
     ### DDRevo #####################
     # TODO: We may want to revisit this alternate implementation once ddr-core is more fully baked
     # or it may be fine just as it is

data/app/models/ddr/resource.rb

@@ -55,9 +55,15 @@ module Ddr
       fields - FILE_FIELDS - reserved_attributes
     end
 
-    delegate :attachable_files, :common_model_name, :governable?, :captionable?, :can_be_streamable?, to: :class
+    def self.tableized_name
+      name.tableize
+    end
+
+    delegate :attachable_files, :common_model_name, :governable?, :captionable?, :can_be_streamable?,
+             :tableized_name, to: :class
 
     alias_method :new_record?, :new_record
+    alias_method :resource_model, :internal_resource
 
     def title_display
       return title.first if title.present?

data/config/initializers/devise.rb

@@ -227,7 +227,11 @@ Devise.setup do |config|
       last_name: "sn",
       nickname: "eduPersonNickname"
     },
-    extra_fields: ["duDukeID"],
+    extra_fields: [
+      "duDukeID",
+      "isMemberOf",
+      "affiliation"
+    ],
   }
 
   # ==> Warden configuration

data/config/locales/ddr-core.en.yml

@@ -3,6 +3,12 @@ en:
     core:
       errors:
         incorrect_resource_class: "%{subject} must be a %{resource_class}"
+    checksum:
+      validation:
+        internal_check_failed: The repository internal checksum validation failed.
+        invalid: "The checksum [%{type}]%{value} is not valid."
+        must_be_stored: Checksum cannot be validated on unstored file.
+        valid: "The checksum [%{type}]%{value} is valid."
     index:
       fields:
         aleph_id:
@@ -15,6 +21,8 @@ en:
           label: DOI
         ead_id:
           label: "EAD ID"
+        fcrepo3_pid:
+          label: "Fedora 3 PID"
         id:
           label: ID
           heading: id

data/lib/ddr/auth/web_auth_context.rb

@@ -16,13 +16,14 @@ module Ddr::Auth
 
     # @return [Array<String>]
     def ismemberof
-      split_env("ismemberof")
+      split_env("isMemberOf")
     end
 
     private
 
     def split_env(attr, delim = ";")
-      env.fetch(attr, "").split(delim)
+      val = env[attr] || env["HTTP_#{attr.upcase}"]
+      val ? val.split(delim) : []
     end
 
   end

data/lib/ddr/core/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Core
-    VERSION = '0.2.2'
+    VERSION = '0.3.0'
   end
 end

data/lib/ddr/error.rb

@@ -2,9 +2,9 @@ module Ddr
   # Base class for custom exceptions
   class Error < StandardError; end
 
-  # # Invalid checksum
-  # class ChecksumInvalid < Error; end
-  #
+  # Invalid checksum
+  class ChecksumInvalid < Error; end
+
   # # Derivative generation failure
   # class DerivativeGenerationFailure < Error; end
   #

data/lib/ddr/index/fields.rb

@@ -40,6 +40,7 @@ module Ddr::Index
     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"
+    FCREPO3_PID                   = Field.new :fcrepo3_pid, :stored_sortable
     FOLDER_FACET                  = Field.new :folder_facet, :facetable
     FOR_COLLECTION_ID             = Field.new :for_collection_id, :symbol
     FORMAT_FACET                  = Field.new :format_facet, :facetable

data/lib/ddr/utils.rb

@@ -81,6 +81,9 @@ module Ddr::Utils
   end
 
   ### DDRevo ################################
+  # Now pretty sure this method isn't needed at all.  Its use has been eliminated
+  # from Ddr::MetadataFileUpload and the other place it's used -- MetsFile --
+  # is no longer used and won't be ported to DDRevo.
   # Needs replacements for ActiveFedora::Base.find_each call.
   ### DDRevo ################################
   # # # Find an object with a given identifier and return its PID.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-core
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Jim Coble
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-11 00:00:00.000000000 Z
+date: 2019-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
@@ -89,14 +89,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: grouper-rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -131,14 +131,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -195,6 +195,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: solrizer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement