easymon 1.6.2 → 1.6.4

data/test/dummy/public/icon.svg

@@ -0,0 +1,3 @@
+<svg width="512" height="512" xmlns="http://www.w3.org/2000/svg">
+  <circle cx="256" cy="256" r="256" fill="red"/>
+</svg>

data/test/dummy/tmp/local_secret.txt

@@ -0,0 +1 @@
+69d142a16a2f12228584cd763b3a304b81a860016191866149145dfd1a343cbc7240b4ab51e2eb4c3f08ffd3f71a8d6b11aff2dc711209df99b151ef88ef540c

data/test/helpers/easymon/checks_helper_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 module Easymon
   class ChecksHelperTest < ActionView::TestCase

data/test/integration/navigation_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 class NavigationTest < ActionDispatch::IntegrationTest
   fixtures :all
@@ -7,4 +7,3 @@ class NavigationTest < ActionDispatch::IntegrationTest
   #   assert true
   # end
 end
-

data/test/test_helper.rb

@@ -19,7 +19,7 @@ class ActiveSupport::TestCase
     # This is needed to prevent leakage between tests, the Easymon::Repository
     # will remember all checks added to it, regardless of what test it was
     # added in
-    Easymon::Repository.names.each {|name| Easymon::Repository.remove(name)}
+    Easymon::Repository.names.each { |name| Easymon::Repository.remove(name) }
   end
 end
 
@@ -28,10 +28,10 @@ class ActionController::TestCase
     # This is needed to prevent leakage between tests, the Easymon::Repository
     # will remember all checks added to it, regardless of what test it was
     # added in
-    Easymon::Repository.names.each {|name| Easymon::Repository.remove(name)}
+    Easymon::Repository.names.each { |name| Easymon::Repository.remove(name) }
   end
 end
 
 # setting up mocha *after* we load the test libraries as per
 # http://gofreerange.com/mocha/docs/
-require 'mocha/minitest'
+require "mocha/minitest"

data/test/unit/checklist_test.rb

@@ -1,9 +1,9 @@
-require 'test_helper'
+require "test_helper"
 
 class ChecklistTest < ActiveSupport::TestCase
   def setup
     Easymon::Repository.add("database", Easymon::ActiveRecordCheck.new(ActiveRecord::Base))
-    Easymon::Repository.add("redis", Easymon::RedisCheck.new(YAML.load_file(Rails.root.join("config/redis.yml"))[Rails.env].symbolize_keys))
+    Easymon::Repository.add("redis", Easymon::RedisCheck.new(YAML.load_file(Rails.root.join("config/redis.yml"), aliases: true)[Rails.env].symbolize_keys))
     Easymon::Repository.add("memcached", Easymon::MemcachedCheck.new(Rails.cache))
   end
 
@@ -34,9 +34,9 @@ class ChecklistTest < ActiveSupport::TestCase
   test "#timing is a sum of all check results" do
     checklist = Easymon::Repository.all
     # Fake some results
-    checklist.results = %w(one two three).inject({}) do |hash, name|
+    checklist.results = %w[one two three].inject({}) do |hash, name|
       timing = 1.2
-      hash[name] = Easymon::Result.new([name, "dummy message"], timing)
+      hash[name] = Easymon::Result.new([ name, "dummy message" ], timing)
       hash
     end
 
@@ -77,4 +77,4 @@ class ChecklistTest < ActiveSupport::TestCase
 
     assert checklist.fetch("database")[:check].instance_of? Easymon::ActiveRecordCheck
   end
-end
+end

data/test/unit/checks/active_record_check_on_postgresql_test.rb

@@ -1,7 +1,6 @@
-require 'test_helper'
+require "test_helper"
 
 class ActiveRecordCheckOnPostgresqlTest < ActiveSupport::TestCase
-
   test "#check returns a successful result on a good run" do
     check = create_check
     results = check.check

data/test/unit/checks/active_record_check_test.rb

@@ -1,7 +1,6 @@
-require 'test_helper'
+require "test_helper"
 
 class ActiveRecordCheckTest < ActiveSupport::TestCase
-
   test "#check returns a successful result on a good run" do
     check = create_check
     results = check.check

data/test/unit/checks/active_record_mysql_writeable_check_test.rb

@@ -1,7 +1,6 @@
-require 'test_helper'
+require "test_helper"
 
 class ActiveRecordMysqlWriteableCheckTest < ActiveSupport::TestCase
-
   test "#check returns a successful result on a good run" do
     check = create_check
     results = check.check
@@ -12,7 +11,7 @@ class ActiveRecordMysqlWriteableCheckTest < ActiveSupport::TestCase
 
   test "#check returns a failed result on a failed run" do
     # Return a mock'd object that responds to .entries that returns [[0]]
-    ActiveRecord::Base.connection.stubs(:execute).returns(mock().stubs(:entries).returns([[1]]))
+    ActiveRecord::Base.connection.stubs(:execute).returns(mock().stubs(:entries).returns([ [ 1 ] ]))
     check = create_check
     results = check.check
 

data/test/unit/checks/http_check_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 class HttpCheckTest < ActiveSupport::TestCase
   test "#run sets success conditions on successful run" do
@@ -10,7 +10,7 @@ class HttpCheckTest < ActiveSupport::TestCase
     assert_equal("Up", results[1])
     assert_equal(true, results[0])
   end
-  
+
   test "#run sets failure conditions on a failed run" do
     Net::HTTP.any_instance.stubs(:request).returns(Net::HTTPNotFound.new(1.1, 404, "Not Found"))
 
@@ -30,7 +30,7 @@ class HttpCheckTest < ActiveSupport::TestCase
     assert_equal("Down", results[1])
     assert_equal(false, results[0])
   end
-  
+
   test "given nil as a url" do
     check = Easymon::HttpCheck.new(nil)
     results = check.check

data/test/unit/checks/memcached_check_test.rb

@@ -1,22 +1,21 @@
-require 'test_helper'
+require "test_helper"
 
 class MemcachedCheckTest < ActiveSupport::TestCase
-  
   test "#run sets success conditions on successful run" do
     Rails.cache.stubs(:write).returns(true)
     Rails.cache.stubs(:read).returns(1)
     check = Easymon::MemcachedCheck.new(Rails.cache)
     results = check.check
-    
+
     assert_equal("Up", results[1])
     assert_equal(true, results[0])
   end
-  
+
   test "#run sets failure conditions on a failed run" do
     Rails.cache.stubs(:write).raises("boom")
     check = Easymon::MemcachedCheck.new(Rails.cache)
     results = check.check
-    
+
     assert_equal("Down", results[1])
     assert_equal(false, results[0])
   end
@@ -30,12 +29,11 @@ class MemcachedCheckTest < ActiveSupport::TestCase
   end
 
   test "fails when passed a cache with no servers" do
-    dalli = Dalli::Client.new('', {:namespace => "easymon"})
+    dalli = Dalli::Client.new("", { namespace: "easymon" })
     check = Easymon::MemcachedCheck.new(dalli)
     results = check.check
 
     assert_equal("Down", results[1])
-    assert_equal(false, results[0])    
+    assert_equal(false, results[0])
   end
-
 end

data/test/unit/checks/multi_active_record_check_test.rb

@@ -0,0 +1,73 @@
+require "test_helper"
+
+class MultiActiveRecordCheckTest < ActiveSupport::TestCase
+  test "#run sets success conditions on successful run" do
+    primary = ActiveRecord::Base.connection
+    primary_replica = Easymon::PrimaryReplica.connection
+    other_replica = Easymon::OtherReplica.connection
+
+    check = Easymon::MultiActiveRecordCheck.new do
+      {
+        "Primary": primary, "PrimaryReplica": primary_replica, "OtherReplica": other_replica
+      }
+    end
+    results = check.check
+
+    assert_equal("Primary: Up - PrimaryReplica: Up - OtherReplica: Up", results[1])
+    assert_equal(true, results[0])
+  end
+
+  test "#run sets failed conditions when replica is down" do
+    primary = ActiveRecord::Base.connection
+    primary_replica = Easymon::PrimaryReplica.connection
+    other_replica = Easymon::OtherReplica.connection
+
+    primary_replica.stubs(:active?).raises("boom")
+
+    check = Easymon::MultiActiveRecordCheck.new do
+      {
+        "Primary": primary, "PrimaryReplica": primary_replica, "OtherReplica": other_replica
+      }
+    end
+    results = check.check
+
+    assert_equal("Primary: Up - PrimaryReplica: Down - OtherReplica: Up", results[1])
+    assert_equal(false, results[0])
+  end
+
+  test "#run sets failed conditions when primary is down" do
+    primary = ActiveRecord::Base.connection
+    primary_replica = Easymon::PrimaryReplica.connection
+    other_replica = Easymon::OtherReplica.connection
+
+    primary.stubs(:active?).raises("boom")
+
+    check = Easymon::MultiActiveRecordCheck.new do
+      {
+        "Primary": primary, "PrimaryReplica": primary_replica, "OtherReplica": other_replica
+      }
+    end
+    results = check.check
+
+    assert_equal("Primary: Down - PrimaryReplica: Up - OtherReplica: Up", results[1])
+    assert_equal(false, results[0])
+  end
+
+  test "given nil as a config" do
+    check = Easymon::MultiActiveRecordCheck.new { }
+    results = check.check
+    assert_equal("", results[1])
+    assert_equal(false, results[0])
+  end
+end
+
+# This would be done in the host app
+module Easymon
+  class PrimaryReplica < ActiveRecord::Base
+    establish_connection :primary_replica
+  end
+
+  class OtherReplica < ActiveRecord::Base
+    establish_connection :other_replica
+  end
+end

data/test/unit/checks/redis_check_test.rb

@@ -1,36 +1,35 @@
-require 'test_helper'
+require "test_helper"
 
 class RedisCheckTest < ActiveSupport::TestCase
-  
   test "#run sets success conditions on successful run" do
     Redis.any_instance.stubs(:ping).returns("PONG")
     check = create_check
     results = check.check
-    
+
     assert_equal("Up", results[1])
     assert_equal(true, results[0])
   end
-  
+
   test "#run sets failure conditions on a failed run" do
     Redis.any_instance.stubs(:ping).raises("boom")
     check = create_check
     results = check.check
-    
+
     assert_equal("Down", results[1])
     assert_equal(false, results[0])
   end
-  
+
   test "given nil as a config" do
     check = Easymon::RedisCheck.new(nil)
     results = check.check
     assert_equal("Down", results[1])
     assert_equal(false, results[0])
   end
-  
-  
+
+
   private
   def create_check
     # Get us a config hash from disk in this case
-    Easymon::RedisCheck.new(YAML.load_file(Rails.root.join("config/redis.yml"))[Rails.env].symbolize_keys)
+    Easymon::RedisCheck.new(YAML.load_file(Rails.root.join("config/redis.yml"), aliases: true)[Rails.env].symbolize_keys)
   end
 end

data/test/unit/checks/redis_writeable_check_test.rb

@@ -1,7 +1,6 @@
-require 'test_helper'
+require "test_helper"
 
 class RedisWriteableCheckTest < ActiveSupport::TestCase
-
   test "#run sets success conditions on successful run" do
     Redis.any_instance.stubs(:set).returns("OK")
     check = create_check
@@ -23,6 +22,6 @@ class RedisWriteableCheckTest < ActiveSupport::TestCase
   private
   def create_check
     # Get us a config hash from disk in this case
-    Easymon::RedisWriteableCheck.new(YAML.load_file(Rails.root.join("config/redis.yml"))[Rails.env].symbolize_keys)
+    Easymon::RedisWriteableCheck.new(YAML.load_file(Rails.root.join("config/redis.yml"), aliases: true)[Rails.env].symbolize_keys)
   end
 end

data/test/unit/checks/semaphore_check_test.rb

@@ -1,7 +1,6 @@
-require 'test_helper'
+require "test_helper"
 
 class SemaphoreCheckTest < ActiveSupport::TestCase
-  
   test "#run sets success conditions on successful run" do
     check = Easymon::SemaphoreCheck.new("config/redis.yml")
     results = check.check
@@ -9,7 +8,7 @@ class SemaphoreCheckTest < ActiveSupport::TestCase
     assert_equal(true, results[0])
     assert_equal("config/redis.yml is in place!", results[1])
   end
-  
+
   test "#run sets failure conditions on a failed run" do
     check = Easymon::SemaphoreCheck.new("config/file-does-not-exist")
     results = check.check

data/test/unit/checks/split_active_record_check_test.rb

@@ -1,13 +1,11 @@
-require 'test_helper'
+require "test_helper"
 
 class SplitActiveRecordCheckTest < ActiveSupport::TestCase
-
   test "#run sets success conditions on successful run" do
     primary = ActiveRecord::Base.connection
-    Easymon::Base.establish_connection
-    replica = Easymon::Base.connection
+    replica = Easymon::Replica.connection
 
-    check = Easymon::SplitActiveRecordCheck.new { [primary, replica] }
+    check = Easymon::SplitActiveRecordCheck.new { [ primary, replica ] }
 
     results = check.check
 
@@ -17,12 +15,11 @@ class SplitActiveRecordCheckTest < ActiveSupport::TestCase
 
   test "#run sets failed conditions when replica is down" do
     primary = ActiveRecord::Base.connection
-    Easymon::Base.establish_connection
-    replica = Easymon::Base.connection
+    replica = Easymon::Replica.connection
 
     replica.stubs(:active?).raises("boom")
 
-    check = Easymon::SplitActiveRecordCheck.new { [primary, replica] }
+    check = Easymon::SplitActiveRecordCheck.new { [ primary, replica ] }
     results = check.check
 
     assert_equal("Primary: Up - Replica: Down", results[1])
@@ -31,12 +28,11 @@ class SplitActiveRecordCheckTest < ActiveSupport::TestCase
 
   test "#run sets failed conditions when primary is down" do
     primary = ActiveRecord::Base.connection
-    Easymon::Base.establish_connection
-    replica = Easymon::Base.connection
+    replica = Easymon::Replica.connection
 
     primary.stubs(:active?).raises("boom")
 
-    check = Easymon::SplitActiveRecordCheck.new { [primary, replica] }
+    check = Easymon::SplitActiveRecordCheck.new { [ primary, replica ] }
     results = check.check
 
     assert_equal("Primary: Down - Replica: Up", results[1])
@@ -53,18 +49,7 @@ end
 
 # This would be done in the host app
 module Easymon
-  class Base < ActiveRecord::Base
-    def establish_connection(spec = nil)
-      if spec
-        super
-      elsif config = Easymon.database_configuration
-        super config
-      end
-    end
-
-    def database_configuration
-      env = "#{Rails.env}_replica"
-      YAML.load_file(Rails.root.join('config/database.yml'))[env]
-    end
+  class Replica < ActiveRecord::Base
+    establish_connection :primary_replica
   end
 end

data/test/unit/checks/traffic_enabled_check_test.rb

@@ -1,7 +1,6 @@
-require 'test_helper'
+require "test_helper"
 
 class TrafficEnabledCheckTest < ActiveSupport::TestCase
-  
   test "#check sets success conditions on successful run" do
     # Using a file we know exists in the test
     check = Easymon::TrafficEnabledCheck.new("config/redis.yml")
@@ -10,7 +9,7 @@ class TrafficEnabledCheckTest < ActiveSupport::TestCase
     assert_equal(true, results[0])
     assert_equal("ENABLED", results[1])
   end
-  
+
   test "#check sets failure conditions on a failed run" do
     check = Easymon::TrafficEnabledCheck.new("config/file-does-not-exist")
     results = check.check

data/test/unit/repository_test.rb

@@ -1,7 +1,6 @@
-require 'test_helper'
+require "test_helper"
 
 class RepositoryTest < ActiveSupport::TestCase
-
   test "we can add a check to the repository" do
     Easymon::Repository.add("database", Easymon::ActiveRecordCheck.new(ActiveRecord::Base))
     check = Easymon::Repository.fetch("database")
@@ -49,4 +48,4 @@ class RepositoryTest < ActiveSupport::TestCase
 
     assert check[:check].instance_of? Easymon::ActiveRecordCheck
   end
-end
+end