ree_lib 1.0.100 → 1.0.102

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 436304224d3a8af781f3fe62abf15b08d1843205b69a709bf2bbd441c31e246e
-  data.tar.gz: 2cdb3e48efa52939a43178dd9cae363cdbdbd1bef33509d359e13db0f6c1d017
+  metadata.gz: 610961c832fe41c44de5956cddfdd9497c729af2446e44bcd3bcddacf68cf0bd
+  data.tar.gz: 31095b276ff9541504867a55ebd5d1edcd2bce13d60cd7c994b734863a14479d
 SHA512:
-  metadata.gz: fe254bd39aaae6cd9c3c9d902dcdc48e3ae2c83d6fd1a868aedef47e80209fe6ff51f17c186d8ffe41d3d6e8486c24847ed7cf10670f5c1ac08756f508b5f712
-  data.tar.gz: c9e0f059aea5fd18804149e6e153f58934db60b57de76e3abd421a7f87fb4c28b8f5b8445523cc39a32df293c54584a6853020de12f4a0822a41049e55de218e
+  metadata.gz: 44b5c42d66744b6e36c9c127162e846d91b0e5fe705e893fdeb0a45038f6e1777949ecf2b0d778c23db4592cd5f221b2d772ac2ab624e45f1de4fcc2d745f899
+  data.tar.gz: f7f437b8324816fdc02639570e64d1425ffeea53d71e8761178633b8826035062baf78ef891c4b96da96a380f2d2a9e92522ad13a800d10b112b165cc7419cf7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ree_lib (1.0.100)
+    ree_lib (1.0.102)
       bigdecimal (~> 3.1.6)
       binding_of_caller (~> 1.0.0)
       i18n (~> 1.14.1)

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

@@ -40,6 +40,13 @@
         "fn"
       ]
     },
+    {
+      "name": "agg_contract_for",
+      "schema": "packages/ree_dao/schemas/ree_dao/functions/agg_contract_for.schema.json",
+      "tags": [
+        "fn"
+      ]
+    },
     {
       "name": "build_connection",
       "schema": "packages/ree_dao/schemas/ree_dao/functions/build_connection.schema.json",

data/lib/ree_lib/packages/ree_dao/package/ree_dao/functions/agg_contract_for.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+class ReeDao::AggContractFor
+  include Ree::FnDSL
+
+  fn :agg_contract_for do
+    target :class
+    with_caller
+  end
+
+  contract(Any => nil)
+  def call(klass)
+    get_caller.contract(
+      Or[Sequel::Dataset, ArrayOf[Integer], Integer, ArrayOf[klass]],
+      Ksplat[
+        only?: ArrayOf[Symbol],
+        except?: ArrayOf[Symbol],
+        RestKeys => Any
+      ] => ArrayOf[klass]
+    )
+
+    nil
+  end
+end

data/lib/ree_lib/packages/ree_dao/schemas/ree_dao/functions/agg_contract_for.schema.json

@@ -0,0 +1,28 @@
+{
+  "schema_type": "object",
+  "schema_version": "1.1",
+  "name": "agg_contract_for",
+  "path": "packages/ree_dao/package/ree_dao/functions/agg_contract_for.rb",
+  "mount_as": "fn",
+  "class": "ReeDao::AggContractFor",
+  "factory": null,
+  "methods": [
+    {
+      "doc": "",
+      "throws": [
+
+      ],
+      "return": "Any",
+      "args": [
+        {
+          "arg": "klass",
+          "arg_type": "req",
+          "type": "Any"
+        }
+      ]
+    }
+  ],
+  "links": [
+
+  ]
+}

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

@@ -87,7 +87,7 @@ RSpec.describe :agg do
     include ReeDao::AggregateDSL
 
     aggregate :agg_users do
-      link :users, from: :ree_dao_agg_test
+      link :users, from: :ree_dao_agg_test, import: -> { User }
       link :organizations_dao, from: :ree_dao_agg_test
       link :user_passports, from: :ree_dao_agg_test
       link :books, from: :ree_dao_agg_test
@@ -96,8 +96,10 @@ RSpec.describe :agg do
       link :reviews, from: :ree_dao_agg_test
       link :review_authors, from: :ree_dao_agg_test
       link :agg, from: :ree_dao
+      link :agg_contract_for, from: :ree_dao
     end
 
+    agg_contract_for User
     def call(ids_or_scope, **opts)
       agg(users, ids_or_scope, **opts) do |users_list|
         belongs_to :organization

data/lib/ree_lib/packages/ree_mapper/package/ree_mapper/functions/build_mapper_factory.rb

@@ -4,56 +4,20 @@ class ReeMapper::BuildMapperFactory
   include Ree::FnDSL
 
   fn :build_mapper_factory do
-    with_caller
     link 'ree_mapper/mapper', -> { Mapper }
     link 'ree_mapper/mapper_factory', -> { MapperFactory }
     link 'ree_mapper/mapper_strategy', -> { MapperStrategy }
   end
 
-  SEMAPHORE = Mutex.new
-
   contract(ArrayOf[MapperStrategy] => SubclassOf[MapperFactory])
   def call(strategies:)
-    mod = if get_caller.is_a?(Module)
-      get_caller
-    else
-      name = get_caller.class.to_s.split("::").first
-      Object.const_get(name)
-    end
-
-    klass = nil
-
-    SEMAPHORE.synchronize do
-      if klass = mod.instance_variable_get(:@mapper_factory)
-        klass.instance_eval do
-          @strategies = strategies
-        end
-      else
-        klass = Class.new(ReeMapper::MapperFactory)
-
-        klass.instance_eval do
-          @types = {}
-          @wrappers = {}
-          @strategies = strategies
-        end
+    klass = Class.new(ReeMapper::MapperFactory)
 
-        mod.instance_variable_set(:@mapper_factory, klass)
-      end
-
-      register_default_types(klass)
-    end
-
-    klass
-  end
-
-  private
-
-  def register_default_types(klass)
-    types = klass.instance_variable_get(:@types)
-    strategies = klass.instance_variable_get(:@strategies)
-
-    return if !types.empty?
-    return if strategies.empty?
+    klass.instance_eval {
+      @types = {}
+      @wrappers = {}
+      @strategies = strategies
+    }
 
     klass.register_type(:bool, ReeMapper::Bool.new)
     klass.register_type(:date_time, ReeMapper::DateTime.new)
@@ -66,5 +30,7 @@ class ReeMapper::BuildMapperFactory
     klass.register_type(:rational, ReeMapper::Rational.new)
 
     klass.register_wrapper(:array, ReeMapper::Array)
+
+    klass
   end
 end

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

@@ -67,13 +67,20 @@ module ReeMapper
     factory = mod.instance_variable_get(:@mapper_factory)
     return factory if factory
 
-    self.build_mapper_factory(mod)
+    if !mod.instance_variable_get(:@mapper_semaphore)
+      mod.instance_variable_set(:@mapper_semaphore, Mutex.new)
+    end
+
+    mod.instance_variable_get(:@mapper_semaphore).synchronize do
+      factory = self.build_mapper_factory(mod)
+      mod.instance_variable_set(:@mapper_factory, factory)
+    end
+
+    factory
   end
 
   private
 
-  require_relative "./ree_mapper/functions/build_mapper_factory"
-
   def self.build_mapper_factory(mod)
     pckg_name = ReeString::Underscore.new.call(mod.name)
     factory_path = "#{pckg_name}/mapper_factory"
@@ -82,9 +89,6 @@ module ReeMapper
       return Object.const_get("#{mod.name}::MapperFactory").new
     end
 
-    factory = ReeMapper::BuildMapperFactory.new
-    factory.set_caller(mod).call(strategies: [])
-
     mapper_factory_klass = if package_file_exists?(factory_path) && mod != self
       package_require(factory_path)
       Object.const_get("#{mod.name}::MapperFactory")

data/lib/ree_lib/packages/ree_mapper/spec/ree_mapper/dsl/dsl_spec.rb

@@ -55,10 +55,10 @@ RSpec.describe ReeMapper::DSL do
     )
 
     expect(result).to eq({
-      id: 1,
-      title: 'Product',
-      creator: {
-        id: 1,
+      id: 1, 
+      title: 'Product', 
+      creator: { 
+        id: 1, 
         name: 'John',
         created_by: {
           id: 2,

data/lib/ree_lib/packages/ree_mapper/spec/spec_helper.rb

@@ -1,12 +1,3 @@
 RSpec.configure do |config|
   config.extend Ree::RSpecLinkDSL
-
-  config.before :each do
-    reset_mapper_factory(self)
-  end
 end
-
-def reset_mapper_factory(mod)
-  mod = Object.const_get(self.class.to_s.split("::").first)
-  mod.instance_variable_set(:@mapper_factory, nil)
-end

data/lib/ree_lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ree_lib
 version: !ruby/object:Gem::Version
-  version: 1.0.100
+  version: 1.0.102
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-31 00:00:00.000000000 Z
+date: 2024-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ree
@@ -331,6 +331,7 @@ files:
 - lib/ree_lib/packages/ree_dao/package/ree_dao/dataset_extensions.rb
 - lib/ree_lib/packages/ree_dao/package/ree_dao/dsl.rb
 - lib/ree_lib/packages/ree_dao/package/ree_dao/functions/agg.rb
+- lib/ree_lib/packages/ree_dao/package/ree_dao/functions/agg_contract_for.rb
 - lib/ree_lib/packages/ree_dao/package/ree_dao/functions/build_connection.rb
 - lib/ree_lib/packages/ree_dao/package/ree_dao/functions/build_dao.rb
 - lib/ree_lib/packages/ree_dao/package/ree_dao/functions/build_pg_connection.rb
@@ -343,6 +344,7 @@ files:
 - lib/ree_lib/packages/ree_dao/package/ree_dao/wrappers/pg_jsonb.rb
 - lib/ree_lib/packages/ree_dao/schemas/ree_dao/beans/connections.schema.json
 - lib/ree_lib/packages/ree_dao/schemas/ree_dao/functions/agg.schema.json
+- lib/ree_lib/packages/ree_dao/schemas/ree_dao/functions/agg_contract_for.schema.json
 - lib/ree_lib/packages/ree_dao/schemas/ree_dao/functions/build_connection.schema.json
 - lib/ree_lib/packages/ree_dao/schemas/ree_dao/functions/build_dao.schema.json
 - lib/ree_lib/packages/ree_dao/schemas/ree_dao/functions/build_pg_connection.schema.json