ree_lib 1.0.98 → 1.0.100

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 003ff6b57d8d5cee946819718f3ee0e374ecd658e7b36f396d675c0cb7ff65ad
-  data.tar.gz: 61b4a4b961971cb19d8747eddee79142faa8134b1d2ab10cfb11daec9dd609f1
+  metadata.gz: 436304224d3a8af781f3fe62abf15b08d1843205b69a709bf2bbd441c31e246e
+  data.tar.gz: 2cdb3e48efa52939a43178dd9cae363cdbdbd1bef33509d359e13db0f6c1d017
 SHA512:
-  metadata.gz: 96069d7ff2c87d9ebcb41e06750e24b8b0131d3e2c8dca411e6c9893a6b932fd22951d7faef7f9dd591d2ffac23595c83281c3367843c3fd049583bc57ea2ad3
-  data.tar.gz: f98b9d6ad3784546f1351ee6db2954732f14020c2905d0dc15bf88c68bd6ba851a9a0560407eaf32f80ca58a52c1785418da0e402598755c94466dfddcad973d
+  metadata.gz: fe254bd39aaae6cd9c3c9d902dcdc48e3ae2c83d6fd1a868aedef47e80209fe6ff51f17c186d8ffe41d3d6e8486c24847ed7cf10670f5c1ac08756f508b5f712
+  data.tar.gz: c9e0f059aea5fd18804149e6e153f58934db60b57de76e3abd421a7f87fb4c28b8f5b8445523cc39a32df293c54584a6853020de12f4a0822a41049e55de218e

data/Gemfile.lock

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

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

@@ -4,20 +4,56 @@ 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:)
-    klass = Class.new(ReeMapper::MapperFactory)
+    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.instance_eval {
-      @types = {}
-      @wrappers = {}
-      @strategies = strategies
-    }
+        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.register_type(:bool, ReeMapper::Bool.new)
     klass.register_type(:date_time, ReeMapper::DateTime.new)
@@ -30,7 +66,5 @@ 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,20 +67,13 @@ module ReeMapper
     factory = mod.instance_variable_get(:@mapper_factory)
     return factory if factory
 
-    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
+    self.build_mapper_factory(mod)
   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"
@@ -89,6 +82,9 @@ 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,3 +1,12 @@
 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.98"
+  VERSION = "1.0.100"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ree_lib
 version: !ruby/object:Gem::Version
-  version: 1.0.98
+  version: 1.0.100
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-30 00:00:00.000000000 Z
+date: 2024-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ree