ree 1.0.38 → 1.0.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35a162c69a00597f108ee30e405a86ec0d5758e94d7110b3f904b5b3b7b7970c
-  data.tar.gz: 5a33fe4850f595f0ad3da5e10acea452d3ca515d47b82003f45e2365f5b5e7b2
+  metadata.gz: c806baccc97f2a671627bb9988a5019e1827f0ecad6781b4936adb9dfeaa8337
+  data.tar.gz: 65786f392d68aa7213a25a46d25c9b5fcdca2161a8ba1647c925fca63e2c885b
 SHA512:
-  metadata.gz: 4cf7b6cb449a213fbbce8498702a79349133744e91be63de7e171696319d26565e9ec292a3b4403e765ce18cd326a86f1241f41602feb14b80025da24c76f91b
-  data.tar.gz: aa570fbba3f9f361d81196252b969a35b9ed359a5ff400bdc31cb316de9af17e394312f445f8c9922fffa2983454c4cc3a8ace6cd14d70c3f06a63fb29cff41d
+  metadata.gz: 963769f03216f645f0454512eb671eca21d6525967e88179c974dd1cc66a35f9c1be0460288c0fc74f0816037931d93a679d32b019f13aaba156aaa49b518b16
+  data.tar.gz: fbb55a02c5bf9a385a469da241863c0f2f327183075f02061c59f250f1df3428b9201457c1139cd4f3007ca28b6b0ca4df1cf32588514114645b50e5424f10fc

data/Gemfile.lock

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

data/exe/ree

@@ -140,58 +140,6 @@ class ReeCliRunner
       end
     end
 
-    command :"gen.schema_json" do |c|
-      c.syntax      = 'ree gen.schema_json PACKAGE_NAME OBJECT_PATH'
-      c.description = 'generates Schema.json for specified object in specified package'
-      c.summary     = '> ' + c.description
-      c.example     'ree gen.schema_json accounts commands/create_account_cmd.rb', ''
-      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]
-        object_path = args[1]
-        options_hash = options.__hash__
-
-        if options_hash[:project_path]
-          options_hash[:project_path] = File.expand_path(options_hash[:project_path])
-        end
-
-        default_options = {
-          package_name: package_name,
-          object_path: object_path,
-          project_path: options_hash[:project_path] || File.expand_path(Dir.pwd),
-          silence: options_hash.has_key?(:silence)
-        }
-
-        Ree::CLI::GenerateObjectSchema.run(**default_options)
-      end
-    end
-
-    command :"delete.schema_json" do |c|
-      c.syntax      = 'ree delete.schema_json OBJECT_PATH'
-      c.description = 'removes Schema.json for specified object '
-      c.summary     = '> ' + c.description
-      c.example     'ree delete.schema_json commands/create_account_cmd.rb', ''
-      c.option      '--silence', String, 'Silence all logs'
-      c.option      '--project_path [ROOT_PROJECT_DIR]', String, 'Root project dir path'
-      c.action do |args, options|
-        object_path = args[0]
-        options_hash = options.__hash__
-
-        if options_hash[:project_path]
-          options_hash[:project_path] = File.expand_path(options_hash[:project_path])
-        end
-
-        default_options = {
-          object_path: object_path,
-          project_path: options_hash[:project_path] || File.expand_path(Dir.pwd),
-          silence: options_hash.has_key?(:silence)
-        }
-
-        Ree::CLI::DeleteObjectSchema.run(**default_options)
-      end
-    end
-
     command :"gen.template" do |c|
       c.syntax      = "ree gen.template TEMPLATE_NAME [options]"
       c.description = "generates template from ROOT/.ree/templates folder with specified variables"

data/lib/ree/cli.rb

@@ -5,8 +5,6 @@ module Ree
     autoload :Init, 'ree/cli/init'
     autoload :GeneratePackagesSchema, 'ree/cli/generate_packages_schema'
     autoload :GeneratePackageSchema, 'ree/cli/generate_package_schema'
-    autoload :GenerateObjectSchema, 'ree/cli/generate_object_schema'
-    autoload :DeleteObjectSchema, 'ree/cli/delete_object_schema'
     autoload :GeneratePackage, 'ree/cli/generate_package'
     autoload :GenerateTemplate, 'ree/cli/generate_template'
     autoload :Indexing, 'ree/cli/indexing'

data/lib/ree/link_dsl.rb

@@ -40,12 +40,16 @@ module Ree::LinkDSL
     # @param [Nilor[Symbol]] as
     # @param [Nilor[Symbol]] from
     # @param [Nilor[Proc]] import
-    def _link_object(object_name, as: nil, from: nil, import: nil)
+    def _link_object(object_name, as: nil, from: nil, target: nil, import: nil)
       check_arg(object_name, :object_name, Symbol)
       check_arg(as, :as, Symbol) if as
       check_arg(from, :from, Symbol) if from
       check_arg(import, :import, Proc) if import
 
+      if target && ![:object, :class, :both].include?(target)
+        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
       link_object_name = object_name
@@ -69,33 +73,54 @@ module Ree::LinkDSL
         .packages_facade
         .load_package_object(link_package_name, link_object_name)
 
+      target ||= obj.target
+
+      if target == :both
+        mount_obj(obj, link_as, true)
+        mount_obj(obj, link_as, false)
+      elsif target == :class
+        mount_obj(obj, link_as, true)
+      elsif target == :object
+        mount_obj(obj, link_as, false)
+      end
+    end
+
+    def mount_obj(obj, link_as, mount_self)
       if obj.fn?
         if obj.with_caller?
           self.class_eval %Q(
+            #{mount_self ? "class << self" : ""}
             private def #{link_as}(*args, **kwargs, &block)
               #{obj.klass}.new.set_caller(self).call(*args, **kwargs, &block)
             end
+            #{mount_self ? "end" : ""}
           )
         else
           self.class_eval %Q(
+            #{mount_self ? "class << self" : ""}
             private def #{link_as}(*args, **kwargs, &block)
               @#{link_as} ||= #{obj.klass}.new
               @#{link_as}.call(*args, **kwargs, &block)
             end
+            #{mount_self ? "end" : ""}
           )
         end
       else
         if obj.with_caller?
           self.class_eval %Q(
+            #{mount_self ? "class << self" : ""}
             private def #{link_as}
               #{obj.klass}.new.set_caller(self)
             end
+            #{mount_self ? "end" : ""}
           )
         else
           self.class_eval %Q(
+            #{mount_self ? "class << self" : ""}
             private def #{link_as}
               @#{link_as} ||= #{obj.klass}.new
             end
+            #{mount_self ? "end" : ""}
           )
         end
       end

data/lib/ree/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ree
 version: !ruby/object:Gem::Version
-  version: 1.0.38
+  version: 1.0.40
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-29 00:00:00.000000000 Z
+date: 2024-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -63,8 +63,6 @@ files:
 - lib/ree/args.rb
 - lib/ree/bean_dsl.rb
 - lib/ree/cli.rb
-- lib/ree/cli/delete_object_schema.rb
-- lib/ree/cli/generate_object_schema.rb
 - lib/ree/cli/generate_package.rb
 - lib/ree/cli/generate_package_schema.rb
 - lib/ree/cli/generate_packages_schema.rb

data/lib/ree/cli/delete_object_schema.rb

@@ -1,43 +0,0 @@
-require 'fileutils'
-
-module Ree
-  module CLI
-    class DeleteObjectSchema
-      class << self
-        def run(object_path:, project_path:, silence: false)
-          ENV['REE_SKIP_ENV_VARS_CHECK'] = 'true'
-
-          path = Ree.locate_packages_schema(project_path)
-          dir = Pathname.new(path).dirname.to_s
-
-          Ree.init(dir)
-
-          object_name = object_path.split('/')[-1].split('.').first.to_sym
-
-          puts("Deleting old #{object_name}.schema.json") if !silence
-
-          schema_path = Ree::PathHelper.object_schema_rpath(object_path)
-          abs_schema_path = File.join(dir, schema_path)
-
-          if File.exist?(abs_schema_path)
-            FileUtils.rm(abs_schema_path)
-
-            facade = Ree.container.packages_facade
-            package_name = Ree::PathHelper.package_name_from_dir(File.dirname(object_path))
-            if package_name
-              package_name = package_name.to_sym
-              facade.load_package_entry(package_name)
-              package = facade.get_package(package_name)
-              package.remove_object(object_name)
-              facade.dump_package_schema(package_name)
-            end
-
-            puts(" #{schema_path}: is deleted") if !silence
-          end
-
-          puts("done") if !silence
-        end
-      end
-    end
-  end
-end

data/lib/ree/cli/generate_object_schema.rb

@@ -1,49 +0,0 @@
-require 'fileutils'
-
-module Ree
-  module CLI
-    class GenerateObjectSchema
-      class << self
-        def run(package_name:, object_path:, project_path:, silence: false)
-          ENV['REE_SKIP_ENV_VARS_CHECK'] = 'true'
-
-          path = Ree.locate_packages_schema(project_path)
-          dir = Pathname.new(path).dirname.to_s
-
-          Ree.init(dir)
-
-          package_name = package_name.to_sym
-          object_name = object_path.split('/')[-1].split('.').first.to_sym
-
-          puts("Generating #{object_name}.schema.json in #{package_name} package") if !silence
-
-          facade = Ree.container.packages_facade
-          Ree.load_package(package_name)
-
-          package = facade.get_package(package_name)
-
-          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)
-            facade.dump_package_schema(package_name)
-          else
-            file_path = File.join(dir, object_path)
-
-            if File.exist?(file_path)
-              facade.load_file(file_path, package_name)
-              facade.dump_package_schema(package_name)
-
-              if facade.has_object?(package_name, object_name)
-                Ree.write_object_schema(package_name, object_name)
-              end
-            else
-              raise Ree::Error.new("package file not found: #{file_path}")
-            end
-          end
-
-          puts("done") if !silence
-        end
-      end
-    end
-  end
-end