dina 1.0.7.0 → 1.1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 761a480e5d017a1d0d4600cad5adbcb6a0461ca78750a588edb0082676ba6621
-  data.tar.gz: f049320abf3e40cf1fdc0a8fa3b600687cd57980c7fade955672d66767d0189f
+  metadata.gz: 2b0da0908db1832ae7d9449ea98daeee46b51c95b2122787fc65a400d3d40f1f
+  data.tar.gz: 75e4a2f40a4d5ba1951a7c8e92ca5a5eca662f2618c25491c7ba8ac907ec8d1d
 SHA512:
-  metadata.gz: 245a9196b2a2b2e243d505007ad8e57dacf1db31695d8c1cfdb40b7e0c7565409147eab25ef87bff0004bf1b4b7f93b6234061e2b3348e83695a3f8f50fb7024
-  data.tar.gz: d3d5e3aabe72117b5b3235ca6a28ed6829991945ff161e5ae78c60a8b7f56a81e2444903445f084afb35bfc37c159ed19d3fcdc813e648601ee65f3f6cb03919
+  metadata.gz: 47370d47608879648438e719efaea10e00534e25604f644719e57b4d202662894186e569e708dcb930dbbe6d3a4437dcbe18aa6c6eb96599172c58584efabcf6
+  data.tar.gz: a2bb7d19dfb476a294b5b80ea62d76f2da0842879b5ffe66ef45d79149e045060db849205b9336ea3272fd51d620933b92ac5347bcd1e2dd583634bc5ce34b19

data/lib/dina/models/base_model.rb

@@ -18,7 +18,8 @@ module Dina
     # Required by json_api_client
     def self.site
       raise ConfigItemMissing, "Missing endpoint_url from config. Perhaps Dina.config has not yet been called." unless Dina.config.endpoint_url
-      Dina.config.endpoint_url + "/" + endpoint_path
+      raise PropertyInvalid, "Missing endpoint_path in class." unless !endpoint_path.nil?
+      Dina.config.endpoint_url + "/" + endpoint_path.to_s
     end
 
     # injects keycloak bearer token with all json_api_client calls

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

@@ -71,16 +71,16 @@ module Dina
         self.geographicPlaceNameSourceDetail = nil
       end
       if self.dwcMinimumDepthInMeters && !Validator.valid_depth_elevation(value: self.dwcMinimumDepthInMeters)
-        raise PropertyValueInvalid, "#{self.class} is invalid. Accepted value for dwcMinimumDepthInMeters must have no more than two decimal points and be less than or equal to 15000."
+        raise PropertyValueInvalid, "#{self.class} is invalid. Accepted value for dwcMinimumDepthInMeters must have no more than two decimal points and be >= 0 and <= 15000."
       end
       if self.dwcMaximumDepthInMeters && !Validator.valid_depth_elevation(value: self.dwcMaximumDepthInMeters)
-        raise PropertyValueInvalid, "#{self.class} is invalid. Accepted value for dwcMaximumDepthInMeters must have no more than two decimal points and be less than or equal to 15000."
+        raise PropertyValueInvalid, "#{self.class} is invalid. Accepted value for dwcMaximumDepthInMeters must have no more than two decimal points and be >= 0 and <= 15000."
       end
       if self.dwcMinimumElevationInMeters && !Validator.valid_depth_elevation(value: self.dwcMinimumElevationInMeters)
-        raise PropertyValueInvalid, "#{self.class} is invalid. Accepted value for dwcMinimumElevationInMeters must have no more than two decimal points and be less than or equal to 15000."
+        raise PropertyValueInvalid, "#{self.class} is invalid. Accepted value for dwcMinimumElevationInMeters must have no more than two decimal points and be >= 0 and <= 15000."
       end
       if self.dwcMaximumElevationInMeters && !Validator.valid_depth_elevation(value: self.dwcMaximumElevationInMeters)
-        raise PropertyValueInvalid, "#{self.class} is invalid. Accepted value for dwcMaximumElevationInMeters must have no more than two decimal points and be less than or equal to 15000."
+        raise PropertyValueInvalid, "#{self.class} is invalid. Accepted value for dwcMaximumElevationInMeters must have no more than two decimal points and be >= 0 and <= 15000."
       end
       super
     end

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

@@ -11,6 +11,7 @@ module Dina
     property :acHashFunction, type: :string, default: "SHA-1"
     property :acHashValue, type: :string
     property :derivativeType, type: :string
+    property :publiclyReleasable, type: :boolean, default: true
 
     has_one :ac_derived_from, class_name: "ObjectStore"
 

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

@@ -1,96 +1,85 @@
 module Dina
-  class File < BaseModel
-    attr_accessor :id, :file_path, :filename, :group, :is_derivative
 
-    def self.verify_ssl
-      begin
-        connection_options[:ssl][:verify]
-      rescue
-        true
+  class FileConnection
+    def initialize(options = {})
+      site = options.fetch(:site)
+      connection_options = options.slice(:proxy, :ssl, :request, :headers, :params)
+      adapter_options = Array(options.fetch(:adapter, Faraday.default_adapter))
+
+      @faraday = Faraday.new(site, connection_options) do |builder|
+        builder.request :multipart
+        builder.use ::JsonApiClient::Middleware::ParseJson
+        builder.adapter(*adapter_options)
       end
+      yield(self) if block_given?
     end
 
-    def self.find(group:, id:)
-      obj = self.new
-      obj.group = group
-      RestClient::Request.execute(
-        method: :get,
-        headers: { authorization: Dina.header },
-        url: obj.url + "/#{id}",
-        verify_ssl: verify_ssl
+    def run(request_method, path, params: nil, headers: {}, body: nil)
+      path = path + "/#{body[:data]["attributes"]["group"].downcase}"
+      if body[:data]["attributes"].key?("is_derivative")
+        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
       )
-    end
 
-    def self.create(attributes = {})
-      new(attributes).tap do |resource|
-        resource.save
+      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
 
-    def initialize(attributes = {})
-      @id = attributes[:id] || SecureRandom.uuid
-      @group = attributes[:group] || nil
-      @is_derivative = attributes[:is_derivative] || false
-      @file_path = attributes[:file_path] || nil
-      @filename = attributes[:filename] || File.basename(@file_path) rescue nil
-    end
+  class File < BaseModel
+    property :id, type: :string, default: SecureRandom.uuid
+    property :group, type: :string
+    property :filePath, type: :string
+    property :fileName, type: :string
+    property :dcFormat, type: :string
+    property :is_derivative, type: :boolean
 
-    def endpoint
-      Dina.config.endpoint_url
-    end
+    self.connection_class = FileConnection
 
-    def endpoint_path
-      "objectstore-api/"
-    end
-
-    def table_name
-      "file/#{group.downcase}"
-    end
+    validates_presence_of :group, message: "group is required"
+    validates_presence_of :filePath, message: "filePath is required"
+    validates_presence_of :fileName, message: "fileName is required"
+    validates_presence_of :dcFormat, message: "dcFormat is required"
 
-    def url
-      endpoint + "/" + endpoint_path + table_name
+    def self.endpoint_path
+      "objectstore-api/"
     end
 
-    def file
-      new_file = ::File.new(file_path)
-      bound = filename.dup
-      new_file.define_singleton_method(:original_filename) do
-        bound
-      end
-      new_file
+    def self.table_name
+      "file"
     end
 
-    def save
-      validate_params
-      response = RestClient::Request.execute(
-        method: :post,
-        headers: { authorization: Dina.header },
-        url: (!is_derivative) ? url : url + "/derivative",
-        payload: {
-          multipart: true,
-          file: file
-        },
-        verify_ssl: self.class.verify_ssl
-      )
-      json = JSON.parse(response, symbolize_names: true)
-      self.id = json[:uuid]
-      json.each{ |k,v| define_singleton_method(k.to_sym) { v } }
-      json
+    def self.custom_headers
+      { content_type: "multipart/form-data", authorization: Dina.header }
     end
 
     private
 
-    def validate_params
-      if id.nil? || !id.is_uuid?
-        raise ObjectInvalid, "#{self.class} is invalid. id is not a UUID."
-      end
-      if group.nil?
-        raise ObjectInvalid, "#{self.class} is invalid. group is required."
-      end
-      if file_path.nil? || !::File.exist?(file_path)
-        raise ObjectInvalid, "#{self.class} is invalid. file not found in file_path."
+    def on_before_save
+      if !self.filePath.nil? && !::File.exist?(self.filePath)
+        raise PropertyValueInvalid, "#{self.class} is invalid. File not found in filePath."
       end
+      super
     end
 
   end
-end
+end

data/lib/dina/version.rb

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

data/lib/dina.rb

@@ -3,6 +3,7 @@ require "json_api_client"
 require "time"
 require "date"
 require "securerandom"
+require 'faraday/multipart'
 require "require_all"
 require_all File.join(File.dirname(__FILE__), 'dina')
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dina
 version: !ruby/object:Gem::Version
-  version: 1.0.7.0
+  version: 1.1.0.0
 platform: ruby
 authors:
 - David P. Shorthouse
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-21 00:00:00.000000000 Z
+date: 2023-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_api_client
@@ -81,6 +81,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: faraday-multipart
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement