kuniri 0.0.1 → 0.2

data/lib/kuniri/state_machine/OO_structured_fsm/include_state.rb

@@ -16,7 +16,7 @@ module StateMachine
       # @see OOStructuredState
       def handle_line(pLine)
         idle_capture
-        # TODO: HANDLING MULTIPLE LINE COMMENT.
+        # TODO: HANDLING MULTIPLE LINE.
         #if @language.idleHandler.get_idle(pLine)
         #  idle_capture
         #else
@@ -34,11 +34,10 @@ module StateMachine
 
         requirement = @language.externRequirementHandler.get_requirement(pLine)
 
-        if requirement 
+        if requirement
          pElementFile.add_extern_requirement(requirement)
         end
 
-        # TODO: You have to handler the return state.
         idle_capture
 
         if (@language.state.is_a? StateMachine::OOStructuredFSM::IdleState)

data/lib/kuniri/state_machine/OO_structured_fsm/method_state.rb

@@ -1,62 +1,20 @@
 require_relative 'oo_structured_state'
+require_relative 'token_state_machine'
+require_relative 'function_behaviour_state'
 
 module StateMachine
 
   module OOStructuredFSM
 
     # Class responsible for handling Method state.
-    class MethodState < OOStructuredState
-
-      @language
+    class MethodState < FunctionBehaviourState
 
       def initialize(pLanguage)
-        @language = pLanguage
-      end
-
-      # @see OOStructuredState
-      def handle_line(pLine)
-        if @language.conditionalHandler.get_conditional(pLine)
-          conditional_capture
-        elsif @language.repetitionHandler.get_repetition(pLine)
-          repetition_capture
-        else
-          return
-        end
-      end
-
-      # @see OOStructuredState
-      def class_capture
-        @language.rewind_state
-      end
-
-      # @see OOStructuredState
-      def conditional_capture
-        @language.flagFunctionBehaviour = StateMachine::METHOD_STATE
-        @language.set_state(@language.conditionalState)
-      end
-
-      # @see OOStructuredState
-      def repetition_capture
-        @language.flagFunctionBehaviour = StateMachine::METHOD_STATE
-        @language.set_state(@language.repetitionState)
-      end
-
-      # @see OOStructuredState
-      def execute(pElementFile, pLine)
-        methodElement = @language.methodHandler.get_function(pLine)
-
-        if (methodElement)
-          lastIndex = pElementFile.classes.length - 1 # We want the index
-          methodElement.comments = @language.string_comment_to_transfer
-          @language.string_comment_to_transfer = ""
-          pElementFile.classes[lastIndex].add_method(methodElement)
-        end
-
-        if (@language.endBlockHandler.has_end_of_block?(pLine))
-          class_capture
-        end
-
-        return pElementFile
+        super(
+          pLanguage,
+          flagState: StateMachine::METHOD_STATE,
+          functionId: StateMachine::METHOD_LABEL
+        )
       end
 
     # End class

data/lib/kuniri/state_machine/OO_structured_fsm/oo_structured_state.rb

@@ -64,7 +64,12 @@ module StateMachine
         raise NotImplementedError
       end
 
-      # Handling conditional state
+      # Handling aggregation state
+      def aggregation_capture
+        raise NotImplementedError
+      end
+
+      # Handling repetition state
       def repetition_capture
         raise NotImplementedError
       end

data/lib/kuniri/state_machine/OO_structured_fsm/repetition_state.rb

@@ -1,79 +1,30 @@
-require_relative 'oo_structured_state'
+require_relative 'basic_structure_state'
+require_relative '../../language/abstract_container/structured_and_oo/global_tokens.rb'
 
 module StateMachine
 
   module OOStructuredFSM
 
     # Class responsible for handling Repetition state.
-    class RepetitionState < OOStructuredState
+    class RepetitionState < BasicStructureState
 
       @language
 
       def initialize(pLanguage)
         @language = pLanguage
+        @whoAmI = "repetition"
       end
 
-        def handle_line(pLine)
-        end
-
-      # @see OOStructuredState
-      def method_capture
-        reset_flag
-        @language.rewind_state
-      end
-
-      # @see OOStructuredState
-      def constructor_capture
-        reset_flag
-        @language.rewind_state
-      end
-
-      # @see OOStructuredState
-      def function_capture
-        reset_flag
-        @language.rewind_state
-      end
-
-      # @see OOStructuredState
-      def execute(pElementFile, pLine)
-        repetition = @language.repetitionHandler.get_repetition(pLine)
-
-        flag = @language.flagFunctionBehaviour
+      protected
 
-        if (repetition)
-          #Function
-          if (flag == StateMachine::GLOBAL_FUNCTION_STATE)
-            pElementFile.global_functions.last.add_repetition(repetition)
-          #Method
-          elsif (flag == StateMachine::METHOD_STATE)
-            pElementFile.classes.last.methods.last.add_repetition(repetition)
-          #Constructor
-          elsif (flag == StateMachine::CONSTRUCTOR_STATE)
-            pElementFile.classes.last.constructors
-                        .last.add_repetition(repetition)
+        # @see basic_structure_state
+        def addBasicStructure(pLine, pFlag, pClassIndex, pElementFile)
+          repetition = @language.repetitionHandler.get_repetition(pLine)
+          if (repetition)
+            addToCorrectElement(repetition, pElementFile, pFlag, pClassIndex)
           end
         end
 
-        if (@language.endBlockHandler.has_end_of_block?(pLine))
-          if (flag == StateMachine::GLOBAL_FUNCTION_STATE)
-            function_capture
-          elsif (flag == StateMachine::METHOD_STATE)
-            method_capture
-          elsif (flag == StateMachine::CONSTRUCTOR_STATE)
-            constructor_capture
-          end
-        end
-
-        return pElementFile
-
-      end
-
-      private
-
-        # @see OOStructuredState
-        def reset_flag
-          @language.flagFunctionBehaviour = StateMachine::NONE_HANDLING_STATE
-        end
 
     # End class
     end

data/lib/kuniri/state_machine/OO_structured_fsm/token_state_machine.rb

@@ -5,4 +5,8 @@ module StateMachine
   CONSTRUCTOR_STATE         ||= 2       # Constructor state track.
   METHOD_STATE              ||= 3       # Method state track.
 
+  METHOD_LABEL          ||= "method"
+  CONSTRUCTOR_LABEL     ||= "constructor"
+  FUNCTION_LABEL        ||= "function"
+
 end

data/lib/kuniri/state_machine/OO_structured_fsm/variable_state.rb

@@ -34,7 +34,6 @@ module StateMachine
           pElementFile.add_global_variable(variableList)
         end
 
-        # TODO: You have to handler the return state.
         idle_capture
         return pElementFile
       end

data/lib/kuniri/version.rb

@@ -1,3 +1,3 @@
 module Kuniri
-  VERSION = "0.0.1"
+  VERSION = "0.2"
 end

data/spec/core/kuniri_spec.rb

@@ -4,7 +4,8 @@ RSpec.describe Kuniri::Kuniri do
 
   context "When path for run_analysis is wrong." do
     it "Wrong path to " do
-      @kuniriTest = Kuniri::Kuniri.new("wrong/path")
+      @kuniriTest = Kuniri::Kuniri.new
+      @kuniriTest.read_configuration_file('./wrong/path')
       defaultPath = @kuniriTest.run_analysis
       folderFiles = Dir[File.join("./", "**", "**.rb")]
       expect(defaultPath).to match_array(folderFiles)

data/spec/core/setting_spec.rb

@@ -3,24 +3,20 @@ require_relative '../spec_helper'
 RSpec.describe Kuniri::Setting do
 
   def write_kuniri_file(parameter)
-    File.open(".kuniri", 'w') do |file|
-      file.write("language" + parameter[0] + "\n")
-      file.write("source" + parameter[1] + "\n")
-      file.write("output" + parameter[2] + "\n")
-      file.write("extract" + parameter[3] + "\n")
-      file.write("log" + parameter[4] + "\n")
+    File.open(".kuniri-test.yml", 'w') do |file|
+      file.write(":language: " + parameter[0] + "\n")
+      file.write(":source: " + parameter[1] + "\n")
+      file.write(":output: " + parameter[2] + "\n")
     end
   end
 
-  before :all do
-    File.open(".kuniri", 'w') do |file|
-      file.write("language:ruby" + "\n")
-      file.write("source:xpto" + "\n")
-      file.write("output:xpto/2" + "\n")
-      file.write("extract:uml,traceability" + "\n")
-      file.write("log:html\n")
+  before :each do
+    File.open(".kuniri-test.yml", 'w') do |file|
+      file.write(":language: ruby" + "\n")
+      file.write(":source: xpto" + "\n")
+      file.write(":output: xpto/2" + "\n")
     end
-    @settings = Kuniri::Setting.create 
+    @settings = Kuniri::Setting.create
   end
 
   context "When setting is created." do
@@ -34,81 +30,59 @@ RSpec.describe Kuniri::Setting do
     it "Wrong path, get default configuration" do
       defaultConf = @settings.read_configuration_file("wrong/path")
       expect(defaultConf).to include(
-            "language" => "ruby", 
-            "source" => "./", 
-            "output" => "./", 
-            "extract" => "uml",
-            "log" => "html")
-    end
-
-    it "Syntax error: not use ':'." do
-      write_kuniri_file(["=ruby", ":../app/", ":./", ">uml", ":html"])
-      expect{@settings.read_configuration_file(".kuniri")}.to raise_error(
-        Error::ConfigurationFileError)
+            :language => "ruby",
+            :source => "./",
+            :output => "./")
     end
 
     it "Syntax error: not valid language." do
-      write_kuniri_file([":k", ":../app/", ":./", ":uml", ":html"])
-      expect{@settings.read_configuration_file(".kuniri")}.to raise_error(
+      write_kuniri_file(["k", "../app/", "./"])
+      expect{@settings.read_configuration_file(".kuniri-test.yml")}.to raise_error(
         Error::ConfigurationFileError)
     end
 
     it "Syntax error: wrong source directory." do
-      write_kuniri_file([":ruby", ":xpto/", ":./", ":uml", ":html"])
-      expect{@settings.read_configuration_file(".kuniri")}.to raise_error(
+      write_kuniri_file(["ruby", "xpto/", "./"])
+      expect{@settings.read_configuration_file(".kuniri-test.yml")}.to raise_error(
         Error::ConfigurationFileError)
     end
 
     it "Syntax error: wrong output directory." do
-      write_kuniri_file([":ruby", ":../app/", ":xpto/", ":uml", ":html"])
-      expect{@settings.read_configuration_file(".kuniri")}.to raise_error(
+      write_kuniri_file(["ruby", "../app/", "xpto/"])
+      expect{@settings.read_configuration_file(".kuniri-test.yml")}.to raise_error(
         Error::ConfigurationFileError)
     end
 
-    it "Syntax error: wrong extract." do
-      write_kuniri_file([":ruby", ":../app/", ":./", ":umg", ":html"])
-      expect{@settings.read_configuration_file(".kuniri")}.to raise_error(
-          Error::ConfigurationFileError)
-    end
-
   end
 
   context "When input is correct." do
     it "Correct return." do
-      write_kuniri_file([":ruby", ":./", ":./", ":uml", ":html"])
-      hash_config = @settings.read_configuration_file(".kuniri")
+      write_kuniri_file(["ruby", "./", "./"])
+      hash_config = @settings.read_configuration_file(".kuniri-test.yml")
       expect(hash_config).to include(
-            "language" => "ruby", 
-            "source" => "./", 
-            "output" => "./", 
-            "extract" => "uml",
-            "log" => "html")
+            :language => "ruby",
+            :source => "./",
+            :output => "./")
     end
 
     it "Correct return, different parameters." do
-      write_kuniri_file([":ruby", ":./", ":./", ":uml", ":txt"])
-      hash_config = @settings.read_configuration_file(".kuniri")
+      write_kuniri_file(["ruby", "./", "./"])
+      hash_config = @settings.read_configuration_file(".kuniri-test.yml")
       expect(hash_config).to include(
-            "language" => "ruby", 
-            "source" => "./", 
-            "output" => "./", 
-            "extract" => "uml",
-            "log" => "txt")
+            :language => "ruby",
+            :source => "./",
+            :output => "./")
     end
 
 
-    it "Correct return: Case sensitive language." do
-      write_kuniri_file([":ruBy", ":lib/", ":./", ":uMl, traCeaBilitY", ":txt"])
-      expect(@settings.read_configuration_file(".kuniri")).to include(
-            "language" => "ruby",
-            "source" => "lib/", 
-            "output" => "./", 
-            "extract" => "uml,traceability",
-            "log" => "txt")
+    it "Not right: Case sensitive language." do
+      write_kuniri_file(["ruBy", "lib/", "./"])
+      expect{@settings.read_configuration_file(".kuniri-test.yml")}.to raise_error(
+         Error::ConfigurationFileError)
     end
   end
 
-  after :all do
-    File.delete(".kuniri")
+  after :each do
+    File.delete(".kuniri-test.yml")
   end
 end

data/spec/language/abstract_container/aggregation_spec.rb

@@ -0,0 +1,13 @@
+require_relative '../../spec_helper'
+
+RSpec.describe Languages::Aggregation do
+
+  context "When not implemented" do
+    it "Get aggregation" do
+      aggregationAbstract = Languages::Aggregation.new
+      expect{aggregationAbstract.get_aggregation("abc.new")}.to raise_error(
+              NotImplementedError)
+    end
+  end
+
+end

data/spec/language/abstract_container/extern_requirement_spec.rb

@@ -0,0 +1,13 @@
+require_relative '../../spec_helper'
+
+RSpec.describe Languages::ExternRequirement do
+
+  context "When not implemented" do
+    it "Get requirement" do
+      externAbstract = Languages::ExternRequirement.new
+      expect{externAbstract.get_requirement("nothing")}.to raise_error(
+              NotImplementedError)
+    end
+  end
+
+end

data/spec/language/container_data/structured_and_oo/aggregation_data_spec.rb

@@ -0,0 +1,29 @@
+require_relative '../../../spec_helper'
+
+RSpec.describe Languages::AggregationData do
+
+  before :all do
+    @aggregationData = Languages::AggregationData.new("xpto")
+  end
+
+  context "# Aggregation data" do
+    it "Get name" do
+      expect(@aggregationData.name).to eq("xpto")
+
+      @aggregationData.name = "banana"
+      expect(@aggregationData.name).to eq("banana")
+    end
+
+    it "Does not set name" do
+      @aggregationData = Languages::AggregationData.new(nil)
+      expect(@aggregationData.name).to be_nil
+      @aggregationData = Languages::AggregationData.new(1)
+      expect(@aggregationData.name).to be_nil
+    end
+  end
+
+  after :all do
+    @aggregationData = nil
+  end
+
+end

data/spec/language/container_data/structured_and_oo/attribute_data_spec.rb

@@ -23,10 +23,17 @@ RSpec.describe Languages::AttributeData do
       @attributeData.visibility = "protected"
       expect(@attributeData.visibility).to eq("protected")
     end
-  end 
+
+    it "Does not set name" do
+      @attributeData = Languages::AttributeData.new(nil)
+      expect(@attributeData.name).to be_nil
+      @attributeData = Languages::AttributeData.new(1)
+      expect(@attributeData.name).to be_nil
+    end
+  end
 
   after :all do
     @attributeData = nil
   end
 
-end 
+end