phari_doc_gen 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c59179d663a41f7f6646966da28c019bded358d
-  data.tar.gz: 978dd3f5616a8d6e497278472547c8c4cb70ef4c
+  metadata.gz: 3561436d19593047d435d3b001152c030855bfd9
+  data.tar.gz: b13faaedeb84caf6621e9463bb1765334a3b6a93
 SHA512:
-  metadata.gz: bb6ee7e3b71a0f94983622b5844b7301d6a82bae32573a018ad3085d54ddb16e3f3322dbcae38bdee664083cc0500270192687487d5cac2e5c00f2e73654ea08
-  data.tar.gz: 9f4fe4a27d14dec2dea0ff80093889412adc4531fe2f37fc7f8c111e60d54b48a4fe9734ce9e74f56938f116f61de1930713b372365066f3bb7d84bc2633514f
+  metadata.gz: 0bc457c7f8cfdf5b8aa7546c3855eb0dbc2a9da0a524d170b8919f85f3affebc780532f34ad05dab4877c70aab09e402b75ccad893cf49ec2b84f7164bb73b7d
+  data.tar.gz: 1073bee5b12b651b8800bb00c0aac2761f9e435308fb5c91e1d5defd0109f33ae0d1052ee6f621771b58a7c1af8de342227ce17de843917053e88660a3cb3c9e

data/bin/generate

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'phari_doc_gen'
+require_relative 'phari_doc_gen'
 docGen = PhariDocGen.new()
 docGen.generate(ARGV[0], ARGV[1])

data/lib/phari_doc_gen.rb

@@ -19,10 +19,11 @@ class PhariDocGen
       projectDescription = generate.readProject(project)
       models = generate.readFiles(project)
       if path == nil
-          puts 'Insert path to output file'
+          puts 'Insert full path to output file'
           path = gets.chomp
       end
       path += '/' unless path.end_with?('/')
+      path = '/'+path unless path.start_with?('/')
       if path == ''
           puts 'Aborting generation due to empty path'
           exit

data/lib/phari_doc_gen/FileHandler.rb

@@ -44,7 +44,7 @@ class FileHandler
             if File.exist?(helpername) && File.exist?(controllername)
                 modelHelper = File.new(helpername, 'r')
                 modelController = File.new(controllername, 'r')
-                methods = readMethods(modelHelper)
+                methods = readMethods(modelHelper, helpername)
                 routes = readRoutes(modelController)
                 currentModel = Modelo.new(modelname, methods, routes)
                 models << currentModel
@@ -146,7 +146,8 @@ class FileHandler
         line
     end
 
-    def readMethods(helper)
+    def readMethods(helper, helpername)
+        linha = 0
         tipo = ''
         nome = ''
         descricao = ''
@@ -154,41 +155,47 @@ class FileHandler
         outputs = []
         methods = []
         toSent = true
-        arr = IO.readlines(helper)
-        arr.each do |line|
-            if hasKeyword?(line)
-                arg = decodeArgument(line)
-                keyword = arg[0]
-                argument = arg[1]
-                case keyword
-                when 'methods'
-                    if nome != ''
-                        methods << Metodo.new(nome, tipo, inputs, outputs, descricao)
-                        inputs = []
-                        outputs = []
-                        toSent = false
-                    end
-                    tipo = argument
-                when 'name'
-                    if nome != '' && toSent
-                        methods << Metodo.new(nome, tipo, inputs, outputs, descricao)
-                        inputs = []
-                        outputs = []
-                    else
-                        toSent = true
+        begin
+            arr = IO.readlines(helper)
+            arr.each do |line|
+                linha += 1
+                if hasKeyword?(line)
+                    arg = decodeArgument(line)
+                    keyword = arg[0]
+                    argument = arg[1]
+                    case keyword
+                    when 'methods'
+                        if nome != ''
+                            methods << Metodo.new(nome, tipo, inputs, outputs, descricao)
+                            inputs = []
+                            outputs = []
+                            toSent = false
+                        end
+                        tipo = argument
+                    when 'name'
+                        if nome != '' && toSent
+                            methods << Metodo.new(nome, tipo, inputs, outputs, descricao)
+                            inputs = []
+                            outputs = []
+                        else
+                            toSent = true
+                        end
+                        nome = argument
+                    # methods.last.printName
+                    # puts "#{methods.size}"
+                    when 'param'
+                        data = dataValue(argument)
+                        inputs << data
+                    when 'return'
+                        data = dataValue(argument)
+                        outputs << data
                     end
-                    nome = argument
-                # methods.last.printName
-                # puts "#{methods.size}"
-                when 'param'
-                    data = dataValue(argument)
-                    inputs << data
-                when 'return'
-                    data = dataValue(argument)
-                    outputs << data
                 end
+                descricao = decodeDescription(line) if hasDescription?(line)
             end
-            descricao = decodeDescription(line) if hasDescription?(line)
+        rescue ArgumentError => e
+            puts "#{helpername}::#{linha} in #{nome}"
+            puts e.message
         end
         methods << Metodo.new(nome, tipo, inputs, outputs, descricao)
         methods
@@ -275,11 +282,12 @@ class FileHandler
     # Métodos de decodificação da leitura
     def hasKeyword?(line)
         if (line.include? '#') && (line.include? '@')
-            if line.index('#') < line.index('@')
-                true
-            else
-                false
+            for i in 0..line.index('#')-1
+                if line[i].match(/^[[:alpha:]]$/)
+                  return false
+                end
             end
+            true
         else
             false
         end
@@ -301,6 +309,9 @@ class FileHandler
         args = []
         initialIndex = line.index('@') + 1
         finalIndex = line.index("\s", line.index('@'))
+        if finalIndex == nil || initialIndex == nil
+            raise ArgumentError.new("Sytanx error: expected 2 arguments (one given)")
+        end
         lenght = finalIndex - initialIndex
         keyword = line.slice(initialIndex, lenght)
         argument = line.slice(finalIndex + 1, line.size - finalIndex)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phari_doc_gen
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Phari