ree 1.0.22 → 1.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 972811cf5375f041b94d6b27312ec7abf79301c5d3bf84e28e2bd386250ff069
-  data.tar.gz: 5da92138c93885000b6dad4b0f6a380ef1ab3edec2967b1a814fac8a9419128c
+  metadata.gz: 60b602bd07b9adc8ba5cbcee420750e3b2d5266056c888ad750115cbb393c4ea
+  data.tar.gz: 1431632c86f3dacee9ad1f4fee6550e3a56b06dca780d0d3c6c46245c812b407
 SHA512:
-  metadata.gz: e3e656e9eb4edfde775740363105ec9fb08ecd53ab0d1dcae016c1d3d29580601a4f41b3d0474932996edb1c6807c971950babf2397df753db9883227897c698
-  data.tar.gz: 126671be60919618cedc2381cf5aaff4b3a4fb4b65c2d1e50a8821c5394612cdf93b845df4ac5df2d371521ed3b2e7334b8280108d2ab42d5d1eda3274e2b7d6
+  metadata.gz: 58c730e7c3930abe99115bdaffa4175b886c29dd67ef7575b196f6284782f192722dfd706e5e6174808b1cdb0ab0126a216cfa1ccfa6d99fe0a287289e63d708
+  data.tar.gz: 67ebd3b56bed90000f00033e7a7cd9f2a5959df2dd4acc58f168e5830c49bf989b3ba74fdf77902d3e0ceec921de7180a55185e5665f33294316e8d0074f51ca

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ree (1.0.22)
+    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/indexing/index_package.rb

@@ -25,7 +25,7 @@ module Ree
           package_hsh = index_package_entry(package)
 
           hsh[:package_schema] = package_hsh
-          hsh = index_package_files(package, dir, hsh)
+          hsh = index_public_methods_for_package_classes(package, dir, hsh)
 
           JSON.pretty_generate(hsh)
         end
@@ -120,8 +120,8 @@ module Ree
           ]
         end
 
-        def index_package_files(package, dir, index_hash)
-          Ree::CLI::IndexProject.send(:index_package_files, package, dir, index_hash)
+        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

data/lib/ree/cli/indexing/index_project.rb

@@ -60,7 +60,7 @@ module Ree
 
             index_hash[:packages_schema][:packages] << package_hsh
 
-            index_hash = index_package_files(package, dir, index_hash)
+            index_hash = index_public_methods_for_package_classes(package, index_hash)
           end
 
           if facade.get_package(:ree_errors, false)
@@ -72,67 +72,68 @@ module Ree
 
         private
 
-        def index_package_files(package, dir, index_hash)
-          objects_class_names = package.objects.map(&:class_name)
-
-          files = Dir[
-            File.join(
-              Ree::PathHelper.abs_package_module_dir(package), '**/*.rb'
-            )
-          ]
-
-          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)
-
-              if klass.include?(ReeEnum::DSL)
-                hsh = index_enum(klass, file_name, package.name, dir, const_string_from_file_name)
-                hash_key = const_string_from_file_name
-                index_hash[:classes][hash_key] ||= []
-                index_hash[:classes][hash_key] << hsh
-
-                next
-              end
-
-              if klass.include?(ReeDao::DSL)
-                hsh = index_dao(klass, file_name, package.name, dir, const_string_from_file_name)
-                obj_name_key = Ree::StringUtils.underscore(const_string_from_file_name)
-                index_hash[:objects][obj_name_key] ||= []
-                index_hash[:objects][obj_name_key] << hsh
-
-                next
-              end
-
-              if klass.include?(ReeMapper::DSL)
-                # TODO
-                next
-              end
-
-              if !objects_class_names.include?(const_string_with_module)
-                hsh = index_class(klass, file_name, package.name, dir, const_string_from_file_name)
-                hash_key = const_string_from_file_name
-                index_hash[:classes][hash_key] ||= []
-                index_hash[:classes][hash_key] << hsh
-
-                next
-              end
-            rescue NameError
-              next
+        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
 
+          recursively_index_module(package.module, index_hash, package)
+
           index_hash
         end
 
-        def index_class(klass, file_name, package_name, root_dir, hash_key)
+        def recursively_index_module(mod, index_hsh, package)
+          return if !mod.is_a?(Module)
+
+          mod.constants.each do |const_name|
+            const = mod.const_get(const_name)
+
+            recursively_index_module(const, index_hsh, package)
+
+            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 } },
@@ -140,20 +141,14 @@ module Ree
               }
             }
 
-          rpath_from_root_file_path = Pathname.new(file_name).relative_path_from(Pathname.new(root_dir)).to_s
-
           {
-            path: rpath_from_root_file_path,
+            path: rpath,
             package: package_name,
             methods: methods
           }
         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 {
@@ -164,10 +159,8 @@ module Ree
               }
             }
 
-          rpath_from_root_file_path = Pathname.new(file_name).relative_path_from(Pathname.new(root_dir)).to_s
-
           {
-            path: rpath_from_root_file_path,
+            path: rpath,
             package: package_name,
             methods: filters
           }
@@ -175,7 +168,7 @@ module Ree
 
         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"
@@ -193,6 +186,10 @@ module Ree
 
           index_hash
         end
+
+        def demodulize(str)
+          str.split("::").last
+        end
       end
     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_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/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.22"
+  VERSION = "1.0.23"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ree
 version: !ruby/object:Gem::Version
-  version: 1.0.22
+  version: 1.0.23
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-02-03 00:00:00.000000000 Z
+date: 2023-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander