app_status 1.1.2 → 1.2.0

data/spec/features/app_status_features_spec.rb

@@ -0,0 +1,90 @@
+require 'spec_helper'
+
+RSpec::Matchers.define :have_content_type do |expected|
+
+  def extract_content_type(actual)
+    actual.response_headers['Content-Type'].split(';')[0]
+  end
+
+  match do |actual|
+    extract_content_type(actual) == expected
+  end
+
+  failure_message_for_should do |actual|
+    "expected that page's content type would be '#{expected}', but was '#{extract_content_type(actual)}'"
+  end
+
+end
+
+describe "status" do
+
+  before(:each) do
+    AppStatus::CheckCollection.clear_checks!
+    AppStatus::CheckCollection.configure do |c|
+      c.add_check('some_service') {[:ok, 'foo']}
+      c.add_description('some_service', "more info")
+    end
+  end
+
+  it "renders json by default" do
+    visit "/status"
+    page.should have_content_type('application/json')
+  end
+
+  describe "html page" do
+
+    it "is available at status.html" do
+      visit '/status.html'
+      page.should have_content_type('text/html')
+    end
+
+    it "is available at /status/index.html" do
+      visit '/status/index.html'
+      page.should have_content_type('text/html')
+    end
+
+    it "renders in the main application's default layout" do
+      visit '/status.html'
+      page.title.should eq 'Dummy'
+    end
+
+    it "doesn't break route urls in main layout" do
+      visit '/status.html'
+      page.find('#widget_menu').should have_content('Widgets are at http://www.example.com/widgets.')
+    end
+
+  end
+
+  describe "json endpoint" do
+
+    it "is available at status.json" do
+      visit '/status.json'
+      page.should have_content_type('application/json')
+    end
+
+    it "is available at /status/index.json" do
+      visit '/status/index.json'
+      page.should have_content_type('application/json')
+    end
+
+    it "links to html status page" do
+      visit '/status.json'
+      page.should have_content_type('application/json')
+      data = JSON.parse(page.body)
+
+      data['more_info'].should eq 'http://www.example.com/status.html'
+    end
+
+    it "contains status information" do
+      visit '/status.json'
+      page.should have_content_type('application/json')
+      data = JSON.parse(page.body)
+
+      data['status'].should eq 'ok'
+      data['status_code'].should eq 0
+      data['checks']['some_service']['status'].should eq 'ok'
+      data['checks']['some_service']['details'].should eq 'foo'
+    end
+
+  end
+end

data/spec/spec_helper.rb

@@ -4,15 +4,12 @@ require File.expand_path("../dummy/config/environment.rb", __FILE__)
 require 'rspec/rails'
 require 'rspec/autorun'
 require 'timecop'
+require 'capybara/rspec'
 
 Rails.backtrace_cleaner.remove_silencers!
 
-# Load support files
-#Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
-
 RSpec.configure do |config|
   config.mock_with :rspec
-  #config.use_transactional_fixtures = true
   config.infer_base_class_for_anonymous_controllers = false
   config.order = "random"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: app_status
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-09 00:00:00.000000000 Z
+date: 2013-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -91,6 +91,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: AppStatus provides a URL which is easily consumable by Nagios or other
   monitoring tools.
 email:
@@ -107,13 +123,13 @@ files:
 - app/models/app_status/check_collection.rb
 - app/models/app_status/check_item.rb
 - app/views/app_status/status/index.html.erb
-- app/views/layouts/app_status/application.html.erb
 - bin/autospec
 - bin/erubis
 - bin/haml
 - bin/htmldiff
 - bin/kramdown
 - bin/ldiff
+- bin/nokogiri
 - bin/rackup
 - bin/rails
 - bin/rake
@@ -132,12 +148,17 @@ files:
 - MIT-LICENSE
 - Rakefile
 - README.md
-- spec/controllers/status_controller_spec.rb
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/controllers/widgets_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/views/widgets/_form.html.erb
+- spec/dummy/app/views/widgets/edit.html.erb
+- spec/dummy/app/views/widgets/index.html.erb
+- spec/dummy/app/views/widgets/new.html.erb
+- spec/dummy/app/views/widgets/show.html.erb
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
 - spec/dummy/config/database.yml
@@ -167,13 +188,20 @@ files:
 - spec/dummy/tmp/cache/assets/CA5/160/sprockets%2Fc4b6dd696758a9c186897a8c25615778
 - spec/dummy/tmp/cache/assets/CB2/070/sprockets%2Fe1b30e44248fc0395505c899c0f2357e
 - spec/dummy/tmp/cache/assets/CB2/5B0/sprockets%2Fc8e423e85d0a1cb22332859990909a3f
+- spec/dummy/tmp/cache/assets/CD8/370/sprockets%2F357970feca3ac29060c1e3861e2c0953
 - spec/dummy/tmp/cache/assets/CF2/9A0/sprockets%2Fb3eee5a6a87662f428f47c908157f606
 - spec/dummy/tmp/cache/assets/D15/DA0/sprockets%2Fc7e74644f623ec92a443b53b8c1d19c8
+- spec/dummy/tmp/cache/assets/D32/A10/sprockets%2F13fe41fee1fe35b49d145bcc06610705
 - spec/dummy/tmp/cache/assets/D3F/E00/sprockets%2Fa7629a6ce27d07753dbb05bd48098ce0
+- spec/dummy/tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e94586655
 - spec/dummy/tmp/cache/assets/D51/F30/sprockets%2Fbe466f3302fef7895aad76d05d93963d
+- spec/dummy/tmp/cache/assets/D5A/EA0/sprockets%2Fd771ace226fc8215a3572e0aa35bb0d6
 - spec/dummy/tmp/cache/assets/DB8/430/sprockets%2Ff731c6599577d8f741f3afd2d8ed2efb
+- spec/dummy/tmp/cache/assets/DDC/400/sprockets%2Fcffd775d018f68ce5dba1ee0d951a994
 - spec/dummy/tmp/cache/assets/DDD/460/sprockets%2Fe5b8947c2a5caf5460fecdfd48c818d5
+- spec/dummy/tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
 - spec/dummy/tmp/cache/assets/E07/FD0/sprockets%2Fb3d7aafd7ce063e022cd29e7ccb898f9
+- spec/features/app_status_features_spec.rb
 - spec/models/check_collection_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/alexdean/app_status
@@ -190,7 +218,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1438929825745420102
+      hash: -3960571408936906561
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -199,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1438929825745420102
+      hash: -3960571408936906561
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -207,12 +235,17 @@ signing_key:
 specification_version: 3
 summary: AppStatus is a Rails engine for exposing app data to Nagios.
 test_files:
-- spec/controllers/status_controller_spec.rb
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/controllers/widgets_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/views/widgets/_form.html.erb
+- spec/dummy/app/views/widgets/edit.html.erb
+- spec/dummy/app/views/widgets/index.html.erb
+- spec/dummy/app/views/widgets/new.html.erb
+- spec/dummy/app/views/widgets/show.html.erb
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
 - spec/dummy/config/database.yml
@@ -242,12 +275,19 @@ test_files:
 - spec/dummy/tmp/cache/assets/CA5/160/sprockets%2Fc4b6dd696758a9c186897a8c25615778
 - spec/dummy/tmp/cache/assets/CB2/070/sprockets%2Fe1b30e44248fc0395505c899c0f2357e
 - spec/dummy/tmp/cache/assets/CB2/5B0/sprockets%2Fc8e423e85d0a1cb22332859990909a3f
+- spec/dummy/tmp/cache/assets/CD8/370/sprockets%2F357970feca3ac29060c1e3861e2c0953
 - spec/dummy/tmp/cache/assets/CF2/9A0/sprockets%2Fb3eee5a6a87662f428f47c908157f606
 - spec/dummy/tmp/cache/assets/D15/DA0/sprockets%2Fc7e74644f623ec92a443b53b8c1d19c8
+- spec/dummy/tmp/cache/assets/D32/A10/sprockets%2F13fe41fee1fe35b49d145bcc06610705
 - spec/dummy/tmp/cache/assets/D3F/E00/sprockets%2Fa7629a6ce27d07753dbb05bd48098ce0
+- spec/dummy/tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e94586655
 - spec/dummy/tmp/cache/assets/D51/F30/sprockets%2Fbe466f3302fef7895aad76d05d93963d
+- spec/dummy/tmp/cache/assets/D5A/EA0/sprockets%2Fd771ace226fc8215a3572e0aa35bb0d6
 - spec/dummy/tmp/cache/assets/DB8/430/sprockets%2Ff731c6599577d8f741f3afd2d8ed2efb
+- spec/dummy/tmp/cache/assets/DDC/400/sprockets%2Fcffd775d018f68ce5dba1ee0d951a994
 - spec/dummy/tmp/cache/assets/DDD/460/sprockets%2Fe5b8947c2a5caf5460fecdfd48c818d5
+- spec/dummy/tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
 - spec/dummy/tmp/cache/assets/E07/FD0/sprockets%2Fb3d7aafd7ce063e022cd29e7ccb898f9
+- spec/features/app_status_features_spec.rb
 - spec/models/check_collection_spec.rb
 - spec/spec_helper.rb

data/app/views/layouts/app_status/application.html.erb

@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>App Status</title>
-  <%= stylesheet_link_tag    "app_status/application", :media => "all" %>
-  <%= javascript_include_tag "app_status/application" %>
-  <%= csrf_meta_tags %>
-</head>
-<body>
-
-<%= yield %>
-
-</body>
-</html>

data/spec/controllers/status_controller_spec.rb

@@ -1,28 +0,0 @@
-require 'spec_helper'
-
-describe AppStatus::StatusController do
-
-  describe "GET index" do
-    before(:each) do
-      AppStatus::CheckCollection.clear_checks!
-      AppStatus::CheckCollection.add_check('some_service') {[:ok, 'foo']}
-    end
-
-    it "should render json" do
-      get :index, format: 'json', use_route: :app_status
-      response.should be_success
-
-      data = JSON.parse(response.body)
-      data['status'].should eq 'ok'
-      data['status_code'].should eq 0
-      data['checks']['some_service']['status'].should eq 'ok'
-      data['checks']['some_service']['details'].should eq 'foo'
-    end
-
-    it "should render html" do
-      get :index, format: 'html', use_route: :app_status
-      response.should be_success
-      # FIXME: response.body == "". why?
-    end
-  end
-end