dina 0.7.3.0 → 0.7.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06235bf5d722c2f96bbbc1d4c4bd3dd7e78bc1eef08c0e9e7412c6920312c17b
-  data.tar.gz: 4bd30f51b2626a453e1871dab175057869be4d6bd15d00817cf835ff6ec89d00
+  metadata.gz: 8ccd7e97e13338d74abe532c9682da8c190428a6a49e9f185ab8b8ced6ac31ac
+  data.tar.gz: 65fbba40026990fd8cfaa90803e8c909dc3431eea4585800093d9c433801bb25
 SHA512:
-  metadata.gz: d25fecef73f0669268ab5e52e29b935b5e42447988aff67e48489f9b46aec181ab05fde556460384ceab61ca1ecdf9d55e7049d43610f53c6e044091eefba1db
-  data.tar.gz: a8a9e55dd08583d371a47e1fe1004e1003edd844a866ddc51bcc6b6ec5c150f5e57814c024d18a14464c63787bbc158e079e27f8acfc55ee6fb9f7a7c2dd84ed
+  metadata.gz: 0a13c0b80dea86b275fa961cb0f6c17d7645c5a0ed99fc09b6dbbe087923aa6dc95dcc746bc3ebbdfe26f4200f7486fb94355295ea1ead24a632bcebebf5a233
+  data.tar.gz: 1b4fc2d14a4766fbd598cec301c4e39c002e044e34c70b6a6c48fe4852539e00775def68611a1197807e932de23802a9a568abceb76a04f2907d7405dcf09d74

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

@@ -38,22 +38,20 @@ module Dina
       symbolized_params = params.transform_keys(&:to_sym)
       params["id"] = SecureRandom.uuid if !symbolized_params[:id]
       super
+      extend_model_methods
     end
 
-    def english_description
-      if self.respond_to?(:multilingualDescription)
-        multilingualDescription[:descriptions].select{|o| o[:lang] == "en"}.first[:desc]
-      end
-    end
+    private
 
-    def french_description
+    def extend_model_methods
       if self.respond_to?(:multilingualDescription)
-        multilingualDescription[:descriptions].select{|o| o[:lang] == "fr"}.first[:desc]
+        extend MultiLingualDescription
+      end
+      if self.respond_to?(:multilingualTitle)
+        extend MultiLingualTitle
       end
     end
 
-    private
-
     def on_before_create
       self.attributes.delete_if { |k, v| v.nil? || v == "" }
       self.attributes = self.attributes.deep_symbolize_keys

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/utils/multi_lingual_description.rb

@@ -0,0 +1,18 @@
+module Dina
+  module MultiLingualDescription
+
+    # 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.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
+    end
+
+  end
+end

data/lib/dina/utils/multi_lingual_title.rb

@@ -0,0 +1,18 @@
+module Dina
+  module MultiLingualTitle
+
+    # 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.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
+    end
+
+  end
+end

data/lib/dina/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dina
 version: !ruby/object:Gem::Version
-  version: 0.7.3.0
+  version: 0.7.5.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
@@ -199,6 +199,8 @@ files:
 - lib/dina/search/search_mapping.rb
 - lib/dina/utils/identifier.rb
 - lib/dina/utils/identifier_type.rb
+- lib/dina/utils/multi_lingual_description.rb
+- lib/dina/utils/multi_lingual_title.rb
 - lib/dina/version.rb
 homepage: https://github.com/dshorthouse/dina
 licenses: