ree 1.0.29 → 1.0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a9bafffedbc153f633b682e9a7ecbce4ad38a75dbbb9a7436798a3766d57735
-  data.tar.gz: 4b2562f2fb06c0afc492cce67abf5044b160c900057b5c24e14eb76104bf9049
+  metadata.gz: a6d6548b0d788689ab62d295a88602cfe8e555ed00879898118a9fa6335e63d8
+  data.tar.gz: d36aa35b5d3e5c3b618ec5037c28590249ad8d0aefa1633a01564fe6e8806039
 SHA512:
-  metadata.gz: ad6eddfb2656ed64223758a2b3f9a720597ba9bbca3edddbccb7ca4b284770db9fa03e3b5c81cdd5d771858bfff3e2b39566820a993eaa4f02baf3e821e3f116
-  data.tar.gz: 14ecf3e59cdc5d0b3a78f9fcddc74ea39cc6fb7ff77bbe2a23d6a693cf4d98f47141cfb750b4d60f9a8e09c3971e070f25d70ccff11e76121187b80e603e1666
+  metadata.gz: 0b4eeb250100dd7dd1affcd9ba71b2659b18166686082612c4929282a70f22d5b477f9468e5610df4186a6c5c2e499fc81bcd10511905172923f77cd4fc3336d
+  data.tar.gz: 0b59b6a98b4ec333c22a1f857b26d83294ba09b199dadce5e5575f64cc68fdf16f1ee6dbcf57108eb04f8dc003f9880fd04be5b975725a121cc075096b69ebf9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ree (1.0.29)
+    ree (1.0.31)
       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/dsl/object_dsl.rb

@@ -117,40 +117,6 @@ class Ree::ObjectDsl
     @object.set_freeze(flag)
   end
 
-  # @param [Nilor[Symbol]] code Global error code
-  # @param [Proc] proc Error DSL proc
-  def def_error(code = nil, &proc)
-    check_arg(code, :code, Symbol) if code
-
-    if !block_given?
-      raise_error("def_error should accept block with error class definition")
-    end
-
-    if code && !Ree.error_types.include?(code)
-      raise_error("Invalid error code :#{code}. Did you forget to setup it with Ree.add_error_types(*args)?")
-    end
-
-    class_name = begin
-      Ree::ErrorBuilder
-        .new(@packages_facade)
-        .build(
-          @object,
-          code,
-          &proc
-        )
-    rescue Ree::Error
-      raise_error("invalid def_error usage. Valid examples: def_error { InvalidDomainErr } or def_error(:validation) { EmailTakenErr['email taken'] }")
-    end
-
-    @object.add_const_list([class_name])
-
-    @object.errors.push(
-      Ree::ObjectError.new(
-        class_name
-      )
-    )
-  end
-
   # @param [String] path Relative package file path ('accounts/entities/user')
   # @param [Proc] proc Import constants proc
   def link_file(path, import_proc = nil)
@@ -227,12 +193,14 @@ class Ree::ObjectDsl
       raise Ree::Error.new("Mount as should be one of #{MOUNT_AS.inspect}", :invalid_dsl_usage)
     end
 
-    object_name_from_path = if File.exist?(path) && !Ree.irb_mode?
-      File.basename(path, ".*").to_sym
-    end
+    if !Ree.irb_mode?
+      object_name_from_path = if File.exist?(path)
+        File.basename(path, ".*").to_sym
+      end
 
-    if !Ree.irb_mode? && object_name_from_path && object_name != object_name_from_path
-      raise Ree::Error.new("Object name does not correspond to a file name (#{object_name}, #{object_name_from_path}.rb). Fix object name or rename object file", :invalid_dsl_usage)
+      if object_name_from_path && object_name != object_name_from_path
+        raise Ree::Error.new("Object name does not correspond to a file name (#{object_name}, #{object_name_from_path}.rb). Fix object name or rename object file", :invalid_dsl_usage)
+      end
     end
 
     class_name = klass.to_s

data/lib/ree/templates/init/ree.setup.rb

@@ -1,10 +1,3 @@
-
-Ree.add_error_types(
-  :invalid_param,
-  :not_found,
-  :validation
-)
-
 # Switch Ree.logger to debug level
 # Ree.set_logger_debug
 

data/lib/ree/version.rb

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

data/lib/ree.rb

@@ -13,7 +13,6 @@ module Ree
   autoload :Contracts, 'ree/contracts'
   autoload :DomainError, 'ree/dsl/domain_error'
   autoload :Error, 'ree/error'
-  autoload :ErrorBuilder, 'ree/dsl/error_builder'
   autoload :ErrorDsl, 'ree/dsl/error_dsl'
   autoload :FnDSL, 'ree/fn_dsl'
   autoload :Gen, 'ree/gen'
@@ -262,18 +261,6 @@ module Ree
         end
       end
     end
-
-    def error_types
-      @error_types ||= []
-    end
-
-    def add_error_types(*args)
-      args.each do |arg|
-        check_arg(arg, :error, Symbol)
-      end
-
-      @error_types = (error_types + args).uniq
-    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ree
 version: !ruby/object:Gem::Version
-  version: 1.0.29
+  version: 1.0.31
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-08-21 00:00:00.000000000 Z
+date: 2023-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -143,7 +143,6 @@ files:
 - lib/ree/core/path_helper.rb
 - lib/ree/dsl/build_package_dsl.rb
 - lib/ree/dsl/domain_error.rb
-- lib/ree/dsl/error_builder.rb
 - lib/ree/dsl/error_dsl.rb
 - lib/ree/dsl/import_dsl.rb
 - lib/ree/dsl/link_import_builder.rb

data/lib/ree/dsl/error_builder.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal  = true
-
-class Ree::ErrorBuilder
-  def initialize(packages_facade)
-    @packages_facade = packages_facade
-  end
-
-  def build(object, code, &proc)
-    result = Ree::ErrorDsl.new.execute(object.klass, &proc)
-
-    if result.is_a?(Ree::DomainError)
-      object.klass.send(:remove_const, result.name) rescue nil
-      result = Ree::ErrorDsl.new.execute(object.klass, &proc)
-    end
-
-    if !result.is_a?(Ree::ErrorDsl::ClassConstant)
-      raise Ree::Error.new("invalid def_error usage", :invalid_dsl_usage)
-    end
-
-    object.klass.send(:remove_const, result.name) rescue nil
-
-    object.klass.class_eval <<-ruby_eval, __FILE__, __LINE__ + 1
-      class #{result.name} < Ree::DomainError
-        attr_reader :code, :extra_code, :error_code, :package_name, :object_name
-
-        def initialize(msg = nil, extra_code = nil)
-          @code = #{code.inspect}
-          @extra_code = extra_code
-          @error_code = :#{Ree::StringUtils.underscore(result.name)}
-          @package_name = :#{object.package_name}
-          @object_name = :#{object.name}
-          super(msg || #{result.message.inspect})
-        end
-      end
-    ruby_eval
-
-    result.name
-  end
-end