dina 0.7.2.0 → 0.7.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a0d3f25267c47fba2fa7e0cf5df80602065c1d182578d48522d0f1f81815fef
-  data.tar.gz: cf53d98747de1528002a5e4c9b88c8e245ff98e2beebfb5d1a9c3047f38bff33
+  metadata.gz: 620e59a87be3c3adb55fba2d7d4084a12fbb12a78427ca53de33426ae8510110
+  data.tar.gz: 6c2c5daff310c35f43b165156fc06944d44e4a74db84da12af055fb4d0be401d
 SHA512:
-  metadata.gz: f80d1a0565a76412d07a4367d4c6b1085c5042fcac24d83d231d5699c071da560219a11451a9928f01df4702233bfe70dfff7bfca267b7e1aac7a0f0b2c443bf
-  data.tar.gz: d462deb63117f46c998df5ff471d9a809289bce7f411c9b6a50447e71b87c9826e134e881812205003a6c8f03440d7506c33d46cb7401aa66e169ec8c606f1ac
+  metadata.gz: 3b5913b6fe291bbcb26b4c5bf298bf4f6307077e006442952ad1937833952074728352cc1f0e1e01a6abfa8f5197b06161ddf1ef674dc29a4012761f46ed231a
+  data.tar.gz: dea42bb62339358120b3d890edd22727c81058e30e6b9b3c7443d90e515e10942a12533bc94e52b5d8a6a8578d1ba67e70e6c4e1366672c828a789c1bace37e0

data/lib/dina/casters/multilingual_description.rb

@@ -6,31 +6,16 @@ module Dina
       @descriptions = []
       if opts[:descriptions]
         @descriptions = opts[:descriptions]
-      end
-      if opts[:english]
-        self.english_description = opts[:english]
-      end
-      if opts[:french]
-        self.french_description = opts[:french]
+      else
+        self.set_description(opts)
       end
     end
 
-    def english_description=(desc)
-      descriptions.delete_if{|o| o[:lang] == "en"}
-      descriptions << { lang: "en", desc: desc }
-    end
-
-    def english_description
-      descriptions.select{|o| o[:lang] == "en"}.first[:desc]
-    end
-
-    def french_description=(desc)
-      descriptions.delete_if{|o| o[:lang] == "fr"}
-      descriptions << { lang: "fr", desc: desc }
-    end
-
-    def french_description
-      descriptions.select{|o| o[:lang] == "fr"}.first[:desc]
+    def set_description(opts = {})
+      opts.each do |key, value|
+        descriptions.delete_if{|o| o[:lang] == key.to_s}
+        descriptions << { lang: key.to_s, desc: value }
+      end
     end
 
     def to_hash

data/lib/dina/casters/multilingual_description_caster.rb

@@ -4,7 +4,7 @@ module Dina
   class MultilingualDescriptionCaster
     def self.cast(value, default)
       begin
-        Dina::MultilingualDescription.new(value).to_hash
+        MultilingualDescription.new(value).to_hash
       rescue ArgumentError
         { descriptions: [] }
       end

data/lib/dina/casters/multilingual_title.rb

@@ -6,31 +6,16 @@ module Dina
       @titles = []
       if opts[:titles]
         @titles = opts[:titles]
-      end
-      if opts[:english]
-        self.english_title = opts[:english]
-      end
-      if opts[:french]
-        self.french_title = opts[:french]
+      else
+        self.set_title(opts)
       end
     end
 
-    def english_title=(title)
-      titles.delete_if{|o| o[:lang] == "en"}
-      titles << { lang: "en", title: title }
-    end
-
-    def english_title
-      titles.select{|o| o[:lang] == "en"}.first[:title]
-    end
-
-    def french_title=(title)
-      titles.delete_if{|o| o[:lang] == "fr"}
-      titles << { lang: "fr", title: title }
-    end
-
-    def french_title
-      titles.select{|o| o[:lang] == "fr"}.first[:title]
+    def set_title(opts ={})
+      opts.each do |key, value|
+        titles.delete_if{|o| o[:lang] == key.to_s}
+        titles << { lang: key.to_s, title: value }
+      end
     end
 
     def to_hash

data/lib/dina/casters/multilingual_title_caster.rb

@@ -4,7 +4,7 @@ module Dina
   class MultilingualTitleCaster
     def self.cast(value, default)
       begin
-        Dina::MultilingualTitle.new(value).to_hash
+        MultilingualTitle.new(value).to_hash
       rescue ArgumentError
         { titles: [] }
       end

data/lib/dina/exceptions.rb

@@ -4,5 +4,6 @@ module Dina
   class TokenStoreContentInvalid < DinaException; end
   class ConfigItemMissing < DinaException; end
   class ObjectInvalid < DinaException; end
+  class PropertyInvalid < ObjectInvalid; end
   class PropertyValueInvalid < ObjectInvalid; end
 end

data/lib/dina/models/base_model.rb

@@ -40,15 +40,37 @@ module Dina
       super
     end
 
-    def english_description
+    # Adds or updates a multilingualDescription with a language key
+    #
+    # @param opts [Hash] the description expessed as { en: "My description" }
+    def set_multilingualDescription(opts = {})
       if self.respond_to?(:multilingualDescription)
-        multilingualDescription[:descriptions].select{|o| o[:lang] == "en"}.first[:desc]
+        if self.multilingualDescription.nil?
+          self.multilingualDescription = opts
+        else
+          descriptions = multilingualDescription["descriptions"]
+          descriptions.delete_if{|o| o["lang"] == opts.keys[0].to_s}
+          descriptions << { "lang" => opts.keys[0].to_s, "desc" => opts[opts.keys[0]] }
+        end
+      else
+        raise PropertyInvalid, "#{self.class} does not have the property multilingualDescription"
       end
     end
 
-    def french_description
-      if self.respond_to?(:multilingualDescription)
-        multilingualDescription[:descriptions].select{|o| o[:lang] == "fr"}.first[:desc]
+    # Adds or updates a multilingualTitle with a language key
+    #
+    # @param opts [Hash] the title expessed as { en: "My title" }
+    def set_multilingualTitle(opts = {})
+      if self.respond_to?(:multilingualTitle)
+        if self.multilingualTitle.nil?
+          self.multilingualTitle = opts
+        else
+          titles = multilingualTitle["titles"]
+          titles.delete_if{|o| o["lang"] == opts.keys[0].to_s}
+          titles << { "lang" => opts.keys[0].to_s, "title" => opts[opts.keys[0]] }
+        end
+      else
+        raise PropertyInvalid, "#{self.class} does not have the property multilingualTitle"
       end
     end
 

data/lib/dina/models/managed_attribute.rb

@@ -46,22 +46,6 @@ module Dina
       ]
     end
 
-    def english_description=(desc)
-      description[:en] = desc
-    end
-
-    def english_description
-      description[:en]
-    end
-
-    def french_description=(desc)
-      description[:fr] = desc
-    end
-
-    def french_description
-      description[:fr]
-    end
-
     private
 
     def on_before_save

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

@@ -18,6 +18,7 @@ module Dina
     property :dwcVerbatimSRS, type: :string, default: "WGS84 (EPSG:4326)"
     property :dwcVerbatimElevation, type: :string
     property :dwcVerbatimDepth, type: :string
+    property :dwcFieldNumber, type: :string
     property :dwcOtherRecordNumbers, type: :array, default: []
     property :dwcRecordNumber, type: :string
     property :dwcCountry, type: :string

data/lib/dina/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dina
 version: !ruby/object:Gem::Version
-  version: 0.7.2.0
+  version: 0.7.4.0
 platform: ruby
 authors:
 - David P. Shorthouse
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-04 00:00:00.000000000 Z
+date: 2023-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_api_client