ree_lib 1.0.49 → 1.0.50

data/lib/ree_lib/packages/ree_dao/spec/ree_dao/functions/load_agg/ree_dao_load_agg_test.rb

@@ -0,0 +1,524 @@
+Ree.enable_irb_mode
+
+module ReeDaoLoadAggTest
+  include Ree::PackageDSL
+
+  package do
+    depends_on :ree_dao
+    depends_on :ree_array
+    depends_on :ree_string
+    depends_on :ree_hash
+  end
+end
+
+class ReeDaoLoadAggTest::Db
+  include Ree::BeanDSL
+
+  DB_CONFIG = {
+    host: "localhost",
+    user: "postgres",
+    database: "postgres",
+    password: "password",
+    adapter: "postgres",
+    max_connections: 100
+  }.freeze
+
+  bean :db do
+    singleton
+    factory :build
+
+    link :build_pg_connection, from: :ree_dao
+  end
+
+  def build
+    build_pg_connection(DB_CONFIG)
+  end
+end
+
+class ReeDaoLoadAggTest::Organization
+  include ReeDto::EntityDSL
+
+  properties(
+    id: Nilor[Integer],
+    name: String
+  )
+
+  def set_users(users)
+    @users = users
+  end
+
+  def users
+    @users ||= []
+  end
+
+  attr_accessor :name
+end
+
+
+class ReeDaoLoadAggTest::User
+  include ReeDto::EntityDSL
+
+  properties(
+    id: Nilor[Integer],
+    name: String,
+    age: Integer,
+    organization_id: Integer
+  )
+
+  def set_organization(org)
+    @organization = org
+  end
+
+  def organization
+    @organization
+  end
+
+  def set_passport(passport)
+    @passport = passport
+  end
+
+  def passport
+    @passport
+  end
+
+  [
+    :organization,
+    :passport,
+    :books,
+    :movies,
+    :videogames,
+    :hobbies,
+    :vinyls,
+    :pets,
+    :skills,
+    :dreams,
+    :custom_field
+  ].each do |attr|
+    define_method("set_#{attr}") do |*args|
+      instance_variable_set("@#{attr}", *args)
+    end
+
+    define_method("#{attr}") do
+      instance_variable_get("@#{attr}")
+    end
+  end
+
+  attr_accessor :name, :age, :organization_id
+end
+
+
+class ReeDaoLoadAggTest::UserPassport
+  include ReeDto::EntityDSL
+
+  properties(
+    id: Nilor[Integer],
+    user_id: Integer,
+    info: Nilor[String]
+  )
+
+  attr_accessor :info, :user_id
+end
+
+class ReeDaoLoadAggTest::Movie
+  include ReeDto::EntityDSL
+
+  properties(
+    id: Nilor[Integer],
+    user_id: Integer,
+    title: Nilor[String]
+  )
+end
+
+class ReeDaoLoadAggTest::Videogame
+  include ReeDto::EntityDSL
+
+  properties(
+    id: Nilor[Integer],
+    user_id: Integer,
+    title: Nilor[String]
+  )
+end
+
+class ReeDaoLoadAggTest::Hobby
+  include ReeDto::EntityDSL
+
+  properties(
+    id: Nilor[Integer],
+    user_id: Integer,
+    title: Nilor[String]
+  )
+end
+
+class ReeDaoLoadAggTest::Vinyl
+  include ReeDto::EntityDSL
+
+  properties(
+    id: Nilor[Integer],
+    user_id: Integer,
+    title: Nilor[String]
+  )
+end
+
+class ReeDaoLoadAggTest::Pet
+  include ReeDto::EntityDSL
+
+  properties(
+    id: Nilor[Integer],
+    user_id: Integer,
+    name: Nilor[String]
+  )
+end
+
+class ReeDaoLoadAggTest::Skill
+  include ReeDto::EntityDSL
+
+  properties(
+    id: Nilor[Integer],
+    user_id: Integer,
+    title: Nilor[String]
+  )
+end
+
+class ReeDaoLoadAggTest::Dream
+  include ReeDto::EntityDSL
+
+  properties(
+    id: Nilor[Integer],
+    user_id: Integer,
+    description: Nilor[String]
+  )
+end
+
+class ReeDaoLoadAggTest::Book
+  include ReeDto::EntityDSL
+
+  properties(
+    id: Nilor[Integer],
+    user_id: Integer,
+    title: Nilor[String]
+  )
+
+  def set_chapters(chapters)
+    @chapters = chapters; nil
+  end
+
+  def chapters
+    @chapters
+  end
+
+  def set_author(author)
+    @author = author
+  end
+
+  def author
+    @author
+  end
+
+  def set_reviews(reviews)
+    @reviews = reviews; nil
+  end
+
+  def reviews
+    @reviews
+  end
+
+  attr_accessor :title, :user_id
+end
+
+class ReeDaoLoadAggTest::Chapter
+  include ReeDto::EntityDSL
+
+  properties(
+    id: Nilor[Integer],
+    book_id: Integer,
+    title: Nilor[String]
+  )
+
+  attr_accessor :title, :book_id
+end
+
+class ReeDaoLoadAggTest::Author
+  include ReeDto::EntityDSL
+
+  properties(
+    id: Nilor[Integer],
+    book_id: Integer,
+    name: Nilor[String]
+  )
+
+  attr_accessor :name, :book_id
+end
+
+class ReeDaoLoadAggTest::Review
+  include ReeDto::EntityDSL
+
+  properties(
+    id: Nilor[Integer],
+    book_id: Integer,
+    rating: Nilor[Integer]
+  )
+
+  def set_review_author(review_author)
+    @review_author = review_author
+  end
+
+  def review_author
+    @review_author
+  end
+
+  attr_accessor :rating, :book_id
+end
+
+class ReeDaoLoadAggTest::ReviewAuthor
+  include ReeDto::EntityDSL
+
+  properties(
+    id: Nilor[Integer],
+    review_id: Integer,
+    name: String
+  )
+end
+
+class ReeDaoLoadAggTest::Users
+  include ReeDao::DSL
+
+  dao :users do
+    link :db
+  end
+
+  table :users
+
+  schema ReeDaoLoadAggTest::User do
+    integer :id, null: true
+    integer :organization_id
+    string :name
+    integer :age
+  end
+
+  filter :by_name, -> (name) { where(name: name) }
+end
+
+class ReeDaoLoadAggTest::Organizations
+  include ReeDao::DSL
+
+  dao :organizations do
+    link :db
+  end
+
+  table :organizations
+
+  schema ReeDaoLoadAggTest::Organization do
+    integer :id, null: true
+    string :name
+  end
+
+  filter :by_name, -> (name) { where(name: name) }
+end
+
+class ReeDaoLoadAggTest::UserPassports
+  include ReeDao::DSL
+
+  dao :user_passports do
+    link :db
+  end
+
+  table :user_passports
+
+  schema ReeDaoLoadAggTest::UserPassport do
+    integer :id, null: true
+    integer :user_id
+    string :info
+  end
+end
+
+class ReeDaoLoadAggTest::Movies
+  include ReeDao::DSL
+
+  dao :movies do
+    link :db
+  end
+
+  table :movies
+
+  schema ReeDaoLoadAggTest::Movie do
+    integer :id, null: true
+    integer :user_id
+    string :title
+  end
+end
+
+class ReeDaoLoadAggTest::Videogames
+  include ReeDao::DSL
+
+  dao :videogames do
+    link :db
+  end
+
+  table :videogames
+
+  schema ReeDaoLoadAggTest::Videogame do
+    integer :id, null: true
+    integer :user_id
+    string :title
+  end
+end
+
+class ReeDaoLoadAggTest::Hobbies
+  include ReeDao::DSL
+
+  dao :hobbies do
+    link :db
+  end
+
+  table :hobbies
+
+  schema ReeDaoLoadAggTest::Hobby do
+    integer :id, null: true
+    integer :user_id
+    string :title
+  end
+end
+
+class ReeDaoLoadAggTest::Vinyls
+  include ReeDao::DSL
+
+  dao :vinyls do
+    link :db
+  end
+
+  table :vinyls
+
+  schema ReeDaoLoadAggTest::Vinyl do
+    integer :id, null: true
+    integer :user_id
+    string :title
+  end
+end
+
+class ReeDaoLoadAggTest::Pets
+  include ReeDao::DSL
+
+  dao :pets do
+    link :db
+  end
+
+  table :pets
+
+  schema ReeDaoLoadAggTest::Pet do
+    integer :id, null: true
+    integer :user_id
+    string :name
+  end
+end
+
+class ReeDaoLoadAggTest::Skills
+  include ReeDao::DSL
+
+  dao :skills do
+    link :db
+  end
+
+  table :skills
+
+  schema ReeDaoLoadAggTest::Skill do
+    integer :id, null: true
+    integer :user_id
+    string :title
+  end
+end
+
+class ReeDaoLoadAggTest::Dreams
+  include ReeDao::DSL
+
+  dao :dreams do
+    link :db
+  end
+
+  table :dreams
+
+  schema ReeDaoLoadAggTest::Dream do
+    integer :id, null: true
+    integer :user_id
+    string :description
+  end
+end
+
+class ReeDaoLoadAggTest::Books
+  include ReeDao::DSL
+
+  dao :books do
+    link :db
+  end
+
+  table :books
+
+  schema ReeDaoLoadAggTest::Book do
+    integer :id, null: true
+    integer :user_id
+    string :title
+  end
+end
+
+class ReeDaoLoadAggTest::Chapters
+  include ReeDao::DSL
+
+  dao :chapters do
+    link :db
+  end
+
+  table :chapters
+
+  schema ReeDaoLoadAggTest::Chapter do
+    integer :id, null: true
+    integer :book_id
+    string :title
+  end
+end
+
+class ReeDaoLoadAggTest::Authors
+  include ReeDao::DSL
+
+  dao :authors do
+    link :db
+  end
+
+  table :authors
+
+  schema ReeDaoLoadAggTest::Author do
+    integer :id, null: true
+    integer :book_id
+    string :name
+  end
+end
+
+class ReeDaoLoadAggTest::Reviews
+  include ReeDao::DSL
+
+  dao :reviews do
+    link :db
+  end
+
+  table :reviews
+
+  schema ReeDaoLoadAggTest::Review do
+    integer :id, null: true
+    integer :book_id
+    integer :rating
+  end
+end
+
+class ReeDaoLoadAggTest::ReviewAuthors
+  include ReeDao::DSL
+
+  dao :review_authors do
+    link :db
+  end
+
+  table :review_authors
+
+  schema ReeDaoLoadAggTest::ReviewAuthor do
+    integer :id, null: true
+    integer :review_id
+    string :name
+  end
+end

data/lib/ree_lib/packages/ree_logger/package/ree_logger/multi_logger.rb

@@ -60,7 +60,7 @@ class ReeLogger::MultiLogger < Logger
   contract(Nilor[String], Hash, Nilor[Exception], Bool, Nilor[String], Optblock => nil)
   def debug(message = nil, parameters = {}, exception = nil, log_args = false, progname = nil, &block)
     if block_given?
-      log(:debug, yield, parameters, nil, log_args)
+      log_block(:debug, parameters, log_args, yield)
     else
       msg = get_message(message)
       log(:debug, msg, parameters, nil, log_args)
@@ -68,9 +68,9 @@ class ReeLogger::MultiLogger < Logger
   end
 
   contract(Nilor[String], Hash, Nilor[Exception], Bool, Nilor[String], Optblock => nil)
-  def info(message = nil, parameters = {}, exception = nil, log_args = false, progname = nil,  &block)
+  def info(message = nil, parameters = {}, exception = nil, log_args = false, progname = nil, &block)
     if block_given?
-      log(:info, yield, parameters, nil, log_args)
+      log_block(:info, parameters, log_args, yield)
     else
       msg = get_message(message)
       log(:info, msg, parameters, nil)
@@ -78,9 +78,9 @@ class ReeLogger::MultiLogger < Logger
   end
 
   contract(Nilor[String], Hash, Nilor[Exception], Bool, Nilor[String], Optblock => nil)
-  def warn(message = nil, parameters = {}, exception = nil, log_args = false, progname = nil,  &block)
+  def warn(message = nil, parameters = {}, exception = nil, log_args = false, progname = nil, &block)
     if block_given?
-      log(:warn, yield, parameters, nil, log_args)
+      log_block(:warn, parameters, log_args, yield)
     else
       msg = get_message(message)
       log(:warn, msg, parameters, nil)
@@ -90,7 +90,7 @@ class ReeLogger::MultiLogger < Logger
   contract(Nilor[String], Hash, Nilor[Exception], Bool, Nilor[String], Optblock => nil)
   def error(message = nil, parameters = {}, exception = nil, log_args = true, progname = nil,  &block)
     if block_given?
-      log(:error, yield, parameters, exception, log_args)
+      log_block(:error, parameters, log_args, yield)
     else
       msg = get_message(message)
       log(:error, msg, parameters, exception, log_args)
@@ -98,25 +98,34 @@ class ReeLogger::MultiLogger < Logger
   end
 
   contract(Nilor[String], Hash, Nilor[Exception], Bool, Nilor[String], Optblock => nil)
-  def fatal(message = nil, parameters = {}, exception = nil, log_args = true, progname = nil,  &block)
+  def fatal(message = nil, parameters = {}, exception = nil, log_args = true, progname = nil, &block)
     if block_given?
-      log(:error, yield, parameters, exception, log_args)
+      log_block(:fatal, parameters, log_args, yield)
     else
       msg = get_message(message)
-      log(:error, msg, parameters, exception, log_args)
+      log(:fatal, msg, parameters, exception, log_args)
     end
   end
 
   contract(Nilor[String], Hash, Nilor[Exception], Bool, Nilor[String], Optblock => nil)
   def unknown(message = nil, parameters = {}, exception = nil, log_args = true, progname = nil,  &block)
     if block_given?
-      log(:unknown, yield, parameters, exception, log_args)
+      log_block(:unknown, parameters, log_args, yield)
     else
       msg = get_message(message)
       log(:unknown, msg, parameters, exception, log_args)
     end
   end
 
+  contract(Symbol, Hash, Bool, Or[Hash, String] => nil)
+  def log_block(error, parameters, log_args, block_parameters)
+    if block_parameters.is_a?(Hash)
+      log(error, "", block_parameters.merge(parameters), nil, log_args)
+    else
+      log(error, block_parameters, parameters, nil, log_args)
+    end
+  end
+
   contract(Symbol, String, Hash, Nilor[Exception], Bool => nil)
   def log(level, message, parameters = {}, exception = nil, log_args = false)
     if @rate_limiter

data/lib/ree_lib/packages/ree_logger/spec/ree_logger/multi_logger_spec.rb

@@ -142,4 +142,14 @@ RSpec.describe ReeLogger::MultiLogger do
       end
     }.to_not output.to_stdout
   }
+
+  it {
+    expect {
+      logger_with_appenders.info("some info message", { email: 'some@email.com }'}) do
+        {
+          name: "John"
+        }
+      end
+    }.to output(/John/).to_stdout
+  }
 end

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

@@ -33,9 +33,12 @@ class ReeMapper::MapperFactoryProxy
     return self unless blk
 
     mapper = ReeMapper::Mapper.build(strategies)
-    
-    mapper_factory.register_mapper(register_as, mapper) if register_as
-    
+
+    if register_as
+      mapper_factory.register_mapper(register_as, mapper)
+      mapper = mapper_factory.types.fetch(register_as).last
+    end
+
     mapper_factory.new(mapper).instance_exec(&blk)
     mapper.prepare_dto
 

data/lib/ree_lib/packages/ree_std/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

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

@@ -0,0 +1,24 @@
+{
+  "schema_type": "package",
+  "schema_version": "1.1",
+  "name": "ree_std",
+  "entry_path": "packages/ree_std/package/ree_std.rb",
+  "tags": [
+    "ree_std"
+  ],
+  "depends_on": [
+
+  ],
+  "env_vars": [
+
+  ],
+  "objects": [
+    {
+      "name": "retry_on_fail",
+      "schema": "packages/ree_std/schemas/ree_std/functions/retry_on_fail.schema.json",
+      "tags": [
+        "fn"
+      ]
+    }
+  ]
+}

data/lib/ree_lib/packages/ree_std/bin/console

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+require "bundler/setup"
+require "ree"
+
+Ree.init(__dir__, irb: true)

data/lib/ree_lib/packages/ree_std/package/ree_std/functions/retry_on_fail.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+class ReeStd::RetryOnFail
+  include Ree::FnDSL
+
+  fn :retry_on_fail do
+    link "ree_std/retry", -> { Retry }
+  end
+
+  doc(<<~DOC)
+    ## **Ruby Function: retry_on_fail**
+
+    This function allows you to execute a provided block of code and automatically retry it in case a specific exception occurs.
+
+    rubyCopy code
+
+    `x = 0 retry_on_fail(max: 2, retry_block: ->(attempt, e) { x += 1 } ) { 1 / x }`
+
+    ## **Parameters**
+
+    *   **max** (Integer, required): Specifies the maximum number of retry attempts.
+    *   **interval** (Integer, optional, default: 1): Sets the base delay between retry attempts in seconds.
+    *   **max_interval** (Integer, optional, default: Float::INFINITY): Defines the upper limit for the delay between retry attempts.
+    *   **backoff_factor** (Integer, optional, default: 1): Determines the increasing factor for the delay based on the attempt number.
+    *   **exceptions** (StandardError[], optional, default: [StandardError]): Specifies a list of exceptions that should trigger a retry.
+    *   **retry_block** (Proc, optional, default: **Proc.new {|attempt_number, exception|}**): Allows you to provide a custom block of code to be executed after a failed attempt.
+    *   **retry_if** (Proc, optional, default: **Proc.new { |exception| true }**): Provides an additional condition that must be satisfied before initiating a new retry attempt.
+  DOC
+  contract(
+    Kwargs[
+      max: Integer,
+    ],
+    Ksplat[
+      interval?: Integer,
+      max_interval?: Integer,
+      backoff_factor?: Integer,
+      exceptions?: ArrayOf[SubclassOf[StandardError]],
+      retry_block?: Proc,
+      retry_if?: Proc,
+    ],
+    Block => nil
+  )
+  def call(max:, **opts, &block)
+    Retry.new(max: max, **opts).call(&block)
+  end
+end