phari_doc_gen 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fbb3185d3c51d9df091cece9d9dfebc79ece933
-  data.tar.gz: df53a5f7e5e5a9f4b244e379131bc2c22056a732
+  metadata.gz: aed71e1fbe5849d84078cb876c4f5d68aa5635a7
+  data.tar.gz: b7d38db5e2f66a51bdea1eb825f100115c0a0b18
 SHA512:
-  metadata.gz: 49311c2e74bd690489b826e1969ad1cdf6d119ac1e20c189fb4f48fe3901718d190eba1f366795940f1b7d7ea254314911a88298ac5ce5b1f978bd132d6d203d
-  data.tar.gz: 0a15ff03c292842962e109cc9357fbd49e0427adcb6d047bd3d2872a894a40003d109dbce6d2e2e2b60bdc5169dc40c274643d1b1ed0ef3f6949af30e5a1c872
+  metadata.gz: 41a1f5d33ebb0d1691948025a9b5d4fcb441d40208cd5a657c05e8c41f3d0df2e3f654efd5fbc53a7fb9a396b55c8aa41935f71f1bf42ded2dd42e8b1b4ca5aa
+  data.tar.gz: 32fe9025e35439cf9cec31e6cc6e47218680a40b8775b95bfc95599a105cc885a087cbebcb2eae586447257fb46c63cc7909081d996cecfcbc6e5cddeaabe3ea

data/bin/generate

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

data/lib/phari_doc_gen/FileHandler.rb

@@ -45,7 +45,7 @@ class FileHandler
                 modelHelper = File.new(helpername, 'r')
                 modelController = File.new(controllername, 'r')
                 methods = readMethods(modelHelper, helpername)
-                routes = readRoutes(modelController)
+                routes = readRoutes(modelController, controllername)
                 currentModel = Modelo.new(modelname, methods, routes)
                 models << currentModel
             end
@@ -147,7 +147,7 @@ class FileHandler
     end
 
     def readMethods(helper, helpername)
-        linha = 0
+        lineIndex = 0
         tipo = ''
         nome = ''
         descricao = ''
@@ -158,8 +158,8 @@ class FileHandler
         begin
             arr = IO.readlines(helper)
             arr.each do |line|
-                linha += 1
-                if hasKeyword?(line)
+                lineIndex += 1
+                if hasKeyword?(line, lineIndex, helpername)
                     arg = decodeArgument(line)
                     keyword = arg[0]
                     argument = arg[1]
@@ -189,19 +189,22 @@ class FileHandler
                     when 'return'
                         data = dataValue(argument)
                         outputs << data
+                    else
+                        puts "Warning: in #{helpername}:#{lineIndex}: #{keyword} is not a keyword" if keyword != 'namespace'
                     end
                 end
-                descricao = decodeDescription(line) if hasDescription?(line)
+                descricao = decodeDescription(line) if hasDescription?(line, lineIndex, helpername)
             end
         rescue ArgumentError => e
-            puts "#{helpername}::#{linha} in #{nome}"
+            puts "ERROR: #{helpername}:#{lineIndex}: in #{nome}"
             puts e.message
         end
         methods << Metodo.new(nome, tipo, inputs, outputs, descricao)
         methods
     end
 
-    def readRoutes(controller)
+    def readRoutes(controller, controllername)
+        lineIndex = 0
         tipo = ''
         requisicao = ''
         dataInput = ''
@@ -210,96 +213,119 @@ class FileHandler
         outputs = []
         routes = []
         toSent = true
-        arr = IO.readlines(controller)
-        arr.each do |line|
-            next unless hasKeyword?(line)
-            arg = decodeArgument(line)
-            keyword = arg[0]
-            argument = arg[1]
-            case keyword
-            when 'route'
-                if nome != ''
-                    routes << Rota.new(nome, tipo, requisicao, dataInput, inputs, outputs)
-                    inputs = []
-                    outputs = []
-                    toSent = false
-                end
-                tipo = argument
-            when 'POST'
-                if nome != '' && toSent
-                    routes << Rota.new(nome, tipo, requisicao, dataInput, inputs, outputs)
-                    inputs = []
-                    outputs = []
-                else
-                    toSent = true
-                end
-                requisicao = keyword
-                dataInput = argument
-            when 'GET'
-                if nome != '' && toSent
-                    routes << Rota.new(nome, tipo, requisicao, dataInput, inputs, outputs)
-                    inputs = []
-                    outputs = []
-                else
-                    toSent = true
-                end
-                requisicao = keyword
-                dataInput = argument
-            when 'PUT'
-                if nome != '' && toSent
-                    routes << Rota.new(nome, tipo, requisicao, dataInput, inputs, outputs)
-                    inputs = []
-                    outputs = []
-                else
-                    toSent = true
-                end
-                requisicao = keyword
-                dataInput = argument
-            when 'DELETE'
-                if nome != '' && toSent
-                    routes << Rota.new(nome, tipo, requisicao, dataInput, inputs, outputs)
-                    inputs = []
-                    outputs = []
-                else
-                    toSent = true
-                end
-                requisicao = keyword
-                dataInput = argument
-            when 'name'
-                nome = argument
-            when 'param'
-                data = dataValue(argument)
-                inputs << data
-            when 'return'
-                data = dataValue(argument)
-                outputs << data
-            end
+        begin
+          arr = IO.readlines(controller)
+          arr.each do |line|
+              lineIndex += 1
+              next unless hasKeyword?(line, lineIndex, controllername)
+              arg = decodeArgument(line)
+              keyword = arg[0]
+              argument = arg[1]
+              case keyword
+              when 'route'
+                  if nome != ''
+                      routes << Rota.new(nome, tipo, requisicao, dataInput, inputs, outputs)
+                      inputs = []
+                      outputs = []
+                      toSent = false
+                  end
+                  tipo = argument
+              when 'POST'
+                  if nome != '' && toSent
+                      routes << Rota.new(nome, tipo, requisicao, dataInput, inputs, outputs)
+                      inputs = []
+                      outputs = []
+                  else
+                      toSent = true
+                  end
+                  requisicao = keyword
+                  dataInput = argument
+              when 'GET'
+                  if nome != '' && toSent
+                      routes << Rota.new(nome, tipo, requisicao, dataInput, inputs, outputs)
+                      inputs = []
+                      outputs = []
+                  else
+                      toSent = true
+                  end
+                  requisicao = keyword
+                  dataInput = argument
+              when 'PUT'
+                  if nome != '' && toSent
+                      routes << Rota.new(nome, tipo, requisicao, dataInput, inputs, outputs)
+                      inputs = []
+                      outputs = []
+                  else
+                      toSent = true
+                  end
+                  requisicao = keyword
+                  dataInput = argument
+              when 'DELETE'
+                  if nome != '' && toSent
+                      routes << Rota.new(nome, tipo, requisicao, dataInput, inputs, outputs)
+                      inputs = []
+                      outputs = []
+                  else
+                      toSent = true
+                  end
+                  requisicao = keyword
+                  dataInput = argument
+              when 'name'
+                  nome = argument
+              when 'param'
+                  data = dataValue(argument)
+                  inputs << data
+              when 'return'
+                  data = dataValue(argument)
+                  outputs << data
+              else
+                  puts "Warning: in #{controllername}:#{lineIndex}: #{keyword} is not a keyword" if keyword != 'namespace'
+              end
+          end
+        rescue ArgumentError => e
+            puts "ERROR: #{controllername}:#{lineIndex}: in #{nome}"
+            puts e.message
         end
         routes << Rota.new(nome, tipo, requisicao, dataInput, inputs, outputs)
         routes
     end
 
     # Métodos de decodificação da leitura
-    def hasKeyword?(line)
+    def hasKeyword?(line, lineIndex, fileName)
         if (line.include? '#') && (line.include? '@')
             for i in 0..line.index('#')-1
                 if line[i].match(/^[[:alpha:]]$/)
                   return false
                 end
             end
+            for i in line.index('#')+1..line.index('@')-1
+                if line[i].match(/^[[:alpha:]]$/)
+                  lineText = line.slice(line.index('#'), line.index("\n") - line.index('#'))
+                  puts "Warning: in #{fileName}:#{lineIndex}: #{lineText} is not a keyword"
+                  return false
+                end
+            end
             true
         else
             false
         end
     end
 
-    def hasDescription?(line)
+    def hasDescription?(line, lineIndex, fileName)
         if (line.include? '#') && (line.include? '**')
-            if line.index('#') < line.index('**')
-                true
-            else
-                false
-            end
+          for i in 0..line.index('#')-1
+              if line[i].match(/^[[:alpha:]]$/)
+                return false
+              end
+          end
+          for i in line.index('#')+1..line.index('**')-1
+              if line[i].match(/^[[:alpha:]]$/)
+                lineText = line.slice(line.index('#'), line.index("\n") - line.index('#'))
+                puts "Warning: in #{fileName}:#{lineIndex}: #{lineText} is not a description"
+                return false
+              end
+          end
+          true
         else
             false
         end
@@ -310,7 +336,10 @@ class FileHandler
         initialIndex = line.index('@') + 1
         finalIndex = line.index("\s", line.index('@'))
         if finalIndex == nil || initialIndex == nil
+          if line.index('@')+1 == /^[[:alpha:]]$/
             raise ArgumentError.new("Sytanx error: expected 2 arguments (one given)")
+          else raise ArgumentError.new("Sytanx error: expected 2 arguments (none given)")
+          end
         end
         lenght = finalIndex - initialIndex
         keyword = line.slice(initialIndex, lenght)
@@ -327,8 +356,15 @@ class FileHandler
             data = MethodParam.new(name, type)
             # data.printSelf
             return data
+        elsif argument.include? "nil"
+            data = MethodParam.new('', 'nil')
+            return data
+        elsif argument.include? "boolean"
+            data = MethodParam.new('', 'boolen')
+            return data
         end
-        'nil'
+        argumentText = argument.slice(0, argument.index("\n"))
+        raise ArgumentError.new("Sytanx error: #{argumentText} is no data")
     end
 
     def decodeDescription(line)

metadata

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