ree 1.0.28 → 1.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9d6451014359adf3959bb738c0af6d7b8409731861230587d9053ff12680a6c
-  data.tar.gz: 58d5795a1a4053195b62cc8811528f05674f8d1f292d34b59ad50a0b6ac8599a
+  metadata.gz: 8a9bafffedbc153f633b682e9a7ecbce4ad38a75dbbb9a7436798a3766d57735
+  data.tar.gz: 4b2562f2fb06c0afc492cce67abf5044b160c900057b5c24e14eb76104bf9049
 SHA512:
-  metadata.gz: '05780d456c3cada1a08ce6c5d9775054215121eb265305ab30a2b7a8b08b08528cbefc9912ea7ad6b4f46265832d5f266432f50788fdbb4fcd923d8e0025ef1d'
-  data.tar.gz: bade40ae6f6123b55a04d0eaecb9af2c9ece3a3e7b05a0ecde0e9c5bb06344a6616033ce3e236a6fa2c7da4ef3f3c0514b4c53fce84ea19bb58f0e763a67b06d
+  metadata.gz: ad6eddfb2656ed64223758a2b3f9a720597ba9bbca3edddbccb7ca4b284770db9fa03e3b5c81cdd5d771858bfff3e2b39566820a993eaa4f02baf3e821e3f116
+  data.tar.gz: 14ecf3e59cdc5d0b3a78f9fcddc74ea39cc6fb7ff77bbe2a23d6a693cf4d98f47141cfb750b4d60f9a8e09c3971e070f25d70ccff11e76121187b80e603e1666

data/Gemfile.lock

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

data/lib/ree/dsl/import_dsl.rb

@@ -4,12 +4,12 @@ class Ree::ImportDsl
   def execute(klass, proc)
     self.class.instance_exec(&proc)
   rescue Ree::ImportDsl::UnlinkConstError => e
-    const_removed = remove_const(klass, e.const)
+    const_removed = remove_or_assign_const(klass, e.const)
 
     retry if const_removed
   rescue NoMethodError => e
     if e.name == :&
-      const_removed = remove_const(klass, e.receiver)
+      const_removed = remove_or_assign_const(klass, e.receiver)
 
       if const_removed
         retry
@@ -29,7 +29,7 @@ class Ree::ImportDsl
 
   class UnlinkConstError < StandardError
     attr_reader :const
-    
+
     def initialize(const)
       @const = const
     end
@@ -82,25 +82,63 @@ class Ree::ImportDsl
 
   private
 
-  def remove_const(klass, constant)
-    const_removed = false
+  def remove_or_assign_const(klass, constant)
+    retry_after = false
 
     klass.constants.each do |const_sym|
       const = klass.const_get(const_sym)
+      next if const.is_a?(ClassConstant)
 
       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)
-          const_removed = true
+          retry_after = true
           break
         end
       elsif const == constant
         klass.send(:remove_const, const_sym)
-        const_removed = true
+        retry_after = true
         break
       end
     end
 
-    const_removed
+    return true if retry_after
+
+    const_name = if constant.is_a?(String)
+      constant.to_sym
+    elsif constant.is_a?(Class) || constant.is_a?(Module)
+      constant.name
+    else
+      raise ArgumentError.new("unknown constant: #{constant.inspect}")
+    end
+
+    if parent_constant?(klass, const_name)
+      klass.const_set(const_name, ClassConstant.new(const_name.to_s))
+      retry_after = true
+    end
+
+    retry_after
+  end
+
+  private
+
+  def parent_constant?(klass, const_name)
+    modules = klass.to_s.split("::")[0..-2]
+
+    result = modules.each_with_index.any? do |mod, index|
+      mod = Object.const_get(modules[0..index].join("::"))
+      mod.constants.include?(const_name)
+    end
+
+    result || acnchestor_constant?(klass, const_name)
+  end
+
+  def acnchestor_constant?(klass, const_name)
+    return false if klass.ancestors.include?(klass) && klass.ancestors.size == 1
+
+    klass.ancestors.any? do |anchestor|
+      next if anchestor == klass
+      anchestor.constants.include?(const_name) || acnchestor_constant?(anchestor, const_name)
+    end
   end
 end

data/lib/ree/version.rb

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

metadata

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