simplabs-excellent 1.2.1 → 1.2.2

data/History.txt

@@ -1,3 +1,7 @@
+= 1.2.2
+
+* fixed specs
+
 = 1.2.1
 
 * renamed Error to Warning

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 1
 :minor: 2
-:patch: 1
+:patch: 2

data/lib/simplabs/excellent.rb

@@ -7,7 +7,7 @@ module Simplabs #:nodoc:
 
   module Excellent #:nodoc:
 
-    VERSION = '1.2.0'
+    VERSION = '1.2.2'
 
   end
 

data/spec/checks/abc_metric_method_check_spec.rb

@@ -11,26 +11,26 @@ describe Simplabs::Excellent::Checks::AbcMetricMethodCheck do
     describe 'when processing assignments' do
 
       it "should find =" do
-        content = <<-END
+        code = <<-END
           def method_name
             foo = 1
           end
         END
 
-        verify_content_score(content, 1, 0, 0)
+        verify_code_score(code, 1, 0, 0)
       end
 
       ['*=', '/=', '%=', '+=', '<<=', '>>=', '&=', '|=', '^=', '-=', '**='].each do |assignment|
 
         it "should find #{assignment}" do
-          content = <<-END
+          code = <<-END
             def method_name
               foo #{assignment} 1
             end
           END
 
           # these special assignments have score 2 since before the value is assigned, a method is called on the old value
-          verify_content_score(content, 1, 0, 1)
+          verify_code_score(code, 1, 0, 1)
         end
 
       end
@@ -40,33 +40,33 @@ describe Simplabs::Excellent::Checks::AbcMetricMethodCheck do
     describe 'when processing branches' do
 
       it 'should find a virtual method call' do
-        content = <<-END
+        code = <<-END
           def method_name
             call_foo
           end
         END
 
-        verify_content_score(content, 0, 1, 0)
+        verify_code_score(code, 0, 1, 0)
       end
 
       it 'should find an explicit method call' do
-        content = <<-END
+        code = <<-END
           def method_name
             @object.call_foo
           end
         END
 
-        verify_content_score(content, 0, 1, 0)
+        verify_code_score(code, 0, 1, 0)
       end
 
       it 'should exclude a condition' do
-        content = <<-END
+        code = <<-END
           def method_name
             @object.call_foo < 10
           end
         END
 
-        verify_content_score(content, 0, 1, 1)
+        verify_code_score(code, 0, 1, 1)
       end
 
     end
@@ -76,13 +76,13 @@ describe Simplabs::Excellent::Checks::AbcMetricMethodCheck do
       ['==', '!=', '<=', '>=', '<', '>', '<=>', '=~'].each do |conditional|
 
         it "should find #{conditional}" do
-          content = <<-END
+          code = <<-END
             def method_name
               @foo #{conditional} @bar
             end
           END
 
-          verify_content_score(content, 0, 0, 1)
+          verify_code_score(code, 0, 0, 1)
         end
 
       end 
@@ -90,27 +90,27 @@ describe Simplabs::Excellent::Checks::AbcMetricMethodCheck do
     end
 
     it 'should also work on singleton methods' do
-      content = <<-END
+      code = <<-END
         class Class
           def self.method_name
             foo = 1
           end
         end
       END
-      @excellent.check_content(content)
+      @excellent.check_code(code)
       warnings = @excellent.warnings
 
       warnings.should_not be_empty
       warnings[0].info.should        == { :method => 'Class.method_name', :score => 1.0 }
       warnings[0].line_number.should == 2
-      warnings[0].message.should     == "Class.method_name has abc score of 1.0."
+      warnings[0].message.should     == 'Class.method_name has abc score of 1.0.'
     end
 
   end
 
-  def verify_content_score(content, a, b, c)
+  def verify_code_score(code, a, b, c)
     score = Math.sqrt(a*a + b*b + c*c)
-    @excellent.check_content(content)
+    @excellent.check_code(code)
     warnings = @excellent.warnings
 
     warnings.should_not be_empty

data/spec/checks/assignment_in_conditional_check_spec.rb

@@ -9,76 +9,76 @@ describe Simplabs::Excellent::Checks::AssignmentInConditionalCheck do
   describe '#evaluate' do
 
     it 'should accept an assignment before an if clause' do
-      content = <<-END
+      code = <<-END
         count = count += 1 if @some_condition
       END
-      @excellent.check_content(content)
+      @excellent.check_code(code)
 
       @excellent.warnings.should be_empty
     end
 
     it 'should accept block parameters in an if clause' do
-      content = <<-END
+      code = <<-END
         return true if exp.children.any? { |child| contains_statements?(child) }
       END
-      @excellent.check_content(content)
+      @excellent.check_code(code)
 
       @excellent.warnings.should be_empty
     end
 
     it 'should reject assignments of results of blocks in an if clause' do
-      content = <<-END
+      code = <<-END
         return true if value = exp.children.find { |child| contains_statements?(child) }
       END
 
-      verify_warning_found(content)
+      verify_warning_found(code)
     end
 
     it 'should reject an assignment inside an if clause' do
-      content = <<-END
+      code = <<-END
         call_foo if bar = bam
       END
 
-      verify_warning_found(content)
+      verify_warning_found(code)
     end
 
     it 'should reject an assignment inside an unless clause' do
-      content = <<-END
+      code = <<-END
         call_foo unless bar = bam
       END
 
-      verify_warning_found(content)
+      verify_warning_found(code)
     end
 
     it 'should reject an assignment inside a while clause' do
-      content = <<-END
+      code = <<-END
         call_foo while bar = bam
       END
 
-      verify_warning_found(content)
+      verify_warning_found(code)
     end
 
     it 'should reject an assignment inside an until clause' do
-      content = <<-END
+      code = <<-END
         call_foo until bar = bam
       END
 
-      verify_warning_found(content)
+      verify_warning_found(code)
     end
 
     it 'should reject an assignment inside a ternary operator check clause' do
-      content = <<-END
+      code = <<-END
         call_foo (bar = bam) ? baz : bad
       END
 
       #RubyParser sets line number 2 here
-      verify_warning_found(content, 2)
+      verify_warning_found(code, 2)
     end
 
   end
 
-  def verify_warning_found(content, line_number = nil)
-    @excellent.check_content(content)
+  def verify_warning_found(code, line_number = nil)
+    @excellent.check_code(code)
     warnings = @excellent.warnings
 
     warnings.should_not be_empty

data/spec/checks/case_missing_else_check_spec.rb

@@ -9,26 +9,26 @@ describe Simplabs::Excellent::Checks::CaseMissingElseCheck do
   describe '#evaluate' do
 
     it 'should accept case statements that do have an else clause' do
-      content = <<-END
+      code = <<-END
         case foo
           when "bar": "ok"
           else "good"
           end
       END
-      @excellent.check_content(content)
+      @excellent.check_code(code)
       warnings = @excellent.warnings
 
       warnings.should be_empty
     end
 
     it 'should reject case statements that do not have an else clause' do
-      content = <<-END
+      code = <<-END
         case foo
           when "bar": "ok"
           when "bar": "bad"
           end
       END
-      @excellent.check_content(content)
+      @excellent.check_code(code)
       warnings = @excellent.warnings
 
       warnings.should_not be_empty

data/spec/checks/class_line_count_check_spec.rb

@@ -9,46 +9,46 @@ describe Simplabs::Excellent::Checks::ClassLineCountCheck do
   describe '#evaluate' do
 
     it 'should accept classes with less lines than the threshold' do
-      content = <<-END
+      code = <<-END
         class OneLineClass; end
       END
-      @excellent.check_content(content)
+      @excellent.check_code(code)
 
       @excellent.warnings.should be_empty
     end
 
     it 'should accept classes with the same number of lines as the threshold' do
-      content = <<-END
+      code = <<-END
         class ThreeLineClass
           @foo = 1
         end
       END
-      @excellent.check_content(content)
+      @excellent.check_code(code)
 
       @excellent.warnings.should be_empty
     end
 
     it 'should not count blank lines' do
-      content = <<-END
+      code = <<-END
         class ThreeLineClass
 
           @foo = 1
 
         end
       END
-      @excellent.check_content(content)
+      @excellent.check_code(code)
 
       @excellent.warnings.should be_empty
     end
 
     it 'should reject classes with more lines than the threshold' do
-      content = <<-END
+      code = <<-END
         class FourLineClass
           @foo = 1
           @bar = 2
         end
       END
-      @excellent.check_content(content)
+      @excellent.check_code(code)
       warnings = @excellent.warnings
 
       warnings.should_not be_empty

data/spec/checks/class_name_check_spec.rb

@@ -9,32 +9,32 @@ describe Simplabs::Excellent::Checks::ClassNameCheck do
   describe '#evaluate' do
 
     it 'should accept camel case class names starting in capitals' do
-      content = <<-END
+      code = <<-END
         class GoodClassName; end
       END
-      @excellent.check_content(content)
+      @excellent.check_code(code)
 
       @excellent.warnings.should be_empty
     end
 
     it 'should be able to parse scoped class names' do
-      content = <<-END
+      code = <<-END
         class Outer::Inner::GoodClassName 
           def method
           end
         end
       END
-      @excellent.check_content(content)
-
+      @excellent.check_code(code)
+s
       @excellent.warnings.should be_empty
     end
 
     it 'should reject class names with underscores' do
-      content = <<-END
+      code = <<-END
         class Bad_ClassName
         end
       END
-      @excellent.check_content(content)
+      @excellent.check_code(code)
       warnings = @excellent.warnings
 
       warnings.should_not be_empty

data/spec/checks/control_coupling_check_spec.rb

@@ -9,39 +9,39 @@ describe Simplabs::Excellent::Checks::ControlCouplingCheck do
   describe '#evaluate' do
 
     it 'should accept methods that just print out the parameter' do
-      content = <<-END
+      code = <<-END
         def write(quoted)
           pp quoted
         end
       END
-      @excellent.check_content(content)
+      @excellent.check_code(code)
       warnings = @excellent.warnings
 
       warnings.should be_empty
     end
 
     it 'should accept methods with ternary operators using an instance variable' do
-      content = <<-END
+      code = <<-END
         def write(quoted)
           @quoted ? write_quoted('1') : write_quoted('2')
         end
       END
 
-      @excellent.check_content(content)
+      @excellent.check_code(code)
       warnings = @excellent.warnings
 
       warnings.should be_empty
     end
 
     it 'should accept methods with ternary operators using a local variable' do
-      content = <<-END
+      code = <<-END
         def write(quoted)
           test = false
           test ? write_quoted('1') : write_quoted('2')
         end
       END
 
-      @excellent.check_content(content)
+      @excellent.check_code(code)
       warnings = @excellent.warnings
 
       warnings.should be_empty
@@ -50,7 +50,7 @@ describe Simplabs::Excellent::Checks::ControlCouplingCheck do
     %w(if unless).each do |conditional|
 
       it "should reject methods with #{conditional} checks using a parameter" do
-        content = <<-END
+        code = <<-END
           def write(quoted)
             #{conditional} quoted
               write_quoted('test')
@@ -58,23 +58,23 @@ describe Simplabs::Excellent::Checks::ControlCouplingCheck do
           end
         END
 
-        verify_warning_found(content)
+        verify_warning_found(code)
       end
 
     end
 
     it 'should reject methods with ternary operators using a parameter' do
-      content = <<-END
+      code = <<-END
         def write(quoted)
           quoted ? write_quoted('1') : write_quoted('2')
         end
       END
 
-      verify_warning_found(content)
+      verify_warning_found(code)
     end
 
     it "should reject methods with case statements using a parameter" do
-      content = <<-END
+      code = <<-END
         def write(quoted)
           case quoted
             when 1
@@ -85,13 +85,13 @@ describe Simplabs::Excellent::Checks::ControlCouplingCheck do
         end
       END
 
-      verify_warning_found(content)
+      verify_warning_found(code)
     end
 
   end
 
-  def verify_warning_found(content)
-    @excellent.check_content(content)
+  def verify_warning_found(code)
+    @excellent.check_code(code)
     warnings = @excellent.warnings
 
     warnings.should_not be_empty