ree_lib 1.0.93 → 1.0.95

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)