easymon 1.6.3 → 1.6.4

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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: easymon
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.4
 platform: ruby
 authors:
 - Nathan Anderson
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-25 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -24,6 +23,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: benchmark
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -56,56 +69,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: dalli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '3.2'
 description: |-
   Enables your monitoring infrastructure to easily query the
                      status of your app server's health.  Provides routes under
@@ -128,6 +141,7 @@ files:
 - lib/easymon/checks/active_record_mysql_writeable_check.rb
 - lib/easymon/checks/http_check.rb
 - lib/easymon/checks/memcached_check.rb
+- lib/easymon/checks/multi_active_record_check.rb
 - lib/easymon/checks/redis_check.rb
 - lib/easymon/checks/redis_writeable_check.rb
 - lib/easymon/checks/semaphore_check.rb
@@ -140,20 +154,22 @@ files:
 - lib/easymon/version.rb
 - lib/tasks/easymon_tasks.rake
 - test/controllers/easymon/checks_controller_test.rb
-- test/dummy/README.rdoc
 - test/dummy/Rakefile
-- test/dummy/app/assets/config/manifest.js
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/javascripts/easymon.js
 - test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/assets/stylesheets/easymon.css
 - test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/controllers/easymon_controller.rb
 - test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/helpers/easymon_helper.rb
-- test/dummy/app/views/easymon/index.html.erb
-- test/dummy/app/views/easymon/show.html.erb
+- test/dummy/app/jobs/application_job.rb
+- test/dummy/app/mailers/application_mailer.rb
+- test/dummy/app/models/application_record.rb
 - test/dummy/app/views/layouts/application.html.erb
+- test/dummy/app/views/layouts/mailer.html.erb
+- test/dummy/app/views/layouts/mailer.text.erb
+- test/dummy/app/views/pwa/manifest.json.erb
+- test/dummy/app/views/pwa/service-worker.js
+- test/dummy/bin/dev
+- test/dummy/bin/rails
+- test/dummy/bin/rake
+- test/dummy/bin/setup
 - test/dummy/config.ru
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
@@ -163,23 +179,26 @@ files:
 - test/dummy/config/environments/development.rb
 - test/dummy/config/environments/production.rb
 - test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
+- test/dummy/config/initializers/assets.rb
+- test/dummy/config/initializers/content_security_policy.rb
 - test/dummy/config/initializers/easymon.rb
+- test/dummy/config/initializers/filter_parameter_logging.rb
 - test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/secret_token.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/locales/en.yml
 - test/dummy/config/memcached.yml
+- test/dummy/config/puma.rb
 - test/dummy/config/redis.yml
 - test/dummy/config/routes.rb
 - test/dummy/config/storage.yml
+- test/dummy/log/test.log
+- test/dummy/public/400.html
 - test/dummy/public/404.html
+- test/dummy/public/406-unsupported-browser.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/dummy/script/rails
+- test/dummy/public/icon.png
+- test/dummy/public/icon.svg
+- test/dummy/tmp/local_secret.txt
 - test/helpers/easymon/checks_helper_test.rb
 - test/integration/navigation_test.rb
 - test/test_helper.rb
@@ -189,6 +208,7 @@ files:
 - test/unit/checks/active_record_mysql_writeable_check_test.rb
 - test/unit/checks/http_check_test.rb
 - test/unit/checks/memcached_check_test.rb
+- test/unit/checks/multi_active_record_check_test.rb
 - test/unit/checks/redis_check_test.rb
 - test/unit/checks/redis_writeable_check_test.rb
 - test/unit/checks/semaphore_check_test.rb
@@ -199,7 +219,6 @@ homepage: https://github.com/basecamp/easymon
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -214,64 +233,69 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Simple availability checks for your rails app
 test_files:
-- test/unit/checks/memcached_check_test.rb
-- test/unit/checks/http_check_test.rb
-- test/unit/checks/active_record_mysql_writeable_check_test.rb
-- test/unit/checks/redis_writeable_check_test.rb
-- test/unit/checks/semaphore_check_test.rb
-- test/unit/checks/active_record_check_test.rb
-- test/unit/checks/active_record_check_on_postgresql_test.rb
-- test/unit/checks/split_active_record_check_test.rb
-- test/unit/checks/redis_check_test.rb
-- test/unit/checks/traffic_enabled_check_test.rb
-- test/unit/repository_test.rb
-- test/unit/checklist_test.rb
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/controllers/easymon_controller.rb
-- test/dummy/app/views/easymon/index.html.erb
-- test/dummy/app/views/easymon/show.html.erb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/assets/config/manifest.js
-- test/dummy/app/assets/javascripts/easymon.js
-- test/dummy/app/assets/javascripts/application.js
+- test/controllers/easymon/checks_controller_test.rb
+- test/dummy/Rakefile
 - test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/assets/stylesheets/easymon.css
-- test/dummy/app/helpers/easymon_helper.rb
+- test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/helpers/application_helper.rb
-- test/dummy/config/routes.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/environment.rb
-- test/dummy/config/redis.yml
-- test/dummy/config/storage.yml
+- test/dummy/app/jobs/application_job.rb
+- test/dummy/app/mailers/application_mailer.rb
+- test/dummy/app/models/application_record.rb
+- test/dummy/app/views/layouts/application.html.erb
+- test/dummy/app/views/layouts/mailer.html.erb
+- test/dummy/app/views/layouts/mailer.text.erb
+- test/dummy/app/views/pwa/manifest.json.erb
+- test/dummy/app/views/pwa/service-worker.js
+- test/dummy/bin/dev
+- test/dummy/bin/rails
+- test/dummy/bin/rake
+- test/dummy/bin/setup
+- test/dummy/config.ru
 - test/dummy/config/application.rb
-- test/dummy/config/memcached.yml
-- test/dummy/config/database.yml
 - test/dummy/config/boot.rb
+- test/dummy/config/database.yml
 - test/dummy/config/elasticsearch.yml
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/wrap_parameters.rb
+- test/dummy/config/environment.rb
+- test/dummy/config/environments/development.rb
+- test/dummy/config/environments/production.rb
+- test/dummy/config/environments/test.rb
+- test/dummy/config/initializers/assets.rb
+- test/dummy/config/initializers/content_security_policy.rb
 - test/dummy/config/initializers/easymon.rb
-- test/dummy/config/initializers/secret_token.rb
+- test/dummy/config/initializers/filter_parameter_logging.rb
 - test/dummy/config/initializers/inflections.rb
-- test/dummy/config.ru
-- test/dummy/script/rails
-- test/dummy/Rakefile
-- test/dummy/public/favicon.ico
+- test/dummy/config/locales/en.yml
+- test/dummy/config/memcached.yml
+- test/dummy/config/puma.rb
+- test/dummy/config/redis.yml
+- test/dummy/config/routes.rb
+- test/dummy/config/storage.yml
+- test/dummy/log/test.log
+- test/dummy/public/400.html
+- test/dummy/public/404.html
+- test/dummy/public/406-unsupported-browser.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
-- test/dummy/public/404.html
-- test/dummy/README.rdoc
+- test/dummy/public/icon.png
+- test/dummy/public/icon.svg
+- test/dummy/tmp/local_secret.txt
+- test/helpers/easymon/checks_helper_test.rb
 - test/integration/navigation_test.rb
 - test/test_helper.rb
-- test/controllers/easymon/checks_controller_test.rb
-- test/helpers/easymon/checks_helper_test.rb
+- test/unit/checklist_test.rb
+- test/unit/checks/active_record_check_on_postgresql_test.rb
+- test/unit/checks/active_record_check_test.rb
+- test/unit/checks/active_record_mysql_writeable_check_test.rb
+- test/unit/checks/http_check_test.rb
+- test/unit/checks/memcached_check_test.rb
+- test/unit/checks/multi_active_record_check_test.rb
+- test/unit/checks/redis_check_test.rb
+- test/unit/checks/redis_writeable_check_test.rb
+- test/unit/checks/semaphore_check_test.rb
+- test/unit/checks/split_active_record_check_test.rb
+- test/unit/checks/traffic_enabled_check_test.rb
+- test/unit/repository_test.rb