lib/aipim-rails/parser.rb in aipim-rails-0.0.157 vs lib/aipim-rails/parser.rb in aipim-rails-0.0.159

@@ -6,53 +6,65 @@
 		parser(filename)
 	end
 
 
 	def self.tag_screenshot(line,file,workset)
-		if line && ParserHelper.is_marcacao?(line) && ParserHelper.is_screenshot?(line)
+		if line && ParserHelper.is_tag?(line) && ParserHelper.is_screenshot?(line)
 			workset[:screenshot] = true
 			line = ParserHelper::read_line(file)
 		end
-		return line, file, workset
+		return line, workset
 	end
 
 	def self.tag_feature(line,file,workset)
-		if line && ParserHelper.is_funcionalidade?(line)
-			workset[:feature_name] = ParserHelper.get_funcionalidade(line)
-			while ((line = ParserHelper::read_line(file)) && !ParserHelper.is_comando?(line))
+		if line && ParserHelper.is_feature?(line)
+
+			workset[:feature_name] = ParserHelper.get_feature(line)
+
+			while ((line = ParserHelper::read_line(file)) && !ParserHelper.is_command?(line))
 				workset[:feature_description] << line if !(line.gsub(" ", "") == "")
 			end
+			
 		end
-		return line, file, workset
+		return line, workset
 	end
 
 	def  self.tag_context(line,file,workset)
-		if line && ParserHelper.is_contexto?(line)
-			while ((line = ParserHelper::read_line(file)) && !ParserHelper.is_comando?(line))
+		if line && ParserHelper.is_context?(line)
+			while ((line = ParserHelper::read_line(file)) && !ParserHelper.is_command?(line))
 				workset[:context_description] << line if !(line.gsub(" ", "") == "")
 			end
 		end
-		return line, file, workset
+		return line, workset
 	end
 
 	def self.tag_scenario(line,file,workset)
-		if line && ParserHelper.is_cenario?(line)
-			scenario_name = ParserHelper.get_cenario(line)
+		if line && ParserHelper.is_scenario?(line)
+			scenario_name = ParserHelper.get_scenario(line)
 			scenario_steps = []
-			while ((line = ParserHelper::read_line(file)) && !ParserHelper.is_comando?(line))
+			while ((line = ParserHelper::read_line(file)) && !ParserHelper.is_command?(line))
 				scenario_steps << line if !(line.gsub(" ", "") == "")
 			end
 			if workset[:screenshot]
 				screenshot = workset[:screenshots][workset[:screenshot_counter]].to_s
 				workset[:screenshot_counter] += 1
 				workset[:screenshot] = false
 			end
 			workset[:scenarios] << {name: scenario_name, steps: scenario_steps, screenshot: screenshot}
 		end
-		return line, file, workset
+		return line, workset
 	end
 
+	def self.process_tags(line, file, workset)
+		line, workset = tag_screenshot(line, file, workset)
+		line, workset = tag_feature(line, file, workset)
+		line, workset = tag_context(line, file, workset)
+		line, workset = tag_scenario(line, file, workset)
+		line = ParserHelper::read_line(file) unless ParserHelper.is_command?(line)
+		return line, workset
+	end
+
 	def self.parser(filename)
 
 		# Read input
 		file = read_file(filename)
 
@@ -70,19 +82,10 @@
 			scenarios: []
 		}
 
 		line = ParserHelper::read_line(file)
 		while (line)
-
-			line, file, workset = tag_screenshot(line, file, workset)
-
-			line, file, workset = tag_feature(line, file, workset)
-
-			line, file, workset = tag_context(line, file, workset)
-
-			line, file, workset = tag_scenario(line, file, workset)
-
-			line = ParserHelper::read_line(file) unless ParserHelper.is_comando?(line)
+			line, workset = process_tags(line,file,workset)
 		end
 		file.close
 
 		feature = {
 			feature_name: workset[:feature_name],