dina 3.3.2.0 → 3.3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ef96574d56d3dbd98b058142a54fd04fb271d8b904fdaca7e2e8a53ee6e6fdd
-  data.tar.gz: 2e47a3d6dd1ebdc8e0c577e5145b844cf1f09852616a1d81f13274ac703dfd0f
+  metadata.gz: 40974ccc22f630f761b1df813bb15ed0afa2ae53f7a589c0dd264cfb30b3bd9c
+  data.tar.gz: 2b8fec89f74211d0797831c0a4c20d6683331697648cb0b172f77f926ff6abac
 SHA512:
-  metadata.gz: c597b3b2909a1f6503f0a6f51625a82eb637686c4c663b1b579ace1ea874e4dcb696540f9028eb7dd50261b069e7e87021fe48275a774ebc093f5f5521973bf2
-  data.tar.gz: f9b0bb4f37cb4ac04c6a62845d0eaa3c96dd69ea2b5096b2ece6c4da9c717c49df379d7a794dad78095c85d1123fcad8ca80400c24ebb7336faa6873d1477959
+  metadata.gz: 39646e6b949fd93af882d42de82eef38b7471a2a7e8826ef6ce71ebbd85a986fae1d37ec23548425dc92cbbbaac581622205b9d733567963ec3dc9c106f682df
+  data.tar.gz: 8fefe11dca7a890e0f56e175700b41c19f109e6fbf340bcd802445aba1396c694a379c422c32dda427ca01b976a5f8d8554ec5ad5552644526f8187815a17e7e

data/lib/dina/models/material_sample/site.rb

@@ -7,6 +7,11 @@ module Dina
     property :code, type: :string
     property :multilingualDescription, type: :multilingual_description
     property :siteGeom, type: :geospatial
+    property :dwcCountry, type: :string
+    property :dwcCountryCode, type: :string
+    property :dwcStateProvince, type: :string
+    property :geographicPlaceNameSource, type: :string
+    property :geographicPlaceNameSourceDetail, type: :hash, default: {}
     property :createdBy, type: :string
     property :createdOn, type: :time
 
@@ -22,5 +27,14 @@ module Dina
       "site"
     end
 
+    private
+
+    def on_before_save
+      if self.geographicPlaceNameSource.nil?
+        self.geographicPlaceNameSourceDetail = nil
+      end
+      super
+    end
+
   end
 end

data/lib/dina/models/object_store/file.rb

@@ -8,6 +8,7 @@ module Dina
     self.parser = FileParser
 
     custom_endpoint :download, on: :collection, request_method: :get
+    custom_endpoint :info, on: :collection, request_method: :get
 
     property :id, type: :string, default: SecureRandom.uuid_v7
     property :group, type: :string

data/lib/dina/models/object_store/file_connection.rb

@@ -17,6 +17,7 @@ module Dina
     end
 
     def run(request_method, path, params: nil, headers: {}, body: nil)
+
       if request_method == :get && path == "file/download"
         path = "file" + "/#{params[:group].downcase}/#{params[:fileIdentifier]}"
         if params[:isDerivative]
@@ -26,6 +27,14 @@ module Dina
         response = @faraday.run_request(request_method, path, body, headers) do |request|
         end
         response
+      elsif request_method == :get && path == "file/info"
+        path = "file-info" + "/#{params[:group].downcase}/#{params[:fileIdentifier]}#{params[:fileExtension]}"
+        if params[:isDerivative]
+          path = "file-info" + "/#{params[:group].downcase}/derivative/#{params[:fileIdentifier]}#{params[:fileExtension]}"
+        end
+        response = @faraday.run_request(request_method, path, body, headers) do |request|
+        end
+        response
       else
         path = path + "/#{body[:data]["attributes"]["group"].downcase}"
         if body[:data]["attributes"].key?("isDerivative")
@@ -44,15 +53,13 @@ module Dina
         response = @faraday.run_request(request_method, path, body, headers) do |request|
           request.params.update(params) if params
         end
-        attributes = response.body.dup
-        response.body["meta"] = {}
+
+        body = response.body.dup
+        response.body["meta"] = body["meta"]
         response.body["errors"] = []
-        response.body["data"] = { 
-          "id" => attributes["uuid"],
-          "type" => "file",
-          "relationships" => {},
-          "attributes" => attributes
-        }
+        response.body["data"] = body["data"]
+        response.body["data"]["type"] = "file"
+
         response
       end
     end

data/lib/dina/models/object_store/object_store.rb

@@ -12,8 +12,9 @@ module Dina
     property :fileIdentifier, type: :string
     property :bucket, type: :string
     property :acCaption, type: :string
-    property :acDigitizationDate, type: :string
+    property :acDigitizationDate, type: :string, default: Time.now.iso8601.to_s
     property :xmpMetadataDate, type: :time
+    property :filename, type: :string
     property :originalFilename, type: :string
     property :fileExtension, type: :string
     property :acHashFunction, type: :string, default: "SHA-1"
@@ -27,7 +28,9 @@ module Dina
     property :managedAttributes, type: :hash
     property :acTags, type: :array
     property :orientation, type: :integer
+    property :isExternalResource, type: :boolean, default: false
     property :resourceExternalURL, type: :string
+    property :sourceSet, type: :string
 
     has_one :acMetadataCreator, class_name: "Person"
     has_one :dcCreator, class_name: "Person"

data/lib/dina/version.rb

@@ -3,7 +3,7 @@ module Dina
 
     MAJOR = 3
     MINOR = 3
-    PATCH = 2
+    PATCH = 5
     BUILD = 0
 
     def self.version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dina
 version: !ruby/object:Gem::Version
-  version: 3.3.2.0
+  version: 3.3.5.0
 platform: ruby
 authors:
 - David P. Shorthouse
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-17 00:00:00.000000000 Z
+date: 2026-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_api_client