ree_lib 1.0.99 → 1.0.100

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c38ef2b4a8178ef5e2f9121bc05c4758e73a441878ca88191b7c14da82f204ed
-  data.tar.gz: 67f4d77cbe85db2de4cc2bd939444166d1a32d568fe9ec2ab164f976c35a079d
+  metadata.gz: 436304224d3a8af781f3fe62abf15b08d1843205b69a709bf2bbd441c31e246e
+  data.tar.gz: 2cdb3e48efa52939a43178dd9cae363cdbdbd1bef33509d359e13db0f6c1d017
 SHA512:
-  metadata.gz: b579b5d1208625e01e8dc5fcfc354e5a18399bb8121339f4ffda0d049371e0118c60185a6ca974b92cac5a0f4910666d3cec163e85f4d464f39ff300f03295ea
-  data.tar.gz: 5667a2a347f98ac1dd903dd63d08a78f688c93419ac3661ab0edd0bdb355edf27e8d31d4c44a814f0be232ac4b60865b3bd1fb4cd73db99d91a3d924cf7a7a23
+  metadata.gz: fe254bd39aaae6cd9c3c9d902dcdc48e3ae2c83d6fd1a868aedef47e80209fe6ff51f17c186d8ffe41d3d6e8486c24847ed7cf10670f5c1ac08756f508b5f712
+  data.tar.gz: c9e0f059aea5fd18804149e6e153f58934db60b57de76e3abd421a7f87fb4c28b8f5b8445523cc39a32df293c54584a6853020de12f4a0822a41049e55de218e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ree_lib (1.0.99)
+    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

@@ -10,19 +10,50 @@ class ReeMapper::BuildMapperFactory
     link 'ree_mapper/mapper_strategy', -> { MapperStrategy }
   end
 
+  SEMAPHORE = Mutex.new
+
   contract(ArrayOf[MapperStrategy] => SubclassOf[MapperFactory])
   def call(strategies:)
-    module_name = get_caller.class.to_s.split("::").first
-    mod = Object.const_get(module_name)
+    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
+
+        mod.instance_variable_set(:@mapper_factory, klass)
+      end
+
+      register_default_types(klass)
+    end
 
-    klass = Class.new(ReeMapper::MapperFactory)
-    mod.instance_variable_set(:@mapper_factory, klass)
+    klass
+  end
+
+  private
 
-    klass.instance_eval {
-      @types = {}
-      @wrappers = {}
-      @strategies = strategies
-    }
+  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)
@@ -35,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

@@ -72,6 +72,8 @@ module ReeMapper
 
   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"
@@ -80,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/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.99"
+  VERSION = "1.0.100"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ree_lib
 version: !ruby/object:Gem::Version
-  version: 1.0.99
+  version: 1.0.100
 platform: ruby
 authors:
 - Ruslan Gatiyatov