dina 0.3.0.0 → 0.4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9245c7481399aefbf8a290931823fafbc4970c2008ae4e299833c274825353c3
-  data.tar.gz: 448dcde684c17dd881ee2128f184871d05f690429199b92dd858c5c0735c22b8
+  metadata.gz: 4cae0ee74ed1a0967bb360af211c2ab37676dfdb39b54a377ec39b539e0f4301
+  data.tar.gz: 45ee9d1cda7f37da9fb5384690751dac5e5cc0fe30153cddf8306e11a20f7151
 SHA512:
-  metadata.gz: b8d3ea143e058dab38c1073d6d614539620ceb5b14f3dc394a3b4535e069449b2921fe2365208bb9f8b5f7b2b46afb830edbe5bd0471dbd6c518c3d6cc3b8e2d
-  data.tar.gz: 9c18d70386ba41207d9d341e3a700e413ba63ddd34d5f81fcacd1f21453d05c84de2738d28b131767a07c649af800da404dcc62475e83055c92bbd44009b29ef
+  metadata.gz: 60a62ece7262ab086b88002497bd55f1ea04059b94468134b7c93d35a3349deff0c3ed58c45f634dd07a3149e4895da1525c215aef1895258beb62cf5af0aba5
+  data.tar.gz: dba63bace34688530c56cb56af702af39fe36bcb7ba86bf664b1192a7186ca51207ef9cef2deed311993671127772deb4f149f99fd90619ad56408dc379882a7

data/lib/dina/authentication/authentication.rb

@@ -81,11 +81,11 @@ module Dina
       end
 
       def access_token
-        read_token[:access_token] rescue nil
+        read_token[:access_token]
       end
 
       def refresh_token
-        read_token[:refresh_token] rescue nil
+        read_token[:refresh_token]
       end
 
       def auth_expiry

data/lib/dina/exceptions.rb

@@ -2,4 +2,5 @@ module Dina
   class DinaException < StandardError; end
   class TokenStoreFileNotFound < DinaException; end
   class ObjectInvalid < DinaException; end
+  class PropertyValueInvalid < ObjectInvalid; end
 end

data/lib/dina/models/derivative.rb

@@ -3,16 +3,19 @@ require_rel 'base_model'
 module Dina
   class Derivative < BaseModel
     property :id, type: :string, default: SecureRandom.uuid
+    property :group, type: :string
     property :bucket, type: :string
     property :fileIdentifier, type: :string
     property :fileExtension, type: :string
     property :dcType, type: :string
-    property :cdFormat, type: :string
+    property :dcFormat, type: :string
     property :acHashFunction, type: :string, default: "SHA-1"
     property :acHashValue, type: :string
     property :derivativeType, type: :string
 
-    belongs_to :object_store, shallow_path: true
+    belongs_to :ac_derived_from, shallow_path: true, class_name: "ObjectStore"
+
+    validates_presence_of :group, message: "group is required"
 
     def self.endpoint_path
       "objectstore-api/"
@@ -22,5 +25,14 @@ module Dina
       "derivative"
     end
 
+    private
+
+    def on_before_save
+      if self.bucket.nil?
+        self.bucket = self.group
+      end
+      super
+    end
+
   end
 end

data/lib/dina/models/file.rb

@@ -1,6 +1,16 @@
 module Dina
   class File
-    attr_accessor :file_path, :group
+    attr_accessor :file_path, :group, :is_derivative, :id
+
+    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}"
+      )
+    end
 
     def initialize
     end
@@ -22,22 +32,30 @@ module Dina
     end
 
     def save
-      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."
-      end
+      validate_params
       response = RestClient::Request.execute(
         method: :post,
         headers: { authorization: Dina::Authentication.header },
-        url: url,
+        url: (!is_derivative) ? url : url + "/derivative",
         payload: {
           multipart: true,
           file: file
         }
       )
-      JSON.parse(response, symbolize_names: true)
+      json = JSON.parse(response, symbolize_names: true)
+      self.id = json[:uuid]
+      json
+    end
+
+    private
+
+    def validate_params
+      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."
+      end
     end
 
   end

data/lib/dina/models/managed_attribute.rb

@@ -6,14 +6,18 @@ module Dina
     property :group, type: :string
     property :name, type: :string
     property :key, type: :string
-    property :managedAttributeType, type: :string #values = STRING or INTEGER
-    property :managedAttributeComponent, type: :string #values = COLLECTING_EVENT, MATERIAL_SAMPLE, or DETERMINATION
+    property :managedAttributeType, type: :string
+    property :managedAttributeComponent, type: :string
     property :acceptedValues, type: :array
     property :multilingualDescription, type: :multilingual_description
     property :createdBy, type: :string
     property :createdOn, type: :time
 
     validates_presence_of :group, message: "group is required"
+    validates_presence_of :name, message: "name is required"
+    validates_presence_of :managedAttributeType, message: "managedAttributeType is required"
+
+    attr_accessor :accepted_components, :accepted_types
 
     def self.endpoint_path
       "collection-api/"
@@ -23,6 +27,25 @@ module Dina
       "managed-attribute"
     end
 
+    def self.accepted_components
+      [
+        "COLLECTING_EVENT",
+        "MATERIAL_SAMPLE",
+        "DETERMINATION",
+        "ASSEMBLAGE"
+      ]
+    end
+
+    def self.accepted_types
+      [
+        "INTEGER",
+        "STRING",
+        "PICKLIST",
+        "DATE",
+        "BOOL"
+      ]
+    end
+
     def english_description=(desc)
       description[:en] = desc
     end
@@ -39,5 +62,17 @@ module Dina
       description[:fr]
     end
 
+    private
+
+    def on_before_save
+      if !self.managedAttributeComponent.nil? && !self.class.accepted_components.include?(self.managedAttributeComponent)
+        raise PropertyValueInvalid, "#{self.class} is invalid. Accepted value for managedAttributeComponent is one of #{self.class.accepted_components.join(", ")}"
+      end
+      if !self.managedAttributeType.nil? && !self.class.accepted_types.include?(self.managedAttributeType)
+        raise PropertyValueInvalid, "#{self.class} is invalid. Accepted value for managedAttributeType is one of #{self.class.accepted_types.join(", ")}"
+      end
+      super
+    end
+
   end
 end

data/lib/dina/models/material_sample.rb

@@ -52,6 +52,9 @@ module Dina
 
     validates_presence_of :group, message: "group is required"
     validates_presence_of :materialSampleName, message: "materialSampleName is required"
+    validates_presence_of :materialSampleType, message: "materialSampleType is required"
+
+    attr_accessor :accepted_types
 
     def self.endpoint_path
       "collection-api/"
@@ -61,5 +64,23 @@ module Dina
       "material-sample"
     end
 
+    def self.accepted_types
+      [
+        "WHOLE_ORGANISM",
+        "ORGANISM_PART",
+        "MIXED_ORGANISMS",
+        "MOLECULAR_SAMPLE"
+      ]
+    end
+
+    private
+
+    def on_before_save
+      if !self.materialSampleType.nil? && !self.class.accepted_types.include?(self.materialSampleType)
+        raise PropertyValueInvalid, "#{self.class} is invalid. Accepted value for materialSampleType is one of #{self.class.accepted_types.join(", ")}"
+      end
+      super
+    end
+
   end
 end

data/lib/dina/models/object_store.rb

@@ -35,6 +35,8 @@ module Dina
 
     validates_presence_of :group, message: "group is required"
 
+    attr_accessor :accepted_types
+
     def self.endpoint_path
       "objectstore-api/"
     end
@@ -43,11 +45,22 @@ module Dina
       "metadata"
     end
 
+    def self.accepted_types
+      [
+        "IMAGE",
+        "MOVING_IMAGE",
+        "SOUND",
+        "TEXT",
+        "DATASET",
+        "UNDETERMINED"
+      ]
+    end
+
     private
 
     def on_before_save
-      if self.bucket.nil?
-        self.bucket = self.group
+      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
       super
     end

data/lib/dina/models/object_store_managed_attribute.rb

@@ -19,5 +19,14 @@ module Dina
       "managed-attribute"
     end
 
+    private
+
+    def on_before_save
+      if !self.managedAttributeType.nil? && !ManagedAttribute.accepted_types.include?(self.managedAttributeType)
+        raise PropertyValueInvalid, "#{self.class} is invalid. Accepted value for managedAttributeType is one of #{ManagedAttribute.accepted_types.join(", ")}"
+      end
+      super
+    end
+
   end
 end

data/lib/dina/models/object_subtype.rb

@@ -15,5 +15,15 @@ module Dina
     def self.table_name
       "object-subtype"
     end
+
+    private
+
+    def on_before_save
+      if !self.dcType.nil? && !ObjectStore.accepted_types.include?(self.dcType)
+        raise PropertyValueInvalid, "#{self.class} is invalid. Accepted value for dcType is one of #{ObjectStore.accepted_types.join(", ")}"
+      end
+      super
+    end
+
   end
 end

data/lib/dina/models/person.rb

@@ -30,9 +30,9 @@ module Dina
     # Finds a Person object using an email address
     #
     # @param email [String] an email address
-    # @return Person [Object] a Person object
+    # @return array [Array] an array of Person objects
     def self.find_by_email(email)
-      where("email": email).all.first
+      where("email": email).all
     end
 
     private

data/lib/dina/models/storage_unit_type.rb

@@ -6,6 +6,7 @@ module Dina
     property :group, type: :string
     property :name, type: :string
     property :isInseperable, type: :boolean
+    property :gridLayoutDefinition, type: :object
     property :createdBy, type: :string
     property :createdOn, type: :time
 

data/lib/dina/models/transaction.rb

@@ -27,6 +27,8 @@ module Dina
 
     validates_presence_of :group, message: "group is required"
 
+    attr_accessor :accepted_directions
+
     def self.endpoint_path
       "loan-transaction/"
     end
@@ -35,5 +37,21 @@ module Dina
       "transaction"
     end
 
+    def self.accepted_directions
+      [
+        "IN",
+        "OUT"
+      ]
+    end
+
+    private
+
+    def on_before_save
+      if !self.materialDirection.nil? && !self.class.accepted_directions.include?(self.materialDirection)
+        raise PropertyValueInvalid, "#{self.class} is invalid. Accepted value for materialDirection is one of #{self.class.accepted_directions.join(", ")}"
+      end
+      super
+    end
+
   end
 end

data/lib/dina/version.rb

@@ -2,7 +2,7 @@ module Dina
   class Version
 
     MAJOR = 0
-    MINOR = 3
+    MINOR = 4
     PATCH = 0
     BUILD = 0
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dina
 version: !ruby/object:Gem::Version
-  version: 0.3.0.0
+  version: 0.4.0.0
 platform: ruby
 authors:
 - David P. Shorthouse
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-29 00:00:00.000000000 Z
+date: 2022-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_api_client