ruby-watchr 0.1.6.4 → 0.1.6.5

data/lib/watchr/analysers/flog.rb

@@ -46,7 +46,7 @@ module Watchr
         threshold = get_threshold(:very_complex, type)
         complexity = target.total_score >= threshold ? :very_complex : :complex
 
-        get_smell_type(complexity, type.upcase)
+        get_smell_type(complexity, type)
       end
 
       def get_threshold(complexity, type)
@@ -54,7 +54,7 @@ module Watchr
       end
 
       def get_smell_type(complexity, type)
-        Watchr::SmellTypes.const_get("#{complexity.upcase}_#{type.upcase}")
+        "#{complexity}_#{type}".to_sym
       end
     end
   end

data/lib/watchr/analysers/reek.rb

@@ -12,21 +12,21 @@ module Watchr
             smell.location['lines'].first
           )
 
-          type = case smell.smell['subclass']
-          when 'IrresponsibleModule' then IRRESPONSIBLE_MODULE
-          when 'DuplicateMethodCall' then DUPLICATE_METHOD_CALL
-          when 'NestedIterators' then NESTED_ITERATORS
-          when 'TooManyStatements' then TOO_MANY_STATEMENTS
-          when 'FeatureEnvy' then FEATURE_ENVY
-          when 'UtilityFunction' then UTILITY_FUNCTION
-          else nil
-          end
-
           add_smell(Watchr::Smell.new(
-            type, smell.location['context'], smell.smell['message'], location, {}
-          )) unless type.nil?
+            underscore(smell.smell['subclass']).to_sym, smell.location['context'], smell.smell['message'], location, {}
+          ))
         end
       end
+
+      private 
+
+      def underscore(text)
+        text.gsub(/::/, '/').
+        gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+        gsub(/([a-z\d])([A-Z])/,'\1_\2').
+        tr("-", "_").
+        downcase
+      end
     end
   end
 end

data/lib/watchr/rating.rb

@@ -16,16 +16,16 @@ module Watchr
 
     def rate(smell)
       case smell.type
-      when COMPLEX_METHOD,
-        VERY_COMPLEX_METHOD
+      when :complex_method,
+        :very_complex_method
         0.45 * smell.options[:score]
 
-      when COMPLEX_OBJECT,
-        VERY_COMPLEX_OBJECT
+      when :complex_object,
+        :very_complex_object
         0.65 * smell.options[:score]
 
-      when IDENTICAL_CODE,
-        SIMILAR_CODE
+      when :identical_code,
+        :similar_code
         smell.options[:mass]
       else
         0

data/lib/watchr/smell_types.rb

@@ -1,56 +1,33 @@
 module Watchr
   module SmellTypes
-    #
-    # Method complexity is high.
-    #
-    COMPLEX_METHOD = :complex_method
-
-    #
-    # Method complexity is very high.
-    #
-    VERY_COMPLEX_METHOD = :very_complex_method
-
-    #
-    # Object (class / module) total complexity is high.
-    #
-    COMPLEX_OBJECT = :complex_object
-
-    #
-    # Object (class / module) total complexity is very high.
-    #
-    VERY_COMPLEX_OBJECT = :very_complex_object
-
-    #
-    # Code in multiple places is identical.
-    #
-    IDENTICAL_CODE = :identical_code
-
-    #
-    # Code in multiple places is similar (not identical).
-    #
-    SIMILAR_CODE = :similar_code
-
-
-    IRRESPONSIBLE_MODULE = :irresponsible_module
-    DUPLICATE_METHOD_CALL = :duplicate_method_call
-    NESTED_ITERATORS = :nested_iterators
-    TOO_MANY_STATEMENTS = :too_many_statements
-    FEATURE_ENVY = :feature_envy
-    UTILITY_FUNCTION = :utility_function
-
     ALL_SMELLS = [
-      COMPLEX_METHOD,
-      VERY_COMPLEX_METHOD,
-      COMPLEX_OBJECT,
-      VERY_COMPLEX_OBJECT,
-      IDENTICAL_CODE,
-      SIMILAR_CODE,
-      IRRESPONSIBLE_MODULE,
-      DUPLICATE_METHOD_CALL,
-      NESTED_ITERATORS,
-      TOO_MANY_STATEMENTS,
-      FEATURE_ENVY,
-      UTILITY_FUNCTION
+      :complex_method,
+      :very_complex_method,
+      :complex_object,
+      :very_complex_object,
+
+      :identical_code,
+      :similar_code,
+
+      :attribute,
+      :boolean_parameter,
+      :class_variable,
+      :control_couple,
+      :data_clump,
+      :duplication,
+      :feature_envy,
+      :irresponsible_module,
+      :large_class,
+      :long_method,
+      :long_parameter_list,
+      :long_yield_list,
+      :nested_iterators,
+      :simulated_polymorphism,
+      :uncommunicative_method_name,
+      :uncommunicative_module_name,
+      :uncommunicative_parameter_name,
+      :uncommunicative_variable_name,
+      :utility_function
     ]
   end
 end

data/lib/watchr/version.rb

@@ -1,3 +1,3 @@
 module Watchr
-  VERSION = "0.1.6.4"
+  VERSION = "0.1.6.5"
 end

data/spec/watchr/analysers/flog_spec.rb

@@ -47,7 +47,7 @@ describe Watchr::Analysers::Flog do
 
     it 'should add smell for complex method' do
       Watchr::Smell.expects(:new).with(
-        Watchr::Smell::COMPLEX_METHOD,
+        :complex_method,
         complex_method.name,
         '',
         complex_method.location,
@@ -61,7 +61,7 @@ describe Watchr::Analysers::Flog do
 
     it 'should add smell for very complex method' do
       Watchr::Smell.expects(:new).with(
-        Watchr::Smell::VERY_COMPLEX_METHOD,
+        :very_complex_method,
         very_complex_method.name,
         '',
         very_complex_method.location,
@@ -75,7 +75,7 @@ describe Watchr::Analysers::Flog do
 
     it 'should add smell for very complex object' do
       Watchr::Smell.expects(:new).with(
-        Watchr::Smell::VERY_COMPLEX_OBJECT,
+        :very_complex_object,
         clazz.name,
         '',
         clazz.location,

data/spec/watchr/rating_spec.rb

@@ -5,7 +5,7 @@ describe Watchr::Rating do
 
   let(:complexity_smell) { 
     stub('smell', 
-      :type => Watchr::SmellTypes::COMPLEX_METHOD,
+      :type => :complex_method,
       :options => {:score => 29.3}
     )
   }
@@ -18,7 +18,7 @@ describe Watchr::Rating do
 
   let(:duplication_smell) { 
     stub('smell', 
-      :type => Watchr::SmellTypes::IDENTICAL_CODE,
+      :type => :identical_code,
       :options => {:mass => 72})
   }
 

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 1
   - 6
-  - 4
-  version: 0.1.6.4
+  - 5
+  version: 0.1.6.5
 platform: ruby
 authors: 
 - Petr Janda