ree_lib 1.0.47 → 1.0.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c74ce073851aa0f44a9d5ef2d7df9000bd595e1208300a257269cdec28de15e8
-  data.tar.gz: eb2cc59a1ae7da783c6950236288e7be4a5d6a1c42f5216fd0c7cac5728941bd
+  metadata.gz: 4c09a8508f0d27f47f70238fbd1dad1c5627c6082f575d703c509a831c67385f
+  data.tar.gz: 297458d5b314777ce81af4d077e97fdcddc7985bf947ff0e33d7d07635a68718
 SHA512:
-  metadata.gz: 6ae3e653b7ee36a1ce7574cfe1ec091532420744b5b87e33aa121b4c01929ff989f5e5800414dc10a59e9752daf2e02bd6b51f656a6f449db2ee5c89a3242c72
-  data.tar.gz: 6a09a450be8d91aced2a457248e30b6c810ceb9857e391ccb73574e4ee546fc96345cc4dcc0ad3618c3304fe808b78ad45a1a8f69150d95625ce38bd86237151
+  metadata.gz: 7804922d52fc7d3d6b203d58cfbfa63b0d87df69655537edc85b70b01d1e4bba88ed73459bad71e0c1f10ebd6d5ffcbb6d5c86c231b0c817038ed5cb6eba48a3
+  data.tar.gz: ecd43b3975300c865644f617d7235f7d7868b945c9ca5a8f61e8bd2e939faa0214283d66aa883ad85bcba9ce365cfacd723a020eda31027991c74a4919e992b5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ree_lib (1.0.47)
+    ree_lib (1.0.49)
       binding_of_caller (~> 1.0.0)
       i18n (~> 1.12.0)
       loofah (~> 2.18.0)
@@ -36,9 +36,9 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     msgpack (1.6.0)
-    nokogiri (1.14.3-x86_64-darwin)
+    nokogiri (1.15.2-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.14.3-x86_64-linux)
+    nokogiri (1.15.2-x86_64-linux)
       racc (~> 1.4)
     oj (3.13.23)
     pg (1.4.6)

data/lib/ree_lib/packages/ree_mapper/package/ree_mapper/mapper_factory_proxy.rb

@@ -33,11 +33,12 @@ class ReeMapper::MapperFactoryProxy
     return self unless blk
 
     mapper = ReeMapper::Mapper.build(strategies)
+    
+    mapper_factory.register_mapper(register_as, mapper) if register_as
+    
     mapper_factory.new(mapper).instance_exec(&blk)
     mapper.prepare_dto
 
-    mapper_factory.register_mapper(register_as, mapper) if register_as
-
     after_build&.call(mapper)
 
     mapper

data/lib/ree_lib/packages/ree_mapper/spec/ree_mapper/dsl/dsl_spec.rb

@@ -18,6 +18,7 @@ RSpec.describe ReeMapper::DSL do
       build_mapper(register_as: :user).use(:cast) do
         integer :id
         string  :name
+        user    :created_by, null: true
       end
     end
 
@@ -42,11 +43,29 @@ RSpec.describe ReeMapper::DSL do
           title: 'Product',
           creator: {
             id: 1,
-            name: 'John'
+            name: 'John',
+            created_by: {
+              id: 2,
+              name: 'Jane',
+              created_by: nil
+            }
           }
         }
       )
     )
-    expect(result).to eq({id: 1, title: 'Product', creator: { id: 1, name: 'John' }})
+
+    expect(result).to eq({
+      id: 1, 
+      title: 'Product', 
+      creator: { 
+        id: 1, 
+        name: 'John',
+        created_by: {
+          id: 2,
+          name: 'Jane',
+          created_by: nil
+        }
+      }
+    })
   }
 end

data/lib/ree_lib/packages/ree_roda/package/ree_roda/plugins/ree_routes.rb

@@ -78,9 +78,6 @@ class Roda
                   r.instance_exec(@_request, route.warden_scope, &r.scope.opts[:ree_routes_before])
                 end
 
-                # TODO: implement me when migration to roda DSL happens
-                # if route.before; end
-
                 params = r.params
 
                 if r.body
@@ -149,8 +146,10 @@ class Roda
                     r.instance_exec(r, &child_proc)
                   end
 
-                  route_procs.each do |route_proc|
-                    r.instance_exec(r, &route_proc)
+                  r.is do
+                    route_procs.each do |route_proc|
+                      r.instance_exec(r, &route_proc)
+                    end
                   end
 
                   nil
@@ -163,8 +162,10 @@ class Roda
                     r.instance_exec(r, &child_proc)
                   end
 
-                  route_procs.each do |route_proc|
-                    r.instance_exec(r, &route_proc)
+                  r.is do
+                    route_procs.each do |route_proc|
+                      r.instance_exec(r, &route_proc)
+                    end
                   end
 
                   nil
@@ -179,16 +180,20 @@ class Roda
                     r.params[route_part] = param_val
                   end
 
-                  route_procs.each do |route_proc|
-                    r.instance_exec(r, &route_proc)
+                  r.is do
+                    route_procs.each do |route_proc|
+                      r.instance_exec(r, &route_proc)
+                    end
                   end
 
                   nil
                 end
               else
                 r.is route_parts[0] do
-                  route_procs.each do |route_proc|
-                    r.instance_exec(r, &route_proc)
+                  r.is do
+                    route_procs.each do |route_proc|
+                      r.instance_exec(r, &route_proc)
+                    end
                   end
 
                   nil

data/lib/ree_lib/packages/ree_roda/package/ree_roda/services/build_routing_tree.rb

@@ -93,19 +93,23 @@ class ReeRoda::BuildRoutingTree
             print_proc_tree(child)
           end
 
+          puts "#{get_offset(tree.depth + 1)}r.is do"
           tree.routes.each do |route|
-            puts "#{get_offset(tree.depth + 1)}r.#{route.request_method} do"
-            puts "#{get_offset(tree.depth + 1)}end"
+            puts "#{get_offset(tree.depth + 2)}r.#{route.request_method} do"
+            puts "#{get_offset(tree.depth + 2)}end"
           end
+          puts "#{get_offset(tree.depth + 1)}end"
 
           puts "#{get_offset(tree.depth)}end"
         else
           puts "#{get_offset(tree.depth)}r.is #{param_value} do"
 
+          puts "#{get_offset(tree.depth + 1)}r.is do"
           tree.routes.each do |route|
-            puts "#{get_offset(tree.depth + 1)}r.#{route.request_method} do"
-            puts "#{get_offset(tree.depth + 1)}end"
+            puts "#{get_offset(tree.depth + 2)}r.#{route.request_method} do"
+            puts "#{get_offset(tree.depth + 2)}end"
           end
+          puts "#{get_offset(tree.depth + 1)}end"
 
           puts "#{get_offset(tree.depth)}end"
         end

data/lib/ree_lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ree_lib
 version: !ruby/object:Gem::Version
-  version: 1.0.47
+  version: 1.0.49
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-05-10 00:00:00.000000000 Z
+date: 2023-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ree