ree 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f40830100c172dbfa6b7487174a1a9b002b2ef1314fa52135d3d482b58ae99c0
-  data.tar.gz: 39c36079525c39ccfb2b33759d255e4a0a90f70384a986026af51ba3a4a153ac
+  metadata.gz: 4706c35aa267df5bf2216c2eb9473f82dc5adab6caaa85d05d811d724768ba00
+  data.tar.gz: '05389e5c0e3aa6e313c5c78494664a8c9f309c0db991b045df6fa1671464c2fa'
 SHA512:
-  metadata.gz: 44758b1448ea2eb4a94496aca8942e7464dcfaa863e11a202cc0b8a17373b1245580ac4bde240e0b52118e7d80ae160de621ca9d627dcd690e0e1fdf7c57d992
-  data.tar.gz: b542d6ee0ac12408eede6aa67cc250cfe8bd95870ac16e978f8ac5051d36a804405e91a3596eb9a294c39fe12959ded9f4d77fa63e695de20fe40d2b4a93a791
+  metadata.gz: f730da40f895bce754a410aaf054da34d0835cb7b63afe6b26582509a40dcf17d394188d355bcc9171b034618748d3d93c50c697cc5526288d07db8453ef0669
+  data.tar.gz: b33741238e6dac7275c9a1098c8b806c14f0081673b5555c7d12d89f8fcb2becf2e866bf4ce6149a0d737f649c2ebc28bf1b9cedc00e6c86b0049a9390c27c8a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ree (1.1.2)
+    ree (1.2.0)
       commander (~> 5.0.0)
       logger (~> 1.6.5)
 

data/lib/ree/dsl/import_dsl.rb

@@ -27,7 +27,7 @@ class Ree::ImportDsl
   rescue NameError => e
     proc
       .binding
-      .eval("#{e.name} = Ree::ImportDsl::ClassConstant.new('#{e.name}')")
+      .eval("#{e.name} = Ree::ImportDsl::ConstantContextBuilder.get_context('#{e.name}')")
 
     retry
   ensure
@@ -74,50 +74,76 @@ class Ree::ImportDsl
     end
   end
 
-  class ClassConstant
-    attr_reader :name, :constants
-
-    def initialize(name)
-      @name = name
-      @as = nil
-      @constants = []
+  class ConstantContextBuilder
+    def self.get_context(name, module_name = nil)
+      context = Class.new(ConstantContext)
+      context.instance_variable_set(:@name, name)     
+      context.instance_variable_set(:@module_name, module_name)     
+      context.instance_variable_set(:@as, nil)     
+      context.instance_variable_set(:@constants, [])     
+      context    
     end
+  end
 
-    def &(obj)
-      if !obj.is_a?(ClassConstant)
-        raise Ree::ImportDsl::UnlinkConstError.new(obj)
+  class ConstantContext
+    class << self
+      def const_missing(const_name)
+        ConstantContextBuilder.get_context(const_name, name)
       end
 
-      new_obj = if obj.is_a?(Class)
-        ClassConstant.new(obj.to_s.split("::").last)
-      else
-        obj
+      def name
+        @name
       end
 
-      return self if @constants.detect { |_| _.name == new_obj.name }
-      @constants.push(new_obj)
+      def module_name
+        @module_name
+      end
 
-      self
-    end
+      def get_as
+        @as
+      end
 
-    def get_as
-      @as
-    end
+      def constants
+        @constants
+      end
+
+      def as(obj)
+        if !obj.is_a?(Class)
+          raise Ree::ImportDsl::UnlinkConstError.new(obj)
+        end
 
-    def as(obj)
-      if !obj.is_a?(ClassConstant)
-        raise Ree::ImportDsl::UnlinkConstError.new(obj)
+        @as = if has_context_ancestor?(obj)
+          obj
+        else
+          ConstantContextBuilder.get_context(obj.to_s.split("::").last)
+        end
+
+        self
       end
 
-      @as = if obj.is_a?(Class)
-        ClassConstant.new(obj.to_s.split("::").last)
-      else
-        obj
+      def &(obj)
+        if !obj.is_a?(Class)
+          raise Ree::ImportDsl::UnlinkConstError.new(obj)
+        end
+
+        new_obj = if has_context_ancestor?(obj)
+          obj
+        else
+          ConstantContextBuilder.get_context(obj.to_s.split("::").last)
+        end
+
+        return self if @constants.detect { |_| _.name == new_obj.name }
+        @constants.push(new_obj)
+
+        self
       end
 
-      self
+      def has_context_ancestor?(obj)
+        return false unless obj.is_a?(Class)
+        obj.ancestors.include?(ConstantContext)
+      end
     end
-  end
+  end 
 
   private
 
@@ -126,7 +152,7 @@ class Ree::ImportDsl
 
     klass.constants.each do |const_sym|
       const = klass.const_get(const_sym)
-      next if const.is_a?(ClassConstant)
+      next if ConstantContext.has_context_ancestor?(const)
 
       if constant.is_a?(Class) || constant.is_a?(Module)
         if (const.is_a?(Class) || const.is_a?(Module)) && const.name == constant.name
@@ -156,7 +182,7 @@ class Ree::ImportDsl
     end
 
     if parent_constant?(klass, const_name)
-      klass.const_set(const_name, ClassConstant.new(const_name.to_s))
+      klass.const_set(const_name, ConstantContextBuilder.get_context(const_name.to_s))
       retry_after = true
     end
 
@@ -166,7 +192,7 @@ class Ree::ImportDsl
   private
 
   def store_removed_constant(name, constant)
-    return if constant.is_a?(ClassConstant)
+    return if ConstantContext.has_context_ancestor?(constant)
     get_removed_constants << RemovedConstant.new(name, constant.dup)
   end
 

data/lib/ree/dsl/link_import_builder.rb

@@ -55,6 +55,46 @@ class Ree::LinkImportBuilder
     nil
   end
 
+  # @param [Class] klass Object class
+  # @param [Symbol] package_name
+  # @param [Proc] proc
+  # @return [ArrayOf[String]] List of names of imported constants
+  def build_for_objects(klass, package_name, proc)
+    const_list, removed_constants = Ree::ImportDsl.new.execute(klass, proc)
+    package = @packages_facade.get_package(package_name)
+
+    const_list.each do |const_obj|
+      if const_obj.module_name
+        object_name = Ree::StringUtils.underscore(const_obj.module_name).to_sym
+      else
+        object_name = Ree::StringUtils.underscore(const_obj.name).to_sym
+      end
+
+      object = package.get_object(object_name)
+      @packages_facade.load_package_object(package_name, object_name) if object
+
+      if object && object.klass && object.klass.const_defined?(const_obj.name)
+        set_const(klass, object.klass.const_get(const_obj.name), const_obj)
+        next
+      end
+
+      load_const_file(const_obj.name, package)
+      long_const_name = const_obj.module_name ? "#{const_obj.module_name}::#{const_obj.name}" : const_obj.name
+
+      if package.module.const_defined?(const_obj.name)
+        set_const(klass, package.module.const_get(const_obj.name), const_obj)
+      elsif package.module.const_defined?(long_const_name)
+        set_const(klass, package.module.const_get(long_const_name), const_obj)
+      else
+        raise Ree::Error.new("'#{const_obj.name}' is not found in :#{object&.name}")
+      end
+    end
+
+    assign_removed_constants(klass, removed_constants)
+
+    const_list.map(&:name)
+  end
+
   private
 
   def assign_removed_constants(klass, removed_constants)
@@ -69,7 +109,7 @@ class Ree::LinkImportBuilder
       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)
+      if target_klass.const_defined?(const_obj.name) && Ree::ImportDsl::ConstantContext.has_context_ancestor?(target_klass.const_get(const_obj.name))
         target_klass.send(:remove_const, const_obj.name)
       end
     else
@@ -77,4 +117,11 @@ class Ree::LinkImportBuilder
       target_klass.const_set(const_obj.name, ref_class)
     end
   end
+
+  def load_const_file(const_name, package)
+    return unless package.dir
+    path = Dir[File.join(Ree::PathHelper.abs_package_dir(package), Ree::PACKAGE, '**', "#{Ree::StringUtils.underscore(const_name)}.rb")].first
+    return unless path
+    Ree.container.packages_facade.load_file(path, package.name)
+  end
 end

data/lib/ree/dsl/object_dsl.rb

@@ -27,9 +27,14 @@ class Ree::ObjectDsl
   end
 
   # Proxy method for link_object & link_file
+  # 
   def link(*args, **kwargs)
     if args.first.is_a?(Symbol)
-      link_object(*args, **kwargs)
+      if args.size > 1
+        link_multiple_objects(args, **kwargs)
+      else
+        link_object(*args, **kwargs)
+      end
     elsif args.first.is_a?(String)
       link_file(args[0], args[1])
     else
@@ -41,6 +46,14 @@ class Ree::ObjectDsl
     @object.add_tags(list)
   end
 
+  def import(*args, **kwargs)
+    if args.first.is_a?(Symbol) # import from ree object
+      _import_from_object(*args, **kwargs)
+    else
+      _import_object_consts(*args, **kwargs)
+    end
+  end
+
   # @param [Symbol] object_name
   # @param [Nilor[Symbol]] as
   # @param [Nilor[Symbol]] from
@@ -85,6 +98,20 @@ class Ree::ObjectDsl
     @packages_facade.load_package_object(link_package_name, link_object_name)
   end
 
+  # @param [ArrayOf[Symbol]] object_names
+  # @param [Hash] kwargs
+  def link_multiple_objects(object_names, **kwargs)
+    check_arg(kwargs[:from], :from, Symbol) if kwargs[:from]
+
+    if kwargs.reject{ |k, _v| k == :from }.size > 0
+      raise Ree::Error.new("options #{kwargs.reject{ |k, _v| k == :from }.keys} are not allowed for multi-object links", :invalid_link_option)
+    end
+
+    object_names.each do |object_name|
+      link_object(object_name, from: kwargs[:from])
+    end
+  end
+
   # @param [Symbol] target (:object, :class, :both, default: :object)
   def target(val)
     check_arg(val, :target, Symbol)
@@ -298,8 +325,6 @@ class Ree::ObjectDsl
     object
   end
 
-  private
-
   def check_package_dependency_added(package_name)
     @packages_facade.load_package_entry(package_name)
     return if package_name == @package.name
@@ -328,4 +353,24 @@ class Ree::ObjectDsl
 
     raise Ree::Error.new(msg, code)
   end
+
+  def _import_object_consts(import_proc, from: nil)
+    check_arg(from, :from, Symbol) if from
+
+    link_package_name = from.nil? ? @object.package_name : from
+
+    Ree::LinkImportBuilder.new(@packages_facade).build_for_objects(
+      @object.klass, link_package_name, import_proc
+    )
+  end
+
+  def _import_from_object(object_name, import_proc, from: nil)
+    check_arg(from, :from, Symbol) if from
+
+    link_package_name = from.nil? ? @object.package_name : from
+
+    Ree::LinkImportBuilder.new(@packages_facade).build(
+      @object.klass, link_package_name, object_name, import_proc
+    )
+  end
 end

data/lib/ree/link_dsl.rb

@@ -26,7 +26,11 @@ module Ree::LinkDSL
 
     def link(*args, **kwargs)
       if args.first.is_a?(Symbol)
-        _link_object(*args, **kwargs)
+        if args.size > 1
+          _link_multiple_objects(args, **kwargs)
+        else
+          _link_object(*args, **kwargs)
+        end
       elsif args.first.is_a?(String)
         _link_file(args[0], args[1])
       else
@@ -34,8 +38,57 @@ module Ree::LinkDSL
       end
     end
 
+    def import(*args, **kwargs)
+      if args.first.is_a?(Symbol) # import from ree object
+        _import_from_object(*args, **kwargs)
+      else
+        _import_object_consts(*args, **kwargs)
+      end
+    end
+
     private
 
+    # @param [Proc] import_proc
+    # @param [Nilor[Symbol]] from
+    def _import_object_consts(import_proc, from: nil)
+      check_arg(from, :from, Symbol) if from
+
+      packages = Ree.container.packages_facade
+      link_package_name = get_link_package_name(from, '')
+
+      Ree::LinkImportBuilder.new(packages).build_for_objects(
+        self, link_package_name, import_proc
+      )
+    end
+
+    # @param [Symbol] object_name
+    # @param [Proc] import_proc
+    # @param [Nilor[Symbol]] from
+    def _import_from_object(object_name, import_proc, from: nil)
+      check_arg(from, :from, Symbol) if from
+
+      packages = Ree.container.packages_facade
+      link_package_name = get_link_package_name(from, object_name)
+
+      Ree::LinkImportBuilder.new(packages).build(
+        self, link_package_name, object_name, import_proc
+      )
+    end
+
+    # @param [ArrayOf[Symbol]] object_names
+    # @param [Hash] kwargs
+    def _link_multiple_objects(object_names, **kwargs)
+      check_arg(kwargs[:from], :from, Symbol) if kwargs[:from]
+
+      if kwargs.reject{ |k, _v| k == :from }.size > 0
+        raise Ree::Error.new("options #{kwargs.reject{ |k, _v| k == :from }.keys} are not allowed for multi-object links", :invalid_link_option)
+      end
+
+      object_names.each do |object_name|
+        _link_object(object_name, from: kwargs[:from])
+      end
+    end
+
     # @param [Symbol] object_name
     # @param [Nilor[Symbol]] as
     # @param [Nilor[Symbol]] from

data/lib/ree/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ree
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 bindir: exe
 cert_chain: []
-date: 2025-05-14 00:00:00.000000000 Z
+date: 2025-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander