dina 3.1.3.0 → 3.2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5324a63fa700654179acbbe8e7eae34989df24b614a36b60eebada527871062d
-  data.tar.gz: a3adbd6fedd3dbf69abac9fbf5687f5b39c851c7a36e0867911d4c8eca3114a1
+  metadata.gz: 2eda00f62a4b5a9ef520e5c2ed2a253861a9ce38d1d43f96989d87ca170ffc91
+  data.tar.gz: ac9c14b964f24f478cf52bb5157b0c0b70102573dc234c821c56717d0ba52470
 SHA512:
-  metadata.gz: b7975a2185a52911ea0875c6db3e0b2aa7642b5138376411c67d38800ef20d836eca7a7d420c83b07c870d38de4c7e56a67359daecf05b070f81e628244e4587
-  data.tar.gz: ad2419b9a087f07acd703b469b2befba7c2edc83ac9a22ac239d4f046cc8b06035a1ed63416cb5b09b2671127b82853842d0c3d5e4b18b963d42cac1a7effae9
+  metadata.gz: f1417c9d2bbdc048d03173d7fd6f11fc0a373ef072dcf2e921c41befbc31459904a55537f8a28a0f7388ff5735d035cc3199486a7b115cb23660ad8737c3bffe
+  data.tar.gz: 928d1b4c29320ae094a69156c3637b2791acd81ab39b019571ad3aa75ea94e56b865d36c40831bf636266ccb5622ce4fe9ac384f7663e8712fa525b58d4880dd

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

@@ -1,9 +1,13 @@
 require_rel '../base_model'
 require_rel 'file_connection'
+require_rel 'file_parser'
 
 module Dina
   class File < BaseModel
     self.connection_class = FileConnection
+    self.parser = FileParser
+
+    custom_endpoint :download, 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,33 +17,54 @@ 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"
-      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
-      )
+      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|
-        request.params.update(params) if params
+        response = @faraday.run_request(request_method, path, body, headers) do |request|
+        end
+        response.body["meta"] = {}
+        response.body["errors"] = []
+        response.body["data"] = { 
+          "id" => params[:fileId],
+          "type" => "file",
+          "relationships" => {},
+          "attributes" => response.headers
+        }
+        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
-      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/models/object_store/file_parser.rb

@@ -0,0 +1,104 @@
+require_rel '../base_model'
+
+module Dina
+  class FileParser
+    class << self
+      def parse(klass, response)
+        data = response.body.present? ? response.body : {}
+
+        return data if !data.respond_to?(:fetch)
+
+        ::JsonApiClient::ResultSet.new.tap do |result_set|
+          result_set.record_class = klass
+          result_set.uri = response.env[:url]
+          handle_json_api(result_set, data)
+          handle_data(result_set, data)
+          handle_errors(result_set, data)
+          handle_meta(result_set, data)
+          handle_links(result_set, data)
+          handle_relationships(result_set, data)
+          handle_pagination(result_set, data)
+          handle_included(result_set, data)
+        end
+      end
+
+      #
+      # Given a resource hash, returns a Resource.new friendly hash
+      # which flattens the attributes in w/ id and type.
+      #
+      # Example:
+      #
+      # Given:
+      #  {
+      #    id: 1.
+      #    type: 'person',
+      #    attributes: {
+      #      first_name: 'Jeff',
+      #      last_name: 'Ching'
+      #    },
+      #    links: {...},
+      #    relationships: {...}
+      #  }
+      #
+      # Returns:
+      #  {
+      #    id: 1,
+      #    type: 'person',
+      #    first_name: 'Jeff',
+      #    last_name: 'Ching'
+      #    links: {...},
+      #    relationships: {...}
+      #  }
+      #
+      #
+      def parameters_from_resource(params)
+        attrs = params.slice('id', 'links', 'meta', 'type', 'relationships')
+        attrs.merge(params.fetch('attributes', {}))
+      end
+
+      private
+
+      def handle_json_api(result_set, data)
+        result_set.implementation = ::JsonApiClient::Implementation.new(data.fetch("jsonapi", {}))
+      end
+
+      def handle_data(result_set, data)
+        # all data lives under the "data" attribute
+        results = data.fetch("data", [])
+
+        # we will treat everything as an Array
+        results = [results] unless results.is_a?(Array)
+        resources = results.compact.map do |res|
+          resource = result_set.record_class.load(parameters_from_resource(res))
+          resource.last_result_set = result_set
+          resource
+        end
+        result_set.concat(resources)
+      end
+
+      def handle_errors(result_set, data)
+        result_set.errors = ErrorCollector.new(data.fetch("errors", []))
+      end
+
+      def handle_meta(result_set, data)
+        result_set.meta = MetaData.new(data.fetch("meta", {}), result_set.record_class)
+      end
+
+      def handle_links(result_set, data)
+        result_set.links = Linking::TopLevelLinks.new(result_set.record_class, data.fetch("links", {}))
+      end
+
+      def handle_relationships(result_set, data)
+        result_set.relationships = Relationships::TopLevelRelations.new(result_set.record_class, data.fetch("relationships", {}))
+      end
+
+      def handle_pagination(result_set, data)
+        result_set.pages = result_set.record_class.paginator.new(result_set, data)
+      end
+
+      def handle_included(result_set, data)
+        result_set.included = IncludedData.new(result_set, data.fetch("included", []))
+      end
+    end
+  end
+end

data/lib/dina/version.rb

@@ -2,8 +2,8 @@ module Dina
   class Version
 
     MAJOR = 3
-    MINOR = 1
-    PATCH = 3
+    MINOR = 2
+    PATCH = 1
     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.1.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-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_api_client
@@ -188,6 +188,7 @@ files:
 - lib/dina/models/object_store/derivative.rb
 - lib/dina/models/object_store/file.rb
 - lib/dina/models/object_store/file_connection.rb
+- lib/dina/models/object_store/file_parser.rb
 - lib/dina/models/object_store/object_store.rb
 - lib/dina/models/object_store/object_store_managed_attribute.rb
 - lib/dina/models/object_store/object_subtype.rb
@@ -230,7 +231,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:
   - - ">="