dina 3.1.1.0 → 3.1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1d097058a7482fdd3790d63a02f789084c7e3738bf4c1ef9087629eb7e51d0b
-  data.tar.gz: 388a7c4a2d078f6cf02b00ae7897c5dd5b7368a5fcd3e87923c00131a77cbfe5
+  metadata.gz: 5324a63fa700654179acbbe8e7eae34989df24b614a36b60eebada527871062d
+  data.tar.gz: a3adbd6fedd3dbf69abac9fbf5687f5b39c851c7a36e0867911d4c8eca3114a1
 SHA512:
-  metadata.gz: 002eee0061dc36f6bd91458e5341eb4e492cae8c75b46eb6b77f8c303902a7c845b20f8b8cbb646390b43ffae9cb9a5a5236dc01a89e50eacc84f72405f9a3c2
-  data.tar.gz: f3becc80ee064e41890976e0937414e381071202dd971aca122b1c1ef5c3b26a82ff75875cd07675e0eb86b9ff3b721c2715e809410aadd175277d66a1049801
+  metadata.gz: b7975a2185a52911ea0875c6db3e0b2aa7642b5138376411c67d38800ef20d836eca7a7d420c83b07c870d38de4c7e56a67359daecf05b070f81e628244e4587
+  data.tar.gz: ad2419b9a087f07acd703b469b2befba7c2edc83ac9a22ac239d4f046cc8b06035a1ed63416cb5b09b2671127b82853842d0c3d5e4b18b963d42cac1a7effae9

data/lib/dina/components/agent_role.rb

@@ -10,12 +10,12 @@ module Dina
       @roles = []
     end
 
-    def add_agent(id)
+    def add_agent(id:)
       raise PropertyValueInvalid, "Agent must be a UUID." if !id.is_uuid?
       @agent << id
     end
 
-    def add_role(role)
+    def add_role(role:)
       @roles << role
     end
 

data/lib/dina/components/determination.rb

@@ -53,7 +53,7 @@ module Dina
     # Add a determiner as UUID to the array of determiner
     #
     # @param id [String] a UUID for a determiner
-    def add_determiner(id)
+    def add_determiner(id:)
       raise PropertyValueInvalid, "Determiner must be a UUID." if !id.is_uuid?
       @determiner << id
     end

data/lib/dina/components/{geographic_source.rb → geographic_place_name_source_detail.rb}

@@ -1,5 +1,5 @@
 module Dina
-  class GeographicSource
+  class GeographicPlaceNameSourceDetail
     attr_accessor :sourceUrl
     attr_accessor :customGeographicPlace
     attr_accessor :selectedGeographicPlace

data/lib/dina/components/geographic_thesaurus.rb

@@ -0,0 +1,24 @@
+module Dina
+    class GeographicThesaurus
+      attr_accessor :source
+      attr_accessor :subjectId
+      attr_accessor :preferredTerm
+      attr_accessor :preferredParent
+      attr_accessor :additionalParents
+  
+      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/georeference_assertion.rb

@@ -21,7 +21,7 @@ module Dina
     # Add a georeferencedBy as UUID to the array
     #
     # @param id [String] a UUID for a georeferencedBy
-    def add_georeferencedBy(id)
+    def add_georeferencedBy(id:)
       raise PropertyValueInvalid, "georeferencedBy must be a UUID." if !id.is_uuid?
       @georeferencedBy << id
     end

data/lib/dina/components/protocol_data.rb

@@ -8,11 +8,11 @@ module Dina
       @protocolDataElement = []
     end
 
-    def add_data_element(data_element)
-      if !data_element.instance_of?(ProtocolDataElement)
+    def add_data_element(element:)
+      if !element.instance_of?(ProtocolDataElement)
         raise PropertyValueInvalid, "Data Element must be a ProtocolDataElement."
       end
-      @protocolDataElement << data_element.to_hash
+      @protocolDataElement << element.to_hash
     end
 
     # Produce a hash with symbolized keys

data/lib/dina/components/shipment.rb

@@ -15,7 +15,7 @@ module Dina
       @address = {}
     end
 
-    def add_address(address)
+    def add_address(address:)
       if !address.instance_of?(Address)
         raise PropertyValueInvalid, "Address must be of type Address."
       end

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

@@ -31,7 +31,7 @@ module Dina
     #
     # @param email [String] an email address
     # @return array [Array] an array of Person objects
-    def self.find_by_email(email)
+    def self.find_by_email(email:)
       where("email": email).all
     end
 
@@ -39,7 +39,7 @@ module Dina
     #
     # @param name [String] any portion of a person's name
     # @return array [Array] an array of Person objects, ordered by relevance
-    def self.search_by_name(name)
+    def self.search_by_name(name:)
       payload = {
         query: {
           multi_match: {

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

@@ -36,6 +36,7 @@ module Dina
     property :tags, type: :array, default: []
     property :geographicPlaceNameSource, type: :string
     property :geographicPlaceNameSourceDetail, type: :hash, default: {}
+    property :geographicThesaurus, type: :hash
     property :managedAttributes, type: :hash
     property :geoReferenceAssertions, type: :array, default: []
     property :eventGeom, type: :string

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

@@ -40,7 +40,7 @@ module Dina
     #
     # @param code [String] a code
     # @return object [Object] a Collection object
-    def self.find_by_code(code)
+    def self.find_by_code(code:)
       where(code: code).all
     end
 

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

@@ -9,6 +9,7 @@ module Dina
     property :remarks, type: :string
     property :isTarget, type: :boolean
     property :managedAttributes, type: :hash
+    property :dwcVernacularName, type: :string
     property :determination, type: :array, default: []
     property :createdBy, type: :string
     property :createdOn, type: :time

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

@@ -2,7 +2,6 @@ require_rel '../base_model'
 require_rel 'file_connection'
 
 module Dina
-
   class File < BaseModel
     self.connection_class = FileConnection
 

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

@@ -1,50 +1,50 @@
 require_rel '../base_model'
 
 module Dina
+  class FileConnection
 
-    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.response :json
-          builder.adapter(*adapter_options)
-        end
-        yield(self) if block_given?
+    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.response :json
+        builder.adapter(*adapter_options)
       end
-  
-      def run(request_method, path, params: nil, headers: {}, body: nil)
-        path = path + "/#{body[:data]["attributes"]["group"].downcase}"
-        if body[:data]["attributes"].key?("isDerivative")
-          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
-        )
-  
-        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
+      yield(self) if block_given?
+    end
+
+    def run(request_method, path, params: nil, headers: {}, body: nil)
+      path = path + "/#{body[:data]["attributes"]["group"].downcase}"
+      if body[:data]["attributes"].key?("isDerivative")
+        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
+      )
+
+      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
 end

data/lib/dina/search/search_connection.rb

@@ -1,7 +1,6 @@
 require_rel '../models/base_model'
 
 module Dina
-
   class SearchConnection
 
     attr_reader :faraday
@@ -69,5 +68,4 @@ module Dina
     end
 
   end
-
 end

data/lib/dina/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dina
 version: !ruby/object:Gem::Version
-  version: 3.1.1.0
+  version: 3.1.3.0
 platform: ruby
 authors:
 - David P. Shorthouse
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-17 00:00:00.000000000 Z
+date: 2024-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_api_client
@@ -155,7 +155,8 @@ files:
 - lib/dina/components/address.rb
 - lib/dina/components/agent_role.rb
 - lib/dina/components/determination.rb
-- lib/dina/components/geographic_source.rb
+- lib/dina/components/geographic_place_name_source_detail.rb
+- lib/dina/components/geographic_thesaurus.rb
 - lib/dina/components/georeference_assertion.rb
 - lib/dina/components/protocol_data.rb
 - lib/dina/components/protocol_data_element.rb