ree_lib 1.1.0 → 1.2.0

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

@@ -42,15 +42,8 @@ module ReeDto::DtoInstanceMethods
 
   contract Symbol => Any
   def get_value(name)
-    @_attrs.fetch(name) do
-      meta = get_meta(name)
-
-      if !meta.has_default?
-        raise FieldNotSetError.new("field `#{name}` not set for: #{self}")
-      else
-        @_attrs[name] = meta.default
-      end
-    end
+    return @_attrs[name] unless @_attrs[name].nil?
+    get_nil_or_raise(name)
   end
 
   contract None => Hash
@@ -82,7 +75,7 @@ module ReeDto::DtoInstanceMethods
 
   contract Symbol => Bool
   def has_value?(name)
-    @_attrs.key?(name) || get_meta(name).has_default?
+    @_attrs.key?(name)
   end
 
   contract None => ArrayOf[Symbol]
@@ -161,4 +154,9 @@ module ReeDto::DtoInstanceMethods
       v.inspect
     end
   end
+
+  def get_nil_or_raise(name)
+    return if @_attrs.has_key?(name)
+    raise FieldNotSetError.new("field `#{name}` not set for: #{self}")
+  end
 end

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

@@ -4,14 +4,15 @@ class ReeDto::FieldMeta
 
   NONE = Object.new.freeze
 
-  attr_reader :name, :contract, :setter, :default
+  attr_reader :name, :contract, :setter, :default, :field_type
 
-  contract Symbol, Any, Bool, Any => Any
-  def initialize(name, contract, setter, default)
+  contract Symbol, Any, Bool, Any, Symbol => Any
+  def initialize(name, contract, setter, default, field_type)
     @name = name
     @contract = contract
     @setter = setter
     @default = default
+    @field_type = field_type
   end
 
   contract None => Bool

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

@@ -23,6 +23,7 @@ class ReeDto::BuildDto
     builder.instance_exec(&proc)
 
     klass.send(:set_fields, builder.fields)
+    klass.send(:set_fields_with_default, builder.fields_with_default)
     klass.send(:set_collections, builder.collections)
 
     builder.fields.each do |field|

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

@@ -38,16 +38,23 @@ RSpec.describe ReeDto::DSL do
     }
 
     it {
-      dto = ReeDto::DtoClass.new
+      dto = ReeDto::DtoClass.build
+      
       expect(dto.with_default).to eq(1)
 
-      dto = ReeDto::DtoClass.new({})
+      dto = ReeDto::DtoClass.build({})
       expect(dto.with_default).to eq(1)
       expect(dto.get_value(:with_default)).to eq(1)
     }
 
     it {
       dto = ReeDto::DtoClass.new
+      expect(dto.has_value?(:with_default)).to eq(false)
+      expect(dto.has_value?(:string)).to eq(false)
+    }
+
+    it {
+      dto = ReeDto::DtoClass.build
       expect(dto.has_value?(:with_default)).to eq(true)
       expect(dto.has_value?(:string)).to eq(false)
     }
@@ -60,6 +67,26 @@ RSpec.describe ReeDto::DSL do
     it {
       dto = ReeDto::DtoClass.new
 
+      expect {
+        dto.string
+      }.to raise_error do |e|
+        expect(e.message).to eq("field `string` not set for: #<dto ReeDto::DtoClass >")
+      end
+    }
+
+    it {
+      dto = ReeDto::DtoClass.new
+      
+      expect {
+        dto.with_default
+      }.to raise_error do |e|
+        expect(e.message).to eq("field `with_default` not set for: #<dto ReeDto::DtoClass >")
+      end
+    }
+
+    it {
+      dto = ReeDto::DtoClass.build
+
       expect {
         dto.string
       }.to raise_error do |e|
@@ -86,6 +113,20 @@ RSpec.describe ReeDto::DSL do
         values << value
       end
 
+      expect(fields).to eq([])
+      expect(values).to eq([])
+    }
+
+    it {
+      dto = ReeDto::DtoClass.build
+      fields = []
+      values = []
+
+      dto.each_field do |name, value|
+        fields << name
+        values << value
+      end
+
       expect(fields).to eq([:with_default])
       expect(values).to eq([1])
     }
@@ -169,16 +210,16 @@ RSpec.describe ReeDto::DSL do
 
     it {
       expect(
-        ReeDto::DtoClass.new(string: "str")
+        ReeDto::DtoClass.build(string: "str")
       ).not_to eq(
-        ReeDto::DtoClass.new(string: "str", with_default: 2)
+        ReeDto::DtoClass.build(string: "str", with_default: 2)
       )
     }
   end
 
   describe "#to_h" do
     it {
-      dto = ReeDto::DtoClass.new(string: "str")
+      dto = ReeDto::DtoClass.build(string: "str")
       expect(dto.to_h).to eq({ string: "str", with_default: 1 })
     }
   end

data/lib/ree_lib/packages/ree_errors/package/ree_errors/error.rb

@@ -7,10 +7,6 @@ module ReeErrors
     link :underscore, from: :ree_string
 
     def initialize(msg = nil)
-      if !msg && !locale && !default_msg
-        raise ArgumentError, "message, locale or default message should be specified"
-      end
-
       message = if msg
         msg
       elsif default_msg
@@ -34,8 +30,10 @@ module ReeErrors
 
             if check_locale_exists(loc = "#{mod}.errors.#{klass}.#{path}")
               t(loc, default_by_locale: :en)
-            else check_locale_exists(loc = "#{mod}.errors.#{path}")
+            elsif check_locale_exists(loc = "#{mod}.errors.#{path}")
               t(loc, default_by_locale: :en)
+            else
+              raise ArgumentError.new("Translation missing for: #{klass}.#{path}")
             end
           else
           end

data/lib/ree_lib/packages/ree_errors/package/ree_errors/invalid_param_error.rb

@@ -10,6 +10,6 @@ class ReeErrors::InvalidParamError
 
   contract Symbol, Nilor[String], Kwargs[msg: Nilor[String]] => SubclassOf[Error]
   def call(code, locale = nil, msg: nil)
-    build_error(get_caller, :invalid_param, code,locale, msg)
+    build_error(get_caller, :invalid_param, code, locale, msg)
   end
 end

data/lib/ree_lib/packages/ree_errors/spec/ree_errors/invalid_param_error_spec.rb

@@ -14,4 +14,16 @@ RSpec.describe ReeErrors::InvalidParamError do
     expect(error.type).to eq(:invalid_param)
     expect(error.locale).to eq(nil)
   }
-end
+
+  it {
+    klass = invalid_param_error(:locale_error1)
+    error = klass.new
+
+    expect(klass).to be_a(Class)
+    expect(error).to be_a(ReeErrors::Error)
+    expect(error.message).to eq('locale error 1')
+    expect(error.code).to eq(:locale_error1)
+    expect(error.type).to eq(:invalid_param)
+    expect(error.locale).to eq(nil)
+  }
+end

data/lib/ree_lib/packages/ree_logger/spec/ree_logger/formatters/colorized_formatter_spec.rb

@@ -44,8 +44,15 @@ RSpec.describe ReeLogger::ColorizedFormatter do
   }
 
   it {
+    if RUBY_VERSION >= '3.4'
+      colored_expected = "[05/11/05 00:00:00] \e[31merror:\e[0m Some error message\n\e[34mPARAMETERS:\e[0m {some_error: \"params\"}\n\e[31mEXCEPTION:\e[0m StandardError (Help me, I am error)\n"
+      expected = "[05/11/05 00:00:00] error: Some error message\nPARAMETERS: {some_error: \"params\"}\nEXCEPTION: StandardError (Help me, I am error)\n"
+    else
+      colored_expected = "[05/11/05 00:00:00] \e[31merror:\e[0m Some error message\n\e[34mPARAMETERS:\e[0m {:some_error=>\"params\"}\n\e[31mEXCEPTION:\e[0m StandardError (Help me, I am error)\n"
+      expected = "[05/11/05 00:00:00] error: Some error message\nPARAMETERS: {:some_error=>\"params\"}\nEXCEPTION: StandardError (Help me, I am error)\n"
+    end
     expect(formatter.format(error_log_event, nil))
-      .to eq("[05/11/05 00:00:00] \e[31merror:\e[0m Some error message\n\e[34mPARAMETERS:\e[0m {:some_error=>\"params\"}\n\e[31mEXCEPTION:\e[0m StandardError (Help me, I am error)\n")
-      .or eq("[05/11/05 00:00:00] error: Some error message\nPARAMETERS: {:some_error=>\"params\"}\nEXCEPTION: StandardError (Help me, I am error)\n")
+      .to eq(colored_expected)
+      .or eq(expected)
   }
-end
+end

data/lib/ree_lib/packages/ree_logger/spec/ree_logger/formatters/default_formatter_spec.rb

@@ -42,7 +42,11 @@ RSpec.describe ReeLogger::DefaultFormatter do
   }
 
   it {
-    expected = "[05/11/05 00:00:00] ERROR: Some error message\nPARAMETERS: {:some_error=>\"params\"}\nEXCEPTION: StandardError (Help me, I am error)\n"
+    expected = if RUBY_VERSION >= '3.4'
+      "[05/11/05 00:00:00] ERROR: Some error message\nPARAMETERS: {some_error: \"params\"}\nEXCEPTION: StandardError (Help me, I am error)\n"
+    else
+      "[05/11/05 00:00:00] ERROR: Some error message\nPARAMETERS: {:some_error=>\"params\"}\nEXCEPTION: StandardError (Help me, I am error)\n"
+    end
     expect(formatter.format(error_log_event, nil)).to eq(expected)
   }
-end
+end

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

@@ -91,7 +91,12 @@ RSpec.describe ReeLogger::MultiLogger do
     expect { logger_with_appenders.info('hello world', { param: 1, another_param: { name: 'John'}, password: 'password01' }) }.to output(/John/).to_stdout
     expect(Rollbar).to have_received(:log)
     expect(File.read(log_file_path)).to match("John")
-    expect(File.read(log_file_path)).to match(":password=>\"FILTERED\"")
+    expected = if RUBY_VERSION >= '3.4'
+      'password: "FILTERED"'
+    else
+      ':password=>"FILTERED"'
+    end
+    expect(File.read(log_file_path)).to match(expected)
   }
 
   it {
@@ -121,7 +126,12 @@ RSpec.describe ReeLogger::MultiLogger do
     expect { logger_with_appenders.fatal('some fatal message', { email: 'some@mail.com', password: 'password01' }, exception) }.to output(/some fatal message/).to_stdout
     expect(Rollbar).to have_received(:log)
     expect(File.read(log_file_path)).to match("some fatal message")
-    expect(File.read(log_file_path)).to match(":password=>\"FILTERED\"")
+    expected = if RUBY_VERSION >= '3.4'
+      'password: "FILTERED"'
+    else
+      ':password=>"FILTERED"'
+    end
+    expect(File.read(log_file_path)).to match(expected)
   }
 
   it {
@@ -152,4 +162,4 @@ RSpec.describe ReeLogger::MultiLogger do
       end
     }.to output(/John/).to_stdout
   }
-end
+end

data/lib/ree_lib/packages/ree_mapper/package/ree_mapper/strategy_outputs/ree_dto_output.rb

@@ -3,7 +3,7 @@
 class ReeMapper::ReeDtoOutput < ReeMapper::StrategyOutput
   contract(None => Any)
   def build_object
-    dto.new
+    dto.build
   end
 
   contract(Object, ReeMapper::Field, Any => nil)

data/lib/ree_lib/version.rb

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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ree_lib
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Ruslan Gatiyatov
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2025-01-27 00:00:00.000000000 Z
+date: 2025-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ree
@@ -30,84 +29,84 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 2.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 2.0.6
 - !ruby/object:Gem::Dependency
   name: loofah
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.22.0
+        version: 2.24.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.22.0
+        version: 2.24.0
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.16.3
+        version: 3.16.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.16.3
+        version: 3.16.9
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.1
+        version: 1.14.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.1
+        version: 1.14.7
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.76.0
+        version: 5.88.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.76.0
+        version: 5.88.0
 - !ruby/object:Gem::Dependency
   name: binding_of_caller
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +127,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.6
+        version: 3.1.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.6
+        version: 3.1.9
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -156,42 +155,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.76.0
+        version: 3.88.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.76.0
+        version: 3.88.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.3
+        version: 2.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.3
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.4
+        version: 1.5.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.4
+        version: 1.5.9
 - !ruby/object:Gem::Dependency
   name: warden
   requirement: !ruby/object:Gem::Requirement
@@ -212,42 +211,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: 0.9.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: 0.9.10
 - !ruby/object:Gem::Dependency
   name: rollbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.1
+        version: 3.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.1
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 3.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 3.5.1
 description: Ree Lib provides set of packages to extend Ruby Standard Library
 email:
 - ruslan.gatiyatov@gmail.com
@@ -313,6 +312,7 @@ files:
 - lib/ree_lib/packages/ree_dao/package/ree_dao/association_methods.rb
 - lib/ree_lib/packages/ree_dao/package/ree_dao/associations.rb
 - lib/ree_lib/packages/ree_dao/package/ree_dao/beans/connections.rb
+- lib/ree_lib/packages/ree_dao/package/ree_dao/build_methods.rb
 - lib/ree_lib/packages/ree_dao/package/ree_dao/contract/dao_dataset_contract.rb
 - lib/ree_lib/packages/ree_dao/package/ree_dao/contract/dto_contract.rb
 - lib/ree_lib/packages/ree_dao/package/ree_dao/contract/entity_contract.rb
@@ -330,6 +330,7 @@ files:
 - lib/ree_lib/packages/ree_dao/package/ree_dao/thread_parents.rb
 - lib/ree_lib/packages/ree_dao/package/ree_dao/wrappers/pg_array.rb
 - lib/ree_lib/packages/ree_dao/package/ree_dao/wrappers/pg_jsonb.rb
+- lib/ree_lib/packages/ree_dao/spec/ree_dao/functions/build_dto_spec.rb
 - lib/ree_lib/packages/ree_dao/spec/ree_dao/functions/build_pg_connection_spec.rb
 - lib/ree_lib/packages/ree_dao/spec/ree_dao/functions/build_sqlite_connection/max_connections_spec.rb
 - lib/ree_lib/packages/ree_dao/spec/ree_dao/functions/build_sqlite_connection_spec.rb
@@ -1074,7 +1075,6 @@ metadata:
   homepage_uri: https://github.com/glabix/ree/tree/main/ree_lib
   source_code_uri: https://github.com/glabix/ree/tree/main/ree_lib
   changelog_uri: https://github.com/glabix/ree/blob/main/ree_lib/CHANGELOG.md
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -1089,8 +1089,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Ruby Standard Library Extensions
 test_files: []