okcomputer 0.3.0 → 0.3.1

data/app/controllers/ok_computer_controller.rb

@@ -1,12 +1,12 @@
 class OkComputerController < ActionController::Base
   layout nil
-  respond_to :text, :json
+  respond_to :text, :html, :json
 
   before_filter :authenticate
 
   rescue_from OKComputer::Registry::CheckNotFound do |e|
     respond_to do |f|
-      f.text { render text: e.message, status: :not_found }
+      f.any(:text, :html) { render text: e.message, status: :not_found }
       f.json { render json: { error: e.message }, status: :not_found }
     end
   end
@@ -15,20 +15,28 @@ class OkComputerController < ActionController::Base
     checks = OKComputer::Registry.all
     checks.run
 
-    respond_with checks, status: status_code(checks)
+    respond checks, status_code(checks)
   end
 
   def show
     check = OKComputer::Registry.fetch(params[:check])
     check.run
 
-    respond_with check, status: status_code(check)
+    respond check, status_code(check)
+  end
+
+private
+
+  def respond(data, status)
+    respond_to do |format|
+       format.any(:text, :html) { render text: data, status: status }
+       format.json { render json: data, status: status }
+    end
   end
 
   def status_code(check)
     check.success? ? :ok : :error
   end
-  private :status_code
 
   def authenticate
     if OKComputer.requires_authentication?
@@ -37,5 +45,4 @@ class OkComputerController < ActionController::Base
       end
     end
   end
-  private :authenticate
 end

data/config/routes.rb

@@ -1,5 +1,5 @@
 Rails.application.routes.draw do
-  match "/okcomputer" => "ok_computer#show", defaults: {check: "default", format: "text"}
-  match "/okcomputer/all(.:format)" => "ok_computer#index", defaults: {format: "text"}
-  match "/okcomputer/(:check)(.:format)" => "ok_computer#show", defaults: {format: "text"}
+  match "/okcomputer" => "ok_computer#show", defaults: {check: "default"}
+  match "/okcomputer/all" => "ok_computer#index"
+  match "/okcomputer/:check" => "ok_computer#show"
 end

data/lib/okcomputer/version.rb

@@ -1,3 +1,3 @@
 module OKComputer
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -2,14 +2,14 @@
 name: okcomputer
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Patrick Byrne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-07 00:00:00.000000000 Z
+date: 2013-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
@@ -100,7 +100,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2545106061881900479
+      hash: -124086234721425557
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2545106061881900479
+      hash: -124086234721425557
   none: false
 requirements: []
 rubyforge_project: