dina 0.9.0.0 → 0.9.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27acdf30e09b690b73f8259fb85b62336c19af883559d1c37f29956fd1a65def
-  data.tar.gz: 3407082f98d36a8ff78301e48a5aa28c45482b27ccfd25d579c887d7bb12d155
+  metadata.gz: 4d8c290f712923b2bafe35e05adfb3ceea63ee0bc6d5feff86bcbd1a1419c562
+  data.tar.gz: 406853667848946c07e023d41470bf625898e81d917d6fe3eb13408324224c56
 SHA512:
-  metadata.gz: 548ddc0feac986f42f2f36ac2a1887639f67cf647215e8f0d0f27977886a92213bc6ca8912576c8abcb110e0b2fe37a3ab36f544f0b4c63b484e3cf864a6a187
-  data.tar.gz: 6b51728d08aa817222e7d8ddd32085bede6abac6553a815aa4f80d7d4d846e16a0bc1d24912faf70b60b98dd218232b7ab038043971a8fd72c54926100592d0c
+  metadata.gz: 7240f2a9e0f637cbc35515ec956f8e39ed42fe0d4472b4397302a85a3835a23feecff76862c7174c40656dd29f51db4f31bc29a2d7ddc508eb2ff00554c89b9b
+  data.tar.gz: c48bd3f5d7032bdf40468998cafe4288b96b0934995be5e84aeafd1e342b8cac37f9903aac4dc5366d093aebef64ccfc0fc62adfa2d969f416b855750c07f8e0

data/lib/dina/authentication/authentication.rb

@@ -53,16 +53,12 @@ module Dina
       Keycloak.auth_server_url = config.authorization_url
       Keycloak.realm = config.realm
 
-      if ::File.zero?(config.token_store_file)
+      if ::File.zero?(config.token_store_file) || !token.key?(config.server_name.to_sym)
         write_token(data: empty_token)
       end
     end
 
-    # Gets, sets, and renews a Bearer access token as required
-    # and produces a Header string
-    #
-    # WARNING: this is not likely to be threadsafe unless we do away with @token
-    # and load the token_store_file with every call to header
+    # Gets, sets, and renews a Bearer access token as required and produces a Header string
     #
     # @return [String] the Bearer token
     def header

data/lib/dina/components/address.rb

@@ -9,7 +9,11 @@ module Dina
     attr_accessor :zipCode
     attr_accessor :country
 
-    def initialize
+    def initialize(params = {})
+      params.each do |key, value|
+        setter = "#{key}="
+        send(setter, value) if respond_to?(setter.to_sym, false)
+      end
     end
 
     def to_hash

data/lib/dina/components/geographic_source.rb

@@ -8,7 +8,11 @@ module Dina
     attr_accessor :country
     attr_accessor :recordedOn
 
-    def initialize
+    def initialize(params = {})
+      params.each do |key, value|
+        setter = "#{key}="
+        send(setter, value) if respond_to?(setter.to_sym, false)
+      end
     end
 
     def to_hash

data/lib/dina/components/protocol_data.rb

@@ -0,0 +1,26 @@
+module Dina
+  class ProtocolData
+    attr_accessor :key
+    attr_accessor :vocabularyBased #boolean
+    attr_accessor :protocolDataElement #array
+
+    def initialize
+      @protocolDataElement = []
+    end
+
+    def add_data_element(data_element)
+      if !data_element.instance_of?(ProtocolDataElement)
+        raise PropertyValueInvalid, "Data Element must be a ProtocolDataElement."
+      end
+      @protocolDataElement << data_element.to_hash
+    end
+
+    # Produce a hash with symbolized keys
+    def to_hash
+      hash = {}
+      instance_variables.each { |var| hash[var.to_s.delete('@')] = instance_variable_get(var) }
+      hash.deep_symbolize_keys
+    end
+
+  end
+end

data/lib/dina/components/protocol_data_element.rb

@@ -0,0 +1,22 @@
+module Dina
+  class ProtocolDataElement
+    attr_accessor :elementType #string
+    attr_accessor :value #string
+    attr_accessor :vocabularyBased #boolean
+    attr_accessor :unit #string
+
+    def initialize(params = {})
+      params.each do |key, value|
+        setter = "#{key}="
+        send(setter, value) if respond_to?(setter.to_sym, false)
+      end
+    end
+
+    def to_hash
+      hash = {}
+      instance_variables.each { |var| hash[var.to_s.delete('@')] = instance_variable_get(var) }
+      hash.deep_symbolize_keys
+    end
+
+  end
+end

data/lib/dina/components/scheduled_action.rb

@@ -6,7 +6,11 @@ module Dina
     attr_accessor :remarks
     attr_accessor :assignedTo
 
-    def initialize
+    def initialize(params = {})
+      params.each do |key, value|
+        setter = "#{key}="
+        send(setter, value) if respond_to?(setter.to_sym, false)
+      end
     end
 
     def to_hash

data/lib/dina/components/shipment.rb

@@ -16,10 +16,10 @@ module Dina
     end
 
     def add_address(address)
-      if !address.instance_of?(Hash)
-        raise PropertyValueInvalid, "Address must be a Hash."
+      if !address.instance_of?(Address)
+        raise PropertyValueInvalid, "Address must be of type Address."
       end
-      @address.merge!(address)
+      @address.merge!(address.to_hash)
     end
 
     def to_hash

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

@@ -5,7 +5,9 @@ module Dina
     property :id, type: :string, default: SecureRandom.uuid
     property :group, type: :string
     property :name, type: :string
+    property :protocolType, type: :string
     property :multilingualDescription, type: :multilingual_description
+    property :protocolData, type: :array
     property :createdBy, type: :string
     property :createdOn, type: :time
 

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

@@ -3,7 +3,6 @@ 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
@@ -13,10 +12,13 @@ module Dina
     property :acHashValue, type: :string
     property :derivativeType, type: :string
 
-    belongs_to :ac_derived_from, shallow_path: true, class_name: "ObjectStore"
+    has_one :ac_derived_from, class_name: "ObjectStore"
 
-    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 :fileIdentifier, message: "fileIdentifier is required"
+    validates_presence_of :fileExtension, message: "fileExtension is required"
 
     def self.endpoint_path
       "objectstore-api/"
@@ -29,9 +31,6 @@ module Dina
     private
 
     def on_before_save
-      if self.group && self.bucket.nil?
-        self.bucket = self.group.downcase
-      end
       super
     end
 

data/lib/dina/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dina
 version: !ruby/object:Gem::Version
-  version: 0.9.0.0
+  version: 0.9.2.0
 platform: ruby
 authors:
 - David P. Shorthouse
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-24 00:00:00.000000000 Z
+date: 2023-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_api_client
@@ -156,6 +156,8 @@ files:
 - lib/dina/components/determination.rb
 - lib/dina/components/geographic_source.rb
 - lib/dina/components/georeference_assertion.rb
+- lib/dina/components/protocol_data.rb
+- lib/dina/components/protocol_data_element.rb
 - lib/dina/components/scheduled_action.rb
 - lib/dina/components/shipment.rb
 - lib/dina/exceptions.rb