ree_lib 1.0.93 → 1.0.95

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d101ebcf45c8bacd0e8de2004ea34f6965b04a8522cd8caceda535ea6ff4acf
-  data.tar.gz: f3ceb4c8aef3c232538e88c469292e651c9ab39b0eeb6f626f2155d13551365c
+  metadata.gz: 7e8b705443daf4776540951e35b4f80fb232b95292bd0c1c589124e24914fb7d
+  data.tar.gz: aefa991e6d624886cca7052a14b8a126222cdf4e29a0438b1b473b6b62020fe6
 SHA512:
-  metadata.gz: 806da6ef5619f5f287e50df5000110ac87e561b16e9a4f7cec09c1b38ea3f66df4f5766c5b627aea1a6c48bc4fc14ca099a17eb63765aa356128f6b28c3407a3
-  data.tar.gz: d06860fd4ba9e3549a7149e6572d48df681a93662a5f619a5b3c0a9ce612317e279f766ad28f3fbe92dff0b7bf1dee0801d9a2b63abcb6fa531b160691b01516
+  metadata.gz: c8efb3a06244abe7248da8aefa9438fcab0fad88167ead0017f82ea95aba3b25bf816b093480cb91d87c8948da0af91447c0316d25299e6357e213605f8356fc
+  data.tar.gz: cf257f985bcf7a0b7389567480fa53790d771e56e0c45d915fcec10000f719f9ac0e28bee42468e25f7ce158ac705956509de93d70acf465f2edb83bdef4b050

data/Gemfile

@@ -11,4 +11,5 @@ group :test do
   gem 'rspec'
   gem 'bootsnap'
   gem 'webmock'
+  gem 'ruby-prof'
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ree_lib (1.0.93)
+    ree_lib (1.0.95)
       bigdecimal (~> 3.1.6)
       binding_of_caller (~> 1.0.0)
       i18n (~> 1.14.1)
@@ -15,73 +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)
@@ -102,6 +106,7 @@ DEPENDENCIES
   roda (~> 3.76.0)
   rollbar (~> 3.5.1)
   rspec
+  ruby-prof
   sqlite3 (~> 1.4.4)
   timecop (~> 0.9.5)
   warden (~> 1.2.9)

data/lib/ree_lib/packages/ree_dao/package/ree_dao/wrappers/pg_array.rb

@@ -6,25 +6,29 @@ class ReeDao::PgArray < ReeMapper::AbstractWrapper
   contract(
     Any,
     Kwargs[
-      name: String,
       role: Nilor[Symbol, ArrayOf[Symbol]],
-      fields_filters: ArrayOf[ReeMapper::FieldsFilter],
-      location: Nilor[String],
+      fields_filters: Nilor[ArrayOf[ReeMapper::FieldsFilter]],
     ] => Or[Sequel::Postgres::PGArray, String]
   )
-  def db_dump(value, name:, role: nil, fields_filters: [], location: nil)
+  def db_dump(value, role: nil, fields_filters: nil)
     if !value.is_a?(Array)
-      raise ReeMapper::TypeError.new("`#{name}` should be an array, got `#{truncate(value.inspect)}`", location)
+      raise ReeMapper::TypeError.new("should be an array, got `#{truncate(value.inspect)}`")
     end
 
-    value = value.map.with_index do |el, index|
-      subject.type.db_dump(
-        el,
-        name: "#{name}[#{index}]",
-        role: role,
-        fields_filters: fields_filters + [subject.fields_filter],
-        location: subject.location,
-      )
+    if subject.fields_filter
+      fields_filters = if fields_filters
+        fields_filters + [subject.fields_filter]
+      else
+        [subject.fields_filter]
+      end
+    end
+
+    value = value.map.with_index do |item, idx|
+      subject.type.db_dump(item, role:, fields_filters:)
+    rescue ReeMapper::ErrorWithLocation => e
+      e.location ||= subject.location
+      e.prepend_field_name(idx.to_s)
+      raise e
     end
 
     if value.empty?
@@ -37,25 +41,29 @@ class ReeDao::PgArray < ReeMapper::AbstractWrapper
   contract(
     Any,
     Kwargs[
-      name: String,
       role: Nilor[Symbol, ArrayOf[Symbol]],
-      fields_filters: ArrayOf[ReeMapper::FieldsFilter],
-      location: Nilor[String],
+      fields_filters: Nilor[ArrayOf[ReeMapper::FieldsFilter]],
     ] => Array
   ).throws(ReeMapper::TypeError)
-  def db_load(value, name:, role: nil, fields_filters: [], location: nil)
+  def db_load(value, role: nil, fields_filters: nil)
     if !value.is_a?(Sequel::Postgres::PGArray)
