datory 1.0.0.rc18 → 1.0.0.rc20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb979251a3c5abfb4391233277520df3ae8d03d605cdae59166a80f1c8713b05
-  data.tar.gz: c5fa307e7db176c5f794f1e00da679cbb03463fb4a2ae588a7ae2bdd3b1df418
+  metadata.gz: 7d89294162d1c0f3ba39169be07688e41bd756ce01aca92d819eadb4a2fa17c6
+  data.tar.gz: d5f85e0a122bc34fee393bd2fcdb5039e69c6db7500e7d3d6ff3be9db6d482a0
 SHA512:
-  metadata.gz: a5e6e7aedec61ea373c9e4df22fe2ded364bc02e9c37b0de0782fdde2e4a52d729b468dd7adfb6252c6b7ea886ffa0d8c3d1ecf37a80620fcff0289676ddc66c
-  data.tar.gz: 7ba8a8b89b44463649617203976bf99000a12d9e9748acc2c1d45f27bf592e6860d1839b5311b5dcae5825c12d008564b9b9eaf5f9ce12f487ff530745c7ccb0
+  metadata.gz: 58752a040a8c9a9f48adb20c9cfe5251469e47df3f384a63fa0c2d70e5983a4244aae2ce73e91c6fef5727e44bc996ce68a641daef5fac01797a7de055116645
+  data.tar.gz: 77a9dcc175d8b1a0304d7b8d4d3597077848304f7220396eb62bf6d4d177f8e11b514040dda727a2ad04a76d5d3eff8662dcebc04d7f0193414929dd42a3a728

data/README.md

@@ -3,7 +3,7 @@
   <a href="https://github.com/servactory/datory/releases"><img src="https://img.shields.io/github/release-date/servactory/datory" alt="Release Date"></a>
 </p>
 
-## Documentation (soon)
+## Documentation
 
 See [datory.servactory.com](https://datory.servactory.com) for documentation.
 
@@ -20,15 +20,15 @@ gem "datory"
 #### Serialize
 
 ```ruby
-user = User.find(...)
+serial = Serial.find(id)
 
-UserDto.serialize(user) # => { ... }
+SerialDto.serialize(serial) # => { ... }
 ```
 
 #### Deserialize
 
 ```ruby
-UserDto.deserialize(json) # => Datory::Result
+SerialDto.deserialize(json) # => Datory::Result
 ```
 
 #### Form
@@ -37,9 +37,9 @@ For serialization, the `form` method is also available.
 This prepares a `Form` object, which has a set of additional methods such as `valid?` and `invalid?`.
 
 ```ruby
-form = UserDto.form(user)
+form = SerialDto.form(serial)
 
-form.target # => UserDto
+form.target # => SerialDto
 form.model # => { ... }
 
 form.valid? # => true
@@ -51,38 +51,34 @@ form.serialize # => { ... }
 #### Examples
 
 ```ruby
-class UserDto < Datory::Base
+class SerialDto < Datory::Base
   uuid :id
 
-  string :firstname, to: :first_name
-  string :lastname, to: :last_name
+  string :status
+  string :title
 
-  string :email
-  string :phone
-  string :website
+  one :poster, include: ImageDto
 
-  date :birthDate, to: :birth_date
+  one :ratings, include: RatingsDto
 
-  one :login, include: UserLoginDto
-  one :company, include: UserCompanyDto
+  many :countries, include: CountryDto
+  many :genres, include: GenreDto
+  many :seasons, include: SeasonDto
 
-  many :addresses, include: UserAddressDto
+  date :premieredOn, to: :premiered_on
 end
 ```
 
 ```ruby
-class UserLoginDto < Datory::Base
+class SeasonDto < Datory::Base
   uuid :id
-  
-  string :username
-  string :password
-  
-  string :md5
-  string :sha1
-
-  duration :lifetime
-  
-  datetime :registered_at
+  uuid :serial_id
+
+  integer :number
+
+  many :episodes, include: EpisodeDto
+
+  date :premiered_on
 end
 ```
 
@@ -93,25 +89,31 @@ end
 #### attribute
 
 ```ruby
-attribute :firstname, from: String, to: :first_name, as: String
+attribute :uuid, from: String, to: :id, as: String, format: :uuid
 ```
 
 #### string
 
 ```ruby
-string :first_name
+string :uuid, to: :id
 ```
 
 #### integer
 
 ```ruby
-integer :attempts, min: 1, max: 10
+integer :rating, min: 1, max: 10
 ```
 
 #### float
 
 ```ruby
-float :interest_rate
+float :rating
+```
+
+#### boolean
+
+```ruby
+boolean :default
 ```
 
 ### Helpers
@@ -129,31 +131,31 @@ uuid :id
 It will prepare two attributes `*_cents` and `*_currency`.
 
 ```ruby
-money :price
+money :box_office
 ```
 
 #### duration
 
 ```ruby
-duration :lifetime
+duration :episode_duration
 ```
 
 #### date
 
 ```ruby
-date :birth_date
+date :premiered_on
 ```
 
 #### time
 
 ```ruby
-time :registered_at
+time :premiered_at
 ```
 
 #### datetime
 
 ```ruby
-datetime :registered_at
+time :premiered_at
 ```
 
 ### Nesting
@@ -161,13 +163,13 @@ datetime :registered_at
 #### one
 
 ```ruby
-one :company, include: UserCompanyDto
+one :poster, include: ImageDto
 ```
 
 #### many
 
 ```ruby
-many :addresses, include: UserAddressDto
+many :seasons, include: SeasonDto
 ```
 
 ## Object information
@@ -175,36 +177,35 @@ many :addresses, include: UserAddressDto
 ### Info
 
 ```ruby
-UserDto.info
+SerialDto.info
 ```
 
 ```
-#<Datory::Info::Result:0x000000011eecd7d0 @attributes={:id=>{:from=>{:name=>:id, :type=>String, :min=>nil, :max=>nil, :consists_of=>false, :format=>:uuid}, :to=>{:name=>:id, :type=>String, :min=>nil, :max=>nil, :consists_of=>false, :format=>:uuid, :required=>true, :include=>nil}}, :firstname=>{:from=>{:name=>:firstname, :type=>String, :min=>nil, :max=>nil, :consists_of=>false, :format=>nil}, :to=>{:name=>:first_name, :type=>String, :min=>nil, :max=>nil, :consists_of=>false, :format=>nil, :required=>true, :include=>nil}}, :lastname=>{:from=>{:name=>:lastname, :type=>String, :min=>nil, :max=>nil, :consists_of=>false, :format=>nil}, :to=>{:name=>:last_name, :type=>String, :min=>nil, :max=>nil, :consists_of=>false, :format=>nil, :required=>true, :include=>nil}}, :email=>{:from=>{:name=>:email, :type=>String, :min=>nil, :max=>nil, :consists_of=>false, :format=>nil}, :to=>{:name=>:email, :type=>String, :min=>nil, :max=>nil, :consists_of=>false, :format=>nil, :required=>true, :include=>nil}}, :phone=>{:from=>{:name=>:phone, :type=>String, :min=>nil, :max=>nil, :consists_of=>false, :format=>nil}, :to=>{:name=>:phone, :type=>String, :min=>nil, :max=>nil, :consists_of=>false, :format=>nil, :required=>true, :include=>nil}}, :website=>{:from=>{:name=>:website, :type=>String, :min=>nil, :max=>nil, :consists_of=>false, :format=>nil}, :to=>{:name=>:website, :type=>String, :min=>nil, :max=>nil, :consists_of=>false, :format=>nil, :required=>true, :include=>nil}}, :birthDate=>{:from=>{:name=>:birthDate, :type=>String, :min=>nil, :max=>nil, :consists_of=>false, :format=>:date}, :to=>{:name=>:birth_date, :type=>Date, :min=>nil, :max=>nil, :consists_of=>false, :format=>nil, :required=>true, :include=>nil}}, :login=>{:from=>{:name=>:login, :type=>Hash, :min=>nil, :max=>nil, :consists_of=>false, :format=>nil}, :to=>{:name=>:login, :type=>[Datory::Result, Hash], :min=>nil, :max=>nil, :consists_of=>false, :format=>nil, :required=>true, :include=>Usual::Example1::UserLogin}}, :company=>{:from=>{:name=>:company, :type=>Hash, :min=>nil, :max=>nil, :consists_of=>false, :format=>nil}, :to=>{:name=>:company, :type=>[Datory::Result, Hash], :min=>nil, :max=>nil, :consists_of=>false, :format=>nil, :required=>true, :include=>Usual::Example1::UserCompany}}, :addresses=>{:from=>{:name=>:addresses, :type=>Array, :min=>nil, :max=>nil, :consists_of=>[Datory::Result, Hash], :format=>nil}, :to=>{:name=>:addresses, :type=>Array, :min=>nil, :max=>nil, :consists_of=>[Datory::Result, Hash], :format=>nil, :required=>true, :include=>Usual::Example1::UserAddress}}}>
+#<Datory::Info::Result:0x0000000124aa7bc8 @attributes={:id=>{:from=>{:name=>:id, :type=>String, :min=>nil, :max=>nil, :consists_of=>false, :format=>:uuid}, :to=>{:name=>:id, :type=>String, :min=>nil, :max=>nil, :consists_of=>false, :format=>:uuid, :required=>true, :include=>nil}}, :status=>{:from=>{:name=>:status, :type=>String, :min=>nil, :max=>nil, :consists_of=>false, :format=>nil}, :to=>{:name=>:status, :type=>String, :min=>nil, :max=>nil, :consists_of=>false, :format=>nil, :required=>true, :include=>nil}}, :title=>{:from=>{:name=>:title, :type=>String, :min=>nil, :max=>nil, :consists_of=>false, :format=>nil}, :to=>{:name=>:title, :type=>String, :min=>nil, :max=>nil, :consists_of=>false, :format=>nil, :required=>true, :include=>nil}}, :poster=>{:from=>{:name=>:poster, :type=>Hash, :min=>nil, :max=>nil, :consists_of=>false, :format=>nil}, :to=>{:name=>:poster, :type=>[Datory::Result, Hash], :min=>nil, :max=>nil, :consists_of=>false, :format=>nil, :required=>true, :include=>Usual::Example1::Image}}, :ratings=>{:from=>{:name=>:ratings, :type=>Hash, :min=>nil, :max=>nil, :consists_of=>false, :format=>nil}, :to=>{:name=>:ratings, :type=>[Datory::Result, Hash], :min=>nil, :max=>nil, :consists_of=>false, :format=>nil, :required=>true, :include=>Usual::Example1::Ratings}}, :countries=>{:from=>{:name=>:countries, :type=>Array, :min=>nil, :max=>nil, :consists_of=>[Datory::Result, Hash], :format=>nil}, :to=>{:name=>:countries, :type=>Array, :min=>nil, :max=>nil, :consists_of=>[Datory::Result, Hash], :format=>nil, :required=>true, :include=>Usual::Example1::Country}}, :genres=>{:from=>{:name=>:genres, :type=>Array, :min=>nil, :max=>nil, :consists_of=>[Datory::Result, Hash], :format=>nil}, :to=>{:name=>:genres, :type=>Array, :min=>nil, :max=>nil, :consists_of=>[Datory::Result, Hash], :format=>nil, :required=>true, :include=>Usual::Example1::Genre}}, :seasons=>{:from=>{:name=>:seasons, :type=>Array, :min=>nil, :max=>nil, :consists_of=>[Datory::Result, Hash], :format=>nil}, :to=>{:name=>:seasons, :type=>Array, :min=>nil, :max=>nil, :consists_of=>[Datory::Result, Hash], :format=>nil, :required=>true, :include=>Usual::Example1::Season}}, :premieredOn=>{:from=>{:name=>:premieredOn, :type=>String, :min=>nil, :max=>nil, :consists_of=>false, :format=>:date}, :to=>{:name=>:premiered_on, :type=>Date, :min=>nil, :max=>nil, :consists_of=>false, :format=>nil, :required=>true, :include=>nil}}}>
 ```
 
 ### Describe
 
 ```ruby
-UserDto.describe
+SerialDto.describe
 ```
 
 ```
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-|                                         UserDto                                         |
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-| Attribute | From   | To         | As                     | Include                      |
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-| id        | String | id         | String                 |                              |
-| firstname | String | first_name | String                 |                              |
-| lastname  | String | last_name  | String                 |                              |
-| email     | String | email      | String                 |                              |
-| phone     | String | phone      | String                 |                              |
-| website   | String | website    | String                 |                              |
-| birthDate | String | birth_date | Date                   |                              |
-| login     | Hash   | login      | [Datory::Result, Hash] | Usual::Example1::UserLogin   |
-| company   | Hash   | company    | [Datory::Result, Hash] | Usual::Example1::UserCompany |
-| addresses | Array  | addresses  | Array                  | Usual::Example1::UserAddress |
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+|                                 SerialDto                                 |
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+| Attribute   | From   | To           | As                     | Include    |
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+| id          | String | id           | String                 |            |
+| status      | String | status       | String                 |            |
+| title       | String | title        | String                 |            |
+| poster      | Hash   | poster       | [Datory::Result, Hash] | ImageDto   |
+| ratings     | Hash   | ratings      | [Datory::Result, Hash] | RatingsDto |
+| countries   | Array  | countries    | Array                  | CountryDto |
+| genres      | Array  | genres       | Array                  | GenreDto   |
+| seasons     | Array  | seasons      | Array                  | SeasonDto  |
+| premieredOn | String | premiered_on | Date                   |            |
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ```
 
 ## Contributing

data/config/locales/en.yml

@@ -1,5 +1,5 @@
 en:
-  servactory:
+  datory:
     common:
       undefined_method:
         missing_name: "[%{service_class_name}] %{error_text}"

data/config/locales/ru.yml

@@ -1,5 +1,5 @@
 ru:
-  servactory:
+  datory:
     common:
       undefined_method:
         missing_name: "[%{service_class_name}] %{error_text}"

data/lib/datory/attributes/dsl.rb

@@ -47,34 +47,38 @@ module Datory
         ########################################################################
 
         def uuid(name, **options)
+          options = options.slice(:to)
           options = options.merge(format: :uuid)
           string(name, **options)
         end
 
         def money(name, **options)
-          options_for_cents = options.merge(from: Integer)
-          options_for_currency = options.merge(from: [Symbol, String])
+          options = options.slice(:to)
 
-          attribute(:"#{name}_cents", **options_for_cents)
-          attribute(:"#{name}_currency", **options_for_currency)
+          integer :"#{name}_cents", **options
+          string :"#{name}_currency", **options
         end
 
         def duration(name, **options)
+          options = options.slice(:to)
           options = options.merge(from: String, as: ActiveSupport::Duration, format: { from: :duration })
           string(name, **options)
         end
 
         def date(name, **options)
+          options = options.slice(:to)
           options = options.merge(from: String, as: Date, format: { from: :date })
           string(name, **options)
         end
 
         def time(name, **options)
+          options = options.slice(:to)
           options = options.merge(from: String, as: Time, format: { from: :time })
           string(name, **options)
         end
 
         def datetime(name, **options)
+          options = options.slice(:to)
           options = options.merge(from: String, as: DateTime, format: { from: :datetime })
           string(name, **options)
         end
@@ -96,6 +100,11 @@ module Datory
           attribute(name, **options)
         end
 
+        def boolean(name, **options)
+          options = options.merge(from: [TrueClass, FalseClass])
+          attribute(name, **options)
+        end
+
         ########################################################################
 
         def collection_of_attributes

data/lib/datory/context/workspace.rb

@@ -3,19 +3,6 @@
 module Datory
   module Context
     module Workspace
-      def attributes
-        @attributes ||= Attributes.new(
-          context: self,
-          incoming_attributes: incoming_attributes,
-          collection_of_attributes: collection_of_attributes
-        )
-      end
-
-      private
-
-      attr_reader :incoming_attributes,
-                  :collection_of_attributes
-
       def _serialize(model:, collection_of_attributes:)
         serialize(
           model: model,

data/lib/datory/service/base.rb

@@ -26,6 +26,8 @@ module Datory
           Servactory::ToolKit::DynamicOptions::Max.use
         ]
 
+        i18n_root_key :datory
+
         predicate_methods_enabled false
       end
     end

data/lib/datory/version.rb

@@ -5,7 +5,7 @@ module Datory
     MAJOR = 1
     MINOR = 0
     PATCH = 0
-    PRE = "rc18"
+    PRE = "rc20"
 
     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.rc18
+  version: 1.0.0.rc20
 platform: ruby
 authors:
 - Anton Sokolov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-01 00:00:00.000000000 Z
+date: 2024-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -48,16 +48,16 @@ dependencies:
   name: servactory
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.1
+        version: 2.6.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.1
+        version: 2.6.0.rc2
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement