RubyGems - ruby_to_uml - Versions diffs - 3.0.0 → 3.0.1 - Mend

ruby_to_uml 3.0.0 → 3.0.1

Files changed (4) hide show

checksums.yaml +4 -4
data/lib/ruby_to_uml/uml_diagram_renderer/uml_diagram_template.erb +2 -2
data/lib/ruby_to_uml/uml_info_generator/processor_helpers.rb +88 -85
metadata +2 -2

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: befc4a48683c7d789764a96b099056651fccb47fb9c32ce7cc0530634bfc5e73
-  data.tar.gz: a91d111eac181e1ebdaa72841cb8166230819e6ef53b4ca33273fd67d4ff8fd9
+  metadata.gz: 7fd9a79f3cfd30246e5775ba4c311914ba4de1b4398f6dd2610153dd85d9b961
+  data.tar.gz: 468eea42c858bfeb483aac63c1c82ed44524974fa0f8c4fec3d6c4a1084a577e
 SHA512:
-  metadata.gz: 6aa2837bb4861fe1a01e10b83c0848bb453b5ffedcb74f4e02f7fa3683e5fbca10075dc2edc733cd1c8286290bc1307a9b87ff7579672127680f261472f9aeec
-  data.tar.gz: 545c66c708ffb85f36f4a32e070204a40c28e9846d26fa8fbed0db40d5781837c89b3c6c9460a68e8d4d3eb4685038c989e9f4da10f0ac7b8c0f5d50b9fdc8ce
+  metadata.gz: a461fb1839346bf0bf8420af01b006b85cb1252b519227f1d8a5f7239cf3e03fa700728923e1c5bac99bc0b4abbb6a6ab4b2a0a2b188df8880844d4d8b877108
+  data.tar.gz: 32f6ee7888dc6650e0c8ff0e6705a838791b3e3e518d1992315fe76760c8fd0e5ae95327d9d80dc12aafa6bb7c4747be822a2e94eb04f65e02a9bb8d27af422d

data/lib/ruby_to_uml/uml_diagram_renderer/uml_diagram_template.erb CHANGED Viewed

@@ -7,8 +7,8 @@
   <title>Diagram</title>
 </head>
 <body>
-  <script src="//unpkg.com/graphre/dist/graphre.js"></script>
-  <script src="//unpkg.com/nomnoml/dist/nomnoml.js"></script>
+  <script src="https://unpkg.com/graphre/dist/graphre.js"></script>
+  <script src="https://unpkg.com/nomnoml/dist/nomnoml.js"></script>
   <canvas id="target-canvas"></canvas>
   <script>

data/lib/ruby_to_uml/uml_info_generator/processor_helpers.rb CHANGED Viewed

@@ -2,55 +2,39 @@ module RubyToUML
   module UMLInfoGenerator
     module ProcessorHelpers
       private
-      def get_class_name(node)
-        constant, inherit, children = *node
-        get_constant_name(constant)
-      end
-      def get_class_body(node)
-        body_node_index = 2
-        node.children[body_node_index]
-      end
-      def get_superclass_name(node)
-        constant, inherit, children = *node
-        inherit ? get_constant_name(inherit) : nil
-      end
-      def get_instance_methods_closure
+      def instance_methods_closure
         type = :public
         lambda do |node, instance_methods_info|
           case node.type
           when :def
-            method_name = get_method_name(node)
-            args        = get_instance_method_args(node)
+            method_name = NodeFinder.method_name(node)
+            args        = NodeFinder.instance_method_args(node)
             instance_methods_info << InstanceMethodInfo.new(method_name, type, args)
           when :send
-            method_name = get_send_method(node)
-            new_type    = get_method_type_change(method_name)
+            method_name = NodeFinder.send_method(node)
+            new_type    = NodeFinder.method_type_change(method_name)
             type = new_type if new_type
           end
         end
       end
-      def get_singleton_methods_closure
+      def singleton_methods_closure
         lambda do |node, singleton_methods_info|
           if node.type == :defs
-            method_name = get_singleton_method_name(node)
-            args        = get_singleton_method_args(node)
+            method_name = NodeFinder.singleton_method_name(node)
+            args        = NodeFinder.singleton_method_args(node)
             singleton_methods_info << SingletonMethodInfo.new(method_name, args)
           end
         end
       end
-      def get_instance_variables_closure
+      def instance_variables_closure
         lambda do |node, instance_variables_info|
-          if node.type == :def && get_method_name(node) == :initialize
-            method_body_node = BodyNodeWrapper.new(get_method_body_node(node))
+          if node.type == :def && NodeFinder.method_name(node) == :initialize
+            method_body_node = BodyNodeWrapper.new(NodeFinder.method_body_node(node))
             closure = lambda do |node|
               if node.type == :ivar || node.type == :ivasgn
-                variable_name = get_instance_variable_name(node)
+                variable_name = NodeFinder.instance_variable_name(node)
                 instance_variables_info << variable_name
               end
             end
@@ -76,79 +60,98 @@ module RubyToUML
       end
       def add_module_relationship(class_name, arguments, type)
-        module_name = get_constant_name(arguments)
+        module_name = NodeFinder.constant_name(arguments)
         relationships << RelationshipInfo.new(class_name, module_name, type)
       end
+    end
-      def get_constant_name(const_node)
-        constant_name_index = 1
-        const_node.children[constant_name_index]
-      end
+    class NodeFinder
+      class << self
+        def class_name(node)
+          constant, inherit, children = *node
+          NodeFinder.constant_name(constant)
+        end
-      def get_method_name(def_node)
-        name_index = 0
-        def_node.children[name_index]
-      end
+        def class_body(node)
+          body_node_index = 2
+          node.children[body_node_index]
+        end
-      def get_instance_method_args(def_node)
-        args_index = 1
-        get_arguments(def_node.children[args_index])
-      end
+        def superclass_name(node)
+          constant, inherit, children = *node
+          inherit ? NodeFinder.constant_name(inherit) : nil
+        end
-      def get_send_method(send_node)
-        caller, method, arguments = *send_node
-        method
-      end
+        def constant_name(const_node)
+          constant_name_index = 1
+          const_node.children[constant_name_index]
+        end
-      def get_method_type_change(method_name)
-        %i[public private protected].include?(method_name) ? method_name : nil
-      end
+        def method_name(def_node)
+          name_index = 0
+          def_node.children[name_index]
+        end
-      def get_singleton_method_name(defs_node)
-        name_index = 1
-        defs_node.children[name_index]
-      end
+        def instance_method_args(def_node)
+          args_index = 1
+          NodeFinder.arguments(def_node.children[args_index])
+        end
-      def get_singleton_method_args(defs_node)
-        args_index = 2
-        get_arguments(defs_node.children[args_index])
-      end
+        def send_method(send_node)
+          caller, method, arguments = *send_node
+          method
+        end
-      def get_arguments(node)
-        return [] if node.children.nil?
+        def method_type_change(method_name)
+          %i[public private protected].include?(method_name) ? method_name : nil
+        end
-        node.children.each_with_object([]) { |node, args| args << node.children[0] }
-      end
+        def singleton_method_name(defs_node)
+          name_index = 1
+          defs_node.children[name_index]
+        end
-      def get_method_body_node(def_node)
-        body_index = 2
-        def_node.children[body_index]
-      end
+        def singleton_method_args(defs_node)
+          args_index = 2
+          NodeFinder.arguments(defs_node.children[args_index])
+        end
-      def get_instance_variable_name(node)
-        name_index = 0
-        node.children[name_index]
-      end
+        def arguments(node)
+          return [] if node.children.nil?
-      def get_module_name(node)
-        constant, = *node
-        get_constant_name(constant)
-      end
+          node.children.each_with_object([]) { |node, args| args << node.children[0] }
+        end
-      def get_module_body(node)
-        _, body = *node
-        body
+        def method_body_node(def_node)
+          body_index = 2
+          def_node.children[body_index]
+        end
+        def instance_variable_name(node)
+          name_index = 0
+          node.children[name_index]
+        end
+        def module_name(node)
+          constant, = *node
+          NodeFinder.constant_name(constant)
+        end
+        def module_body(node)
+          _, body = *node
+          body
+        end
       end
     end
     module ClassAndRelationshipsProcessor
       def on_class(node)
-        class_name              = get_class_name(node)
-        superclass_name         = get_superclass_name(node)
-        class_body_node         = BodyNodeWrapper.new(get_class_body(node))
-        instance_methods_info   = class_body_node.array_operation(&get_instance_methods_closure)
-        singleton_methods_info  = class_body_node.array_operation(&get_singleton_methods_closure)
-        instance_variables_info = class_body_node.array_operation(&get_instance_variables_closure)
+        class_name              = NodeFinder.class_name(node)
+        superclass_name         = NodeFinder.superclass_name(node)
+        class_body_node         = BodyNodeWrapper.new(NodeFinder.class_body(node))
+        instance_methods_info   = class_body_node.array_operation(&instance_methods_closure)
+        singleton_methods_info  = class_body_node.array_operation(&singleton_methods_closure)
+        instance_variables_info = class_body_node.array_operation(&instance_variables_closure)
         add_inheritence_relationship(class_name, superclass_name) if superclass_name
         class_body_node.simple_operation(&add_module_relationships_if_exist_closure(class_name))
@@ -167,10 +170,10 @@ module RubyToUML
     module ModuleProcesor
       def on_module(node)
-        module_name            = get_module_name(node)
-        module_body_node       = BodyNodeWrapper.new(get_module_body(node))
-        instance_methods_info  = module_body_node.array_operation(&get_instance_methods_closure)
-        singleton_methods_info = module_body_node.array_operation(&get_singleton_methods_closure)
+        module_name            = NodeFinder.module_name(node)
+        module_body_node       = BodyNodeWrapper.new(NodeFinder.module_body(node))
+        instance_methods_info  = module_body_node.array_operation(&instance_methods_closure)
+        singleton_methods_info = module_body_node.array_operation(&singleton_methods_closure)
         add_module(module_name, instance_methods_info, singleton_methods_info)

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_to_uml
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Iuliu Pop
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-23 00:00:00.000000000 Z
+date: 2022-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erb