-      raise ReeMapper::TypeError.new("`#{name}` should be a Sequel::Postgres::PGArray, got `#{truncate(value.inspect)}`", location)
+      raise ReeMapper::TypeError.new("should be a Sequel::Postgres::PGArray, got `#{truncate(value.inspect)}`")
+    end
+
+    if subject.fields_filter
+      fields_filters = if fields_filters
+        fields_filters + [subject.fields_filter]
+      else
+        [subject.fields_filter]
+      end
     end
 
-    value.map.with_index do |val, index|
-      subject.type.db_load(
-        val,
-        name: "#{name}[#{index}]",
-        role: role,
-        fields_filters: fields_filters + [subject.fields_filter],
-        location: subject.location,
-      )
+    value.map.with_index do |item, idx|
+      subject.type.db_load(item, role:, fields_filters:)
+    rescue ReeMapper::ErrorWithLocation => e
+      e.location ||= subject.location
+      e.prepend_field_name(idx.to_s)
+      raise e
     end
   end
 end

data/lib/ree_lib/packages/ree_dao/package/ree_dao/wrappers/pg_jsonb.rb

@@ -6,10 +6,8 @@ class ReeDao::PgJsonb < ReeMapper::AbstractWrapper
   contract(
     Any,
     Kwargs[
-      name: String,
       role: Nilor[Symbol, ArrayOf[Symbol]],
-      fields_filters: ArrayOf[ReeMapper::FieldsFilter],
-      location: Nilor[String],
+      fields_filters: Nilor[ArrayOf[ReeMapper::FieldsFilter]],
     ] => Or[
       Sequel::Postgres::JSONBHash,
       Sequel::Postgres::JSONBArray,
@@ -21,29 +19,34 @@ class ReeDao::PgJsonb < ReeMapper::AbstractWrapper
       Sequel::Postgres::JSONBNull
     ]
   ).throws(ReeMapper::TypeError)
-  def db_dump(value, name:, role: nil, fields_filters: [], location: nil)
-    value = subject.type.db_dump(
-      value,
-      name: name,
-      role: role,
-      fields_filters: fields_filters + [subject.fields_filter],
-      location: subject.location,
-    )
+  def db_dump(value, role: nil, fields_filters: nil)
+    if subject.fields_filter
+      fields_filters = if fields_filters
+        fields_filters + [subject.fields_filter]
+      else
+        [subject.fields_filter]
+      end
+    end
+
+    value = begin
+      subject.type.db_dump(value, role:, fields_filters:)
+    rescue ReeMapper::ErrorWithLocation => e
+      e.location ||= subject.location
+      raise e
+    end
 
     begin
       Sequel.pg_jsonb_wrap(value)
     rescue Sequel::Error
-      raise ReeMapper::TypeError.new("`#{name}` should be an jsonb primitive, got `#{truncate(value.inspect)}`", location)
+      raise ReeMapper::TypeError.new("should be an jsonb primitive, got `#{truncate(value.inspect)}`")
     end
   end
 
   contract(
     Any,
     Kwargs[
-      name: String,
       role: Nilor[Symbol, ArrayOf[Symbol]],
-      fields_filters: ArrayOf[ReeMapper::FieldsFilter],
-      location: Nilor[String],
+      fields_filters: Nilor[ArrayOf[ReeMapper::FieldsFilter]],
     ] => Or[
       Hash,
       Array,
@@ -55,7 +58,7 @@ class ReeDao::PgJsonb < ReeMapper::AbstractWrapper
       Rational,
     ]
   ).throws(ReeMapper::TypeError)
-  def db_load(value, name:, role: nil, fields_filters: [], location: nil)
+  def db_load(value, role: nil, fields_filters: nil)
     value = case value
     when Sequel::Postgres::JSONBHash
       ReeObject::ToHash.new.call(value.to_h)
@@ -64,15 +67,22 @@ class ReeDao::PgJsonb < ReeMapper::AbstractWrapper
     when Numeric, String, TrueClass, FalseClass, NilClass
       value
     else
-      raise ReeMapper::TypeError.new("`#{name}` should be a Sequel::Postgres::JSONB, got `#{truncate(value.inspect)}`", location)
+      raise ReeMapper::TypeError.new("should be a Sequel::Postgres::JSONB, got `#{truncate(value.inspect)}`")
     end
 
-    subject.type.db_load(
-      value,
-      name: name,
-      role: role,
-      fields_filters: fields_filters + [subject.fields_filter],
-      location: subject.location,
-    )
+    if subject.fields_filter
+      fields_filters = if fields_filters
+        fields_filters + [subject.fields_filter]
+      else
+        [subject.fields_filter]
+      end
+    end
+
+    begin
+      subject.type.db_load(value, role:, fields_filters:)
+    rescue ReeMapper::ErrorWithLocation => e
+      e.location ||= subject.location
+      raise e
+    end
   end
-end
+end

data/lib/ree_lib/packages/ree_enum/package/ree_enum/base_enum_mapper.rb

@@ -8,29 +8,17 @@ class ReeEnum::BaseEnumMapper < ReeMapper::AbstractType
     @enum = enum
   end
 
-  contract(
-    ReeEnum::Value,
-    Kwargs[
-      name: String,
-      location: Nilor[String],
-    ] => Or[Integer, String]
-  )
-  def db_dump(value, name:, location: nil)
+  contract(ReeEnum::Value => Or[Integer, String])
+  def db_dump(value)
     value.mapped_value
   end
 
-  contract(
-    Or[Integer, String],
-    Kwargs[
-      name: String,
-      location: Nilor[String],
-    ] => ReeEnum::Value
-  ).throws(ReeMapper::CoercionError)
-  def db_load(value, name:, location: nil)
+  contract(Or[Integer, String] => ReeEnum::Value).throws(ReeMapper::CoercionError)
+  def db_load(value)
     enum_val = @enum.get_values.by_mapped_value(value)
 
     if !enum_val
-      raise ReeMapper::CoercionError.new("`#{name}` should be one of #{enum_inspection}, got `#{truncate(value.inspect)}`", location)
+      raise ReeMapper::CoercionError.new("should be one of #{enum_inspection}, got `#{truncate(value.inspect)}`")
     end
 
     enum_val
@@ -41,4 +29,4 @@ class ReeEnum::BaseEnumMapper < ReeMapper::AbstractType
   def enum_inspection
     @enum_inspection ||= truncate(@enum.get_values.each.map(&:to_s).inspect)
   end
-end
+end

data/lib/ree_lib/packages/ree_enum/package/ree_enum/integer_value_enum_mapper.rb

@@ -2,25 +2,13 @@
 require_relative "base_enum_mapper"
 
 class ReeEnum::IntegerValueEnumMapper < ReeEnum::BaseEnumMapper
-  contract(
-    ReeEnum::Value,
-    Kwargs[
-      name: String,
-      location: Nilor[String],
-    ] => Integer
-  )
-  def serialize(value, name:, location: nil)
+  contract(ReeEnum::Value => Integer)
+  def serialize(value)
     value.value
   end
 
-  contract(
-    Any,
-    Kwargs[
-      name: String,
-      location: Nilor[String],
-    ] => ReeEnum::Value
-  ).throws(ReeMapper::CoercionError)
-  def cast(value, name:, location: nil)
+  contract(Any => ReeEnum::Value).throws(ReeMapper::CoercionError)
+  def cast(value)
     enum_value = case value
     when Integer
       @enum.get_values.by_value(value)
@@ -34,9 +22,9 @@ class ReeEnum::IntegerValueEnumMapper < ReeEnum::BaseEnumMapper
     end
 
     if enum_value.nil?
-      raise ReeMapper::CoercionError.new("`#{name}` should be one of #{enum_inspection}, got `#{truncate(value.inspect)}`", location)
+      raise ReeMapper::CoercionError.new("should be one of #{enum_inspection}, got `#{truncate(value.inspect)}`")
     end
 
     enum_value
   end
-end
+end

data/lib/ree_lib/packages/ree_enum/package/ree_enum/string_value_enum_mapper.rb

@@ -2,25 +2,13 @@
 require_relative "base_enum_mapper"
 
 class ReeEnum::StringValueEnumMapper < ReeEnum::BaseEnumMapper
-  contract(
-    ReeEnum::Value,
-    Kwargs[
-      name: String,
-      location: Nilor[String],
-    ] => String
-  )
-  def serialize(value, name:, location: nil)
+  contract(ReeEnum::Value => String)
+  def serialize(value)
     value.value
   end
 
-  contract(
-    Any,
-    Kwargs[
-      name: String,
-      location: Nilor[String],
-    ] => ReeEnum::Value
-  ).throws(ReeMapper::CoercionError)
-  def cast(value, name:, location: nil)
+  contract(Any => ReeEnum::Value).throws(ReeMapper::CoercionError)
+  def cast(value)
     enum_value = case value
     when String
       @enum.get_values.by_value(value)
@@ -29,9 +17,9 @@ class ReeEnum::StringValueEnumMapper < ReeEnum::BaseEnumMapper
     end
 
     if enum_value.nil?
-      raise ReeMapper::CoercionError.new("`#{name}` should be one of #{enum_inspection}, got `#{truncate(value.inspect)}`", location)
+      raise ReeMapper::CoercionError.new("should be one of #{enum_inspection}, got `#{truncate(value.inspect)}`")
     end
 
     enum_value
   end
-end
+end

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