flapjack 0.8.10 → 0.8.11

data/spec/lib/flapjack/gateways/jsonapi_spec.rb

@@ -3,6 +3,15 @@ require 'flapjack/gateways/jsonapi'
 
 describe 'Flapjack::Gateways::JSONAPI', :sinatra => true, :logger => true do
 
-  it "handles a route matching failure"
+  include_context "jsonapi"
+
+  it "handles a route matching failure" do
+    aget "/this/route/doesn't/exist"
+    expect(last_response.status).to eq(404)
+  end
+
+  it "rejects a POST request with invalid content type"
+
+  it "rejects a PATCH request with invalid content type"
 
 end

data/spec/lib/flapjack/gateways/web_spec.rb

@@ -134,6 +134,7 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
     expect(entity_check).to receive(:last_change).and_return(time.to_i - (3 * 60 * 60))
     expect(entity_check).to receive(:summary).and_return('all good')
     expect(entity_check).to receive(:details).and_return('seriously, all very wonderful')
+    expect(entity_check).to receive(:perfdata).and_return([{"key" => "foo", "value" => "bar"}])
     expect(entity_check).to receive(:last_notifications_of_each_type).and_return(last_notifications)
     expect(entity_check).to receive(:maintenances).with(nil, nil, :scheduled => true).and_return([])
     expect(entity_check).to receive(:failed?).and_return(false)

data/spec/support/jsonapi_helper.rb

@@ -0,0 +1,62 @@
+module JsonapiHelper
+
+  shared_context "jsonapi" do
+
+    def app
+      Flapjack::Gateways::JSONAPI
+    end
+
+    let(:contact)      { double(Flapjack::Data::Contact, :id => '21') }
+    let(:contact_core) {
+      {'id'         => contact.id,
+       'first_name' => "Ada",
+       'last_name'  => "Lovelace",
+       'email'      => "ada@example.com",
+       'tags'       => ["legend", "first computer programmer"]
+      }
+    }
+
+    let(:redis)           { double(::Redis) }
+
+    let(:semaphore) {
+      double(Flapjack::Data::Semaphore, :resource => 'folly',
+             :key => 'semaphores:folly', :expiry => 30, :token => 'spatulas-R-us')
+    }
+
+    let(:jsonapi_post_env) {
+      {'CONTENT_TYPE' => 'application/json',
+       'HTTP_ACCEPT'  => 'application/json; q=0.8, application/vnd.api+json'}
+    }
+
+    let(:jsonapi_patch_env) {
+      {'CONTENT_TYPE' => 'application/json-patch+json',
+       'HTTP_ACCEPT'  => 'application/json; q=0.8, application/vnd.api+json'}
+    }
+
+    before(:all) do
+      Flapjack::Gateways::JSONAPI.class_eval {
+        set :raise_errors, true
+      }
+    end
+
+    before(:each) do
+      expect(Flapjack::RedisPool).to receive(:new).and_return(redis)
+      Flapjack::Gateways::JSONAPI.instance_variable_set('@config', {})
+      Flapjack::Gateways::JSONAPI.instance_variable_set('@logger', @logger)
+      Flapjack::Gateways::JSONAPI.start
+    end
+
+    after(:each) do
+      if last_response.status >= 200 && last_response.status < 300
+        expect(last_response.headers.keys).to include('Access-Control-Allow-Methods')
+        expect(last_response.headers['Access-Control-Allow-Origin']).to eq("*")
+        unless last_response.status == 204
+          expect(Oj.load(last_response.body)).to be_a(Enumerable)
+          expect(last_response.headers['Content-Type']).to eq(Flapjack::Gateways::JSONAPI::JSONAPI_MEDIA_TYPE)
+        end
+      end
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 0.8.10
+  version: 0.8.11
 platform: ruby
 authors:
 - Lindsay Holmwood
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-28 00:00:00.000000000 Z
+date: 2014-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dante
@@ -292,6 +292,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rbtrace
+  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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -401,11 +415,15 @@ files:
 - lib/flapjack/gateways/jabber/alert.text.erb
 - lib/flapjack/gateways/jabber/rollup.text.erb
 - lib/flapjack/gateways/jsonapi.rb
+- lib/flapjack/gateways/jsonapi/check_methods.rb
+- lib/flapjack/gateways/jsonapi/check_presenter.rb
 - lib/flapjack/gateways/jsonapi/contact_methods.rb
-- lib/flapjack/gateways/jsonapi/entity_check_presenter.rb
 - lib/flapjack/gateways/jsonapi/entity_methods.rb
-- lib/flapjack/gateways/jsonapi/entity_presenter.rb
+- lib/flapjack/gateways/jsonapi/medium_methods.rb
+- lib/flapjack/gateways/jsonapi/notification_rule_methods.rb
+- lib/flapjack/gateways/jsonapi/pagerduty_credential_methods.rb
 - lib/flapjack/gateways/jsonapi/rack/json_params_parser.rb
+- lib/flapjack/gateways/jsonapi/report_methods.rb
 - lib/flapjack/gateways/oobetet.rb
 - lib/flapjack/gateways/pagerduty.rb
 - lib/flapjack/gateways/pagerduty/alert.text.erb
@@ -504,10 +522,14 @@ files:
 - spec/lib/flapjack/gateways/api_spec.rb
 - spec/lib/flapjack/gateways/email_spec.rb
 - spec/lib/flapjack/gateways/jabber_spec.rb
+- spec/lib/flapjack/gateways/jsonapi/check_methods_spec.rb
+- spec/lib/flapjack/gateways/jsonapi/check_presenter_spec.rb
 - spec/lib/flapjack/gateways/jsonapi/contact_methods_spec.rb
-- spec/lib/flapjack/gateways/jsonapi/entity_check_presenter_spec.rb
 - spec/lib/flapjack/gateways/jsonapi/entity_methods_spec.rb
-- spec/lib/flapjack/gateways/jsonapi/entity_presenter_spec.rb
+- spec/lib/flapjack/gateways/jsonapi/medium_methods_spec.rb
+- spec/lib/flapjack/gateways/jsonapi/notification_rule_methods_spec.rb
+- spec/lib/flapjack/gateways/jsonapi/pagerduty_credential_methods_spec.rb
+- spec/lib/flapjack/gateways/jsonapi/report_methods_spec.rb
 - spec/lib/flapjack/gateways/jsonapi_spec.rb
 - spec/lib/flapjack/gateways/oobetet_spec.rb
 - spec/lib/flapjack/gateways/pagerduty_spec.rb
@@ -524,6 +546,7 @@ files:
 - spec/lib/flapjack/utility_spec.rb
 - spec/spec_helper.rb
 - spec/support/erb_view_helper.rb
+- spec/support/jsonapi_helper.rb
 - spec/support/profile_all_formatter.rb
 - spec/support/uncolored_doc_formatter.rb
 - tasks/benchmarks.rake
@@ -615,10 +638,14 @@ test_files:
 - spec/lib/flapjack/gateways/api_spec.rb
 - spec/lib/flapjack/gateways/email_spec.rb
 - spec/lib/flapjack/gateways/jabber_spec.rb
+- spec/lib/flapjack/gateways/jsonapi/check_methods_spec.rb
+- spec/lib/flapjack/gateways/jsonapi/check_presenter_spec.rb
 - spec/lib/flapjack/gateways/jsonapi/contact_methods_spec.rb
-- spec/lib/flapjack/gateways/jsonapi/entity_check_presenter_spec.rb
 - spec/lib/flapjack/gateways/jsonapi/entity_methods_spec.rb
-- spec/lib/flapjack/gateways/jsonapi/entity_presenter_spec.rb
+- spec/lib/flapjack/gateways/jsonapi/medium_methods_spec.rb
+- spec/lib/flapjack/gateways/jsonapi/notification_rule_methods_spec.rb
+- spec/lib/flapjack/gateways/jsonapi/pagerduty_credential_methods_spec.rb
+- spec/lib/flapjack/gateways/jsonapi/report_methods_spec.rb
 - spec/lib/flapjack/gateways/jsonapi_spec.rb
 - spec/lib/flapjack/gateways/oobetet_spec.rb
 - spec/lib/flapjack/gateways/pagerduty_spec.rb
@@ -635,5 +662,6 @@ test_files:
 - spec/lib/flapjack/utility_spec.rb
 - spec/spec_helper.rb
 - spec/support/erb_view_helper.rb
+- spec/support/jsonapi_helper.rb
 - spec/support/profile_all_formatter.rb
 - spec/support/uncolored_doc_formatter.rb

data/lib/flapjack/gateways/jsonapi/entity_presenter.rb

@@ -1,75 +0,0 @@
-#!/usr/bin/env ruby
-
-# Formats entity data for presentation by the API methods in Flapjack::Gateways::API.
-# Currently this just aggregates all of the check data for an entity, leaving
-# clients to make any further calculations for themselves.
-
-require 'sinatra/base'
-
-require 'flapjack/gateways/jsonapi/entity_check_presenter'
-require 'flapjack/data/entity_check'
-
-module Flapjack
-
-  module Gateways
-
-    class JSONAPI < Sinatra::Base
-
-      class EntityPresenter
-
-        def initialize(entity, options = {})
-          @entity = entity
-          @redis = options[:redis]
-        end
-
-        def status
-          checks.collect {|c| {:entity => @entity.name, :check => c,
-                               :status => check_presenter(c).status } }
-        end
-
-        def outages(start_time, end_time)
-          checks.collect {|c|
-            {:entity => @entity.name, :check => c, :outages => check_presenter(c).outages(start_time, end_time)}
-          }
-        end
-
-        def unscheduled_maintenances(start_time, end_time)
-          checks.collect {|c|
-            {:entity => @entity.name, :check => c, :unscheduled_maintenances =>
-              check_presenter(c).unscheduled_maintenances(start_time, end_time)}
-          }
-        end
-
-        def scheduled_maintenances(start_time, end_time)
-          checks.collect {|c|
-            {:entity => @entity.name, :check => c, :scheduled_maintenances =>
-              check_presenter(c).scheduled_maintenances(start_time, end_time)}
-          }
-        end
-
-        def downtime(start_time, end_time)
-          checks.collect {|c|
-            {:entity => @entity.name, :check => c, :downtime =>
-              check_presenter(c).downtime(start_time, end_time)}
-          }
-        end
-
-      private
-
-        def checks
-          @check_list ||= @entity.check_list.sort
-        end
-
-        def check_presenter(check)
-          entity_check = Flapjack::Data::EntityCheck.for_entity(@entity, check,
-            :redis => @redis)
-          presenter = Flapjack::Gateways::JSONAPI::EntityCheckPresenter.new(entity_check)
-        end
-
-      end
-
-    end
-
-  end
-
-end

data/spec/lib/flapjack/gateways/jsonapi/entity_presenter_spec.rb

@@ -1,108 +0,0 @@
-require 'spec_helper'
-require 'flapjack/gateways/jsonapi/entity_presenter'
-
-describe 'Flapjack::Gateways::JSONAPI::EntityPresenter' do
-
-  let(:entity) { double(Flapjack::Data::Entity) }
-
-  let(:check_a) { double(Flapjack::Data::EntityCheck) }
-  let(:check_b) { double(Flapjack::Data::EntityCheck) }
-
-  let(:checkpres_a) { double(Flapjack::Gateways::JSONAPI::EntityCheckPresenter) }
-  let(:checkpres_b) { double(Flapjack::Gateways::JSONAPI::EntityCheckPresenter) }
-
-  let(:time) { Time.now.to_i }
-
-  let(:start_time) { time - (6 * 60 * 60) }
-  let(:end_time)   { time - (2 * 60 * 60) }
-
-  def expect_check_presenters
-    expect(entity).to receive(:name).exactly(4).times.and_return('foo')
-    expect(entity).to receive(:check_list).and_return(['ping', 'ssh'])
-    expect(Flapjack::Data::EntityCheck).to receive(:for_entity).
-      with(entity, 'ssh', anything).and_return(check_a)
-    expect(Flapjack::Data::EntityCheck).to receive(:for_entity).
-      with(entity, 'ping', anything).and_return(check_b)
-
-    expect(Flapjack::Gateways::JSONAPI::EntityCheckPresenter).to receive(:new).
-      with(check_a).and_return(checkpres_a)
-    expect(Flapjack::Gateways::JSONAPI::EntityCheckPresenter).to receive(:new).
-      with(check_b).and_return(checkpres_b)
-  end
-
-  it 'returns a list of status hashes for each check on an entity' do
-    expect_check_presenters
-
-    status_a = double('status_a')
-    status_b = double('status_b')
-    expect(checkpres_a).to receive(:status).and_return(status_a)
-    expect(checkpres_b).to receive(:status).and_return(status_b)
-
-    ep = Flapjack::Gateways::JSONAPI::EntityPresenter.new(entity)
-    status = ep.status
-    expect(status).to eq([{:entity => entity.name, :check => 'ping', :status => status_b},
-                      {:entity => entity.name, :check => 'ssh',  :status => status_a}])
-
-  end
-
-  it "returns a list of outage hashes for each check on an entity" do
-    expect_check_presenters
-    outages_a = double('outages_a')
-    outages_b = double('outages_b')
-    expect(checkpres_a).to receive(:outages).with(start_time, end_time).
-      and_return(outages_a)
-    expect(checkpres_b).to receive(:outages).with(start_time, end_time).
-      and_return(outages_b)
-
-    ep = Flapjack::Gateways::JSONAPI::EntityPresenter.new(entity)
-    outages = ep.outages(start_time, end_time)
-    expect(outages).to eq([{:entity => entity.name, :check => 'ping', :outages => outages_b},
-                       {:entity => entity.name, :check => 'ssh',  :outages => outages_a}])
-  end
-
-  it "returns a list of unscheduled maintenance periods for each check on an entity" do
-    expect_check_presenters
-    unsched_maint_a = double('unsched_maint_a')
-    unsched_maint_b = double('unsched_maint_b')
-    expect(checkpres_a).to receive(:unscheduled_maintenances).with(start_time, end_time).
-      and_return(unsched_maint_a)
-    expect(checkpres_b).to receive(:unscheduled_maintenances).with(start_time, end_time).
-      and_return(unsched_maint_b)
-
-    ep = Flapjack::Gateways::JSONAPI::EntityPresenter.new(entity)
-    unsched_maint = ep.unscheduled_maintenances(start_time, end_time)
-    expect(unsched_maint).to eq([{:entity => entity.name, :check => 'ping', :unscheduled_maintenances => unsched_maint_b},
-                             {:entity => entity.name, :check => 'ssh',  :unscheduled_maintenances => unsched_maint_a}])
-  end
-
-  it "returns a list of scheduled maintenance periods for each check on an entity" do
-    expect_check_presenters
-    sched_maint_a = double('sched_maint_a')
-    sched_maint_b = double('sched_maint_b')
-    expect(checkpres_a).to receive(:scheduled_maintenances).with(start_time, end_time).
-      and_return(sched_maint_a)
-    expect(checkpres_b).to receive(:scheduled_maintenances).with(start_time, end_time).
-      and_return(sched_maint_b)
-
-    ep = Flapjack::Gateways::JSONAPI::EntityPresenter.new(entity)
-    sched_maint = ep.scheduled_maintenances(start_time, end_time)
-    expect(sched_maint).to eq([{:entity => entity.name, :check => 'ping', :scheduled_maintenances => sched_maint_b},
-                           {:entity => entity.name, :check => 'ssh',  :scheduled_maintenances => sched_maint_a}])
-  end
-
-  it "returns a list of downtime for each check on an entity" do
-    expect_check_presenters
-    downtime_a = double('downtime_a')
-    downtime_b = double('downtime_b')
-    expect(checkpres_a).to receive(:downtime).with(start_time, end_time).
-      and_return(downtime_a)
-    expect(checkpres_b).to receive(:downtime).with(start_time, end_time).
-      and_return(downtime_b)
-
-    ep = Flapjack::Gateways::JSONAPI::EntityPresenter.new(entity)
-    downtime = ep.downtime(start_time, end_time)
-    expect(downtime).to eq([{:entity => entity.name, :check => 'ping', :downtime => downtime_b},
-                        {:entity => entity.name, :check => 'ssh',  :downtime => downtime_a}])
-  end
-
-end