datory 1.0.0.rc4 → 1.0.0.rc6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ca68aea305e426d629f97a3d8940e016a933e4298e56b7ab7d3f9e495fb515d
-  data.tar.gz: 3589f41e040965dacdbaa9f22d197c837afd96f6a5d34e6b32b93e2043ce2391
+  metadata.gz: 36c9c3d73db41d95c3d5bafd98df4bb5002ea1f36cacc7fafa808ccb9f8af8d7
+  data.tar.gz: 56304b66db42d82a4b143711f1192df86f3139979711a0a9c4d6bf6be7f95d85
 SHA512:
-  metadata.gz: 4b08dcadef0150c3183c5ae1458fdd4de9ddf9a1dd6303c5b7dfa1e104f7c4581826c4876660628879a432263ac4cc87de728d2948a3167dc1dd20c83b6bf176
-  data.tar.gz: a19f50f5e2bfe11d3092292ea2e641f546ba78bd2b2eb8efb50769f42d47753c9a6edd46460a6391b4e389c6dcd662cbaf5510f80aa7fd66ab9cf0f3233bb5f0
+  metadata.gz: 7a741dd5da9f0ad4782c101ce76c1063668fe5c77074ff650edb23e16216dffe3bceb7b049b13301a06a6ac4de37156da84b3ebc3754297bf2509ef9cb09195e
+  data.tar.gz: ec355c7bb2073c0236d4556e6005c874987b3c513389f2efb5c64adb25de3b35f16077579c5468661e53b60a6933217be561d246031d261d8c1e5ab11be0758a

data/README.md

@@ -35,11 +35,11 @@ UserDto.deserialize(json)
 
 ```ruby
 class UserDto < Datory::Base
-  string :id
+  uuid :id
   string :firstname, to: :first_name
   string :lastname, to: :last_name
   string :email
-  string :birthDate, to: :birth_date, output: ->(value:) { value.to_s }
+  string :birthDate, to: :birth_date, as: Date
 
   one :login, include: UserLoginDto
 
@@ -59,7 +59,7 @@ class UserLoginDto < Datory::Base
   string :password
   string :md5
   string :sha1
-  string :registered
+  string :registered, to: :registered_at, as: DateTime
 end
 ```
 

data/lib/datory/attributes/attribute.rb

@@ -9,6 +9,56 @@ module Datory
         @name = name
         @options = options
       end
+
+      def input_options # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+        hash = {
+          as: options.fetch(:to, name),
+          type: options.fetch(:from),
+          required: options.fetch(:required, true),
+          consists_of: options.fetch(:consists_of, false),
+          prepare: (lambda do |value:|
+            include_class = options.fetch(:include, nil)
+            return value unless include_class.present?
+
+            from_type = options.fetch(:from, nil)
+
+            if [Set, Array].include?(from_type)
+              value.map { |item| include_class.build(**item) }
+            else
+              include_class.build(**value)
+            end
+          end)
+        }
+
+        if (format = options.fetch(:format, nil)).present?
+          hash[:format] = format
+        end
+
+        hash
+      end
+
+      def output_options # rubocop:disable Metrics/MethodLength
+        hash = {
+          consists_of: if (consists_of_type = options.fetch(:consists_of, false)) == Hash
+                         Datory::Result
+                       else
+                         consists_of_type
+                       end,
+          type: if (from_type = options.fetch(:from)) == Hash
+                  Datory::Result
+                elsif (option_as = options.fetch(:as, nil)).present?
+                  option_as
+                else
+                  from_type
+                end
+        }
+
+        if (format = options.fetch(:format, nil)).present?
+          hash[:format] = format
+        end
+
+        hash
+      end
     end
   end
 end

data/lib/datory/attributes/dsl.rb

@@ -17,18 +17,29 @@ module Datory
 
         private
 
-        def singular(value)
-          @singular = value
+        def attribute(name, **options)
+          collection_of_attributes << Attribute.new(name, **options)
         end
 
-        def plural(value)
-          @plural = value
+        ########################################################################
+
+        def one(name, include:, to: nil)
+          attribute(name, to: to.presence || name, from: Hash, include: include)
         end
 
-        def attribute(name, **options)
-          collection_of_attributes << Attribute.new(name, **options)
+        def many(name, include:, to: nil)
+          attribute(name, to: to.presence || name, from: Array, consists_of: Hash, include: include)
+        end
+
+        ########################################################################
+
+        def uuid(name, **options)
+          options = options.merge(format: :uuid)
+          string(name, **options)
         end
 
+        ########################################################################
+
         def symbol(name, **options)
           options = options.merge(from: Symbol)
           attribute(name, **options)
@@ -49,6 +60,11 @@ module Datory
           attribute(name, **options)
         end
 
+        def duration(name, **options)
+          options = options.merge(from: ActiveSupport::Duration)
+          attribute(name, **options)
+        end
+
         def date(name, **options)
           options = options.merge(from: Date)
           attribute(name, **options)
@@ -64,13 +80,7 @@ module Datory
           attribute(name, **options)
         end
 
-        def one(name, include:, to: nil)
-          attribute(name, to: to.presence || name, from: Hash, include: include)
-        end
-
-        def many(name, include:, to: nil)
-          attribute(name, to: to.presence || name, from: Array, consists_of: Hash, include: include)
-        end
+        ########################################################################
 
         def collection_of_attributes
           @collection_of_attributes ||= Collection.new

data/lib/datory/attributes/serialization/serializator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datory
   module Attributes
     module Serialization
@@ -37,6 +39,8 @@ module Datory
                   output_formatter.call(value: value)
                 elsif [Date, Time, DateTime].include?(value.class)
                   value.to_s
+                elsif ActiveSupport::Duration == value.class
+                  value.iso8601
                 else
                   value
                 end

data/lib/datory/attributes/tools/service_factory.rb

@@ -13,47 +13,19 @@ module Datory
           @collection_of_attributes = collection_of_attributes
         end
 
-        # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+        # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
         def create
           return if @model_class.const_defined?(ServiceBuilder::SERVICE_CLASS_NAME)
 
           collection_of_attributes = @collection_of_attributes
 
           class_sample = Class.new(Datory::Service::Builder) do
-            collection_of_attributes.each do |attribute| # rubocop:disable Metrics/BlockLength
+            collection_of_attributes.each do |attribute|
               input_internal_name = attribute.options.fetch(:to, attribute.name)
 
-              input attribute.name,
-                    as: input_internal_name,
-                    type: attribute.options.fetch(:from),
-                    required: attribute.options.fetch(:required, true),
-                    consists_of: attribute.options.fetch(:consists_of, false),
-                    prepare: (lambda do |value:|
-                      include_class = attribute.options.fetch(:include, nil)
-                      return value unless include_class.present?
-
-                      from_type = attribute.options.fetch(:from, nil)
-
-                      if [Set, Array].include?(from_type)
-                        value.map { |item| include_class.build(**item) }
-                      else
-                        include_class.build(**value)
-                      end
-                    end)
-
-              output input_internal_name,
-                     consists_of: if (consists_of_type = attribute.options.fetch(:consists_of, false)) == Hash
-                                    Datory::Result
-                                  else
-                                    consists_of_type
-                                  end,
-                     type: if (from_type = attribute.options.fetch(:from)) == Hash
-                             Datory::Result
-                           elsif (option_as = attribute.options.fetch(:as, nil)).present?
-                             option_as
-                           else
-                             from_type
-                           end
+              input attribute.name, **attribute.input_options
+
+              output input_internal_name, **attribute.output_options
 
               make :"assign_#{input_internal_name}_output"
 
@@ -62,15 +34,7 @@ module Datory
 
                 option_as = attribute.options.fetch(:as, nil)
 
-                if [Date, Time, DateTime].include?(option_as)
-                  value = option_as.parse(value)
-                elsif option_as == String
-                  value = value.to_s
-                elsif option_as == Integer
-                  value = value.to_i
-                elsif option_as == Float
-                  value = value.to_f
-                end
+                value = Datory::Utils.transform_value_with(value, option_as)
 
                 outputs.public_send(:"#{input_internal_name}=", value)
               end
@@ -92,7 +56,7 @@ module Datory
 
           @model_class.const_set(ServiceBuilder::SERVICE_CLASS_NAME, class_sample)
         end
-        # rubocop:enable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+        # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
       end
     end
   end

data/lib/datory/service/base.rb

@@ -13,6 +13,14 @@ module Datory
         failure_class Datory::Service::Exceptions::Failure
 
         result_class Datory::Result
+
+        input_option_helpers [
+          Servactory::ToolKit::DynamicOptions::Format.use
+        ]
+
+        output_option_helpers [
+          Servactory::ToolKit::DynamicOptions::Format.use
+        ]
       end
     end
   end

data/lib/datory/utils.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Datory
+  module Utils
+    module_function
+
+    TRANSFORMATIONS = {
+      Symbol => ->(value) { value.to_sym },
+      String => ->(value) { value.to_s },
+      Integer => ->(value) { value.to_i },
+      Float => ->(value) { value.to_f },
+      Date => ->(value) { Date.parse(value) },
+      Time => ->(value) { Time.parse(value) },
+      DateTime => ->(value) { DateTime.parse(value) },
+      ActiveSupport::Duration => ->(value) { ActiveSupport::Duration.parse(value) }
+    }.freeze
+
+    private_constant :TRANSFORMATIONS
+
+    def transform_value_with(value, type)
+      TRANSFORMATIONS.fetch(type, ->(v) { v }).call(value)
+    end
+  end
+end

data/lib/datory/version.rb

@@ -5,7 +5,7 @@ module Datory
     MAJOR = 1
     MINOR = 0
     PATCH = 0
-    PRE = "rc4"
+    PRE = "rc6"
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join(".")
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datory
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc4
+  version: 1.0.0.rc6
 platform: ruby
 authors:
 - Anton Sokolov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-23 00:00:00.000000000 Z
+date: 2024-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.0.rc2
+        version: 2.5.0.rc5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.0.rc2
+        version: 2.5.0.rc5
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -211,6 +211,7 @@ files:
 - lib/datory/service/base.rb
 - lib/datory/service/builder.rb
 - lib/datory/service/exceptions.rb
+- lib/datory/utils.rb
 - lib/datory/version.rb
 homepage: https://github.com/servactory/datory
 licenses: