ree 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d3080db0341788d95f77d172fec9b207e3c27a98d31e785a977d245942298eb
-  data.tar.gz: d6eedaf9b82609693d2c3c8b3131e45ae59e6fbc04a9038e6f5e6edc762bf60e
+  metadata.gz: 754004035abda42c6d92689e63dd8c2b5e58d0aa706097cd6a825decdbad36f3
+  data.tar.gz: 43c066a73992ff94ce014301d9dea2df68ab804f90ae580d7a3dfca36f9c59e5
 SHA512:
-  metadata.gz: bce075c79b1fec9acf13f397acff99edb159d2ba0074ed314b5a959be9688d0093eb46e18e59801e2f9be1fea358cd8596b1220ec8e40340b745e9bdf112e071
-  data.tar.gz: adcf4a8b7d7e94c0b9e89c8ee4ff98fe193f7fc76c6c62578f421a0e20c6bbd5c686e59481785669f42c26988fd5280c09a3ca7212524ac0486b0c6724b00a76
+  metadata.gz: f126d959715dbf0c9e2c4bf01824c832a111e78385afe4573c2752c259f7b42ce108995eec25398f3fd3b0b8b32fee9d8edfdd382dd4799dcb6b467dbea2d741
+  data.tar.gz: b6663db03cca36ba13f6faddb54ae041a40d1e20f36ac426b55a126aae9f207c0d217a03527fd89951f0d91658db436ef5f995d9810205fd907f2562e46100af

data/Gemfile.lock

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

data/exe/ree

@@ -148,7 +148,7 @@ class ReeCliRunner
       c.option      '--silence', String, 'Silence all logs'
       c.option      '--project_path [ROOT_PROJECT_DIR]', String, 'Root project dir path'
       c.action do |args, options|
-        package_name = args[0]&.to_sym
+        package_name = args[0]
         object_path = args[1]
         options_hash = options.__hash__
 

data/lib/ree/cli/generate_object_schema.rb

@@ -25,8 +25,7 @@ module Ree
           if facade.has_object?(package_name, object_name)
             object = facade.load_package_object(package_name, object_name)
             Ree.write_object_schema(package.name, object.name)
-
-            obj_path = Ree::PathHelper.abs_object_schema_path(object)
+            facade.dump_package_schema(package_name)
           else
             file_path = File.join(dir, object_path)
 

data/lib/ree/cli/generate_package_schema.rb

@@ -25,7 +25,7 @@ module Ree
 
           facade = Ree.container.packages_facade
           facade.load_packages_schema
-          Ree.load_package(package_name)
+          facade.load_entire_package(package_name)
           facade.write_package_schema(package_name)
 
           package = facade.get_package(package_name)

data/lib/ree/rspec_link_dsl.rb

@@ -1,19 +1,61 @@
 module Ree::RSpecLinkDSL
-  def link(obj_name, as: nil, from:)
-    obj = Ree.container.compile(from, obj_name)
+  def link(obj_name, import_proc = nil, as: nil, from: nil)
+    if obj_name.is_a?(Symbol)
+      obj = link_object(from, obj_name)
 
-    if obj.nil?
-      raise Ree::Error.new("object :#{obj_name} was not found for package :#{from}")
-    end
-    
-    as ||= obj_name
-
-    define_method as do |*args, **kwargs, &proc|
-      if obj.object?
-        obj.klass.new
-      else
-        obj.klass.new.call(*args, **kwargs, &proc)
+      if obj.nil?
+        raise Ree::Error.new("object :#{obj_name} was not found for package :#{from}")
+      end
+
+      as ||= obj_name
+
+      define_method as do |*args, **kwargs, &proc|
+        if obj.object?
+          obj.klass.new
+        else
+          obj.klass.new.call(*args, **kwargs, &proc)
+        end
       end
+    elsif obj_name.is_a?(String)
+      const_list = link_file(from, obj_name, import_proc)
+      const_list.each do |const|
+        Object.const_set(const.name, self.const_get(const.name))
+      end
+    else
+      raise Ree::Error.new("Invalid link DSL usage. Args should be Hash or String")
+    end  
+  end
+
+  private
+
+  def link_object(from_package_name, obj_name)
+    Ree.container.compile(from_package_name, obj_name)
+  end
+
+  def link_file(from_package_name, path, import_proc)
+    Ree.container.packages_facade.load_package_entry(from_package_name)
+    package = Ree.container.packages_facade.get_package(from_package_name)
+
+    file_path = File.join(
+        Ree::PathHelper.abs_package_dir(package),
+        Ree::PACKAGE, path
+    )
+    Ree.container.packages_facade.load_file(file_path, package.name)
+
+    const_list = path.split('/').map { |_| Ree::StringUtils.camelize(_) }
+    const_short = [const_list[0], const_list.last].join("::")
+    const_long = const_list.join("::")
+
+    file_const = if Object.const_defined?(const_long)
+      Object.const_get(const_long)
+    elsif Object.const_defined?(const_short)
+      Object.const_get(const_short)
+    else
+      raise Ree::Error.new("Unable to link '#{path}'. #{const_long} or #{const_short} was not defined in #{file_path}")
     end
+
+    const_list = Ree::LinkImportBuilder
+      .new(Ree.container.packages_facade)
+      .build_for_const(self, file_const, import_proc)
   end
 end

data/lib/ree/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ree
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-25 00:00:00.000000000 Z
+date: 2022-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -209,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.24
 signing_key: 
 specification_version: 4
 summary: Ruby framework to create modular applications