app_status 1.1.2 → 1.2.0

data/app/controllers/app_status/application_controller.rb

@@ -1,4 +1,6 @@
 module AppStatus
-  class ApplicationController < ActionController::Base
+  # inherit from the parent app's ApplicationController so we can
+  # render inside it's default layout.
+  class ApplicationController < ::ApplicationController
   end
 end

data/app/controllers/app_status/status_controller.rb

@@ -1,11 +1,17 @@
 module AppStatus
-  class StatusController < ApplicationController
+  class StatusController < ::ApplicationController
     def index
       @checks = CheckCollection.new
       @checks.evaluate!
 
       json_data = @checks.as_json
-      json_data['more_info'] = app_status_url
+
+      more_info = app_status_engine.root_url
+      # try to build html url, when main app has route like '/status(.:format)'
+      if match = more_info.match(/(.*)\.json/)
+        more_info = match[1]+'.html'
+      end
+      json_data['more_info'] = more_info
 
       respond_to do |format|
         format.json { render json: json_data}

data/app/views/app_status/status/index.html.erb

@@ -1,5 +1,4 @@
 <div class="app_status">
-
   <h1 class="<%= @checks.status %>">Current Status : <%= @checks.status %></h1>
 
   <% if @checks.size > 0 %>
@@ -10,6 +9,9 @@
         <td class="name"><%= check.name %></td>
         <td class="details"><%= check.details %></td>
         <td class="ms"><%= check.ms %>ms</td>
+        <td class="more_info">
+          <% if check.description.present? -%>More Info<% end %>
+        </td>
       </tr>
       <% if check.description.present? -%>
         <tr class="<%= check.name %> description" style="display: none;">

data/bin/nokogiri

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'nokogiri' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('nokogiri', 'nokogiri')

data/config/routes.rb

@@ -1,4 +1,4 @@
 AppStatus::Engine.routes.draw do
-  root :to => 'status#index', :defaults => {:format => 'json'}
-  get "/index" => 'status#index', :as => 'app_status'
+  get '/index(.:format)', to: 'app_status/status#index'
+  root to: 'app_status/status#index'
 end

data/lib/app_status/engine.rb

@@ -1,10 +1,7 @@
 module AppStatus
   class Engine < ::Rails::Engine
-    isolate_namespace AppStatus
-
     config.generators do |g|
       g.test_framework :rspec, :fixture => false
-      #g.fixture_replacement :factory_girl, :dir => 'spec/factories'
       g.assets false
       g.helper false
     end

data/lib/app_status/version.rb

@@ -1,3 +1,3 @@
 module AppStatus
-  VERSION = "1.1.2"
+  VERSION = "1.2.0"
 end

data/spec/dummy/app/controllers/widgets_controller.rb

@@ -0,0 +1,83 @@
+class WidgetsController < ApplicationController
+  # GET /widgets
+  # GET /widgets.json
+  def index
+    @widgets = Widget.all
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @widgets }
+    end
+  end
+
+  # GET /widgets/1
+  # GET /widgets/1.json
+  def show
+    @widget = Widget.find(params[:id])
+
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render json: @widget }
+    end
+  end
+
+  # GET /widgets/new
+  # GET /widgets/new.json
+  def new
+    @widget = Widget.new
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render json: @widget }
+    end
+  end
+
+  # GET /widgets/1/edit
+  def edit
+    @widget = Widget.find(params[:id])
+  end
+
+  # POST /widgets
+  # POST /widgets.json
+  def create
+    @widget = Widget.new(params[:widget])
+
+    respond_to do |format|
+      if @widget.save
+        format.html { redirect_to @widget, notice: 'Widget was successfully created.' }
+        format.json { render json: @widget, status: :created, location: @widget }
+      else
+        format.html { render action: "new" }
+        format.json { render json: @widget.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /widgets/1
+  # PUT /widgets/1.json
+  def update
+    @widget = Widget.find(params[:id])
+
+    respond_to do |format|
+      if @widget.update_attributes(params[:widget])
+        format.html { redirect_to @widget, notice: 'Widget was successfully updated.' }
+        format.json { head :no_content }
+      else
+        format.html { render action: "edit" }
+        format.json { render json: @widget.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /widgets/1
+  # DELETE /widgets/1.json
+  def destroy
+    @widget = Widget.find(params[:id])
+    @widget.destroy
+
+    respond_to do |format|
+      format.html { redirect_to widgets_url }
+      format.json { head :no_content }
+    end
+  end
+end

data/spec/dummy/app/views/layouts/application.html.erb

@@ -8,6 +8,10 @@
 </head>
 <body>
 
+<div id="widget_menu">
+  Widgets are at <%= widgets_url %>.
+</div>
+
 <%= yield %>
 
 </body>

data/spec/dummy/app/views/widgets/_form.html.erb

@@ -0,0 +1,17 @@
+<%= form_for(@widget) do |f| %>
+  <% if @widget.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(@widget.errors.count, "error") %> prohibited this widget from being saved:</h2>
+
+      <ul>
+      <% @widget.errors.full_messages.each do |msg| %>
+        <li><%= msg %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <div class="actions">
+    <%= f.submit %>
+  </div>
+<% end %>

data/spec/dummy/app/views/widgets/edit.html.erb

@@ -0,0 +1,6 @@
+<h1>Editing widget</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Show', @widget %> |
+<%= link_to 'Back', widgets_path %>

data/spec/dummy/app/views/widgets/index.html.erb

@@ -0,0 +1,21 @@
+<h1>Listing widgets</h1>
+
+<table>
+  <tr>
+    <th></th>
+    <th></th>
+    <th></th>
+  </tr>
+
+<% @widgets.each do |widget| %>
+  <tr>
+    <td><%= link_to 'Show', widget %></td>
+    <td><%= link_to 'Edit', edit_widget_path(widget) %></td>
+    <td><%= link_to 'Destroy', widget, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+  </tr>
+<% end %>
+</table>
+
+<br />
+
+<%= link_to 'New Widget', new_widget_path %>

data/spec/dummy/app/views/widgets/new.html.erb

@@ -0,0 +1,5 @@
+<h1>New widget</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Back', widgets_path %>

data/spec/dummy/app/views/widgets/show.html.erb

@@ -0,0 +1,5 @@
+<p id="notice"><%= notice %></p>
+
+
+<%= link_to 'Edit', edit_widget_path(@widget) %> |
+<%= link_to 'Back', widgets_path %>

data/spec/dummy/config/routes.rb

@@ -1,3 +1,5 @@
 Rails.application.routes.draw do
-  mount AppStatus::Engine => "/status"
+  resources :widgets
+
+  mount AppStatus::Engine => "/status(.:format)", defaults: {format: 'json'}
 end

data/spec/dummy/log/development.log

@@ -815,3 +815,153 @@ Served asset /jquery.js - 304 Not Modified (0ms)
 
 Started GET "/assets/jquery_ujs.js?body=1" for 127.0.0.1 at 2013-10-08 21:51:51 -0500
 Served asset /jquery_ujs.js - 304 Not Modified (0ms)
+
+
+Started GET "/status/index.json" for 127.0.0.1 at 2013-10-12 17:01:20 -0500
+Processing by AppStatus::StatusController#index as JSON
+Completed 200 OK in 3ms (Views: 0.5ms)
+
+
+Started GET "/status/index.html" for 127.0.0.1 at 2013-10-12 17:01:27 -0500
+Processing by AppStatus::StatusController#index as HTML
+  Rendered /Users/alex/Code/app_status/app/views/app_status/status/index.html.erb within layouts/application (80.8ms)
+Compiled application.css  (0ms)  (pid 62743)
+Compiled application.js  (6ms)  (pid 62743)
+Completed 200 OK in 128ms (Views: 128.0ms)
+
+
+Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2013-10-12 17:01:27 -0500
+Served asset /application.css - 200 OK (1ms)
+
+
+Started GET "/assets/jquery.js?body=1" for 127.0.0.1 at 2013-10-12 17:01:27 -0500
+Served asset /jquery.js - 200 OK (1ms)
+
+
+Started GET "/assets/jquery_ujs.js?body=1" for 127.0.0.1 at 2013-10-12 17:01:27 -0500
+Served asset /jquery_ujs.js - 200 OK (1ms)
+
+
+Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2013-10-12 17:01:27 -0500
+Served asset /application.js - 200 OK (2ms)
+
+
+Started GET "/status.html" for 127.0.0.1 at 2013-10-12 17:10:04 -0500
+Processing by AppStatus::StatusController#index as HTML
+  Rendered /Users/alex/Code/app_status/app/views/app_status/status/index.html.erb within layouts/application (5.4ms)
+Completed 500 Internal Server Error in 12ms
+
+ActionView::Template::Error (rendering HTML):
+    1: <% raise "rendering HTML" %>
+    2: <div class="app_status">
+    3:   <h1 class="<%= @checks.status %>">Current Status : <%= @checks.status %></h1>
+    4: 
+  /Users/alex/Code/app_status/app/views/app_status/status/index.html.erb:1:in `___sers_alex__ode_app_status_app_views_app_status_status_index_html_erb__4255533823524142632_70320794355040'
+  actionpack (3.2.14) lib/action_view/template.rb:145:in `block in render'
+  activesupport (3.2.14) lib/active_support/notifications.rb:125:in `instrument'
+  actionpack (3.2.14) lib/action_view/template.rb:143:in `render'
+  actionpack (3.2.14) lib/action_view/renderer/template_renderer.rb:48:in `block (2 levels) in render_template'
+  actionpack (3.2.14) lib/action_view/renderer/abstract_renderer.rb:38:in `block in instrument'
+  activesupport (3.2.14) lib/active_support/notifications.rb:123:in `block in instrument'
+  activesupport (3.2.14) lib/active_support/notifications/instrumenter.rb:20:in `instrument'
+  activesupport (3.2.14) lib/active_support/notifications.rb:123:in `instrument'
+  actionpack (3.2.14) lib/action_view/renderer/abstract_renderer.rb:38:in `instrument'
+  actionpack (3.2.14) lib/action_view/renderer/template_renderer.rb:47:in `block in render_template'
+  actionpack (3.2.14) lib/action_view/renderer/template_renderer.rb:55:in `render_with_layout'
+  actionpack (3.2.14) lib/action_view/renderer/template_renderer.rb:46:in `render_template'
+  actionpack (3.2.14) lib/action_view/renderer/template_renderer.rb:19:in `render'
+  actionpack (3.2.14) lib/action_view/renderer/renderer.rb:36:in `render_template'
+  actionpack (3.2.14) lib/action_view/renderer/renderer.rb:17:in `render'
+  actionpack (3.2.14) lib/abstract_controller/rendering.rb:110:in `_render_template'
+  actionpack (3.2.14) lib/action_controller/metal/streaming.rb:225:in `_render_template'
+  actionpack (3.2.14) lib/abstract_controller/rendering.rb:103:in `render_to_body'
+  actionpack (3.2.14) lib/action_controller/metal/renderers.rb:28:in `render_to_body'
+  actionpack (3.2.14) lib/action_controller/metal/compatibility.rb:50:in `render_to_body'
+  actionpack (3.2.14) lib/abstract_controller/rendering.rb:88:in `render'
+  actionpack (3.2.14) lib/action_controller/metal/rendering.rb:16:in `render'
+  actionpack (3.2.14) lib/action_controller/metal/instrumentation.rb:40:in `block (2 levels) in render'
+  activesupport (3.2.14) lib/active_support/core_ext/benchmark.rb:5:in `block in ms'
+  /Users/alex/.rvm/rubies/ruby-1.9.3-p194/lib/ruby/1.9.1/benchmark.rb:295:in `realtime'
+  activesupport (3.2.14) lib/active_support/core_ext/benchmark.rb:5:in `ms'
+  actionpack (3.2.14) lib/action_controller/metal/instrumentation.rb:40:in `block in render'
+  actionpack (3.2.14) lib/action_controller/metal/instrumentation.rb:83:in `cleanup_view_runtime'
+  actionpack (3.2.14) lib/action_controller/metal/instrumentation.rb:39:in `render'
+  actionpack (3.2.14) lib/action_controller/metal/implicit_render.rb:10:in `default_render'
+  actionpack (3.2.14) lib/action_controller/metal/mime_responds.rb:196:in `respond_to'
+  /Users/alex/Code/app_status/app/controllers/app_status/status_controller.rb:18:in `index'
+  actionpack (3.2.14) lib/action_controller/metal/implicit_render.rb:4:in `send_action'
+  actionpack (3.2.14) lib/abstract_controller/base.rb:167:in `process_action'
+  actionpack (3.2.14) lib/action_controller/metal/rendering.rb:10:in `process_action'
+  actionpack (3.2.14) lib/abstract_controller/callbacks.rb:18:in `block in process_action'
+  activesupport (3.2.14) lib/active_support/callbacks.rb:414:in `_run__3823003795726122098__process_action__1171103283506279445__callbacks'
+  activesupport (3.2.14) lib/active_support/callbacks.rb:405:in `__run_callback'
+  activesupport (3.2.14) lib/active_support/callbacks.rb:385:in `_run_process_action_callbacks'
+  activesupport (3.2.14) lib/active_support/callbacks.rb:81:in `run_callbacks'
+  actionpack (3.2.14) lib/abstract_controller/callbacks.rb:17:in `process_action'
+  actionpack (3.2.14) lib/action_controller/metal/rescue.rb:29:in `process_action'
+  actionpack (3.2.14) lib/action_controller/metal/instrumentation.rb:30:in `block in process_action'
+  activesupport (3.2.14) lib/active_support/notifications.rb:123:in `block in instrument'
+  activesupport (3.2.14) lib/active_support/notifications/instrumenter.rb:20:in `instrument'
+  activesupport (3.2.14) lib/active_support/notifications.rb:123:in `instrument'
+  actionpack (3.2.14) lib/action_controller/metal/instrumentation.rb:29:in `process_action'
+  actionpack (3.2.14) lib/action_controller/metal/params_wrapper.rb:207:in `process_action'
+  actionpack (3.2.14) lib/abstract_controller/base.rb:121:in `process'
+  actionpack (3.2.14) lib/abstract_controller/rendering.rb:45:in `process'
+  actionpack (3.2.14) lib/action_controller/metal.rb:203:in `dispatch'
+  actionpack (3.2.14) lib/action_controller/metal/rack_delegation.rb:14:in `dispatch'
+  actionpack (3.2.14) lib/action_controller/metal.rb:246:in `block in action'
+  actionpack (3.2.14) lib/action_dispatch/routing/route_set.rb:73:in `call'
+  actionpack (3.2.14) lib/action_dispatch/routing/route_set.rb:73:in `dispatch'
+  actionpack (3.2.14) lib/action_dispatch/routing/route_set.rb:36:in `call'
+  journey (1.0.4) lib/journey/router.rb:68:in `block in call'
+  journey (1.0.4) lib/journey/router.rb:56:in `each'
+  journey (1.0.4) lib/journey/router.rb:56:in `call'
+  actionpack (3.2.14) lib/action_dispatch/routing/route_set.rb:608:in `call'
+  railties (3.2.14) lib/rails/engine.rb:484:in `call'
+  railties (3.2.14) lib/rails/railtie/configurable.rb:30:in `method_missing'
+  journey (1.0.4) lib/journey/router.rb:68:in `block in call'
+  journey (1.0.4) lib/journey/router.rb:56:in `each'
+  journey (1.0.4) lib/journey/router.rb:56:in `call'
+  actionpack (3.2.14) lib/action_dispatch/routing/route_set.rb:608:in `call'
+  actionpack (3.2.14) lib/action_dispatch/middleware/best_standards_support.rb:17:in `call'
+  rack (1.4.5) lib/rack/etag.rb:23:in `call'
+  rack (1.4.5) lib/rack/conditionalget.rb:25:in `call'
+  actionpack (3.2.14) lib/action_dispatch/middleware/head.rb:14:in `call'
+  actionpack (3.2.14) lib/action_dispatch/middleware/params_parser.rb:21:in `call'
+  actionpack (3.2.14) lib/action_dispatch/middleware/flash.rb:242:in `call'
+  rack (1.4.5) lib/rack/session/abstract/id.rb:210:in `context'
+  rack (1.4.5) lib/rack/session/abstract/id.rb:205:in `call'
+  actionpack (3.2.14) lib/action_dispatch/middleware/cookies.rb:341:in `call'
+  actionpack (3.2.14) lib/action_dispatch/middleware/callbacks.rb:28:in `block in call'
+  activesupport (3.2.14) lib/active_support/callbacks.rb:405:in `_run__3779300152876328565__call__313638182897300773__callbacks'
+  activesupport (3.2.14) lib/active_support/callbacks.rb:405:in `__run_callback'
+  activesupport (3.2.14) lib/active_support/callbacks.rb:385:in `_run_call_callbacks'
+  activesupport (3.2.14) lib/active_support/callbacks.rb:81:in `run_callbacks'
+  actionpack (3.2.14) lib/action_dispatch/middleware/callbacks.rb:27:in `call'
+  actionpack (3.2.14) lib/action_dispatch/middleware/reloader.rb:65:in `call'
+  actionpack (3.2.14) lib/action_dispatch/middleware/remote_ip.rb:31:in `call'
+  actionpack (3.2.14) lib/action_dispatch/middleware/debug_exceptions.rb:16:in `call'
+  actionpack (3.2.14) lib/action_dispatch/middleware/show_exceptions.rb:56:in `call'
+  railties (3.2.14) lib/rails/rack/logger.rb:32:in `call_app'
+  railties (3.2.14) lib/rails/rack/logger.rb:16:in `block in call'
+  activesupport (3.2.14) lib/active_support/tagged_logging.rb:22:in `tagged'
+  railties (3.2.14) lib/rails/rack/logger.rb:16:in `call'
+  actionpack (3.2.14) lib/action_dispatch/middleware/request_id.rb:22:in `call'
+  rack (1.4.5) lib/rack/methodoverride.rb:21:in `call'
+  rack (1.4.5) lib/rack/runtime.rb:17:in `call'
+  activesupport (3.2.14) lib/active_support/cache/strategy/local_cache.rb:72:in `call'
+  rack (1.4.5) lib/rack/lock.rb:15:in `call'
+  actionpack (3.2.14) lib/action_dispatch/middleware/static.rb:63:in `call'
+  railties (3.2.14) lib/rails/engine.rb:484:in `call'
+  railties (3.2.14) lib/rails/application.rb:231:in `call'
+  rack (1.4.5) lib/rack/content_length.rb:14:in `call'
+  railties (3.2.14) lib/rails/rack/log_tailer.rb:17:in `call'
+  rack (1.4.5) lib/rack/handler/webrick.rb:59:in `service'
+  /Users/alex/.rvm/rubies/ruby-1.9.3-p194/lib/ruby/1.9.1/webrick/httpserver.rb:138:in `service'
+  /Users/alex/.rvm/rubies/ruby-1.9.3-p194/lib/ruby/1.9.1/webrick/httpserver.rb:94:in `run'
+  /Users/alex/.rvm/rubies/ruby-1.9.3-p194/lib/ruby/1.9.1/webrick/server.rb:191:in `block in start_thread'
+
+
+  Rendered /Users/alex/.rvm/gems/ruby-1.9.3-p194@app_status/gems/actionpack-3.2.14/lib/action_dispatch/middleware/templates/rescues/_trace.erb (12.1ms)
+  Rendered /Users/alex/.rvm/gems/ruby-1.9.3-p194@app_status/gems/actionpack-3.2.14/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb (0.7ms)
+  Rendered /Users/alex/.rvm/gems/ruby-1.9.3-p194@app_status/gems/actionpack-3.2.14/lib/action_dispatch/middleware/templates/rescues/template_error.erb within rescues/layout (19.5ms)