ree 1.0.11 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ab958ee043c81bd88eb63c97ae9bb27a93e653e0488f14f46d9ec6d6b1e3e31
-  data.tar.gz: 7f41c692cafddc219cbb9a9ba3191b930a59b204d2a20d1ad873291dfdb335f2
+  metadata.gz: f161bd31a19bf61834065dd4dab0a875d275eaa6bde5c29941d8ea8ec8b267cf
+  data.tar.gz: 3d8350795235645b86bd4abcd926d6de5818aebf75e9622c99427047572bf075
 SHA512:
-  metadata.gz: a6a93a7e5cc610dad542897ca0f35c61650a93b13dd784a1030c7f94d794e24bae48bb3cc3a11c652737e27902418e67c35089064a0ce66547c745f557ba4166
-  data.tar.gz: 16b33f81947babead599ac94c95746915a05e858d3b9be38c45761b3425cdf5be868e93279378b37c6af523b6b0928a6f476f701b596b454df21430d933e087a
+  metadata.gz: 3e72a0f2728261d609c943a07292f93ef076818cba7fe0502517006b1b18b2fa65bbab5b0e1019737bf5f6ad1c2f49c22caf5597feddeec6566c242f187c0d7e
+  data.tar.gz: 541cebae73096e5b4798d7580d8bd11f21ca7fcdf3bf7ccc28c33b423ae587b4c246ed93a25d5e67535ef4316905dade9987e64c48fee82b5818969baacb73df

data/Gemfile.lock

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

data/lib/ree/cli/index_file.rb

@@ -25,6 +25,15 @@ module Ree
           Ree.load_package(current_package_name)
 
           package = facade.get_package(current_package_name)
+
+          files = Dir[
+            File.join(
+              Ree::PathHelper.abs_package_module_dir(package), '**/*.rb'
+            )
+          ]
+
+          return {} if !files.include?(file_path)
+
           objects_class_names = package.objects.map(&:class_name)
           file_name_const_string = Ree::StringUtils.camelize(file_path.split('/')[-1].split('.rb')[0])
           const_string_with_module = "#{package.module}::#{file_name_const_string}"

data/lib/ree/cli/index_project.rb

@@ -10,8 +10,9 @@ module Ree
 
           Ree.init(dir)
 
-          index_hash = {}
-          index_hash[:classes] = {}
+          @index_hash = {}
+          @index_hash[:classes] = {}
+          @index_hash[:objects] = {}
 
           facade = Ree.container.packages_facade
 
@@ -31,38 +32,114 @@ module Ree
 
             files.each do |file_name|
               begin
-                file_name_const_string = Ree::StringUtils.camelize(file_name.split('/')[-1].split('.rb')[0])
-                const_string_with_module = "#{package.module}::#{file_name_const_string}"
+                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)
 
-                next if objects_class_names.include?(const_string_with_module) # skip objects
+                if klass.include?(ReeEnum::DSL)
+                  index_enum(klass, file_name, package.name, dir, const_string_from_file_name)
 
-                klass = Object.const_get(const_string_with_module)
+                  next
+                end
+
+                if klass.include?(ReeDao::DSL)
+                  index_dao(klass, file_name, package.name, dir, const_string_from_file_name)
+                  next
+                end
 
-                methods = klass
-                  .public_instance_methods(false)
-                  .reject { _1.match?(/original/) } # remove aliases defined by contracts
-                  .map {
-                    {
-                      name: _1,
-                      location: klass.public_instance_method(_1).source_location&.last,
-                    }
-                  }
-
-                hsh = {
-                  path: file_name,
-                  package: package.name,
-                  methods: methods
-                }
-
-                index_hash[:classes][file_name_const_string] ||= []
-                index_hash[:classes][file_name_const_string] << hsh
+                if klass.include?(ReeMapper::DSL)
+                  # TODO
+                  next
+                end
+
+                if !objects_class_names.include?(const_string_with_module)
+                  index_class(klass, file_name, package.name, dir, const_string_from_file_name)
+
+                  next
+                end
               rescue NameError
                 next
               end
             end
           end
 
-          JSON.pretty_generate(index_hash)
+          if facade.get_package(:ree_errors, false)
+            index_exceptions(facade.get_package(:ree_errors))
+          end
+          
+
+          JSON.pretty_generate(@index_hash)
+        end
+
+        private
+
+        def index_class(klass, file_name, package_name, root_dir, hash_key)
+          methods = klass
+            .public_instance_methods(false)
+            .reject { _1.match?(/original/) } # remove aliases defined by contracts
+            .map {
+              {
+                name: _1,
+                location: klass.public_instance_method(_1).source_location&.last,
+              }
+            }
+
+          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,
+            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)
+          filters = klass
+            .instance_variable_get(:@filters)
+            .map {
+              {
+                name: _1.name,
+                parameters: _1.proc.parameters.map { |param| { name: param.last, required: param.first } },
+                location: _1.proc&.source_location&.last
+              }
+            }
+
+          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,
+            package: package_name,
+            methods: filters
+          }
+
+          @index_hash[:objects][obj_name_key] ||= []
+          @index_hash[:objects][obj_name_key] << hsh
+        end
+
+        def index_exceptions(errors_package)
+          errors_package.objects.each do |obj|
+            const_name = obj.class_name.split("::")[-1]
+            file_name = File.join(
+              Ree::PathHelper.abs_package_module_dir(errors_package),
+              obj.name.to_s + ".rb"
+            )
+
+            hsh = {
+              path: file_name,
+              package: errors_package.name,
+              methods: []
+            }
+
+            @index_hash[:classes][const_name] ||= []
+            @index_hash[:classes][const_name] << hsh
+          end
         end
       end
     end

data/lib/ree/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ree
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.13
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-23 00:00:00.000000000 Z
+date: 2022-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander