dina 3.1.3.0 → 3.2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5324a63fa700654179acbbe8e7eae34989df24b614a36b60eebada527871062d
-  data.tar.gz: a3adbd6fedd3dbf69abac9fbf5687f5b39c851c7a36e0867911d4c8eca3114a1
+  metadata.gz: b352cf3c52493540a1f8089e292d1eb5a24e178330796c9d8548ea2fd04a555e
+  data.tar.gz: 592c57a9d91d6853b5ebf4bf10502f316a31f40c660e9525c83f6f31ab6ec8a4
 SHA512:
-  metadata.gz: b7975a2185a52911ea0875c6db3e0b2aa7642b5138376411c67d38800ef20d836eca7a7d420c83b07c870d38de4c7e56a67359daecf05b070f81e628244e4587
-  data.tar.gz: ad2419b9a087f07acd703b469b2befba7c2edc83ac9a22ac239d4f046cc8b06035a1ed63416cb5b09b2671127b82853842d0c3d5e4b18b963d42cac1a7effae9
+  metadata.gz: 42f07765799ef8bfdf9d04b01b2fea2623f41ded4298e42ab7e53996ba8ed4d30d625c2a23160b4bab7cfe9e63c16498ad04d54d0d7428d4be907489a8a9405c
+  data.tar.gz: 72d908349ce9f90f07f52135fe44fcb2f2f960bc87cd2acb1f81233508bac9206593568a0a0adf2534586995b0386bfb6dcb79ad6547714c1ac35441a0b9f3c6

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

@@ -5,6 +5,8 @@ module Dina
   class File < BaseModel
     self.connection_class = FileConnection
 
+    custom_endpoint :download, on: :collection, request_method: :get
+
     property :id, type: :string, default: SecureRandom.uuid_v7
     property :group, type: :string
     property :filePath, type: :string

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

@@ -17,33 +17,44 @@ module Dina
     end
 
     def run(request_method, path, params: nil, headers: {}, body: nil)
-      path = path + "/#{body[:data]["attributes"]["group"].downcase}"
-      if body[:data]["attributes"].key?("isDerivative")
-        path = path + "/derivative"
+      if request_method == :get && path == "file/download"
+        path = "file" + "/#{params[:group]}/#{params[:fileId]}"
+        if params[:isDerivative]
+          path = "file" + "/#{params[:group]}/derivative/#{params[:fileId]}"
+        end
+        headers[:content_type] = "application/octet-stream"
+        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")
+          path = path + "/derivative"
+        end
+        file_path = body[:data]["attributes"]["filePath"]
+        mime_type = body[:data]["attributes"]["dcFormat"]
+        file_name = body[:data]["attributes"]["fileName"]
+        
+        body[:file] = Faraday::Multipart::FilePart.new(
+          file_path,
+          mime_type,
+          file_name
+        )
+  
+        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"] = {}
+        response.body["errors"] = []
+        response.body["data"] = { 
+          "id" => attributes["uuid"],
+          "type" => "file",
+          "relationships" => {},
+          "attributes" => attributes
+        }
+        response
       end
-      file_path = body[:data]["attributes"]["filePath"]
-      mime_type = body[:data]["attributes"]["dcFormat"]
-      file_name = body[:data]["attributes"]["fileName"]
-      
-      body[:file] = Faraday::Multipart::FilePart.new(
-        file_path,
-        mime_type,
-        file_name
-      )
-
-      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"] = {}
-      response.body["errors"] = []
-      response.body["data"] = { 
-        "id" => attributes["uuid"],
-        "type" => "file",
-        "relationships" => {},
-        "attributes" => attributes
-      }
-      response
     end
 
   end

data/lib/dina/version.rb

@@ -2,8 +2,8 @@ module Dina
   class Version
 
     MAJOR = 3
-    MINOR = 1
-    PATCH = 3
+    MINOR = 2
+    PATCH = 0
     BUILD = 0
 
     def self.version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dina
 version: !ruby/object:Gem::Version
-  version: 3.1.3.0
+  version: 3.2.0.0
 platform: ruby
 authors:
 - David P. Shorthouse
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-16 00:00:00.000000000 Z
+date: 2025-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_api_client
@@ -230,7 +230,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.2'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="