ree_lib 1.0.100 → 1.0.101

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 436304224d3a8af781f3fe62abf15b08d1843205b69a709bf2bbd441c31e246e
-  data.tar.gz: 2cdb3e48efa52939a43178dd9cae363cdbdbd1bef33509d359e13db0f6c1d017
+  metadata.gz: d1d87d5cb2c9730ec270732d8a4fab58e5b2d2ebd0aca6f5b075c151301a91bf
+  data.tar.gz: 219ad2e3f9543a507985d813c218be53f332e740b376d429f20ce0d68806d75c
 SHA512:
-  metadata.gz: fe254bd39aaae6cd9c3c9d902dcdc48e3ae2c83d6fd1a868aedef47e80209fe6ff51f17c186d8ffe41d3d6e8486c24847ed7cf10670f5c1ac08756f508b5f712
-  data.tar.gz: c9e0f059aea5fd18804149e6e153f58934db60b57de76e3abd421a7f87fb4c28b8f5b8445523cc39a32df293c54584a6853020de12f4a0822a41049e55de218e
+  metadata.gz: 811e76e202564fe0f001c1798bdc6ba91a080581a5c6c16d010e979d227f27298c193d643c3c4ba2553936c39862373dff7153dd8c6639e744a07ca88fed52c3
+  data.tar.gz: 21048d71c59f71efc205d77ae89fcd85c8414ae3fa230a318cb8152fe4c85c28434f13072475d684e7550cf67a6f0b94fdfcdd2b2f614ff89e8c90d1a3efbda9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ree_lib (1.0.100)
+    ree_lib (1.0.101)
       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,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.101"
 end

metadata

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