ddr-core 1.6.6 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63206a3cc7fdaf62637f980a49fd6b4c5c6912238ebc028c111246ccf0fec036
-  data.tar.gz: a05daaf250a9a618ad05e312c267fba162ae0072c85a7eea9941e174d48c2b54
+  metadata.gz: 22911e9ad5452855fb5b40ef580f328296e41a1abd7a9ed589a6d2015eb745a1
+  data.tar.gz: 8191a791a07c581ede3d65b555bea9f123e218eeaf629f69210f4d7f000b0cc3
 SHA512:
-  metadata.gz: 21ecc27d2b66cd0729352b603ebda307321b643b0ae05e09693b2fbdef9a35cedbf0a367e6e6fdfbd4bf68bf6fcae5141a9ac918abe80d1b9c0be3f9cdd42daa
-  data.tar.gz: e2f16e2a8501c000eef52a17d3b90d967e471aea12a4dbe04fe674417c9bd39962cab3b5763ca792f94bba75bb8f86434b78602b59590c868cfde18d3b3e8ef1
+  metadata.gz: a1059b1a44d54aa2a3fa9003e4d1f0733563e606fa53160eaee724f2f9333f1bb21d5313bbaf43318abe354fca4baeca55b8288bf2924b42ed6ba62ee7adcd60
+  data.tar.gz: b909f0636e55d0b69e48e9593320c141c66229eaa772656dd064f2e26899a48819d03a4d5099791024b10f167713700fc53baf829b2366d81816df25b16791f0

data/README.md

@@ -10,19 +10,11 @@ Change to the `.docker` directory.
 
 Start the *development* stack:
 
-    $ ./dev.sh up -d --build
+    $ ./dev.sh up -d
 
 To run a Bash shell on the app server:
 
-    $ ./dev.sh run --rm app bash
-
-To connect to the *development* database:
-
-    $ ./dev.sh run --rm app psql -U postgres -h db -d ddr_core
-
-To run the *test suite*:
-
-    $ ./run_test_suite.sh
+    $ ./dev.sh exec app bash
 
 Stop the *development* stack:
 

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

@@ -6,55 +6,9 @@ module Ddr
       attribute :content, Ddr::File.optional
       attribute :fits_file, Ddr::File.optional
 
-      ### DDRevo ################################################
-      # Extracted text factored out to separate concern -- Ddr::HasExtractedText
-      ### DDRevo ################################################
-      # has_file_datastream \
-      #     name: Ddr::Datastreams::EXTRACTED_TEXT,
-      #     type: Ddr::Datastreams::PlainTextDatastream,
-      #     versionable: true,
-      #     label: "Text extracted from the content file",
-      #     control_group: "M"
-      #
-
       delegate :original_filename, to: :content, allow_nil: true
-
-      #######DDRevo#########
-      # expect that the FileManagement module will go to staff app
-      #######DDRevo#########
-      # include FileManagement
-      #
-      #######DDRevo#########
-      # to staff app
-      #######DDRevo#########
-      # delegate :validate_checksum!, to: :content
     end
 
-    #######DDRevo#########
-    # to staff app
-    #######DDRevo#########
-    # # Convenience method wrapping FileManagement#add_file
-    # def upload file, opts={}
-    #   add_file(file, Ddr::Datastreams::CONTENT, opts)
-    # end
-    #
-    #######DDRevo#########
-    # to staff app
-    #######DDRevo#########
-    # # Set content to file and save
-    # def upload! file, opts={}
-    #   upload(file, opts)
-    #   save
-    # end
-    #
-    #######DDRevo#########
-    # DerivativesManager will go to staff app.  Need to determine if there is a need for a '#derivatives' method on
-    # content-bearing objects and, if so, what it should return
-    #######DDRevo#########
-    # def derivatives
-    #   @derivatives ||= Ddr::Managers::DerivativesManager.new(self)
-    # end
-    #
     def techmd
       @techmd ||= Ddr::Managers::TechnicalMetadataManager.new(self)
     end
@@ -80,10 +34,6 @@ module Ddr
       content_type&.split("/")&.last
     end
 
-    # def content_type= mime_type
-    #   self.content.mimeType = mime_type
-    # end
-    #
     def image?
       content_major_type == "image"
     end
@@ -92,42 +42,5 @@ module Ddr
       content_type == "application/pdf"
     end
 
-    # def virus_checks
-    #   Ddr::Events::VirusCheckEvent.for_object(self)
-    # end
-    #
-    # def last_virus_check
-    #   virus_checks.last
-    # end
-    #
-    # def last_virus_check_on
-    #   last_virus_check && last_virus_check.event_date_time
-    # end
-    #
-    # def last_virus_check_outcome
-    #   last_virus_check && last_virus_check.outcome
-    # end
-    #
-    # def content_changed?
-    #   content.external? ? content.dsLocation_changed? : content.content_changed?
-    # end
-    #
-    ### DDRevo ###########################################
-    # Moved to Ddr::Resource where other 'has_<file>?' methods reside
-    ### DDRevo ###########################################
-    # def has_extracted_text?
-    #   extractedText.has_content?
-    # end
-    #
-    # def with_content_file(&block)
-    #   WithContentFile.new(self, &block)
-    # end
-    #
-    # protected
-    #
-    # def default_content_type
-    #   "application/octet-stream"
-    # end
-
   end
 end

data/app/models/ddr/digest.rb

@@ -4,5 +4,9 @@ module Ddr
     attribute :type, Ddr::Files::CHECKSUM_TYPES
     attribute :value, Valkyrie::Types::Strict::String
 
+    def sha1?
+      type == Ddr::Files::CHECKSUM_TYPE_SHA1
+    end
+
   end
 end

data/app/models/ddr/file.rb

@@ -28,6 +28,10 @@ module Ddr
       file.size
     end
 
+    def sha1
+      digest.detect(&:sha1?)&.value
+    end
+
     # Return default file extension for file based on MIME type
     def default_file_extension
       mimetypes = MIME::Types[media_type]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-core
 version: !ruby/object:Gem::Version
-  version: 1.6.6
+  version: 1.7.0
 platform: ruby
 authors:
 - Jim Coble
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-01 00:00:00.000000000 Z
+date: 2021-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
@@ -269,16 +269,16 @@ dependencies:
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: solr_wrapper
   requirement: !ruby/object:Gem::Requirement