ddr-core 1.6.3 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c2ee6a1a1de8fd86904bc1f067378379972862830e591ad2588c77057666608
-  data.tar.gz: 999d2c0e8710e45fe854bd7b75718dd36f1e2ee01181ffe4af2c34121f49ca70
+  metadata.gz: 22911e9ad5452855fb5b40ef580f328296e41a1abd7a9ed589a6d2015eb745a1
+  data.tar.gz: 8191a791a07c581ede3d65b555bea9f123e218eeaf629f69210f4d7f000b0cc3
 SHA512:
-  metadata.gz: 4b2a4518977f7a36e6b9959b0f1b5e891f975edf97f8c474bc4f10bfb80646fb8da294bd8c5e03a19a113c31d4ec27ce2423455734b40ecdd0bfb56b3e6ae147
-  data.tar.gz: bed7b8d7fcb879d9763bfbe6b0989c8c0e5b39eea4b0e12120dfa995d731a915b932c95c79b46555db1c3a0daac08a5dbfc65098af2d359b06f4eb711f09860e
+  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]

data/lib/ddr/core.rb

@@ -71,7 +71,7 @@ module Ddr
         'audio/ogg'       => 'ogg',
         'audio/wav'       => 'wav',
         'text/vtt'        => 'vtt',
-        'video/flv'       => 'flv',
+        'video/x-flv'     => 'flv',
         'video/mp4'       => 'mp4',
         'video/quicktime' => 'mov',
         'video/webm'      => 'webm'
@@ -83,7 +83,7 @@ module Ddr
     {
         '.aac'  => 'audio/mp4',
         '.f4a'  => 'audio/mp4',
-        '.flv'  => 'video/flv',
+        '.flv'  => 'video/x-flv',
         '.m2t'  => 'video/vnd.dlna.mpeg-tts',
         '.m2ts' => 'video/m2ts',
         '.m4a'  => 'audio/mp4',

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.3
+  version: 1.7.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-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
@@ -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.30
 signing_key: 
 specification_version: 4
 summary: Models used in the Duke Digital Repository