okcomputer 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 161950434c3da5a4b521fc015247990a91339d93
-  data.tar.gz: 2ace45ea756b34aba4346f7ddacd5b0faeae158f
+  metadata.gz: b75010b5b64ee83ad4d0c3a60a31e54ee2f8cc66
+  data.tar.gz: 447930608cd2de52c23369f190190e9ca4c7375c
 SHA512:
-  metadata.gz: de92606a0f4424d51d0b76a243b092bcc6b076f101a6a73f8d0866d455672caf8be4feb503eee85d1da9470239f1167229e6f548acea680b9e11ed2354ead834
-  data.tar.gz: fc4b63fe2d2eb780598ae201fd2beee97a4fa57792bf16615a60a1d32e2aa2b1bf312ef48c362545fa77da31639dcb92288e568f5ce066fca055ab0acb7618da
+  metadata.gz: 98e01dfe30d9e5ddba45c82fcba45aeeebfe93c1c216632d18b91127259ddc31d2fa24a030671ddb69a0d02286b4deb688c1a95b3b274270db4b0ee0f14625b8
+  data.tar.gz: ab3b3ca90ad9c8307ff83de7bcc69d7915ab7b84a650be60a43d554d07a7ebadc8e1d578cd9c11215bdf03819ed0814be3fa2132227c9db7cd9825dd9171cdea

data/app/controllers/ok_computer/ok_computer_controller.rb

@@ -1,8 +1,10 @@
 module OkComputer
   class OkComputerController < ActionController::Base
+    include LegacyRailsControllerSupport if Rails::VERSION::MAJOR < 5
+
     layout nil
 
-    before_filter :authenticate
+    before_action :authenticate
 
     if OkComputer.analytics_ignore && defined?(NewRelic::Agent::Instrumentation::ControllerInstrumentation)
       include NewRelic::Agent::Instrumentation::ControllerInstrumentation
@@ -11,7 +13,7 @@ module OkComputer
 
     rescue_from OkComputer::Registry::CheckNotFound do |e|
       respond_to do |f|
-        f.any(:text, :html) { render text: e.message, status: :not_found }
+        f.any(:text, :html) { render plain: e.message, status: :not_found }
         f.json { render json: { error: e.message }, status: :not_found }
       end
     end
@@ -34,7 +36,7 @@ module OkComputer
 
     def respond(data, status)
       respond_to do |format|
-         format.any(:text, :html) { render text: data, status: status }
+         format.any(:text, :html) { render plain: data, status: status }
          format.json { render json: data, status: status }
       end
     end

data/config/routes.rb

@@ -1,5 +1,5 @@
 OkComputer::Engine.routes.draw do
-  root to: "ok_computer#show", defaults: {check: "default"}, via: [:get, :options]
+  root to: "ok_computer#show", via: [:get, :options], check: "default"
   match "/all" => "ok_computer#index", via: [:get, :options], as: :okcomputer_checks
   match "/:check" => "ok_computer#show", via: [:get, :options], as: :okcomputer_check
 end

data/lib/ok_computer/legacy_rails_controller_support.rb

@@ -0,0 +1,18 @@
+module OkComputer
+  module LegacyRailsControllerSupport
+    def self.included(base)
+      # Support <callback>_action for Rails 3
+      %w(before after around).each do |callback|
+        unless base.respond_to?("#{callback}_action")
+          base.singleton_class.send(:alias_method, "#{callback}_action", "#{callback}_filter")
+        end
+      end
+    end
+
+    # Support 'render plain' for Rails 3
+    def render(**options, &block)
+      options[:text] = options.delete(:plain) if options.include?(:plain)
+      super
+    end
+  end
+end

data/lib/ok_computer/version.rb

@@ -1,3 +1,3 @@
 module OkComputer
-  VERSION = '1.8.0'
+  VERSION = '1.9.0'
 end

data/lib/okcomputer.rb

@@ -3,6 +3,7 @@ require "ok_computer/engine" if defined?(Rails)
 require "ok_computer/check"
 require "ok_computer/check_collection"
 require "ok_computer/registry"
+require "ok_computer/legacy_rails_controller_support"
 
 # and the built-in checks
 require "ok_computer/built_in_checks/size_threshold_check"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: okcomputer
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Patrick Byrne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-11 00:00:00.000000000 Z
+date: 2016-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -91,6 +91,7 @@ files:
 - lib/ok_computer/check_collection.rb
 - lib/ok_computer/configuration.rb
 - lib/ok_computer/engine.rb
+- lib/ok_computer/legacy_rails_controller_support.rb
 - lib/ok_computer/registry.rb
 - lib/ok_computer/version.rb
 - lib/okcomputer.rb
@@ -114,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: A simple, extensible health-check monitor