ddr-core 1.6.4 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fda53111cfb7cebbe51424a6d5f8ba1064c7e8ac09f9346f4a1fe809f87208d
-  data.tar.gz: '0832501621a8238e217fc3d51c5bc0a4509bdebc4e83d65b3cc25cbc970e5cc7'
+  metadata.gz: 8ecf0c2c7b9b7cbe1c4a6f97c52b9890e6baf5bb5de8696cd79c0fc9a9b1ed5c
+  data.tar.gz: c5962101e2e49c746565a9de779f9e23d0aa00a410129bb766ea2d9fd19b96b6
 SHA512:
-  metadata.gz: 7af4e67c7c9cdaab03b2009f49703b6720848d262405e708dc587f40fbd8e4492189b03f3da724bed84cf7dbbcc44a1f15cdf1db8b200c08f085aef2ddd8df91
-  data.tar.gz: 87882efe5994948c4945045b3eacf760edd3d2ca19d3f5b2cf13398ed35f325bc04dfe33cd658f781a9cb4b1a8e3e6a3aba78bbe8faa7e1617e1cbbe4319dcfc
+  metadata.gz: f11f35d59878e82b1c5d81571ecfcb914d48541280745df1df7a2c0f7434afb02897a54a26c777a683dc3a27b6734fe863b2016c2bc761e587b3b65cc259eee9
+  data.tar.gz: 8406cd5b5f19da79f2b618f33d56c0a9fb4e779485df5a3856ce533f291d44d4b93c547f6d70fb27eac0d29c5524cc922b7c0fc2f3b5c9779be2e1f7b6b7cccf

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]

data/lib/ddr/index/fields.rb

@@ -28,6 +28,7 @@ module Ddr::Index
     COMPANY_FACET                 = Field.new :company_facet, :facetable
     COMPOSER_FACET                = Field.new :composer_facet, :facetable
     CONTENT_CREATE_DATE           = Field.new :content_create_date, :stored_sortable, type: :date
+    CONTENT_SHA1                  = Field.new :content_sha1, :stored_sortable
     CONTENT_SIZE                  = Field.new :content_size, solr_name: "content_size_lsi"
     CONTENT_SIZE_HUMAN            = Field.new :content_size_human, :symbol
     CONTENTDM_ID                  = Field.new :contentdm_id, :stored_sortable
@@ -37,6 +38,7 @@ module Ddr::Index
     DATE_SORT                     = Field.new :date_sort, :sortable
     DC_IS_PART_OF                 = Field.new :isPartOf, :symbol
     DEPOSITOR                     = Field.new :depositor, :stored_sortable
+    DERIVED_IMAGE_FILE_PATH       = Field.new :derived_image_file_path, :stored_sortable
     # DDR-1997 - description should always be indexed as _tesim regardless of length - Valkyrie indexes fields > 1000
     # characters in length as _tsim only
     DESCRIPTION                   = Field.new :description, :stored_searchable # stored_searchable produces _tesim

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-core
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 1.8.0
 platform: ruby
 authors:
 - Jim Coble
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-25 00:00:00.000000000 Z
+date: 2021-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
@@ -47,14 +47,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -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
@@ -455,7 +455,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.21
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: Models used in the Duke Digital Repository