kuniri 0.0.1 → 0.2

data/lib/kuniri/language/container_data/structured_and_oo/function_data.rb

@@ -7,11 +7,11 @@ module Languages
 
     public
 
-      attr_reader :parameters
-
+      # Initialize function data based on name.
+      # @param pFunctionName name string.
       def initialize(pFunctionName)
         super(pFunctionName)
-        @visibility = "global"
+        @type = GLOBAL_FUNCTION_DATA
       end
 
   # class

data/lib/kuniri/language/container_data/structured_and_oo/manager_basic_structure_data.rb

@@ -0,0 +1,55 @@
+require_relative 'basic_data'
+require_relative 'conditional_data'
+require_relative 'repetition_data'
+
+module Languages
+
+  # ManagerBasicStructureData Class responsible for management conditionals
+  # and repetition.
+  class ManagerBasicStructureData < Languages::BasicData
+
+    public
+
+      attr_accessor :basicStructure
+
+      def initialize
+        @basicStructure = []
+        @currentLevel = 0
+      end
+
+      # Add conditional to basicStructure
+      # @param pConditional ConditionalData to add inside basicStructure
+      def add_conditional(pConditional)
+        return nil unless pConditional.is_a?(Languages::ConditionalData)
+        pConditional.level = @currentLevel
+        @basicStructure.push(pConditional)
+      end
+
+      # Add repetition to basicStructure
+      # @param pRepetition RepetitionData to add inside basicStrure
+      def add_repetition(pRepetition)
+        return nil unless pRepetition.is_a?(Languages::RepetitionData)
+        pRepetition.level = @currentLevel
+        @basicStructure.push(pRepetition)
+      end
+
+      # Up current level
+      def up_level
+        @currentLevel -= 1 if @currentLevel > 0
+      end
+
+      # Add nested level, basically, if we have a lot of nested conditional or
+      # repetition we add one level for each nest.
+      def down_level
+        @currentLevel += 1
+      end
+
+    private
+
+      @currentLevel
+
+  # End class
+  end
+
+# End module
+end

data/lib/kuniri/language/container_data/structured_and_oo/method_data.rb

@@ -7,10 +7,11 @@ module Languages
 
     public
 
-      attr_reader :parameters
-
-      def initialize(pMethod_name)
-        super(pMethod_name)
+      # Initialize Method object, based on name.
+      # @param pMethodName Method name.
+      def initialize(pMethodName)
+        super(pMethodName)
+        @type = METHOD_DATA
       end
 
   # Class

data/lib/kuniri/language/container_data/structured_and_oo/module_namespace_data.rb

@@ -8,7 +8,9 @@ module Languages
     public
 
       def initialize(pName)
-          @name = pName
+      	return nil if pName.nil? or !pName.is_a? String
+
+        @name = pName
       end
 
   # Class

data/lib/kuniri/language/container_data/structured_and_oo/repetition_data.rb

@@ -1,20 +1,9 @@
-require_relative 'basic_data'
+require_relative 'basic_structure'
 
 module Languages
 
   # Class responsible for handling repetition data
-  class RepetitionData < Languages::BasicData
-
-    public
-
-      attr_accessor :type
-      attr_accessor :expression
-
-      def initialize
-        @name = "nothing"
-        @type = "none"
-        @expression = "empty"
-      end
+  class RepetitionData < Languages::BasicStructure
 
   # class
   end

data/lib/kuniri/language/container_data/structured_and_oo/variable_global_data.rb

@@ -11,6 +11,8 @@ module Languages
       attr_accessor :type
 
       def initialize(pName)
+        return nil if pName.nil? or !pName.is_a? String
+
         @name = pName
         @visibility = "global"
       end

data/lib/kuniri/language/language.rb

@@ -11,6 +11,7 @@ require_relative '../state_machine/OO_structured_fsm/oo_structured_state'
 require_relative '../state_machine/OO_structured_fsm/conditional_state'
 require_relative '../state_machine/OO_structured_fsm/repetition_state'
 require_relative '../state_machine/OO_structured_fsm/comment_state'
+require_relative '../state_machine/OO_structured_fsm/aggregation_state'
 
 # Module that keeps the language syntax.
 module Languages
@@ -37,6 +38,7 @@ module Languages
       attr_reader :conditionalState
       attr_reader :repetitionState
       attr_reader :commentState
+      attr_reader :aggregationState
 
       attr_reader :externRequirementHandler
       attr_reader :variableHandler
@@ -50,6 +52,9 @@ module Languages
       attr_reader :conditionalHandler
       attr_reader :repetitionHandler
       attr_reader :commentHandler
