dina 3.2.4.0 → 3.3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eea9336b00c838a2be0237867e77e6eb9dd9e435bc79d59ab50ee77ec6f4987b
-  data.tar.gz: 6fec0c850001711a8d2dde7ea1b454b44feb7659c8cabbc2b944bcb510283f1b
+  metadata.gz: 4088094ab4899f78647b11b7b0da9d979eb222984e2f2f1b2b678f08e98e04c0
+  data.tar.gz: a5e772cac4cf7cd3075f05e88df710bd46a9c64a123fd97d7defae84af8b93be
 SHA512:
-  metadata.gz: 69b3299bbc31dadd6acca040cf8c27bda7f0368909575c8da26c9c76e925ecae4a42b972a6e0f14f747b70cef1a76f42f12cb5d74f21ec0225343ae5ee0832a9
-  data.tar.gz: b6e5d5e1534a82a6c3b1d91ce9d988e56e82d9e8be13d813cafe3efb70ff2ae4965ebc2b1cc169f0cdd33c10b3eb4f7e39ba98bb75418ba9be991a54cbf769a9
+  metadata.gz: 579c66634326646ebd0e31c74efedab223213dc3e7afe467774aaf1b73f910004281915a88db541533b63d3e3564201fb42939ac8036b0b32c3f4523b07602fd
+  data.tar.gz: 0ab584ad3816634c6d37fa23508ec8bec544349e63358566cb14d20b4ad6b7fc7513f03a1cf7339a64428260e3d81f2bd592647c22e8404437ee2af5bb862d93

data/lib/dina/casters/geospatial.rb

@@ -0,0 +1,23 @@
+module Dina
+  class Geospatial
+    attr_accessor :type
+    attr_accessor :coordinates
+
+    def initialize(opts = {})
+      @type = ""
+      @coordinates = []
+      if opts[:type]
+        @type = opts[:type]
+      end
+      if opts[:coordinates]
+        @coordinates = opts[:coordinates]
+      end
+    end
+
+    def to_hash
+      hash = {}
+      instance_variables.each { |var| hash[var.to_s.delete('@')] = instance_variable_get(var) }
+      hash
+    end
+  end
+end

data/lib/dina/casters/geospatial_caster.rb

@@ -0,0 +1,13 @@
+require_relative 'geospatial'
+
+module Dina
+  class GeospatialCaster
+    def self.cast(value, default)
+      begin
+        Geospatial.new(value).to_hash
+      rescue ArgumentError
+        { type: "", coordinates: [] }
+      end
+    end
+  end
+end

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

@@ -46,6 +46,8 @@ module Dina
 
     has_one :protocol, class_name: "Protocol" 
     has_one :collectionMethod, class_name: "CollectionMethod"
+    has_one :expedition, class_name: "Expedition"
+    has_one :site, class_name: "Site"
     has_many :collectors, class_name: "Person"
     has_many :attachment, class_name: "Attachment"
 

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

@@ -0,0 +1,28 @@
+require_rel '../base_model'
+
+module Dina
+  class Expedition < BaseModel
+    property :id, type: :string, default: SecureRandom.uuid_v7
+    property :group, type: :string
+    property :name, type: :string
+    property :multilingualDescription, type: :multilingual_description
+    property :startDate, type: :date
+    property :endDate, type: :date
+    property :geographicContext, type: :string
+    property :createdBy, type: :string
+    property :createdOn, type: :time
+
+    has_many :participants, class_name: "Person"
+
+    validates_presence_of :group, message: "group is required"
+
+    def self.endpoint_path
+      "collection-api/"
+    end
+
+    def self.table_name
+      "expedition"
+    end
+
+  end
+end

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

@@ -0,0 +1,25 @@
+
+module Dina
+  class Site < BaseModel
+    property :id, type: :string, default: SecureRandom.uuid_v7
+    property :group, type: :string
+    property :code, type: :string
+    property :multilingualDescription, type: :multilingual_description
+    property :siteGeom, type: :geospatial
+    property :createdBy, type: :string
+    property :createdOn, type: :time
+
+    has_many :attachment, class_name: "Attachment"
+
+    validates_presence_of :group, message: "group is required"
+
+    def self.endpoint_path
+      "collection-api/"
+    end
+
+    def self.table_name
+      "site"
+    end
+
+  end
+end

data/lib/dina/version.rb

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

data/lib/dina.rb

@@ -1,4 +1,5 @@
 require "keycloak"
+require "ostruct"
 require "json_api_client"
 require "time"
 require "date"
@@ -14,6 +15,7 @@ module Dina
   JsonApiClient::Schema.register array: ArrayCaster,
       hash: HashCaster,
       date: DateCaster,
+      geospatial: Geospatial,
       multilingual_title: MultilingualTitleCaster,
       multilingual_description: MultilingualDescriptionCaster
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dina
 version: !ruby/object:Gem::Version
-  version: 3.2.4.0
+  version: 3.3.0.0
 platform: ruby
 authors:
 - David P. Shorthouse
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-28 00:00:00.000000000 Z
+date: 2026-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_api_client
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: securerandom
   requirement: !ruby/object:Gem::Requirement
@@ -147,6 +147,8 @@ files:
 - lib/dina/authentication/authentication.rb
 - lib/dina/casters/array_caster.rb
 - lib/dina/casters/date_caster.rb
+- lib/dina/casters/geospatial.rb
+- lib/dina/casters/geospatial_caster.rb
 - lib/dina/casters/hash_caster.rb
 - lib/dina/casters/multilingual_description.rb
 - lib/dina/casters/multilingual_description_caster.rb
@@ -179,12 +181,14 @@ files:
 - lib/dina/models/material_sample/collection.rb
 - lib/dina/models/material_sample/collection_method.rb
 - lib/dina/models/material_sample/collection_sequence_generator.rb
+- lib/dina/models/material_sample/expedition.rb
 - lib/dina/models/material_sample/material_sample.rb
 - lib/dina/models/material_sample/organism.rb
 - lib/dina/models/material_sample/preparation_method.rb
 - lib/dina/models/material_sample/preparation_type.rb
 - lib/dina/models/material_sample/project.rb
 - lib/dina/models/material_sample/protocol.rb
+- lib/dina/models/material_sample/site.rb
 - lib/dina/models/object_store/derivative.rb
 - lib/dina/models/object_store/file.rb
 - lib/dina/models/object_store/file_connection.rb