flapjack 0.7.15 → 0.7.16

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 ## Flapjack Changelog
 
+# 0.7.16 - 2013-06-27
+- Bug: errors accessing API gh-231 (@ali-graham)
+
 # 0.7.15 - 2013-06-27
 - Feature: Show acknowledgement duration on web interface, queryable via jabber gh-159 (@ali-graham)
 - Feature: More info on check state in email gh-207 (@ali-graham)

data/lib/flapjack/gateways/api.rb

@@ -722,7 +722,7 @@ module Flapjack
               entity_check = find_entity_check(entity, check)
               {:entity => entity_name,
                :check => check,
-               result_type.to_sym => yield(Flapjack::Gateways::API::EntityCheckPresenter.new(entity_check, :redis => redis))
+               result_type.to_sym => yield(Flapjack::Gateways::API::EntityCheckPresenter.new(entity_check))
               }
             }
           }.flatten(1)

data/lib/flapjack/gateways/api/entity_check_presenter.rb

@@ -26,9 +26,9 @@ module Flapjack
            'in_unscheduled_maintenance'        => @entity_check.in_unscheduled_maintenance?,
            'in_scheduled_maintenance'          => @entity_check.in_scheduled_maintenance?,
            'last_update'                       => @entity_check.last_update,
-           'last_problem_notification'         => entity_check.last_notification_for_state(:problem)[:timestamp],
-           'last_recovery_notification'        => entity_check.last_notification_for_state(:recovery)[:timestamp],
-           'last_acknowledgement_notification' => entity_check.last_notification_for_state(:acknowledgement)[:timestamp]}
+           'last_problem_notification'         => @entity_check.last_notification_for_state(:problem)[:timestamp],
+           'last_recovery_notification'        => @entity_check.last_notification_for_state(:recovery)[:timestamp],
+           'last_acknowledgement_notification' => @entity_check.last_notification_for_state(:acknowledgement)[:timestamp]}
         end
 
         def outages(start_time, end_time, options = {})
@@ -51,6 +51,8 @@ module Flapjack
             obj = hist_states[index]
             index += 1
 
+            next if obj[:state] == 'ok'
+
             if last_obj && (last_obj[:state] == obj[:state])
               # TODO maybe build up arrays of these instead, and leave calling
               # classes to join them together if needed?
@@ -59,8 +61,6 @@ module Flapjack
               next
             end
 
-            next if obj[:state] == 'ok'
-
             ts = obj[:timestamp]
 
             obj_st  = (last_obj || !start_time) ? ts : [ts, start_time].max

data/lib/flapjack/version.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
 module Flapjack
-  VERSION = "0.7.15"
+  VERSION = "0.7.16"
 end

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

@@ -114,7 +114,7 @@ describe 'Flapjack::Gateways::API', :sinatra => true, :logger => true, :json =>
       entity_check_presenter.should_receive(:status).and_return(status)
 
       Flapjack::Gateways::API::EntityCheckPresenter.should_receive(:new).
-        with(entity_check, :redis => redis).and_return(entity_check_presenter)
+        with(entity_check).and_return(entity_check_presenter)
 
       Flapjack::Data::EntityCheck.should_receive(:for_entity).
         with(entity, check, :redis => redis).and_return(entity_check)
@@ -182,7 +182,7 @@ describe 'Flapjack::Gateways::API', :sinatra => true, :logger => true, :json =>
       sched = mock('sched', :to_json => 'sched!'.to_json)
       entity_check_presenter.should_receive(:scheduled_maintenances).with(nil, nil).and_return(sched)
       Flapjack::Gateways::API::EntityCheckPresenter.should_receive(:new).
-        with(entity_check, :redis => redis).and_return(entity_check_presenter)
+        with(entity_check).and_return(entity_check_presenter)
       Flapjack::Data::Entity.should_receive(:find_by_name).
         with(entity_name, :redis => redis).and_return(entity)
       Flapjack::Data::EntityCheck.should_receive(:for_entity).
