ree 1.0.43 → 1.0.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2673db96f54aa11d629b50c4edd402fcf44caebc3f41f64b0214aed053a70ab7
-  data.tar.gz: b71fe02e9ef5c6394d122b9ca300ee6fcb71c72912eef455a75bd49ede91441d
+  metadata.gz: 210b89e5324ca6f5db8822df39deebd8e0d3d4b83c199196a271b0cb0bfc81cd
+  data.tar.gz: 8fff42665a010ef7951cd9d154ed2d77215e68ade7f332e1bb7d7227a1c328de
 SHA512:
-  metadata.gz: 5144f814a5dce7e8b2a6a552c9b34ffeec076284e19f6950e34f2b9c1d19b22ecbaebb32b943365823ed3125517c273e562e5fcbf9153a0b7b4b4abcf19716ee
-  data.tar.gz: 22ad163ff20029f24232be9b98b51503f15ba0ce1c273a1c0b33461776e6ac00abf1be91a1432d2f2e6f2060cceea2a451f91c661a1a49b54708e9f825d2084f
+  metadata.gz: f26553e3a3d62489d1090c6a38c38f0633ce8f735ae1b77a3e8e809cd4ece9f87b0cd8a31032aee8992e231a52028a96aca8369fcf3249c264dc1dcbaf8d0d37
+  data.tar.gz: e627fa0c50ceabea70ec3adc2c9af2d3107dadbad1a0f2aa416f36a1c10e9da49152edaa99cd38c50d9f93f70db540d4f0d30e2864dff23cafaf4e2f11feda07

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ree (1.0.43)
+    ree (1.0.45)
       commander (~> 5.0.0)
 
 GEM

data/lib/ree/cli/indexing.rb

@@ -40,26 +40,26 @@ module Ree
           if !object.fn?
             return []
           end
-  
+
           klass = object.klass
 
           object_is_action = object.tags.include?("action")
           action_caster = object.klass.const_get(:ActionCaster) if object.klass.const_defined?(:ActionCaster)
-      
+
           method_name = object_is_action ? :__original_call : :call
           method_decorator = Ree::Contracts.get_method_decorator(
             klass, method_name, scope: :instance
           )
-      
+
           begin
             if method_decorator.nil?
               parameters = klass.instance_method(:call).parameters
-      
+
               args = parameters.inject({}) do |res, param|
                 res[param.last] = Ree::Contracts::CalledArgsValidator::Arg.new(
                   param.last, param.first, nil, nil
                 )
-      
+
                 res
               end
             else
@@ -70,7 +70,7 @@ module Ree
             raise Ree::Error.new("method call is not defined for #{klass}")
           end
 
-          
+
           arg_list = parameters.map do |param|
             arg = args[param.last]
             validator = arg.validator
@@ -78,21 +78,21 @@ module Ree
 
             type = if object_is_action && action_caster && arg.name == :attrs
               map_mapper_fields(action_caster.fields).to_s.gsub(/\\*\"/, "").gsub(/\=\>/, ' => ')
-            else 
+            else
               if validator
                 validator.to_s
               else
                 arg_type == :block ? "Block" : "Any"
               end
             end
-      
+
             {
               Ree::ObjectSchema::Methods::Args::ARG => arg.name,
               Ree::ObjectSchema::Methods::Args::ARG_TYPE => arg.type,
               Ree::ObjectSchema::Methods::Args::TYPE => type
             }
           end
-      
+
           [
             {
               Ree::ObjectSchema::Methods::DOC => method_decorator&.doc || "",
@@ -106,6 +106,8 @@ module Ree
         def index_public_methods_for_package_classes(package, index_hash)
           package.objects.each do |obj|
             klass = obj.klass
+            next if klass.nil?
+
             klass_name = demodulize(klass.to_s)
             obj_name = obj.name.to_s
             rpath = obj.rpath
@@ -137,53 +139,53 @@ module Ree
         def recursively_index_module(mod, index_hsh, package, mod_index)
             return if !mod.is_a?(Module)
             return if mod_index[mod]
-  
+
             mod_index[mod] = true
-  
+
             mod.constants.each do |const_name|
               const = mod.const_get(const_name)
-  
+
               recursively_index_module(const, index_hsh, package, mod_index)
-  
+
               next if !const.is_a?(Class)
               next if package.objects.any? { |o| o.klass == const }
               next if index_hsh[:classes].has_key?(demodulize(const.name))
-  
+
               const_abs_path = mod.const_source_location(const.name)&.first
               next if !const_abs_path
-  
+
               rpath = Pathname.new(const_abs_path).relative_path_from(Ree.root_dir).to_s
               hsh = index_class(const, rpath, package.name)
               class_name = demodulize(const.name)
-  
+
               index_hsh[:classes][class_name] ||= []
               index_hsh[:classes][class_name] << hsh
             end
           end
-  
+
           def index_class(klass, rpath, package_name)
             all_methods = klass.public_instance_methods(false)
             orig_methods = all_methods.grep(/original/)
-  
+
             methods = (all_methods - orig_methods) # remove aliases defined by contracts
               .map { |m|
                 orig_method_name = orig_methods.find { |om| om.match(/original_#{Regexp.escape(m.name)}_[0-9a-fA-F]+/) }
                 orig_method = orig_method_name ? klass.public_instance_method(orig_method_name) : nil
-  
+
                 {
                   name: m,
                   parameters: orig_method&.parameters&.map { |param| { name: param.last, required: param.first } },
                   location: orig_method&.source_location&.last,
                 }
               }
-  
+
             {
               path: rpath,
               package: package_name,
               methods: methods
             }
           end
-  
+
           def index_dao(klass, rpath, package_name)
             filters = (klass.instance_variable_get(:@filters) || []).map do
               {
@@ -194,14 +196,14 @@ module Ree
                 location: _1.proc&.source_location&.last
               }
             end
-  
+
             {
               path: rpath,
               package: package_name,
               methods: filters
             }
           end
-  
+
           def index_exceptions(errors_package, index_hash)
             errors_package.objects.each do |obj|
               const_name = demodulize(obj.class_name)
@@ -209,17 +211,17 @@ module Ree
                 Ree::PathHelper.abs_package_module_dir(errors_package),
                 obj.name.to_s + ".rb"
               )
-  
+
               hsh = {
                 path: file_name,
                 package: errors_package.name,
                 methods: []
               }
-  
+
               index_hash[:classes][const_name] ||= []
               index_hash[:classes][const_name] << hsh
             end
-  
+
             index_hash
           end
 
@@ -262,4 +264,4 @@ module Ree
       end
     end
   end
-end
+end

data/lib/ree/cli/spec_runner.rb

@@ -93,6 +93,8 @@ module Ree
         @packages_to_run.each do |package|
           ree_package = Ree.container.packages_facade.get_package(package)
 
+          next if ree_package.dir.nil?
+
           Ree::SpecRunner::Runner.new(
             path: Ree::PathHelper.project_root_dir(ree_package),
             package: package,
@@ -107,7 +109,7 @@ module Ree
       def project_packages(packages)
         packages.reject(&:gem?)
       end
-      
+
       def non_existent_packages
         @package_names ? @package_names - packages.map(&:name) : []
       end
@@ -148,7 +150,7 @@ module Ree
 
         unless acc.include?(package.name)
           acc << package.name
-          
+
           package.deps.map(&:name).each do |pack|
             next if !packages_set.include?(pack)
             recursively_find_children_packages(pack, acc)

data/lib/ree/core/package_loader.rb

@@ -35,7 +35,7 @@ class Ree::PackageLoader
   private
 
   def recursively_load_package(name, loaded_packages)
-    @loaded_packages[name] = true
+    loaded_packages[name] = true
     package = @packages_store.get(name)
 
     if !package
@@ -47,7 +47,7 @@ class Ree::PackageLoader
 
     if package.dir.nil?
       package.set_schema_loaded
-      return package
+      return @loaded_packages[name] = package
     end
 
     not_loaded = Set.new(
@@ -92,4 +92,4 @@ class Ree::PackageLoader
 
     @loaded_packages[name] = package
   end
-end
+end

data/lib/ree/dsl/build_package_dsl.rb

@@ -127,7 +127,7 @@ class Ree::BuildPackageDsl
     name = Ree::StringUtils.underscore(list[0]).to_sym
 
     if !Ree.irb_mode? && name != name_from_path
-      raise Ree::Error.new("Package module '#{module_name}' does not correspond to package name 'name'. Fix file name or module name.")
+      raise Ree::Error.new("Package module '#{module_name}' does not correspond to package name '#{name}'. Fix file name or module name.")
     end
 
     package = @packages_facade.get_package(name, false)

data/lib/ree/facades/packages_facade.rb

@@ -207,6 +207,13 @@ class Ree::PackagesFacade
     @packages_store
   end
 
+  # @param [Symbol] package_name
+  # @return [Bool]
+  def has_package?(package_name)
+    check_arg(package_name, :package_name, Symbol)
+    !!@packages_store.get(package_name)
+  end
+
   # @param [Symbol] package_name
   # @return [Ree::Package]
   def get_package(package_name, raise_if_missing = true)

data/lib/ree/link_dsl.rb

@@ -50,29 +50,18 @@ module Ree::LinkDSL
         raise Ree::Error.new("target should be one of [:object, :class, :both]", :invalid_dsl_usage)
       end
 
-      package_name = Ree::StringUtils.underscore(self.name.split('::').first).to_sym
-      link_package_name = from.nil? ? package_name : from
+      packages = Ree.container.packages_facade
+      link_package_name = get_link_package_name(from, object_name)
       link_object_name = object_name
       link_as = as ? as : object_name
 
-      _check_package_dependency_added(link_package_name, package_name)
-
       if import
-        Ree::LinkImportBuilder
-          .new(Ree.container.packages_facade)
-          .build(
-            self,
-            link_package_name,
-            link_object_name,
-            import
-          )
+        Ree::LinkImportBuilder.new(packages).build(
+          self, link_package_name, link_object_name, import
+        )
       end
 
-      obj = Ree
-        .container
-        .packages_facade
-        .load_package_object(link_package_name, link_object_name)
-
+      obj = packages.load_package_object(link_package_name, link_object_name)
       target ||= obj.target
 
       if target == :both
@@ -133,12 +122,9 @@ module Ree::LinkDSL
 
       list = path.split('/')
       package_name = File.basename(list[0], ".*").to_sym
-      current_package_name = Ree::StringUtils.underscore(self.name.split('::').first).to_sym
-
-      _check_package_dependency_added(package_name, current_package_name)
-
-      Ree.container.packages_facade.load_package_entry(package_name)
-      package = Ree.container.packages_facade.get_package(package_name)
+      packages = Ree.container.packages_facade
+      packages.load_package_entry(package_name)
+      package = packages.get_package(package_name)
 
       file_path = File.join(
         Ree::PathHelper.abs_package_dir(package),
@@ -153,7 +139,7 @@ module Ree::LinkDSL
         end
       end
 
-      Ree.container.packages_facade.load_file(file_path, package.name)
+      packages.load_file(file_path, package.name)
 
       const_list = path.split('/').map { |_| Ree::StringUtils.camelize(_) }
       const_short = [const_list[0], const_list.last].join("::")
@@ -168,13 +154,9 @@ module Ree::LinkDSL
       end
 
       if import_proc
-        Ree::LinkImportBuilder
-          .new(Ree.container.packages_facade)
-          .build_for_const(
-            self,
-            file_const,
-            import_proc
-          )
+        Ree::LinkImportBuilder.new(packages).build_for_const(
+          self, file_const, import_proc
+        )
       end
 
       nil
@@ -182,33 +164,24 @@ module Ree::LinkDSL
 
     def _raise_error(text, code = :invalid_dsl_usage)
       msg = <<~DOC
-        object: :#{@object.name}
-        path: #{Ree::PathHelper.abs_object_path(@object)}
+        class: :#{self}
         error: #{text}
       DOC
 
       raise Ree::Error.new(msg, code)
     end
 
-    def _check_package_dependency_added(package_name, current_package_name)
-      return if package_name == current_package_name
-
-      facade = Ree.container.packages_facade
-      facade.load_package_entry(package_name)
-      facade.load_package_entry(current_package_name)
+    def get_link_package_name(from, object_name)
+      return from if from
 
-      current_package = facade.get_package(current_package_name)
+      package_name = Ree::StringUtils.underscore(self.name.split('::').first).to_sym
+      result = Ree.container.packages_facade.has_package?(package_name) ? package_name : nil
 
-      dep_package = current_package.deps.detect do |d|
-        d.name == package_name
+      if result.nil?
+        raise Ree::Error.new("package is not provided for link :#{object_name}", :invalid_dsl_usage)
       end
 
-      if dep_package.nil?
-        raise Ree::Error.new(
-          "Package :#{package_name} is not added as dependency for :#{current_package_name} package\npackage path: #{File.join(Ree.root_dir, current_package.entry_rpath || "")}\nclass:#{self.name}",
-          :invalid_dsl_usage
-        )
-      end
+      result
     end
   end
 end

data/lib/ree/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ree
 version: !ruby/object:Gem::Version
-  version: 1.0.43
+  version: 1.0.45
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-06 00:00:00.000000000 Z
+date: 2024-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander