Merge remote-tracking branch 'jpmckinney_github/okcheck' into rails-3-develop

6 files changed, 13 insertions, 31 deletions

diff --git a/lib/health_checks/checks/days_ago_check.rb b/lib/health_checks/checks/days_ago_check.rb
index 9e574fe95..3c1cb784f 100644
--- a/lib/health_checks/checks/days_ago_check.rb
+++ b/lib/health_checks/checks/days_ago_check.rb
@@ -20,7 +20,7 @@ module HealthChecks
                 "#{ super }: #{ subject.call }"
             end
 
-            def check
+            def ok?
                 subject.call >= days.days.ago
             end
 
diff --git a/lib/health_checks/health_checkable.rb b/lib/health_checks/health_checkable.rb
index f71ca36ca..1e324c1c7 100644
--- a/lib/health_checks/health_checkable.rb
+++ b/lib/health_checks/health_checkable.rb
@@ -13,12 +13,8 @@ module HealthChecks
             self.class.to_s
         end
 
-        def check
-            raise NotImplementedError
-        end
-
         def ok?
-            check ? true : false
+            raise NotImplementedError
         end
 
         def message
diff --git a/lib/health_checks/health_checks.rb b/lib/health_checks/health_checks.rb
index 54cb0d96b..6c98365fc 100644
--- a/lib/health_checks/health_checks.rb
+++ b/lib/health_checks/health_checks.rb
@@ -32,7 +32,7 @@ module HealthChecks
     private
 
     def assert_valid_check(check)
-        check.respond_to?(:check)
+        check.respond_to?(:ok?)
     end
 
 end
diff --git a/spec/lib/health_checks/checks/days_ago_check_spec.rb b/spec/lib/health_checks/checks/days_ago_check_spec.rb
index 829b8e71e..4fbc1913b 100644
--- a/spec/lib/health_checks/checks/days_ago_check_spec.rb
+++ b/spec/lib/health_checks/checks/days_ago_check_spec.rb
@@ -16,16 +16,16 @@ describe HealthChecks::Checks::DaysAgoCheck do
         expect(check.days).to eq(4)
     end
 
-    describe :check do
+    describe :ok? do
 
         it 'is successful if the subject is in the last day' do
             check = HealthChecks::Checks::DaysAgoCheck.new { Time.now }
-            expect(check.check).to be_true
+            expect(check.ok?).to be_true
         end
 
         it 'fails if the subject is over a day ago' do
             check = HealthChecks::Checks::DaysAgoCheck.new { 2.days.ago }
-            expect(check.check).to be_false
+            expect(check.ok?).to be_false
         end
 
     end
diff --git a/spec/lib/health_checks/health_checkable_spec.rb b/spec/lib/health_checks/health_checkable_spec.rb
index 301585bbd..59d76c337 100644
--- a/spec/lib/health_checks/health_checkable_spec.rb
+++ b/spec/lib/health_checks/health_checkable_spec.rb
@@ -32,24 +32,10 @@ describe HealthChecks::HealthCheckable do
 
     end
 
-    describe :check do
-
-        it 'is intended to be overridden by the includer' do
-            expect{ @subject.check }.to raise_error(NotImplementedError)
-        end
-
-    end
-
     describe :ok? do
 
-        it 'returns true if the check was successful' do
-            @subject.stub(:check => true)
-            expect(@subject.ok?).to be_true
-        end
-
-        it 'returns false if the check failed' do
-            @subject.stub(:check => false)
-            expect(@subject.ok?).to be_false
+        it 'is intended to be overridden by the includer' do
+            expect{ @subject.ok? }.to raise_error(NotImplementedError)
         end
 
     end
@@ -93,7 +79,7 @@ describe HealthChecks::HealthCheckable do
         context 'if the check succeeds' do
 
             before(:each) do
-                @subject.stub(:check => true)
+                @subject.stub(:ok? => true)
             end
 
             it 'returns the default success message' do
@@ -110,7 +96,7 @@ describe HealthChecks::HealthCheckable do
         context 'if the check fails' do
 
             before(:each) do
-                @subject.stub(:check => false)
+                @subject.stub(:ok? => false)
             end
 
             it 'returns the default failure message' do
diff --git a/spec/lib/health_checks/health_checks_spec.rb b/spec/lib/health_checks/health_checks_spec.rb
index 335e10b3a..0b97725db 100644
--- a/spec/lib/health_checks/health_checks_spec.rb
+++ b/spec/lib/health_checks/health_checks_spec.rb
@@ -7,7 +7,7 @@ describe HealthChecks do
     describe :add do
 
         it 'adds a check to the collection and returns the check' do
-            check = double('MockCheck', :check => true)
+            check = double('MockCheck', :ok? => true)
             expect(add(check)).to eq(check)
         end
 
@@ -21,8 +21,8 @@ describe HealthChecks do
     describe :all do
 
         it 'returns all the checks' do
-            check1 = double('MockCheck', :check => true)
-            check2 = double('AnotherCheck', :check => false)
+            check1 = double('MockCheck', :ok? => true)
+            check2 = double('AnotherCheck', :ok? => false)
             add(check1)
             add(check2)
             expect(all).to include(check1, check2)