@@ -226,7 +226,7 @@ describe 'Flapjack::Gateways::API', :sinatra => true, :logger => true, :json =>
       unsched = mock('unsched', :to_json => 'unsched!'.to_json)
       entity_check_presenter.should_receive(:unscheduled_maintenances).with(nil, nil).and_return(unsched)
       Flapjack::Gateways::API::EntityCheckPresenter.should_receive(:new).
-        with(entity_check, :redis => redis).and_return(entity_check_presenter)
+        with(entity_check).and_return(entity_check_presenter)
       Flapjack::Data::Entity.should_receive(:find_by_name).
         with(entity_name, :redis => redis).and_return(entity)
       Flapjack::Data::EntityCheck.should_receive(:for_entity).
@@ -244,7 +244,7 @@ describe 'Flapjack::Gateways::API', :sinatra => true, :logger => true, :json =>
       unsched = mock('unsched', :to_json => 'unsched!'.to_json)
       entity_check_presenter.should_receive(:unscheduled_maintenances).with(start.to_i, finish.to_i).and_return(unsched)
       Flapjack::Gateways::API::EntityCheckPresenter.should_receive(:new).
-        with(entity_check, :redis => redis).and_return(entity_check_presenter)
+        with(entity_check).and_return(entity_check_presenter)
       Flapjack::Data::Entity.should_receive(:find_by_name).
         with(entity_name, :redis => redis).and_return(entity)
       Flapjack::Data::EntityCheck.should_receive(:for_entity).
@@ -274,7 +274,7 @@ describe 'Flapjack::Gateways::API', :sinatra => true, :logger => true, :json =>
       out = mock('out', :to_json => 'out!'.to_json)
       entity_check_presenter.should_receive(:outages).with(nil, nil).and_return(out)
       Flapjack::Gateways::API::EntityCheckPresenter.should_receive(:new).
-        with(entity_check, :redis => redis).and_return(entity_check_presenter)
+        with(entity_check).and_return(entity_check_presenter)
       Flapjack::Data::Entity.should_receive(:find_by_name).
         with(entity_name, :redis => redis).and_return(entity)
       Flapjack::Data::EntityCheck.should_receive(:for_entity).
@@ -303,7 +303,7 @@ describe 'Flapjack::Gateways::API', :sinatra => true, :logger => true, :json =>
       down = mock('down', :to_json => 'down!'.to_json)
       entity_check_presenter.should_receive(:downtime).with(nil, nil).and_return(down)
       Flapjack::Gateways::API::EntityCheckPresenter.should_receive(:new).
-        with(entity_check, :redis => redis).and_return(entity_check_presenter)
+        with(entity_check).and_return(entity_check_presenter)
       Flapjack::Data::Entity.should_receive(:find_by_name).
         with(entity_name, :redis => redis).and_return(entity)
       Flapjack::Data::EntityCheck.should_receive(:for_entity).
@@ -362,7 +362,7 @@ describe 'Flapjack::Gateways::API', :sinatra => true, :logger => true, :json =>
     entity_check_presenter.should_receive(:status).and_return(status)
 
     Flapjack::Gateways::API::EntityCheckPresenter.should_receive(:new).
-      with(entity_check, :redis => redis).and_return(entity_check_presenter)
+      with(entity_check).and_return(entity_check_presenter)
 
     Flapjack::Data::EntityCheck.should_receive(:for_entity).
       with(entity, check, :redis => redis).and_return(entity_check)
@@ -518,7 +518,7 @@ describe 'Flapjack::Gateways::API', :sinatra => true, :logger => true, :json =>
     entity_check_presenter.should_receive(:scheduled_maintenances).with(nil, nil).and_return(sm)
 
     Flapjack::Gateways::API::EntityCheckPresenter.should_receive(:new).
-      with(entity_check, :redis => redis).and_return(entity_check_presenter)
+      with(entity_check).and_return(entity_check_presenter)
 
     Flapjack::Data::EntityCheck.should_receive(:for_entity).
       with(entity, check, :redis => redis).and_return(entity_check)