+      attr_reader :aggregationHandler
+
+      attr_reader :metadata
 
       attr_accessor :fileElements
 
@@ -57,6 +62,8 @@ module Languages
       # conditional information and repetition data.
       attr_accessor :flagFunctionBehaviour
 
+      attr_reader :countNestedCondLoop
+
       attr_accessor :string_comment_to_transfer
 
       # This method initialize all the needed states of state machine.
@@ -78,6 +85,8 @@ module Languages
         @repetitionState =
           StateMachine::OOStructuredFSM::RepetitionState.new(self)
         @commentState = StateMachine::OOStructuredFSM::CommentState.new(self)
+        @aggregationState =
+          StateMachine::OOStructuredFSM::AggregationState.new(self)
 
         @state = @idleState
         @previousState = []
@@ -85,6 +94,7 @@ module Languages
 
         @fileElements = []
         @flagFunctionBehaviour = nil
+        @countNestedCondLoop = 0
 
         @string_comment_to_transfer = ""
       end
@@ -138,16 +148,6 @@ module Languages
         @state = @previousState.pop
       end
 
-      # TODO: REMOVE IT
-      def get_name
-        return @name
-      end
-
-      # TODO: REMOVE IT
-      def get_path
-        return @path
-      end
-
       # Handling line
       def handle_line(pLine)
         @state.handle_line
@@ -204,17 +204,43 @@ module Languages
         @state.conditional_capture
       end
 
+      # Aggregation state.
+      def aggregation_capture
+        @state.aggregation_capture
+      end
+
       # keep track of state.
       def set_state (pState)
         @previousState.push(@state)
         @state = pState
       end
 
+      # Increase nested level
+      def moreNested
+        @countNestedCondLoop += 1
+      end
+
+      # Reduce nested level
+      def lessNested
+        @countNestedCondLoop -= 1 if @countNestedCondLoop > 0
+      end
+
+      # Verify if is nested or not
+      def isNested?
+        return true if @countNestedCondLoop > 0
+        return false
+      end
+
+      # Reset nested structure
+      def resetNested
+        @countNestedCondLoop = 0
+      end
+
     protected
 
       @languageType
       @source
-      
+
   # End class
   end
 

data/lib/kuniri/language/metadata.rb

@@ -0,0 +1,29 @@
+module Languages
+
+  # Keep important information for second parser.
+  class Metadata
+
+    public
+
+      private_class_method :new
+      attr_accessor :allClasses # !@attribute All classes to be analysed.
+      attr_accessor :allAggregations # !@attribute All aggregation in classes.
+
+      def initialize
+        @allClasses = []
+        @allAggregations = []
+      end
+
+      def Metadata.create
+        @@metadata = new unless @@metadata
+        return @@metadata
+      end
+
+    private
+
+      @@metadata = nil
+
+  # Class
+  end
+# Module
+end

data/lib/kuniri/language/ruby/aggregation_ruby.rb

@@ -0,0 +1,37 @@
+require_relative '../abstract_container/structured_and_oo/aggregation'
+require_relative '../../core/setting'
+require_relative '../container_data/structured_and_oo/aggregation_data'
+
+module Languages
+
+  module Ruby
+
+    # Ruby Handling Ruby aggregation
+    class AggregationRuby < Languages::Aggregation
+
+      public
+
+        # @param pLine Verify if line has a ruby aggregation.
+        # @return Return string or nil.
+        def get_aggregation(pLine)
+          result = detect_aggregation(pLine)
+          return nil unless result
+          return Languages::AggregationData.new(result)
+        end
+
+    protected
+
+      # Override
+      def detect_aggregation(pLine)
+        regexExp = /(\w*)\s*\.\s*new[\n|\s|\(]+/
+        return nil unless pLine =~ regexExp
+        return pLine[regexExp, 1]
+      end
+
+    #Class
+    end
+
+  # Ruby
+  end
+#Language
+end

data/lib/kuniri/language/ruby/attribute_ruby.rb

@@ -1,6 +1,5 @@
 require_relative '../abstract_container/structured_and_oo/attribute'
 require_relative '../container_data/structured_and_oo/attribute_data'
-require_relative '../../util/html_logger'
 require_relative '../../core/setting'
 
 module Languages
@@ -13,19 +12,16 @@ module Languages
       public
 
         def initialize
-          @log = @settings = Kuniri::Setting.create.log
           @attributeList = []
         end
 
-        # Get ruby attribute. 
+        # Get ruby attribute.
         # @param pLine Verify if line has a ruby attribute.
         # @return Return AttributeData or nil.
         def get_attribute(pLine)
           result = detect_attribute(pLine)
           return nil unless result
 
-          @log.write_log("Info: Prepare to get attribute.")
-
           listOfAttributes = []
 
           # Has comma? Split string by comma
@@ -34,13 +30,10 @@ module Languages
           # Separated by comma, equal or the common case
           if result.scan(/,/).count >= 1
             listOfAttributes = handle_multiple_declaration_with_comma(result)
-            @log.write_log("Debug: Declared with comma: #{listOfAttributes}")
           elsif result.scan(/=/).count > 1
             listOfAttributes = handle_multiple_declaration_with_equal(result)
-            @log.write_log("Debug: separed by comma: #{listOfAttributes}")
           else
             listOfAttributes = handle_line_declaration(result)
-            @log.write_log("Debug: One line declaration #{listOfAttributes}")
           end
 
           return listOfAttributes
@@ -71,59 +64,51 @@ module Languages
 
       # Override
       def handle_multiple_declaration_with_comma(pString)
-        listOfAttributes = []
-        pString = pString.split(",")
-        pString.each do |variable|
-          return nil if variable.scan(/=/).count > 1
-
+        return handle_multiple_declaration(pString, ",") do |variable|
           variable = variable.scan(/.*=/).join("") if variable =~ /.*=/
-
-          return nil if variable =~ /\./
-
-          variable = prepare_final_string(variable)
-          attribute = Languages::AttributeData.new(variable)
-          listOfAttributes.push(attribute)
+          variable
         end
-
-        return listOfAttributes
       end
 
       # Override
       def handle_multiple_declaration_with_equal(pString)
-        listOfAttributes = []
-        pString = pString.split("=")
-        pString.each do |variable|
-          return nil if variable =~ /\./
+        return handle_multiple_declaration(pString, "="){ |variable| variable }
+      end
 
-          variable = prepare_final_string(variable)
-          attribute = Languages::AttributeData.new(variable)
-          listOfAttributes.push(attribute)
-        end
+    private
 
-        return listOfAttributes
-      end
+      @attributeList
 
-      # Override
       def handle_line_declaration(pString)
-        listOfAttributes = []
+        return handle_line(pString){ |pString| pString }
+      end
+
+      def handle_line(pString)
         if pString =~ /=/
           pString = pString.scan(/.*=/).join("")
           return nil if pString =~ /\./
         end
 
+        pString = yield(pString)
+
         return nil if pString =~ /\./
 
         pString = prepare_final_string(pString)
         attribute = Languages::AttributeData.new(pString)
-        listOfAttributes.push(attribute)
 
-        return listOfAttributes
+        return [attribute]
       end
 
-    private
+      def handle_multiple_declaration(pString, pSplitChar)
+        listOfAttributes = []
+        pString = pString.split(pSplitChar)
+        pString.each do |variable|
+          attribute = handle_line(variable) { |pString| yield(pString) }
+          listOfAttributes.concat(attribute) if attribute
+        end
 
-      @log
-      @attributeList
+        return listOfAttributes
+      end
 
     #Class
     end

data/lib/kuniri/language/ruby/class_ruby.rb

@@ -1,6 +1,5 @@
 require_relative '../abstract_container/structured_and_oo/class'
 require_relative '../container_data/structured_and_oo/class_data'
-require_relative '../../util/html_logger'
 require_relative '../../core/setting'
 
 module Languages
@@ -13,7 +12,6 @@ module Languages
       public
 
         def initialize
-          @log = @settings = Kuniri::Setting.create.log
         end
 
         # Get ruby class.
@@ -22,8 +20,6 @@ module Languages
           result = detect_class(pLine)
           return nil unless result
 
-          @log.write_log("Info: Detect class")
-
           classCaptured = Languages::ClassData.new
 
           inheritance = get_inheritance(result)
@@ -32,8 +28,6 @@ module Languages
           result = prepare_final_string(result)
           classCaptured.name = result
 
-          @log.write_log("Debug: Class: #{classCaptured.name}")
-
           return classCaptured
         end
 
@@ -49,7 +43,7 @@ module Languages
         # Override
         def get_inheritance(pString)
           if pString =~ /</
-            partial = pString.scan(/<(.*)/)
+            partial = pString.scan(/<\s*(\w+)/)
             return remove_unnecessary_information(partial)
           end
           return nil
@@ -71,11 +65,9 @@ module Languages
 
     private
 
-      @log
-
     # class
     end
-  
+
   # Ruby
   end