ree_lib 1.0.111 → 1.0.113

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59f41ff2397eb9507b0e565246430ccde3467b8137bb747991181cecbb99a8d0
-  data.tar.gz: c267d40f7cd30a41ab86f428c0f30eec225a96fc6ed3ca33e9ab58cf130c0529
+  metadata.gz: cb77d3a2632671effd8c80d733e53f779a7761c085fbccb68dfc52249c7e98ea
+  data.tar.gz: 19c54d8117bf8f3dc5e9a6374aa80af299270c3d0e3ff85f3951ead216308f24
 SHA512:
-  metadata.gz: 04367c6369bd195fa8f2094159f999a1897485632b3e9c86d7e4ed7909513aeef7ea3beba05d544f7660b5bc9a22522f93cd7e3035da6650fbe60ea580d92045
-  data.tar.gz: 305010534eb1ed83b5e7a900b2cd88a9429ce6d1c629527af13dd1ecfcc8951b65a3ca68eb3c74c1a65f1d41e6ebce4cff788b4d5525cc787ab3bf13b0ffdebf
+  metadata.gz: cc40d56b11b04ba48d5c3e4cea3de8c0fa1292f75bcd1dce90544542fc92ab26cb77a9774831831fc4c38efd0105d2dbff9407814c4ae495a51bff920f310b81
+  data.tar.gz: 53a0bf48487d02322766a2a7fac151058dc52678a8d228f20add3161e80c3096e8ec3f5d82b9a6a0d0b88963a90a245b46999e9a62a065260cbda331045d04a6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ree_lib (1.0.111)
+    ree_lib (1.0.113)
       bigdecimal (~> 3.1.6)
       binding_of_caller (~> 1.0.0)
       i18n (~> 1.14.1)

data/lib/ree_lib/packages/ree_dto/Package.schema.json

@@ -9,6 +9,9 @@
   "depends_on": [
     {
       "name": "ree_object"
+    },
+    {
+      "name": "ree_string"
     }
   ],
   "env_vars": [

data/lib/ree_lib/packages/ree_dto/package/ree_dto/dto/dto_instance_methods.rb

@@ -64,7 +64,7 @@ module ReeDto::DtoInstanceMethods
   def set_value(name, val)
     if has_value?(name)
       old = get_value(name)
-      return if old == val
+      return old if old == val
     end
 
     @changed_fields ||= Set.new

data/lib/ree_lib/packages/ree_dto/package/ree_dto/functions/build_dto.rb

@@ -46,7 +46,7 @@ class ReeDto::BuildDto
     end
 
     builder.collections.each do |collection|
-      col_class = build_dto_collection_class(collection.contract)
+      col_class = build_dto_collection_class(klass, collection.name, collection.contract)
       col_class.class_exec(&collection.filter_proc) if collection.filter_proc
 
       klass.instance_exec do

data/lib/ree_lib/packages/ree_dto/package/ree_dto/functions/build_dto_collection_class.rb

@@ -2,12 +2,15 @@ class ReeDto::BuildDtoCollectionClass
   include Ree::FnDSL
 
   fn :build_dto_collection_class do
+    link :camelize, from: :ree_string
     link "ree_dto/dto/dto_collection", -> { DtoCollection }
   end
 
-  contract Any => Class
-  def call(entity_contract)
-    Class.new(DtoCollection) do
+  contract Class, Symbol, Any => Class
+  def call(klass, collection_name, entity_contract)
+    name = camelize(collection_name.to_s)
+
+    const = Class.new(DtoCollection) do
       contract entity_contract => nil
       def add(item)
         @list ||= []
@@ -23,5 +26,9 @@ class ReeDto::BuildDtoCollectionClass
       alias :<< :add
       alias :push :add
     end
+
+    const_name = "#{name}CollectionDto"
+    klass.const_set(const_name, const)
+    klass.const_get(const_name)
   end
 end

data/lib/ree_lib/packages/ree_dto/package/ree_dto.rb

@@ -3,6 +3,7 @@ module ReeDto
 
   package do
     depends_on :ree_object
+    depends_on :ree_string
   end
 
   class << self

data/lib/ree_lib/packages/ree_dto/spec/ree_dto/dsl_spec.rb

@@ -90,6 +90,10 @@ RSpec.describe ReeDto::DSL do
 
       dto.numbers << 1
       dto.numbers << 2
+
+      expect(dto.numbers.class).to eq(ReeDto::DtoClass::NumbersCollectionDto)
+      expect(dto.users.class).to eq(ReeDto::DtoClass::UsersCollectionDto)
+      expect(dto.active_users.class).to eq(ReeDto::DtoClass::ActiveUsersCollectionDto)
       expect(dto.numbers.sum).to eq(3)
       expect(dto.numbers.to_s).to eq("odd_collection")
     }

data/lib/ree_lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ReeLib
-  VERSION = "1.0.111"
+  VERSION = "1.0.113"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ree_lib
 version: !ruby/object:Gem::Version
-  version: 1.0.111
+  version: 1.0.113
 platform: ruby
 authors:
 - Ruslan Gatiyatov