ree_lib 1.0.94 → 1.0.95

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 999bb2c56def52960bba5ba42d451d51720732b56c6133c6b2f31138fd5d1b1b
-  data.tar.gz: fcc8978282f0823ad26d8481c6beba74f3ff622306deabb88a93a466c6b9a476
+  metadata.gz: 7e8b705443daf4776540951e35b4f80fb232b95292bd0c1c589124e24914fb7d
+  data.tar.gz: aefa991e6d624886cca7052a14b8a126222cdf4e29a0438b1b473b6b62020fe6
 SHA512:
-  metadata.gz: cd5215c19233b1cedd2e817f7dfde0d2d034148fc548e9116f8f67b98f6678a4d7435b14119a4282840e1f20d9e87d59708e0490282b59074b2cfe38ab979c4a
-  data.tar.gz: d3df53d29afbcb3306437ea20e2d4fc6f36d203853737fd1d7359bc31276d744f5ad092dd4283f5ca94cf0cd36e16af1999bddacbbf2f8bd7f5776d9fe103c38
+  metadata.gz: c8efb3a06244abe7248da8aefa9438fcab0fad88167ead0017f82ea95aba3b25bf816b093480cb91d87c8948da0af91447c0316d25299e6357e213605f8356fc
+  data.tar.gz: cf257f985bcf7a0b7389567480fa53790d771e56e0c45d915fcec10000f719f9ac0e28bee42468e25f7ce158ac705956509de93d70acf465f2edb83bdef4b050

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ree_lib (1.0.94)
+    ree_lib (1.0.95)
       bigdecimal (~> 3.1.6)
       binding_of_caller (~> 1.0.0)
       i18n (~> 1.14.1)
@@ -15,74 +15,77 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
-    bigdecimal (3.1.6)
-    binding_of_caller (1.0.0)
-      debug_inspector (>= 0.0.1)
-    bootsnap (1.17.1)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    bigdecimal (3.1.8)
+    binding_of_caller (1.0.1)
+      debug_inspector (>= 1.2.0)
+    bootsnap (1.18.3)
       msgpack (~> 1.2)
     commander (5.0.0)
       highline (~> 3.0.0)
-    concurrent-ruby (1.2.3)
-    crack (0.4.5)
+    concurrent-ruby (1.3.3)
+    crack (1.0.0)
+      bigdecimal
       rexml
     crass (1.0.6)
     debug_inspector (1.2.0)
-    diff-lcs (1.5.0)
-    faker (3.2.3)
+    diff-lcs (1.5.1)
+    faker (3.4.2)
       i18n (>= 1.8.11, < 2)
     hashdiff (1.1.0)
     highline (3.0.1)
-    i18n (1.14.1)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     msgpack (1.7.2)
-    nokogiri (1.16.0-x86_64-darwin)
+    nokogiri (1.16.7-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.0-x86_64-linux)
+    nokogiri (1.16.7-x86_64-linux)
       racc (~> 1.4)
-    oj (3.16.3)
+    oj (3.16.4)
       bigdecimal (>= 3.0)
-    pg (1.5.4)
-    public_suffix (5.0.4)
-    racc (1.7.3)
-    rack (3.0.8)
+    pg (1.5.7)
+    public_suffix (6.0.1)
+    racc (1.8.0)
+    rack (3.1.7)
     rack-test (2.1.0)
       rack (>= 1.3)
     rainbow (3.1.1)
-    rake (13.1.0)
-    ree (1.0.35)
+    rake (13.2.1)
+    ree (1.0.37)
       commander (~> 5.0.0)
-    rexml (3.2.6)
+    rexml (3.3.2)
+      strscan
     roda (3.76.0)
       rack
-    rollbar (3.5.1)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    rollbar (3.5.2)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.6)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.1)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
     ruby-prof (1.7.0)
     sequel (5.76.0)
       bigdecimal
     sqlite3 (1.4.4)
-    timecop (0.9.8)
+    strscan (3.1.0)
+    timecop (0.9.10)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     warden (1.2.9)
       rack (>= 2.0.9)
-    webmock (3.19.1)
+    webmock (3.23.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)

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

@@ -9,6 +9,9 @@
   "depends_on": [
     {
       "name": "ree_i18n"
+    },
+    {
+      "name": "ree_string"
     }
   ],
   "env_vars": [
@@ -19,7 +22,7 @@
       "name": "auth_error",
       "schema": "packages/ree_errors/schemas/ree_errors/auth_error.schema.json",
       "tags": [
-        "object"
+        "fn"
       ]
     },
     {
@@ -33,42 +36,42 @@
       "name": "conflict_error",
       "schema": "packages/ree_errors/schemas/ree_errors/conflict_error.schema.json",
       "tags": [
-        "object"
+        "fn"
       ]
     },
     {
       "name": "invalid_param_error",
       "schema": "packages/ree_errors/schemas/ree_errors/invalid_param_error.schema.json",
       "tags": [
-        "object"
+        "fn"
       ]
     },
     {
       "name": "not_found_error",
       "schema": "packages/ree_errors/schemas/ree_errors/not_found_error.schema.json",
       "tags": [
-        "object"
+        "fn"
       ]
     },
     {
       "name": "payment_required_error",
       "schema": "packages/ree_errors/schemas/ree_errors/payment_required_error.schema.json",
       "tags": [
-        "object"
+        "fn"
       ]
     },
     {
       "name": "permission_error",
       "schema": "packages/ree_errors/schemas/ree_errors/permission_error.schema.json",
       "tags": [
-        "object"
+        "fn"
       ]
     },
     {
       "name": "validation_error",
       "schema": "packages/ree_errors/schemas/ree_errors/validation_error.schema.json",
       "tags": [
-        "object"
+        "fn"
       ]
     }
   ]

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

@@ -1,15 +1,15 @@
-require_relative 'error_factory'
+class ReeErrors::AuthError
+  include Ree::FnDSL
 
-class ReeErrors::AuthError < ReeErrors::ErrorFactory
-  include Ree::BeanDSL
-
-  bean :auth_error do
+  fn :auth_error do
+    target :class
+    with_caller
     link :build_error
     link 'ree_errors/error', -> { Error }
   end
 
-  contract Symbol, Nilor[String] => SubclassOf[Error]
-  def build(code, locale = nil)
-    build_error(:auth, code, locale)
+  contract Symbol, Nilor[String], Kwargs[msg: Nilor[String]] => SubclassOf[Error]
+  def call(code, locale = nil, msg: nil)
+    build_error(get_caller, :auth, code,locale, msg)
   end
 end

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

@@ -5,14 +5,16 @@ class ReeErrors::BuildError
     link 'ree_errors/error', -> { Error }
   end
 
-  contract Symbol, Symbol, Nilor[String] => SubclassOf[Error]
-  def call(type, code, locale)
+  contract Any, Symbol, Symbol, Nilor[String], Nilor[String] => SubclassOf[Error]
+  def call(caller, type, code, locale, default_msg)
     klass = Class.new(Error)
 
     klass.instance_exec do
+      @caller = caller
       @type = type
       @code = code
       @locale = locale
+      @default_msg = default_msg
     end
 
     klass

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

@@ -1,15 +1,15 @@
-require_relative 'error_factory'
+class ReeErrors::ConflictError
+  include Ree::FnDSL
 
-class ReeErrors::ConflictError < ReeErrors::ErrorFactory
-  include Ree::BeanDSL
-
-  bean :conflict_error do
+  fn :conflict_error do
+    target :class
+    with_caller
     link :build_error
     link 'ree_errors/error', -> { Error }
   end
 
-  contract Symbol, Nilor[String] => SubclassOf[Error]
-  def build(code, locale = nil)
-    build_error(:conflict, code, locale)
+  contract Symbol, Nilor[String], Kwargs[msg: Nilor[String]] => SubclassOf[Error]
+  def call(code, locale = nil, msg: nil)
+    build_error(get_caller, :conflict, code,locale, msg)
   end
 end

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

@@ -3,15 +3,46 @@ module ReeErrors
     include Ree::LinkDSL
 
     link :t, from: :ree_i18n
+    link :check_locale_exists, from: :ree_i18n
+    link :underscore, from: :ree_string
 
     def initialize(msg = nil)
-      if !locale && !msg
-        raise ArgumentError, "message or locale should be specified"
+      if !msg && !locale && !default_msg
+        raise ArgumentError, "message, locale or default message should be specified"
       end
 
-      super(
-        locale ? t(locale, default_by_locale: :en) : msg
-      )
+      message = if msg
+        msg
+      elsif default_msg
+        default_msg
+      else
+        path = (locale || code).to_s
+        has_path = path.include?(".")
+
+        if has_path
+          pre_path = [caller_module, caller_class].compact.map { underscore(_)}.join(".")
+
+          if check_locale_exists(path)
+            t(path, default_by_locale: :en)
+          else
+            t("#{pre_path}.#{path}", default_by_locale: :en)
+          end
+        else
+          if caller_module
+            mod = underscore(caller_module)
+            klass = underscore(caller_class)
+
+            if check_locale_exists(loc = "#{mod}.errors.#{klass}.#{path}")
+              t(loc, default_by_locale: :en)
+            else check_locale_exists(loc = "#{mod}.errors.#{path}")
+              t(loc, default_by_locale: :en)
+            end
+          else
+          end
+        end
+      end
+
+      super(message)
     end
 
     def type
@@ -26,20 +57,72 @@ module ReeErrors
       t
     end
 
+    def default_msg
+      self.class.instance_variable_get(:@default_msg)
+    end
+
     def locale
       self.class.instance_variable_get(:@locale)
     end
 
+    def caller
+      self.class.instance_variable_get(:@caller)
+    end
+
+    def caller_module
+      @caller_module ||= begin
+        if !caller
+          nil
+        else
+          c = caller
+
+          if c.is_a?(Class)
+            extract_module_name(c.to_s)
+          else
+            extract_module_name(c.class.to_s)
+          end
+        end
+      end
+    end
+
+    def caller_class
+      @caller_class ||= begin
+        if !caller
+          nil
+        else
+          c = caller
+
+          if c.is_a?(Class)
+            extract_class_name(c.to_s)
+          else
+            extract_class_name(c.class.to_s)
+          end
+        end
+      end
+    end
+
     def code
       c = self.class.instance_variable_get(:@code)
 
       if !c
         raise ArgumentError.new(
-          "code was not specified for domain error => #{self.inspect}"
+          "code not specified for error => #{self.inspect}"
         )
       end
 
       c
     end
+
+    private
+
+    def extract_module_name(klass_str)
+      class_name = klass_str.split("::").first
+      return nil if class_name == klass_str
+      return class_name
+    end
+
+    def extract_class_name(klass_str)
+      klass_str.split("::").last
+    end
   end
 end

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

@@ -1,15 +1,15 @@
-require_relative 'error_factory'
+class ReeErrors::InvalidParamError
+  include Ree::FnDSL
 
-class ReeErrors::InvalidParamError < ReeErrors::ErrorFactory
-  include Ree::BeanDSL
-
-  bean :invalid_param_error do
+  fn :invalid_param_error do
+    target :class
+    with_caller
     link :build_error
     link 'ree_errors/error', -> { Error }
   end
 
-  contract Symbol, Nilor[String] => SubclassOf[Error]
-  def build(code, locale = nil)
-    build_error(:invalid_param, code, locale)
+  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)
   end
-end
+end

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

@@ -1,15 +1,15 @@
-require_relative 'error_factory'
+class ReeErrors::NotFoundError
+  include Ree::FnDSL
 
-class ReeErrors::NotFoundError < ReeErrors::ErrorFactory
-  include Ree::BeanDSL
-
-  bean :not_found_error do
+  fn :not_found_error do
+    target :class
+    with_caller
     link :build_error
     link 'ree_errors/error', -> { Error }
   end
 
-  contract Symbol, Nilor[String] => SubclassOf[Error]
-  def build(code, locale = nil)
-    build_error(:not_found, code, locale)
+  contract Symbol, Nilor[String], Kwargs[msg: Nilor[String]] => SubclassOf[Error]
+  def call(code, locale = nil, msg: nil)
+    build_error(get_caller, :not_found, code,locale, msg)
   end
 end

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

@@ -1,15 +1,15 @@
-require_relative 'error_factory'
+class ReeErrors::PaymentRequiredError
+  include Ree::FnDSL
 
-class ReeErrors::PaymentRequiredError < ReeErrors::ErrorFactory
-  include Ree::BeanDSL
-
-  bean :payment_required_error do
+  fn :payment_required_error do
+    target :class
+    with_caller
     link :build_error
     link 'ree_errors/error', -> { Error }
   end
 
-  contract Symbol, Nilor[String] => SubclassOf[Error]
-  def build(code, locale = nil)
-    build_error(:payment_required, code, locale)
+  contract Symbol, Nilor[String], Kwargs[msg: Nilor[String]] => SubclassOf[Error]
+  def call(code, locale = nil, msg: nil)
+    build_error(get_caller, :payment_required, code,locale, msg)
   end
 end

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

@@ -1,15 +1,15 @@
-require_relative 'error_factory'
+class ReeErrors::PermissionError
+  include Ree::FnDSL
 
-class ReeErrors::PermissionError < ReeErrors::ErrorFactory
-  include Ree::BeanDSL
-
-  bean :permission_error do
+  fn :permission_error do
+    target :class
+    with_caller
     link :build_error
     link 'ree_errors/error', -> { Error }
   end
 
-  contract Symbol, Nilor[String] => SubclassOf[Error]
-  def build(code, locale = nil)
-    build_error(:permission, code, locale)
+  contract Symbol, Nilor[String], Kwargs[msg: Nilor[String]] => SubclassOf[Error]
+  def call(code, locale = nil, msg: nil)
+    build_error(get_caller, :permission, code,locale, msg)
   end
 end

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

@@ -1,15 +1,15 @@
-require_relative 'error_factory'
+class ReeErrors::ValidationError
+  include Ree::FnDSL
 
-class ReeErrors::ValidationError < ReeErrors::ErrorFactory
-  include Ree::BeanDSL
-
-  bean :validation_error do
+  fn :validation_error do
+    target :class
+    with_caller
     link :build_error
     link 'ree_errors/error', -> { Error }
   end
 
-  contract Symbol, Nilor[String] => SubclassOf[Error]
-  def build(code, locale = nil)
-    build_error(:validation, code, locale)
+  contract Symbol, Nilor[String], Kwargs[msg: Nilor[String]] => SubclassOf[Error]
+  def call(code, locale = nil, msg: nil)
+    build_error(get_caller, :validation, code,locale, msg)
   end
 end

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

@@ -3,5 +3,6 @@ module ReeErrors
 
   package do
     depends_on :ree_i18n
+    depends_on :ree_string
   end
 end

data/lib/ree_lib/packages/ree_errors/schemas/ree_errors/auth_error.schema.json

@@ -3,11 +3,34 @@
   "schema_version": "1.1",
   "name": "auth_error",
   "path": "packages/ree_errors/package/ree_errors/auth_error.rb",
-  "mount_as": "object",
+  "mount_as": "fn",
   "class": "ReeErrors::AuthError",
   "factory": null,
   "methods": [
+    {
+      "doc": "",
+      "throws": [
 
+      ],
+      "return": "SubclassOf[ReeErrors::Error]",
+      "args": [
+        {
+          "arg": "code",
+          "arg_type": "req",
+          "type": "Symbol"
+        },
+        {
+          "arg": "locale",
+          "arg_type": "opt",
+          "type": "Nilor[String]"
+        },
+        {
+          "arg": "msg",
+          "arg_type": "key",
+          "type": "Nilor[String]"
+        }
+      ]
+    }
   ],
   "links": [
     {

data/lib/ree_lib/packages/ree_errors/schemas/ree_errors/build_error.schema.json

@@ -14,6 +14,11 @@
       ],
       "return": "SubclassOf[ReeErrors::Error]",
       "args": [
+        {
+          "arg": "caller",
+          "arg_type": "req",
+          "type": "Any"
+        },
         {
           "arg": "type",
           "arg_type": "req",
@@ -28,6 +33,11 @@
           "arg": "locale",
           "arg_type": "req",
           "type": "Nilor[String]"
+        },
+        {
+          "arg": "default_msg",
+          "arg_type": "req",
+          "type": "Nilor[String]"
         }
       ]
     }

data/lib/ree_lib/packages/ree_errors/schemas/ree_errors/conflict_error.schema.json

@@ -3,11 +3,34 @@
   "schema_version": "1.1",
   "name": "conflict_error",
   "path": "packages/ree_errors/package/ree_errors/conflict_error.rb",
-  "mount_as": "object",
+  "mount_as": "fn",
   "class": "ReeErrors::ConflictError",
   "factory": null,
   "methods": [
+    {
+      "doc": "",
+      "throws": [
 
+      ],
+      "return": "SubclassOf[ReeErrors::Error]",
+      "args": [
+        {
+          "arg": "code",
+          "arg_type": "req",
+          "type": "Symbol"
+        },
+        {
+          "arg": "locale",
+          "arg_type": "opt",
+          "type": "Nilor[String]"
+        },
+        {
+          "arg": "msg",
+          "arg_type": "key",
+          "type": "Nilor[String]"
+        }
+      ]
+    }
   ],
   "links": [
     {

data/lib/ree_lib/packages/ree_errors/schemas/ree_errors/invalid_param_error.schema.json

@@ -3,11 +3,34 @@
   "schema_version": "1.1",
   "name": "invalid_param_error",
   "path": "packages/ree_errors/package/ree_errors/invalid_param_error.rb",
-  "mount_as": "object",
+  "mount_as": "fn",
   "class": "ReeErrors::InvalidParamError",
   "factory": null,
   "methods": [
+    {
+      "doc": "",
+      "throws": [
 
+      ],
+      "return": "SubclassOf[ReeErrors::Error]",
+      "args": [
+        {
+          "arg": "code",
+          "arg_type": "req",
+          "type": "Symbol"
+        },
+        {
+          "arg": "locale",
+          "arg_type": "opt",
+          "type": "Nilor[String]"
+        },
+        {
+          "arg": "msg",
+          "arg_type": "key",
+          "type": "Nilor[String]"
+        }
+      ]
+    }
   ],
   "links": [
     {

data/lib/ree_lib/packages/ree_errors/schemas/ree_errors/not_found_error.schema.json

@@ -3,11 +3,34 @@
   "schema_version": "1.1",
   "name": "not_found_error",
   "path": "packages/ree_errors/package/ree_errors/not_found_error.rb",
-  "mount_as": "object",
+  "mount_as": "fn",
   "class": "ReeErrors::NotFoundError",
   "factory": null,
   "methods": [
+    {
+      "doc": "",
+      "throws": [
 
+      ],
+      "return": "SubclassOf[ReeErrors::Error]",
+      "args": [
+        {
+          "arg": "code",
+          "arg_type": "req",
+          "type": "Symbol"
+        },
+        {
+          "arg": "locale",
+          "arg_type": "opt",
+          "type": "Nilor[String]"
+        },
+        {
+          "arg": "msg",
+          "arg_type": "key",
+          "type": "Nilor[String]"
+        }
+      ]
+    }
   ],
   "links": [
     {

data/lib/ree_lib/packages/ree_errors/schemas/ree_errors/payment_required_error.schema.json

@@ -3,11 +3,34 @@
   "schema_version": "1.1",
   "name": "payment_required_error",
   "path": "packages/ree_errors/package/ree_errors/payment_required_error.rb",
-  "mount_as": "object",
+  "mount_as": "fn",
   "class": "ReeErrors::PaymentRequiredError",
   "factory": null,
   "methods": [
+    {
+      "doc": "",
+      "throws": [
 
+      ],
+      "return": "SubclassOf[ReeErrors::Error]",
+      "args": [
+        {
+          "arg": "code",
+          "arg_type": "req",
+          "type": "Symbol"
+        },
+        {
+          "arg": "locale",
+          "arg_type": "opt",
+          "type": "Nilor[String]"
+        },
+        {
+          "arg": "msg",
+          "arg_type": "key",
+          "type": "Nilor[String]"
+        }
+      ]
+    }
   ],
   "links": [
     {

data/lib/ree_lib/packages/ree_errors/schemas/ree_errors/permission_error.schema.json

@@ -3,11 +3,34 @@
   "schema_version": "1.1",
   "name": "permission_error",
   "path": "packages/ree_errors/package/ree_errors/permission_error.rb",
-  "mount_as": "object",
+  "mount_as": "fn",
   "class": "ReeErrors::PermissionError",
   "factory": null,
   "methods": [
+    {
+      "doc": "",
+      "throws": [
 
+      ],
+      "return": "SubclassOf[ReeErrors::Error]",
+      "args": [
+        {
+          "arg": "code",
+          "arg_type": "req",
+          "type": "Symbol"
+        },
+        {
+          "arg": "locale",
+          "arg_type": "opt",
+          "type": "Nilor[String]"
+        },
+        {
+          "arg": "msg",
+          "arg_type": "key",
+          "type": "Nilor[String]"
+        }
+      ]
+    }
   ],
   "links": [
     {

data/lib/ree_lib/packages/ree_errors/schemas/ree_errors/validation_error.schema.json

@@ -3,11 +3,34 @@
   "schema_version": "1.1",
   "name": "validation_error",
   "path": "packages/ree_errors/package/ree_errors/validation_error.rb",
-  "mount_as": "object",
+  "mount_as": "fn",
   "class": "ReeErrors::ValidationError",
   "factory": null,
   "methods": [
+    {
+      "doc": "",
+      "throws": [
 
+      ],
+      "return": "SubclassOf[ReeErrors::Error]",
+      "args": [
+        {
+          "arg": "code",
+          "arg_type": "req",
+          "type": "Symbol"
+        },
+        {
+          "arg": "locale",
+          "arg_type": "opt",
+          "type": "Nilor[String]"
+        },
+        {
+          "arg": "msg",
+          "arg_type": "key",
+          "type": "Nilor[String]"
+        }
+      ]
+    }
   ],
   "links": [
     {

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

@@ -2,25 +2,27 @@ package_require('ree_errors/auth_error')
 
 RSpec.describe ReeErrors::AuthError do
   link :add_load_path, from: :ree_i18n
+  link :auth_error, from: :ree_errors
 
   before :all do
     add_load_path(Dir[File.join(__dir__, 'locales/*.yml')])
   end
 
   it {
-    klass = described_class.build(:code, 'ree_errors_test.error')
-    error = klass.new('CUSTOM MESSAGE')
+    klass = auth_error(:code, 'ree_errors_test.error', msg: "test")
+    error = klass.new
 
     expect(klass).to be_a(Class)
     expect(error).to be_a(ReeErrors::Error)
-    expect(error.message).to eq('test error message')
+    expect(error.message).to eq('test')
     expect(error.code).to eq(:code)
     expect(error.type).to eq(:auth)
     expect(error.locale).to eq('ree_errors_test.error')
+    expect(error.caller).to eq(self)
   }
 
   it {
-    klass = described_class.build(:code)
+    klass = auth_error(:code)
 
     expect {
       klass.new
@@ -28,7 +30,7 @@ RSpec.describe ReeErrors::AuthError do
   }
 
   it {
-    klass = described_class.build(:code)
+    klass = auth_error(:code)
     error = klass.new('CUSTOM MESSAGE')
 
     expect(klass).to be_a(Class)
@@ -40,14 +42,26 @@ RSpec.describe ReeErrors::AuthError do
   }
 
   it {
-    klass = described_class.build(:code, 'ree_errors_test.error')
+    klass = auth_error(:code, 'locale_error')
+    error = klass.new
+
+    expect(klass).to be_a(Class)
+    expect(error).to be_a(ReeErrors::Error)
+    expect(error.message).to eq('locale error')
+    expect(error.code).to eq(:code)
+    expect(error.type).to eq(:auth)
+    expect(error.locale).to eq("locale_error")
+  }
+
+  it {
+    klass = auth_error(:code, 'locale_error1')
     error = klass.new
 
     expect(klass).to be_a(Class)
     expect(error).to be_a(ReeErrors::Error)
-    expect(error.message).to eq('test error message')
+    expect(error.message).to eq('locale error 1')
     expect(error.code).to eq(:code)
     expect(error.type).to eq(:auth)
-    expect(error.locale).to eq("ree_errors_test.error")
+    expect(error.locale).to eq("locale_error1")
   }
 end

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

@@ -1,8 +1,10 @@
 package_require('ree_errors/invalid_param_error')
 
 RSpec.describe ReeErrors::InvalidParamError do
+  link :invalid_param_error, from: :ree_errors
+
   it {
-    klass = described_class.build(:code)
+    klass = invalid_param_error(:code)
     error = klass.new('message')
 
     expect(klass).to be_a(Class)

data/lib/ree_lib/packages/ree_errors/spec/ree_errors/locales/en.yml

@@ -1,3 +1,8 @@
 en:
   ree_errors_test:
-    error: 'test error message'
+    error: 'test error message'
+  r_spec:
+    errors:
+      locale_error1: "locale error 1"
+      ree_errors_auth_error:
+        locale_error: "locale error"

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

@@ -1,8 +1,10 @@
 package_require('ree_errors/not_found_error')
 
 RSpec.describe ReeErrors::NotFoundError do
+  link :not_found_error, from: :ree_errors
+
   it {
-    klass = described_class.build(:code)
+    klass = not_found_error(:code)
     error = klass.new('message')
 
     expect(klass).to be_a(Class)

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

@@ -1,8 +1,10 @@
 package_require('ree_errors/payment_required_error')
 
 RSpec.describe ReeErrors::PaymentRequiredError do
+  link :payment_required_error, from: :ree_errors
+
   it {
-    klass = described_class.build(:code)
+    klass = payment_required_error(:code)
     error = klass.new('message')
 
     expect(klass).to be_a(Class)

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

@@ -1,8 +1,10 @@
 package_require('ree_errors/permission_error')
 
 RSpec.describe ReeErrors::PermissionError do
+  link :permission_error, from: :ree_errors
+
   it {
-    klass = described_class.build(:code)
+    klass = permission_error(:code)
     error = klass.new('message')
 
     expect(klass).to be_a(Class)

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

@@ -1,8 +1,10 @@
 package_require('ree_errors/validation_error')
 
 RSpec.describe ReeErrors::ValidationError do
+  link :validation_error, from: :ree_errors
+
   it {
-    klass = described_class.build(:code)
+    klass = validation_error(:code)
     error = klass.new('message')
 
     expect(klass).to be_a(Class)

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

@@ -25,6 +25,13 @@
         "fn"
       ]
     },
+    {
+      "name": "check_locale_exists",
+      "schema": "packages/ree_i18n/schemas/ree_i18n/functions/check_locale_exists.schema.json",
+      "tags": [
+        "fn"
+      ]
+    },
     {
       "name": "get_default_locale",
       "schema": "packages/ree_i18n/schemas/ree_i18n/functions/get_default_locale.schema.json",

data/lib/ree_lib/packages/ree_i18n/package/ree_i18n/functions/check_locale_exists.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class ReeI18n::CheckLocaleExists
+  include Ree::FnDSL
+
+  fn :check_locale_exists
+
+  contract(String, Nilor[Or[String, Symbol]] => Bool)
+  def call(value, locale = nil)
+    I18n.exists?(value, locale || I18n.default_locale)
+  end
+end

data/lib/ree_lib/packages/ree_i18n/schemas/ree_i18n/functions/check_locale_exists.schema.json

@@ -0,0 +1,33 @@
+{
+  "schema_type": "object",
+  "schema_version": "1.1",
+  "name": "check_locale_exists",
+  "path": "packages/ree_i18n/package/ree_i18n/functions/check_locale_exists.rb",
+  "mount_as": "fn",
+  "class": "ReeI18n::CheckLocaleExists",
+  "factory": null,
+  "methods": [
+    {
+      "doc": "",
+      "throws": [
+
+      ],
+      "return": "Bool",
+      "args": [
+        {
+          "arg": "value",
+          "arg_type": "req",
+          "type": "String"
+        },
+        {
+          "arg": "locale",
+          "arg_type": "opt",
+          "type": "Nilor[Or[String, Symbol]]"
+        }
+      ]
+    }
+  ],
+  "links": [
+
+  ]
+}

data/lib/ree_lib/packages/ree_i18n/spec/ree_i18n/functions/check_locale_exists.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+RSpec.describe :check_locale_exists do
+  link :set_locale, from: :ree_i18n
+  link :get_locale, from: :ree_i18n
+  link :add_load_path, from: :ree_i18n
+
+  it {
+    add_load_path(Dir[File.join(__dir__, 'locales/*.yml')])
+
+    expect(check_locale_exists("count.zero", "ru")).to eq(true)
+    expect(check_locale_exists("count.zero")).to eq(true)
+    expect(check_locale_exists("count.zero", :fr)).to eq(false)
+    expect(check_locale_exists("count.none", :ru)).to eq(false)
+  }
+end

data/lib/ree_lib/packages/ree_roda/spec/ree_roda/services/build_swagger_from_routes_spec.rb

@@ -17,19 +17,22 @@ RSpec.describe :build_swagger_from_routes do
       package do
         depends_on :ree_actions
         depends_on :ree_dao
+        depends_on :ree_errors
       end
     end
 
     class ReeRodaTestSwagger::Cmd
       include ReeActions::DSL
 
-      action :cmd
+      action :cmd do
+        link :invalid_param_error, from: :ree_errors
+      end
 
       ActionCaster = build_mapper.use(:cast) do
         integer :id
       end
 
-      InvalidErr = ReeErrors::ValidationError.build(:invalid, "invalid")
+      InvalidErr = invalid_param_error(:invalid, "invalid")
 
       contract(Any, Any => Any).throws(InvalidErr)
       def call(access, attrs)
@@ -71,7 +74,7 @@ RSpec.describe :build_swagger_from_routes do
   it {
     swagger = build_swagger_from_routes(routes, "test", "test", "1.0", "https://example.com")
 
-    expect(swagger.dig(:paths, "/api/actions", :post, :responses, 422, :description))
-      .to eq("- type: **validation**, code: **invalid**, message: **invalid**")
+    expect(swagger.dig(:paths, "/api/actions", :post, :responses, 400, :description))
+      .to eq("- type: **invalid_param**, code: **invalid**, message: **invalid param**")
   }
 end

data/lib/ree_lib/packages/ree_roda/spec/ree_roda/services/locales/en.yml

@@ -1,2 +1,4 @@
 en:
-  invalid: "invalid"
+  ree_roda_test_swagger:
+    errors:
+      invalid: "invalid param"

data/lib/ree_lib/packages/ree_string/package/ree_string/functions/deconstantize.rb

@@ -7,7 +7,7 @@ class ReeString::Deconstantize
 
   doc(<<~DOC)
     Removes the rightmost segment from the constant expression in the string.
-    
+
       deconstantize('Net::HTTP')   # => "Net"
       deconstantize('::Net::HTTP') # => "::Net"
       deconstantize('String')      # => ""

data/lib/ree_lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ree_lib
 version: !ruby/object:Gem::Version
-  version: 1.0.94
+  version: 1.0.95
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-19 00:00:00.000000000 Z
+date: 2024-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ree
@@ -836,7 +836,6 @@ files:
 - lib/ree_lib/packages/ree_errors/package/ree_errors/build_error.rb
 - lib/ree_lib/packages/ree_errors/package/ree_errors/conflict_error.rb
 - lib/ree_lib/packages/ree_errors/package/ree_errors/error.rb
-- lib/ree_lib/packages/ree_errors/package/ree_errors/error_factory.rb
 - lib/ree_lib/packages/ree_errors/package/ree_errors/invalid_param_error.rb
 - lib/ree_lib/packages/ree_errors/package/ree_errors/not_found_error.rb
 - lib/ree_lib/packages/ree_errors/package/ree_errors/payment_required_error.rb
@@ -933,6 +932,7 @@ files:
 - lib/ree_lib/packages/ree_i18n/bin/console
 - lib/ree_lib/packages/ree_i18n/package/ree_i18n.rb
 - lib/ree_lib/packages/ree_i18n/package/ree_i18n/functions/add_load_path.rb
+- lib/ree_lib/packages/ree_i18n/package/ree_i18n/functions/check_locale_exists.rb
 - lib/ree_lib/packages/ree_i18n/package/ree_i18n/functions/get_default_locale.rb
 - lib/ree_lib/packages/ree_i18n/package/ree_i18n/functions/get_locale.rb
 - lib/ree_lib/packages/ree_i18n/package/ree_i18n/functions/set_default_locale.rb
@@ -940,6 +940,7 @@ files:
 - lib/ree_lib/packages/ree_i18n/package/ree_i18n/functions/t.rb
 - lib/ree_lib/packages/ree_i18n/package/ree_i18n/functions/with_locale.rb
 - lib/ree_lib/packages/ree_i18n/schemas/ree_i18n/functions/add_load_path.schema.json
+- lib/ree_lib/packages/ree_i18n/schemas/ree_i18n/functions/check_locale_exists.schema.json
 - lib/ree_lib/packages/ree_i18n/schemas/ree_i18n/functions/get_default_locale.schema.json
 - lib/ree_lib/packages/ree_i18n/schemas/ree_i18n/functions/get_locale.schema.json
 - lib/ree_lib/packages/ree_i18n/schemas/ree_i18n/functions/set_default_locale.schema.json
@@ -947,6 +948,7 @@ files:
 - lib/ree_lib/packages/ree_i18n/schemas/ree_i18n/functions/t.schema.json
 - lib/ree_lib/packages/ree_i18n/schemas/ree_i18n/functions/with_locale.schema.json
 - lib/ree_lib/packages/ree_i18n/spec/package_schema_spec.rb
+- lib/ree_lib/packages/ree_i18n/spec/ree_i18n/functions/check_locale_exists.rb
 - lib/ree_lib/packages/ree_i18n/spec/ree_i18n/functions/locales/en.yml
 - lib/ree_lib/packages/ree_i18n/spec/ree_i18n/functions/locales/ru.yml
 - lib/ree_lib/packages/ree_i18n/spec/ree_i18n/functions/set_locale_spec.rb

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

@@ -1,15 +0,0 @@
-require_relative 'error'
-
-class ReeErrors::ErrorFactory
-  class << self
-    contract Symbol, String => SubclassOf[ReeErrors::Error]
-    def build(code, locale = nil)
-      self.new.build(code, locale)
-    end
-  end
-
-  contract Symbol, String => SubclassOf[ReeErrors::Error]
-  def build(code, locale = nil)
-    raise NotImplementedError, "should be implemented in derived class"
-  end
-end