dina 0.8.9.0 → 0.9.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06da6b53d4a6dd3a67417b5995be1ddba28928aa657ad89b2eb54fcf0660beb4
-  data.tar.gz: 7bf366bbf3f4991fb0a83159d488862b1f23572c1dd5de26817a3ebe02da5dc9
+  metadata.gz: 8a7b64f70c92c1d4321c50087c9f2fe9b12ef6460f97f96f5ddd0c5104df9b1f
+  data.tar.gz: 118bdbeb9e1e04df4cf2b127b22f3601d9218e9c7c48ffc7a1e999f08bf11f9f
 SHA512:
-  metadata.gz: b1429c7a61756cea5bb92ecdc481a4a257fc47858e26293c45a33920982069722c1b0944c8e3b8ccbf6d7ad850eaffed3d4d97dad1df3559c6c4d4bdede678bd
-  data.tar.gz: 2cfd34f2c58022524b329637537cb19a0e9d729176be4e3e895593b27c12da57ad4f63c0ca650305fdbc65676233a805402d5d2ed6e0ce0dcb0213ae27e97573
+  metadata.gz: 64643210a89650b021eb6aee3d8918aaa266cb506ef001c702c17a0f51b59514f9febca4cc421dfd66cc6d352de3e677712867267946554040717558b2fb7a1e
+  data.tar.gz: 5feadd20765cff3e8728db5d5d9ee53423480d6fffe3dc5c609d3c8995718fba010818b6031e3623a7e34af3b4802eaf97c9f61c17f269253e5f8b03eb31ddb0

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/casters/date_caster.rb

@@ -0,0 +1,15 @@
+module Dina
+  class DateCaster
+    def self.cast(value, default)
+      if value.is_a?(String)
+        y, m, d = value.split '-'
+        raise PropertyValueInvalid, "Invalid date" unless Date.valid_date?(y.to_i, m.to_i, d.to_i)
+        Date.parse(value).to_s
+      elsif value.is_a?(Date)
+        value.to_s
+      else
+        default
+      end
+    end
+  end
+end

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/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

@@ -0,0 +1,19 @@
+module Dina
+  class ScheduledAction
+    attr_accessor :actionType
+    attr_accessor :date
+    attr_accessor :actionStatus
+    attr_accessor :remarks
+    attr_accessor :assignedTo
+
+    def initialize
+    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/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/acquisition_event.rb

@@ -4,9 +4,9 @@ module Dina
   class AcquisitionEvent < BaseModel
     property :id, type: :string, default: SecureRandom.uuid
     property :group, type: :string
-    property :receivedDate, type: :string
+    property :receivedDate, type: :date
     property :receptionRemarks, type: :string
-    property :isolatedOn, type: :string
+    property :isolatedOn, type: :date
     property :isolationRemarks, type: :string
     property :createdBy, type: :string
     property :createdOn, type: :time

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

@@ -17,11 +17,11 @@ module Dina
     property :preparationFixative, type: :string
     property :preparationMaterials, type: :string
     property :preparationSubstrate, type: :string
-    property :preparationDate, type: :time
+    property :preparationDate, type: :date
     property :preparationRemarks, type: :string
     property :dwcDegreeOfEstablishment, type: :string
     property :materialSampleState, type: :string
-    property :stateChangedOn, type: :time
+    property :stateChangedOn, type: :date
     property :stateChangeRemarks, type: :string
     property :materialSampleRemarks, type: :string
     property :extensionValues, type: :object

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

@@ -6,8 +6,8 @@ module Dina
     property :group, type: :string
     property :name, type: :string
     property :multilingualDescription, type: :multilingual_description
-    property :startDate, type: :string
-    property :endDate, type: :string
+    property :startDate, type: :date
+    property :endDate, type: :date
     property :status, type: :string
     property :createdBy, type: :string
     property :createdOn, type: :time

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/transaction/transaction.rb

@@ -11,9 +11,9 @@ module Dina
     property :otherIdentifiers, type: :array, default: []
     property :status, type: :string
     property :purpose, type: :string
-    property :openedDate, type: :time
-    property :closedDate, type: :time
-    property :dueDate, type: :time
+    property :openedDate, type: :date
+    property :closedDate, type: :date
+    property :dueDate, type: :date
     property :remarks, type: :string
     property :managedAttributes, type: :object
     property :agentRoles, type: :array # Each of type Dina::AgentRole

data/lib/dina/version.rb

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

data/lib/dina.rb

@@ -1,6 +1,7 @@
 require "keycloak"
 require "json_api_client"
 require "time"
+require "date"
 require "securerandom"
 require "require_all"
 require_all File.join(File.dirname(__FILE__), 'dina')
@@ -11,6 +12,7 @@ module Dina
   JsonApiClient::Paginating::NestedParamPaginator.per_page_param = "limit"
   JsonApiClient::Schema.register array: ArrayCaster
   JsonApiClient::Schema.register object: ObjectCaster
+  JsonApiClient::Schema.register date: DateCaster
   JsonApiClient::Schema.register multilingual_title: MultilingualTitleCaster
   JsonApiClient::Schema.register multilingual_description: MultilingualDescriptionCaster
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dina
 version: !ruby/object:Gem::Version
-  version: 0.8.9.0
+  version: 0.9.1.0
 platform: ruby
 authors:
 - David P. Shorthouse
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-21 00:00:00.000000000 Z
+date: 2023-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_api_client
@@ -145,6 +145,7 @@ files:
 - lib/dina.rb
 - lib/dina/authentication/authentication.rb
 - lib/dina/casters/array_caster.rb
+- lib/dina/casters/date_caster.rb
 - lib/dina/casters/multilingual_description.rb
 - lib/dina/casters/multilingual_description_caster.rb
 - lib/dina/casters/multilingual_title.rb
@@ -155,6 +156,9 @@ 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
 - lib/dina/json_api_client_patch.rb