ree 1.0.21 → 1.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca13d5ef496d85f47eadd745809ae723ecc4753c465aaa3f4ac6765a9d59d613
-  data.tar.gz: f8aca8861e7fa1cddc8bd254abf4cff4967376284c6df859357daa361bfe1f15
+  metadata.gz: 60b602bd07b9adc8ba5cbcee420750e3b2d5266056c888ad750115cbb393c4ea
+  data.tar.gz: 1431632c86f3dacee9ad1f4fee6550e3a56b06dca780d0d3c6c46245c812b407
 SHA512:
-  metadata.gz: 50493c271f9a3abea47885f3c83308b3e2149891f1f0f0b0dccd4f43a0608b7a8df3f5e43131c109902f19c959e7ff68ea3cd8a669fd0ed48c34c4c5b132dc40
-  data.tar.gz: e95bc7ba3124029e388ddb34fa4de0d6cf5b1e775df18095ad48ebab1891a4a27944f5bc8ad87265615da5a7e036ac7971ac0f6e6092fc980ed97a0381372a40
+  metadata.gz: 58c730e7c3930abe99115bdaffa4175b886c29dd67ef7575b196f6284782f192722dfd706e5e6174808b1cdb0ab0126a216cfa1ccfa6d99fe0a287289e63d708
+  data.tar.gz: 67ebd3b56bed90000f00033e7a7cd9f2a5959df2dd4acc58f168e5830c49bf989b3ba74fdf77902d3e0ceec921de7180a55185e5665f33294316e8d0074f51ca

data/Gemfile.lock

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

data/lib/ree/bean_dsl.rb

@@ -16,6 +16,7 @@ module Ree::BeanDSL
       )
 
       dsl.instance_exec(&proc) if block_given?
+      dsl.tags(["object"])
       dsl.object.set_as_compiled(false)
 
       Ree.container.compile(dsl.package, name)

data/lib/ree/cli/delete_object_schema.rb

@@ -22,6 +22,16 @@ module Ree
           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
 

data/lib/ree/cli/{index_package.rb → indexing/index_package.rb}

@@ -14,16 +14,25 @@ module Ree
 
           facade = Ree.container.packages_facade
 
+          hsh = {}
+          hsh[:package_schema] = {}
+          hsh[:classes] = {}
+          hsh[:objects] = {}
+
           package_name = package_name.to_sym
+          facade.load_entire_package(package_name)
           package = facade.get_loaded_package(package_name)
-          package_hsh = map_package_entry(package)
+          package_hsh = index_package_entry(package)
+
+          hsh[:package_schema] = package_hsh
+          hsh = index_public_methods_for_package_classes(package, dir, hsh)
 
-          JSON.pretty_generate(package_hsh)
+          JSON.pretty_generate(hsh)
         end
 
         private
 
-        def map_package_entry(package)
+        def index_package_entry(package)
           package_hsh = {}
           package_hsh[:name] = package.name
           package_hsh[:schema_rpath] = package.schema_rpath
@@ -110,6 +119,10 @@ module Ree
             }
           ]
         end
+
+        def index_public_methods_for_package_classes(package, dir, index_hash)
+          Ree::CLI::IndexProject.send(:index_public_methods_for_package_classes, package, index_hash)
+        end
       end
     end
   end

data/lib/ree/cli/{index_project.rb → indexing/index_project.rb}

@@ -10,16 +10,15 @@ module Ree
 
           Ree.init(dir)
 
-          @index_hash = {}
+          index_hash = {}
           # completion/etc data
-          @index_hash[:classes] = {}
-          @index_hash[:objects] = {}
+          index_hash[:classes] = {}
+          index_hash[:objects] = {}
 
           # schema data
-          @index_hash[:gem_paths] = {}
-          @index_hash[:packages_schema] = {}
-          @index_hash[:packages_schema][:packages] = []
-          @index_hash[:packages_schema][:gem_packages] = []
+          index_hash[:packages_schema] = {}
+          index_hash[:packages_schema][:packages] = []
+          index_hash[:packages_schema][:gem_packages] = []
 
           facade = Ree.container.packages_facade
 
@@ -48,7 +47,7 @@ module Ree
                 }
               }
 
-              @index_hash[:packages_schema][:gem_packages] << gem_package_hsh
+              index_hash[:packages_schema][:gem_packages] << gem_package_hsh
 
               next
             end
@@ -57,68 +56,84 @@ module Ree
               
             facade.load_entire_package(package.name)
 
-            package_hsh = Ree::CLI::IndexPackage.send(:map_package_entry, package)
+            package_hsh = Ree::CLI::IndexPackage.send(:index_package_entry, package)
 
-            @index_hash[:packages_schema][:packages] << package_hsh
+            index_hash[:packages_schema][:packages] << package_hsh
 
-            objects_class_names = package.objects.map(&:class_name)
+            index_hash = index_public_methods_for_package_classes(package, index_hash)
+          end
 
-            files = Dir[
-              File.join(
-                Ree::PathHelper.abs_package_module_dir(package), '**/*.rb'
-              )
-            ]
+          if facade.get_package(:ree_errors, false)
+            index_hash = index_exceptions(facade.get_package(:ree_errors), index_hash)
+          end
 
-            files.each do |file_name|
-              begin
-                const_string_from_file_name = Ree::StringUtils.camelize(file_name.split('/')[-1].split('.rb')[0])
-                const_string_with_module = "#{package.module}::#{const_string_from_file_name}"
-                klass = Object.const_get(const_string_with_module)
+          JSON.pretty_generate(index_hash)
+        end
 
-                if klass.include?(ReeEnum::DSL)
-                  index_enum(klass, file_name, package.name, dir, const_string_from_file_name)
+        private
 
-                  next
-                end
+        def index_public_methods_for_package_classes(package, index_hash)
+          package.objects.each do |obj| 
+            klass = obj.klass
+            klass_name = demodulize(klass.to_s)
+            obj_name = obj.name.to_s
+            rpath = obj.rpath
+
+            if obj.tags.include?("enum")
+              hsh = index_class(klass, rpath, package.name)
+              index_hash[:classes][klass_name] ||= []
+              index_hash[:classes][klass_name] << hsh
+              index_hash[:objects][obj_name] ||= []
+              index_hash[:objects][obj_name] << hsh
+            elsif obj.tags.include?("dao")
+              hsh = index_dao(klass, rpath, package.name)
+              index_hash[:objects][obj_name] ||= []
+              index_hash[:objects][obj_name] << hsh
+            elsif obj.tags.include?("object")
+              hsh = index_class(klass, rpath, package.name)
+              index_hash[:objects][obj_name] ||= []
+              index_hash[:objects][obj_name] << hsh
+            end
+          end
 
-                if klass.include?(ReeDao::DSL)
-                  index_dao(klass, file_name, package.name, dir, const_string_from_file_name)
-                  next
-                end
+          recursively_index_module(package.module, index_hash, package)
 
-                if klass.include?(ReeMapper::DSL)
-                  # TODO
-                  next
-                end
+          index_hash
+        end
 
-                if !objects_class_names.include?(const_string_with_module)
-                  index_class(klass, file_name, package.name, dir, const_string_from_file_name)
+        def recursively_index_module(mod, index_hsh, package)
+          return if !mod.is_a?(Module)
 
-                  next
-                end
-              rescue NameError
-                next
-              end
-            end
-          end
+          mod.constants.each do |const_name|
+            const = mod.const_get(const_name)
 
-          if facade.get_package(:ree_errors, false)
-            index_exceptions(facade.get_package(:ree_errors))
-          end
-          
+            recursively_index_module(const, index_hsh, package)
 
-          JSON.pretty_generate(@index_hash)
-        end
+            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))     
 
-        private
+            const_abs_path = mod.const_source_location(const.name).first
+            next if !const_abs_path
 
-        def index_class(klass, file_name, package_name, root_dir, hash_key)
+            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 } },
@@ -126,22 +141,14 @@ module Ree
               }
             }
 
-          rpath_from_root_file_path = Pathname.new(file_name).relative_path_from(Pathname.new(root_dir)).to_s
-          hsh = {
-            path: rpath_from_root_file_path,
+          {
+            path: rpath,
             package: package_name,
             methods: methods
           }
-
-          @index_hash[:classes][hash_key] ||= []
-          @index_hash[:classes][hash_key] << hsh
         end
 
-        def index_enum(klass, file_name, package_name, root_dir, hash_key)
-          index_class(klass, file_name, package_name, root_dir, hash_key)
-        end
-
-        def index_dao(klass, file_name, package_name, root_dir, hash_key)
+        def index_dao(klass, rpath, package_name)
           filters = klass
             .instance_variable_get(:@filters)
             .map {
@@ -152,22 +159,16 @@ module Ree
               }
             }
 
-          obj_name_key = Ree::StringUtils.underscore(hash_key)
-          rpath_from_root_file_path = Pathname.new(file_name).relative_path_from(Pathname.new(root_dir)).to_s
-
-          hsh = {
-            path: rpath_from_root_file_path,
+          {
+            path: rpath,
             package: package_name,
             methods: filters
           }
-
-          @index_hash[:objects][obj_name_key] ||= []
-          @index_hash[:objects][obj_name_key] << hsh
         end
 
-        def index_exceptions(errors_package)
+        def index_exceptions(errors_package, index_hash)
           errors_package.objects.each do |obj|
-            const_name = obj.class_name.split("::")[-1]
+            const_name = demodulize(obj.class_name)
             file_name = File.join(
               Ree::PathHelper.abs_package_module_dir(errors_package),
               obj.name.to_s + ".rb"
@@ -179,9 +180,15 @@ module Ree
               methods: []
             }
 
-            @index_hash[:classes][const_name] ||= []
-            @index_hash[:classes][const_name] << hsh
+            index_hash[:classes][const_name] ||= []
+            index_hash[:classes][const_name] << hsh
           end
+
+          index_hash
+        end
+
+        def demodulize(str)
+          str.split("::").last
         end
       end
     end

data/lib/ree/cli.rb

@@ -9,9 +9,9 @@ module Ree
     autoload :DeleteObjectSchema, 'ree/cli/delete_object_schema'
     autoload :GeneratePackage, 'ree/cli/generate_package'
     autoload :GenerateTemplate, 'ree/cli/generate_template'
-    autoload :IndexProject, 'ree/cli/index_project'
-    autoload :IndexFile, 'ree/cli/index_file'
-    autoload :IndexPackage, 'ree/cli/index_package'
+    autoload :IndexProject, 'ree/cli/indexing/index_project'
+    autoload :IndexFile, 'ree/cli/indexing/index_file'
+    autoload :IndexPackage, 'ree/cli/indexing/index_package'
     autoload :SpecRunner, 'ree/cli/spec_runner'
   end
 end

data/lib/ree/core/object.rb

@@ -5,7 +5,7 @@ class Ree::Object
               :package_name, :factory, :after_init,
               :class_name, :links, :mount_as, :freeze,
               :errors, :linked_const_list, :compiled_frozen,
-              :singleton
+              :singleton, :tags
   
   # @param [Symbol] name Object name
   # @param [String] schema_rpath Object schema path relative to project root dir
@@ -22,6 +22,7 @@ class Ree::Object
     @singleton = false
     @compiled_frozen = @freeze
     @linked_const_list = []
+    @tags = []
   end
 
   def reset
@@ -129,4 +130,9 @@ class Ree::Object
   def set_after_init(val)
     @after_init = val; self
   end
+
+  def add_tags(list)
+    @tags += list
+    @tags.uniq!
+  end
 end

data/lib/ree/core/object_schema.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal  = true
 
 module Ree::ObjectSchema
-  SCHEMA_VERSION_NUMBER = '1.0'
+  SCHEMA_VERSION_NUMBER = '1.1'
 
   SCHEMA_TYPE = 'schema_type'
   REE_VERSION = 'ree_version'
@@ -40,6 +40,7 @@ module Ree::ObjectSchema
 
     module Args
       ARG = 'arg'
+      ARG_TYPE = 'arg_type'
       TYPE = 'type'
     end
   end

data/lib/ree/core/object_schema_builder.rb

@@ -85,6 +85,7 @@ class Ree::ObjectSchemaBuilder
 
       {
         Schema::Methods::Args::ARG => arg.name,
+        Schema::Methods::Args::ARG_TYPE => arg.type,
         Schema::Methods::Args::TYPE => type
       }
     end

data/lib/ree/core/package.rb

@@ -165,6 +165,16 @@ class Ree::Package
     @objects_store[object.name] = object
   end
 
+  # @param [Symbol] name
+  # @return [nil]
+  def remove_object(name)
+    if @objects_store[name]
+      @objects_store.delete(name)
+    end
+
+    nil
+  end
+
   # @param [Symbol] name
   # @return [Nilor[Ree::Object]]
   def get_object(name)

data/lib/ree/core/package_schema.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal  = true
 
 module Ree::PackageSchema
-  SCHEMA_VERSION_NUMBER = '1.0'
+  SCHEMA_VERSION_NUMBER = '1.1'
 
   SCHEMA_TYPE = 'schema_type'
   REE_VERSION = 'ree_version'
@@ -17,6 +17,7 @@ module Ree::PackageSchema
   module Objects
     NAME = 'name'
     SCHEMA = 'schema'
+    TAGS = 'tags'
   end
 
   module DependsOn

data/lib/ree/core/package_schema_builder.rb

@@ -36,6 +36,7 @@ class Ree::PackageSchemaBuilder
         {
           Schema::Objects::NAME => object.name,
           Schema::Objects::SCHEMA => object.schema_rpath,
+          Schema::Objects::TAGS => object.tags
         }
       }
     }

data/lib/ree/core/package_schema_loader.rb

@@ -102,6 +102,7 @@ class Ree::PackageSchemaLoader
       name = item[Schema::Objects::NAME].to_s
       schema_rpath = item[Schema::Objects::SCHEMA].to_s
       list = [name, schema_rpath]
+      tags = item[Schema::Objects::TAGS] || []
 
       if list.reject(&:empty?).size != list.size
         raise Ree::Error.new("invalid object data for #{item.inspect}: #{abs_schema_path}", :invalid_package_schema)
@@ -119,6 +120,7 @@ class Ree::PackageSchemaLoader
         Ree::PathHelper.object_rpath(schema_rpath),
       )
 
+      object.add_tags(tags)
       object.set_package(package.name)
 
       package.set_object(object)

data/lib/ree/core/path_helper.rb

@@ -52,6 +52,22 @@ class Ree::PathHelper
       File.join(dir, "#{Ree::PACKAGE}/#{name}.rb")
     end
 
+    # @param [String] directory inside package
+    # @return [String] name of package
+    def package_name_from_dir(dir)
+      package_schema = File.join(dir, Ree::PACKAGE_SCHEMA_FILE)
+
+      if File.exist?(package_schema)
+        return package_schema.split('/')[-2]
+      end
+
+      if dir == '/'
+        return nil
+      end
+
+      package_name_from_dir(File.expand_path('..', dir))
+    end
+
     # @param [Ree::Package] package Package schema
     # @return [String] Absolute package entry path (ex. /data/project/bc/accounts/package/accounts.rb)
     def abs_package_entry_path(package)

data/lib/ree/dsl/object_dsl.rb

@@ -37,6 +37,10 @@ class Ree::ObjectDsl
     end
   end
 
+  def tags(list)
+    @object.add_tags(list)
+  end
+
   # @param [Symbol] object_name
   # @param [Nilor[Symbol]] as
   # @param [Nilor[Symbol]] from

data/lib/ree/fn_dsl.rb

@@ -16,6 +16,7 @@ module Ree::FnDSL
       )
 
       dsl.instance_exec(&proc) if block_given?
+      dsl.tags(["fn"])
       dsl.object.set_as_compiled(false)
 
       Ree.container.compile(dsl.package, name)

data/lib/ree/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ree
 version: !ruby/object:Gem::Version
-  version: 1.0.21
+  version: 1.0.23
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-01-30 00:00:00.000000000 Z
+date: 2023-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -69,9 +69,9 @@ files:
 - lib/ree/cli/generate_package_schema.rb
 - lib/ree/cli/generate_packages_schema.rb
 - lib/ree/cli/generate_template.rb
-- lib/ree/cli/index_file.rb
-- lib/ree/cli/index_package.rb
-- lib/ree/cli/index_project.rb
+- lib/ree/cli/indexing/index_file.rb
+- lib/ree/cli/indexing/index_package.rb
+- lib/ree/cli/indexing/index_project.rb
 - lib/ree/cli/init.rb
 - lib/ree/cli/spec_runner.rb
 - lib/ree/container.rb