ree 1.0.39 → 1.0.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c82febb352bce1cb674d2b77cac4aeb8f8b1a1fcaa5fa81adae56d2e62bdb20
-  data.tar.gz: d23d1f28309cd3650cd90cd93bb1261011a36359c3fc6096bf8d7945fd9a8598
+  metadata.gz: c3718d079d89d559261699484fcf0386395bcd8f9aad0faa9aaa81dbd77f8b22
+  data.tar.gz: f2ce896f83ea0f670a5a17279f84abbab3bbcb296cb90c58e4b367d827deed8a
 SHA512:
-  metadata.gz: 23819cdc3a1b4d81cbb57baa3946526138baf1662a297522f4ef8e9d4c1377bc311852d1179be445c8cfcea760660e107b97dfffa882b00a70b3b7933e3a5a9e
-  data.tar.gz: ce36b46fbd0fdffc547020e18eb0ee390f6a84f90150ba1bc3c3f80f59bb781d668008f852b7c47830f9a9dcd83ec59407c720024fe47c2ea8638c06b0cd987f
+  metadata.gz: 368cbacf27970b8df6f0e4f7e527f2ef551b09660714464a33fb788b54672ab7b09ea22863e9ddd9c0ef2f5e44bface5bcfe0b1ea74d70d2cca60db1b62fcf43
+  data.tar.gz: 011c48a7763e2fe8ca22830322402d41af35bd78e1794b11f320808800fd610a4d01ba35de4df0903353bfcc1b261b88991cf58caef71d6dfa6ae954417f4d07

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ree (1.0.39)
+    ree (1.0.41)
       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/object_compiler.rb

@@ -82,40 +82,29 @@ class Ree::ObjectCompiler
     end
 
     if object.factory || object.singleton
-      eval_list.push(indent + "def self.new(**kwargs)")
+      eval_list.push(indent + "def self.new")
 
       if object.singleton
         eval_list.push(indent + "  SEMAPHORE.synchronize do")
-        eval_list.push(indent + "    obj_links = #{links.map(&:as).inspect}")
-        eval_list.push(indent + "    if (obj_links & kwargs.keys).size == 0")
-        eval_list.push(indent + "      @__instance ||= begin")
+        eval_list.push(indent + "    @__instance ||= begin")
 
         if object.factory
-          eval_list.push(indent + "        super(**kwargs).#{object.factory}")
+          eval_list.push(indent + "      super.#{object.factory}")
         else
-          eval_list.push(indent + "        super(**kwargs)")
-        end
-
-        eval_list.push(indent + "      end")
-        eval_list.push(indent + "    else")
-
-        if object.factory
-          eval_list.push(indent + "      super(**kwargs).#{object.factory}")
-        else
-          eval_list.push(indent + "      super(**kwargs)")
+          eval_list.push(indent + "      super")
         end
 
         eval_list.push(indent + "    end")
         eval_list.push(indent + "  end")
       else
-        eval_list.push(indent + "  super(**kwargs).#{object.factory}")
+        eval_list.push(indent + "  super.#{object.factory}")
       end
 
       eval_list.push(indent + "end")
     end
 
     eval_list.push("\n")
-    eval_list.push(indent + "def initialize(**kwargs)")
+    eval_list.push(indent + "def initialize")
 
     indent = inc_indent(indent)
 
@@ -126,7 +115,7 @@ class Ree::ObjectCompiler
 
       @packages_facade.load_package_object(pckg.name, obj.name)
 
-      eval_list.push(indent + "@#{_.as} = kwargs[:#{_.as}] || #{obj.klass}.new(**kwargs)")
+      eval_list.push(indent + "@#{_.as} = #{obj.klass}.new")
     end
 
     if object.after_init?

data/lib/ree/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ree
 version: !ruby/object:Gem::Version
-  version: 1.0.39
+  version: 1.0.41
 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