ree 1.0.29 → 1.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a9bafffedbc153f633b682e9a7ecbce4ad38a75dbbb9a7436798a3766d57735
-  data.tar.gz: 4b2562f2fb06c0afc492cce67abf5044b160c900057b5c24e14eb76104bf9049
+  metadata.gz: c26bd9f765b493214449328b06c723150c4d64a1a6198836ccdd3e92d6c38ed2
+  data.tar.gz: bec255f8119ff87b049000bb758e157d18507568d636fa4e19e6bbe363b9e4f0
 SHA512:
-  metadata.gz: ad6eddfb2656ed64223758a2b3f9a720597ba9bbca3edddbccb7ca4b284770db9fa03e3b5c81cdd5d771858bfff3e2b39566820a993eaa4f02baf3e821e3f116
-  data.tar.gz: 14ecf3e59cdc5d0b3a78f9fcddc74ea39cc6fb7ff77bbe2a23d6a693cf4d98f47141cfb750b4d60f9a8e09c3971e070f25d70ccff11e76121187b80e603e1666
+  metadata.gz: 312e40978d8bec156f2a8bce86a84083045a8034f5436ef7f53c506806ef0044b4c29ca2a09b0233614d20f5198ac6c0babdf2484852816f0d8a3787b4e54461
+  data.tar.gz: b8c81dc9707038944f00ddc38ab4a3f269597630b1a05923df292244f4e12d5d9a8e2ceb3651f3f09003a9ed2a1bfd1eb31d47507a6cb6d05bb5a43ad717d2c1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ree (1.0.29)
+    ree (1.0.30)
       commander (~> 4.6.0)
 
 GEM

data/lib/ree/dsl/import_dsl.rb

@@ -1,21 +1,24 @@
 # frozen_string_literal  = true
 
 class Ree::ImportDsl
+  def initialize
+    setup_removed_constants
+  end
+
   def execute(klass, proc)
-    self.class.instance_exec(&proc)
-  rescue Ree::ImportDsl::UnlinkConstError => e
-    const_removed = remove_or_assign_const(klass, e.const)
+    class_constant = self.class.instance_exec(&proc)
 
-    retry if const_removed
+    [
+      extract_constants(class_constant),
+      get_removed_constants
+    ]
+  rescue Ree::ImportDsl::UnlinkConstError => e
+    retry_after = remove_or_assign_const(klass, e.const)
+    retry if retry_after
   rescue NoMethodError => e
-    if e.name == :&
-      const_removed = remove_or_assign_const(klass, e.receiver)
-
-      if const_removed
-        retry
-      else
-        raise Ree::Error.new("'#{e.receiver}' already linked or defined in '#{klass}'", :invalid_dsl_usage)
-      end
+    if e.name == :& || e.name == :as
+      retry_after = remove_or_assign_const(klass, e.receiver)
+      retry if retry_after
     else
       raise e
     end
@@ -27,6 +30,27 @@ class Ree::ImportDsl
     retry
   end
 
+  private def extract_constants(class_constant)
+    [class_constant] + class_constant.constants
+  end
+
+  private def setup_removed_constants
+    self.class.instance_variable_set(:@removed_constants, [])
+  end
+
+  private def get_removed_constants
+    self.class.instance_variable_get(:@removed_constants)
+  end
+
+  class RemovedConstant
+    attr_reader :name, :const
+
+    def initialize(name, const)
+      @name = name
+      @const = const
+    end
+  end
+
   class UnlinkConstError < StandardError
     attr_reader :const
 
@@ -92,11 +116,15 @@ class Ree::ImportDsl
       if constant.is_a?(Class) || constant.is_a?(Module)
         if (const.is_a?(Class) || const.is_a?(Module)) && const.name == constant.name
           klass.send(:remove_const, const_sym)
+          store_removed_constant(const_sym, constant)
+
           retry_after = true
           break
         end
       elsif const == constant
         klass.send(:remove_const, const_sym)
+        store_removed_constant(const_sym, constant)
+
         retry_after = true
         break
       end
@@ -122,6 +150,11 @@ class Ree::ImportDsl
 
   private
 
+  def store_removed_constant(name, constant)
+    return if constant.is_a?(ClassConstant)
+    get_removed_constants << RemovedConstant.new(name, constant.dup)
+  end
+
   def parent_constant?(klass, const_name)
     modules = klass.to_s.split("::")[0..-2]
 

data/lib/ree/dsl/link_import_builder.rb

@@ -11,14 +11,13 @@ class Ree::LinkImportBuilder
   # @param [Proc] proc
   # @return [ArrayOf[String]] List of names of imported constants
   def build(klass, package_name, object_name, proc)
-    result = Ree::ImportDsl.new.execute(klass, proc)
+    const_list, removed_constants = Ree::ImportDsl.new.execute(klass, proc)
 
     @packages_facade.load_package_object(package_name, object_name)
 
     package = @packages_facade.get_package(package_name)
     object = package.get_object(object_name)
-    const_list = [result] + result.constants
-    
+
     const_list.each do |const_obj|
       if object.klass.const_defined?(const_obj.name)
         set_const(klass, object.klass.const_get(const_obj.name), const_obj)
@@ -29,6 +28,8 @@ class Ree::LinkImportBuilder
       end
     end
 
+    assign_removed_constants(klass, removed_constants)
+
     const_list.map(&:name)
   end
 
@@ -37,9 +38,8 @@ class Ree::LinkImportBuilder
   # @param [Proc] proc
   # @return [ArrayOf[String]] List of names of imported constants
   def build_for_const(klass, source_const, proc)
-    result = Ree::ImportDsl.new.execute(klass, proc)
+    const_list, removed_constants = Ree::ImportDsl.new.execute(klass, proc)
     mod_const = Object.const_get(source_const.name.split("::").first)
-    const_list = [result] + result.constants
 
     const_list.each do |const_obj|
       if source_const.const_defined?(const_obj.name)
@@ -50,14 +50,28 @@ class Ree::LinkImportBuilder
         raise Ree::Error.new("'#{const_obj.name}' is not found in '#{source_const}'")
       end
     end
+
+    assign_removed_constants(klass, removed_constants)
+    nil
   end
 
   private
 
+  def assign_removed_constants(klass, removed_constants)
+    removed_constants.each do |removed_const|
+      next if klass.const_defined?(removed_const.name)
+      klass.const_set(removed_const.name, removed_const.const)
+    end
+  end
+
   def set_const(target_klass, ref_class, const_obj)
     if const_obj.get_as
       target_klass.send(:remove_const, const_obj.get_as.name) rescue nil
       target_klass.const_set(const_obj.get_as.name, ref_class)
+
+      if target_klass.const_get(const_obj.name).is_a?(Ree::ImportDsl::ClassConstant)
+        target_klass.send(:remove_const, const_obj.name)
+      end
     else
       target_klass.send(:remove_const, const_obj.name) rescue nil
       target_klass.const_set(const_obj.name, ref_class)

data/lib/ree/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ree
-  VERSION = "1.0.29"
+  VERSION = "1.0.30"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ree
 version: !ruby/object:Gem::Version
-  version: 1.0.29
+  version: 1.0.30
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-08-21 00:00:00.000000000 Z
+date: 2023-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander