Add fullName attribute serialization logic

Added the fullName attribute to language_spec.rb and language.rb to handle serialization and deserialization, ensuring that the full attribute details are included in the outputs and test cases. Also updated the descriptor to handle the presence of include_class correctly.
servactory · Sep 22, 2024 · 9a375e6 · 9a375e6
1 parent 01b7ee9
commit 9a375e6
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 23 deletions.
diff --git a/examples/usual/example3/language.rb b/examples/usual/example3/language.rb
@@ -6,6 +6,7 @@ class Language < Datory::Base
  uuid! :id
 
  string! :name
+ string? :fullName, to: :full_name
 
  # TODO: Need to prepare this example:
  # {
@@ -32,6 +33,21 @@ class Language < Datory::Base
  one? :lastEOLVersion, to: :last_eol, include: Version
 
  many? :previousVersions, to: :previous, include: Version
+
+ # deserialize
+ getter :fullName do |**|
+ nil
+ end
+
+ # serialize
+ setter :full_name do |attributes:|
+ language_name = attributes.fetch(:name)
+ current_version_name = attributes.dig(:current, :name)
+
+ next language_name if current_version_name.blank?
+
+ "#{language_name} (#{current_version_name})"
+ end
  end
  end
 end
diff --git a/lib/datory/attributes/descriptor.rb b/lib/datory/attributes/descriptor.rb
@@ -26,7 +26,10 @@ def describe(service_class_name:, collection_of_attributes:) # rubocop:disable M
  row << attribute.from.type
  row << attribute.to.name
  row << attribute.to.type
- row << (include_class if include_class <= Datory::Base) if collection_of_attributes.include_class_exist?
+
+ if collection_of_attributes.include_class_exist? && !include_class.nil?
+ row << (include_class if include_class.respond_to?(:<=) && include_class <= Datory::Base)
+ end
 
  rows << row
  end

diff --git a/spec/examples/usual/example3/language_spec.rb b/spec/examples/usual/example3/language_spec.rb
@@ -137,6 +137,7 @@
  {
  id: "73031620-be3b-4088-9a78-5589ff7e1f61",
  name: "Ruby",
+ fullName: "Ruby (3.3.1)",
  currentVersion: {
  name: "3.3.1",
  releasedAt: nil,
@@ -161,6 +162,7 @@
  {
  id: "73031620-be3b-4088-9a78-5589ff7e1f61",
  name: "Ruby",
+ fullName: "Ruby (3.3.1)",
  currentVersion: {
  name: "3.3.1",
  releasedAt: nil,
@@ -374,17 +376,18 @@
  expect { perform }.to(
  output(
  <<~TABLE
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- | Usual::Example3::Language |
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- | Attribute | From | To | As | Include |
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- | id | String | id | String | |
- | name | String | name | String | |
- | currentVersion | [Usual::Example3::Version, Hash] | current | [Usual::Example3::Version, Hash] | Usual::Example3::Version |
- | lastEOLVersion | [Usual::Example3::Version, Hash, NilClass] | last_eol | [Usual::Example3::Version, Hash, NilClass] | Usual::Example3::Version |
- | previousVersions | Array | previous | Array | Usual::Example3::Version |
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ | Usual::Example3::Language |
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ | Attribute | From | To | As | Include |
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ | id | String | id | String | |
+ | name | String | name | String | |
+ | fullName | [String, NilClass] | full_name | [String, NilClass] | |
+ | currentVersion | [Usual::Example3::Version, Hash] | current | [Usual::Example3::Version, Hash] | Usual::Example3::Version |
+ | lastEOLVersion | [Usual::Example3::Version, Hash, NilClass] | last_eol | [Usual::Example3::Version, Hash, NilClass] | Usual::Example3::Version |
+ | previousVersions | Array | previous | Array | Usual::Example3::Version |
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  TABLE
  ).to_stdout
  )
@@ -400,17 +403,18 @@
  expect { perform }.to(
  output(
  <<~TABLE
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- | Usual::Example3::Language |
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- | Attribute | From | To | As | Include |
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- | id | String | id | String | |
- | name | String | name | String | |
- | currentVersion | [Usual::Example3::Version, Hash] | current | [Usual::Example3::Version, Hash] | Usual::Example3::Version |
- | lastEOLVersion | [Usual::Example3::Version, Hash, NilClass] | last_eol | [Usual::Example3::Version, Hash, NilClass] | Usual::Example3::Version |
- | previousVersions | Array | previous | Array | Usual::Example3::Version |
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ | Usual::Example3::Language |
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ | Attribute | From | To | As | Include |
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ | id | String | id | String | |
+ | name | String | name | String | |
+ | fullName | [String, NilClass] | full_name | [String, NilClass] | |
+ | currentVersion | [Usual::Example3::Version, Hash] | current | [Usual::Example3::Version, Hash] | Usual::Example3::Version |
+ | lastEOLVersion | [Usual::Example3::Version, Hash, NilClass] | last_eol | [Usual::Example3::Version, Hash, NilClass] | Usual::Example3::Version |
+ | previousVersions | Array | previous | Array | Usual::Example3::Version |
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  TABLE
  ).to_stdout
  )
@@ -469,6 +473,27 @@
  include: nil
  }
  },
+ fullName: {
+ from: {
+ name: :fullName,
+ type: [String, NilClass],
+ min: nil,
+ max: nil,
+ consists_of: false,
+ format: nil
+ },
+ to: {
+ name: :full_name,
+ type: [String, NilClass],
+ required: false,
+ default: nil,
+ min: nil,
+ max: nil,
+ consists_of: false,
+ format: nil,
+ include: nil
+ }
+ },
  currentVersion: {
  from: {
  name: :currentVersion,