dina 3.1.2.0 → 3.2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 437282826ba1a248fba0a130a73c37cbf246d36eb749f4b1b6fd263f9d813627
-  data.tar.gz: 3bd9a8a0df98e894fc662098c4eff770423d6907c9ab7c91e12b31333c1e0d54
+  metadata.gz: b352cf3c52493540a1f8089e292d1eb5a24e178330796c9d8548ea2fd04a555e
+  data.tar.gz: 592c57a9d91d6853b5ebf4bf10502f316a31f40c660e9525c83f6f31ab6ec8a4
 SHA512:
-  metadata.gz: b72c25c00ea9924de683842c38a0b7a166b5c95bab7b31f213277449052e5a0dced589a1c7adab473770893bdedc15267e0984a4103eea77a6770e9ec2a07ee1
-  data.tar.gz: 56264812471dacbce3be68cd530a8cdd4d733f0d2c15f49eff5e5e4b4cad52bc689f89a39cd66749faea2fc5e6a7c4e5592cddddd4c974187ffa7ed49867e87a
+  metadata.gz: 42f07765799ef8bfdf9d04b01b2fea2623f41ded4298e42ab7e53996ba8ed4d30d625c2a23160b4bab7cfe9e63c16498ad04d54d0d7428d4be907489a8a9405c
+  data.tar.gz: 72d908349ce9f90f07f52135fe44fcb2f2f960bc87cd2acb1f81233508bac9206593568a0a0adf2534586995b0386bfb6dcb79ad6547714c1ac35441a0b9f3c6

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/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/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,10 +2,11 @@ require_rel '../base_model'
 require_rel 'file_connection'
 
 module Dina
-
   class File < BaseModel
     self.connection_class = FileConnection
 
+    custom_endpoint :download, on: :collection, request_method: :get
+
     property :id, type: :string, default: SecureRandom.uuid_v7
     property :group, type: :string
     property :filePath, type: :string

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

@@ -1,22 +1,32 @@
 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)
+      yield(self) if block_given?
+    end
+
+    def run(request_method, path, params: nil, headers: {}, body: nil)
+      if request_method == :get && path == "file/download"
+        path = "file" + "/#{params[:group]}/#{params[:fileId]}"
+        if params[:isDerivative]
+          path = "file" + "/#{params[:group]}/derivative/#{params[:fileId]}"
+        end
+        headers[:content_type] = "application/octet-stream"
+        response = @faraday.run_request(request_method, path, body, headers) do |request|
+        end
+        response
+      else
         path = path + "/#{body[:data]["attributes"]["group"].downcase}"
         if body[:data]["attributes"].key?("isDerivative")
           path = path + "/derivative"
@@ -47,4 +57,5 @@ module Dina
       end
     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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dina
 version: !ruby/object:Gem::Version
-  version: 3.1.2.0
+  version: 3.2.0.0
 platform: ruby
 authors:
 - David P. Shorthouse
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-13 00:00:00.000000000 Z
+date: 2025-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_api_client
@@ -230,7 +230,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.2'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="