dina 0.5.5.0 → 0.5.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2219751eeaf3e31b3b3206c5ca7b87a9e724662c3ed64c0781f8c35668b365cf
-  data.tar.gz: c951a685a472e4486a8847d1a2bf415e4ff39c540e80b9b4e50da72d073e69c4
+  metadata.gz: 4999fc970acb56ad2c4dcacb27124741d65c91b9dc00f13267b6da0f756ee3a9
+  data.tar.gz: 461e2ca77f1b4f4e7a675e42fc5f81008e967222211fb7ea4b0aa8435f869700
 SHA512:
-  metadata.gz: 7fe97ac48169a94af0b4b4d8dc5fe380b9b7aca9ac9abf656b915c428df20949f5b2bd034b681b9e23ac2e44d10635a7c64a5c947348a0f7f9f0bd6d79f5f882
-  data.tar.gz: 131b8bab4675a4bffec2aa7f22a2b52ef495914ad6f4203cf73866736c16ddceba2142a26e8135f3d5ad161d8618f2a151087ab73658d24799b1043fa2c399b2
+  metadata.gz: 2b3573481c0cfffd4fca4f32f8ff521ad357e7eb63598fc3d6ce77441d3a154c1b69bb382ef8473a0ce5525c8268042e4fd936bd203bc7970c720da320aba1b6
+  data.tar.gz: eabb87d0e292a17a4cd1769757c5de8e0862e3fc23aaeb81dcb1d3d5613f211e5937d42eddef28098872e195d8814431de9b33771e972ac6e5ab0a58e42ab84b

data/lib/dina/authentication/authentication.rb

@@ -39,6 +39,10 @@ module Dina
       @endpoint_url = options[:endpoint_url]
       Keycloak.auth_server_url = options[:authorization_url]
       Keycloak.realm = options[:realm]
+
+      if ::File.zero?(@token_store_file)
+        create_empty_token
+      end
     end
 
     # Gets, sets, and renews a Bearer access token as required
@@ -46,10 +50,6 @@ module Dina
     #
     # @return [String] the Bearer token
     def self.header
-      if ::File.zero?(@token_store_file)
-        create_empty_token
-      end
-
       if access_token.nil? || refresh_token.nil?
         set_token
       end

data/lib/dina/models/agent/person.rb

@@ -17,7 +17,7 @@ module Dina
     has_many :identifiers, class_name: "Identifier"
 
     validates_presence_of :familyNames, message: "familyNames is required"
-    validates_presence_of :displayName
+    validates_presence_of :displayName, message: "displayName is required"
 
     def self.endpoint_path
       "agent-api/"

data/lib/dina/models/base_model.rb

@@ -23,6 +23,10 @@ module Dina
       self.where("group.groupName": group).page(page).per(per)
     end
 
+    def self.properties
+      self.schema.instance_values["properties"]
+    end
+
     def initialize(params = {})
       symbolized_params = params.transform_keys(&:to_sym)
       params["id"] = SecureRandom.uuid if !symbolized_params[:id]

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

@@ -33,7 +33,7 @@ module Dina
     # @param email [String] a name
     # @return object [Object] a Collection object
     def self.find_by_name(name)
-      where(name: name).all.first
+      where(name: name).all
     end
 
     # Finds a Collection object by code
@@ -41,7 +41,7 @@ module Dina
     # @param code [String] a code
     # @return object [Object] a Collection object
     def self.find_by_code(code)
-      where(code: code).all.first
+      where(code: code).all
     end
 
   end

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

@@ -16,6 +16,7 @@ module Dina
     belongs_to :ac_derived_from, shallow_path: true, class_name: "ObjectStore"
 
     validates_presence_of :group, message: "group is required"
+    validates_presence_of :bucket, message: "bucket is required"
 
     def self.endpoint_path
       "objectstore-api/"
@@ -28,8 +29,8 @@ module Dina
     private
 
     def on_before_save
-      if self.bucket.nil?
-        self.bucket = self.group
+      if self.group && self.bucket.nil?
+        self.bucket = self.group.downcase
       end
       super
     end

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

@@ -1,14 +1,23 @@
 module Dina
-  class File
+  class File < BaseModel
     attr_accessor :file_path, :group, :is_derivative, :id
 
+    def self.verify_ssl
+      begin
+        connection_options[:ssl][:verify]
+      rescue
+        true
+      end
+    end
+
     def self.find(group:, id:)
       obj = self.new
       obj.group = group
       RestClient::Request.execute(
         method: :get,
         headers: { authorization: Dina::Authentication.header },
-        url: obj.url + "/#{id}"
+        url: obj.url + "/#{id}",
+        verify_ssl: verify_ssl
       )
     end
 
@@ -44,7 +53,8 @@ module Dina
         payload: {
           multipart: true,
           file: file
-        }
+        },
+        verify_ssl: self.class.verify_ssl
       )
       json = JSON.parse(response, symbolize_names: true)
       self.id = json[:uuid]

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

@@ -34,6 +34,7 @@ module Dina
     has_many :derivatives, class_name: "Derivative"
 
     validates_presence_of :group, message: "group is required"
+    validates_presence_of :bucket, message: "bucket is required"
     validates_presence_of :dcFormat, message: "dcFormat is required"
     validates_presence_of :dcType, message: "dcType is required"
     validates_presence_of :xmpRightsUsageTerms, message: "xmpRightsUsageTerms is required"
@@ -63,6 +64,9 @@ module Dina
     private
 
     def on_before_save
+      if self.group && self.bucket.nil?
+        self.bucket = self.group.downcase
+      end
       if !self.dcType.nil? && !self.class.accepted_types.include?(self.dcType)
         raise PropertyValueInvalid, "#{self.class} is invalid. Accepted value for dcType is one of #{self.class.accepted_types.join(", ")}"
       end

data/lib/dina/version.rb

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

data/lib/dina.rb

@@ -14,4 +14,7 @@ module Dina
   JsonApiClient::Schema.register multilingual_title: Dina::MultilingualTitleCaster
   JsonApiClient::Schema.register multilingual_description: Dina::MultilingualDescriptionCaster
 
+  def self.classes
+    Dina::BaseModel.subclasses
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dina
 version: !ruby/object:Gem::Version
-  version: 0.5.5.0
+  version: 0.5.7.0
 platform: ruby
 authors:
 - David P. Shorthouse
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-13 00:00:00.000000000 Z
+date: 2022-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_api_client