@@ -555,7 +555,7 @@ describe 'Flapjack::Gateways::API', :sinatra => true, :logger => true, :json =>
     entity_check_presenter.should_receive(:unscheduled_maintenances).with(nil, nil).and_return(um)
 
     Flapjack::Gateways::API::EntityCheckPresenter.should_receive(:new).
-      with(entity_check, :redis => redis).and_return(entity_check_presenter)
+      with(entity_check).and_return(entity_check_presenter)
 
     Flapjack::Data::EntityCheck.should_receive(:for_entity).
       with(entity, check, :redis => redis).and_return(entity_check)
@@ -578,7 +578,7 @@ describe 'Flapjack::Gateways::API', :sinatra => true, :logger => true, :json =>
     entity_check_presenter.should_receive(:unscheduled_maintenances).with(start.to_i, finish.to_i).and_return(um)
 
     Flapjack::Gateways::API::EntityCheckPresenter.should_receive(:new).
-      with(entity_check, :redis => redis).and_return(entity_check_presenter)
+      with(entity_check).and_return(entity_check_presenter)
 
     Flapjack::Data::EntityCheck.should_receive(:for_entity).
       with(entity, check, :redis => redis).and_return(entity_check)
@@ -618,9 +618,9 @@ describe 'Flapjack::Gateways::API', :sinatra => true, :logger => true, :json =>
       with(entity, :redis => redis).and_return(entity_presenter)
 
     Flapjack::Gateways::API::EntityCheckPresenter.should_receive(:new).
-      with(foo_check, :redis => redis).and_return(foo_check_presenter)
+      with(foo_check).and_return(foo_check_presenter)
     Flapjack::Gateways::API::EntityCheckPresenter.should_receive(:new).
-      with(bar_check, :redis => redis).and_return(bar_check_presenter)
+      with(bar_check).and_return(bar_check_presenter)
 
     Flapjack::Data::Entity.should_receive(:find_by_name).
       with(entity_name, :redis => redis).and_return(entity)
@@ -644,7 +644,7 @@ describe 'Flapjack::Gateways::API', :sinatra => true, :logger => true, :json =>
     entity_check_presenter.should_receive(:outages).with(nil, nil).and_return(outages)
 
     Flapjack::Gateways::API::EntityCheckPresenter.should_receive(:new).
-      with(entity_check, :redis => redis).and_return(entity_check_presenter)
+      with(entity_check).and_return(entity_check_presenter)
 
     Flapjack::Data::EntityCheck.should_receive(:for_entity).
       with(entity, check, :redis => redis).and_return(entity_check)
@@ -681,7 +681,7 @@ describe 'Flapjack::Gateways::API', :sinatra => true, :logger => true, :json =>
     entity_check_presenter.should_receive(:downtime).with(nil, nil).and_return(downtime)
 
     Flapjack::Gateways::API::EntityCheckPresenter.should_receive(:new).
-      with(entity_check, :redis => redis).and_return(entity_check_presenter)
+      with(entity_check).and_return(entity_check_presenter)
 
     Flapjack::Data::EntityCheck.should_receive(:for_entity).
       with(entity, check, :redis => redis).and_return(entity_check)
@@ -735,7 +735,7 @@ describe 'Flapjack::Gateways::API', :sinatra => true, :logger => true, :json =>
     entity_check.should_receive(:check).and_return(check)
     Flapjack::Data::EntityCheck.should_receive(:for_entity).
       with(entity, check, :redis => redis).and_return(entity_check)
-  
+
     Flapjack::Data::Event.should_receive(:test_notifications).
     with(entity_name, check, hash_including(:redis => redis))
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 0.7.15
+  version: 0.7.16
   prerelease: 
 platform: ruby
 authors:
@@ -553,7 +553,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3712563231395847463
+      hash: -2341530797246933358
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -562,7 +562,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3712563231395847463
+      hash: -2341530797246933358
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23