flapjack 0.7.18 → 0.7.19

data/spec/lib/flapjack/gateways/web/views/{check.haml_spec.rb → check.html.erb_spec.rb}

@@ -1,13 +1,13 @@
 require 'spec_helper'
 
-describe 'web/views/check.haml', :haml_view => true do
+describe 'web/views/check.html.erb', :erb_view => true do
 
   it "should escape unsafe check characters in URIs" do
     @entity = 'abc-xyz-01'
     @check  = 'Disk / Utilisation'
     @last_notifications = {}
 
-    page = render_haml('check.haml', self)
+    page = render_erb('check.html.erb', binding)
     page.should match(%r{/abc-xyz-01/Disk%20%2F%20Utilisation})
   end
 

data/spec/lib/flapjack/gateways/web/views/{contact.haml_spec.rb → contact.html.erb_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'web/views/contact.haml', :haml_view => true do
+describe 'web/views/contact.html.erb', :erb_view => true do
 
   it "should escape unsafe check characters in URI parameters" do
     @contact = mock('contact')
@@ -15,8 +15,8 @@ describe 'web/views/contact.haml', :haml_view => true do
 
     @entities_and_checks = [{:entity => entity, :checks => checks}]
 
-    page = render_haml('contact.haml', self)
-    page.should match(%r{\?entity=abc-xyz-01&check=Disk\+%2F\+Utilisation})
+    page = render_erb('contact.html.erb', binding)
+    page.should match(%r{\?entity=abc-xyz-01&check=Disk%20%2F%20Utilisation})
   end
 
 end

data/spec/lib/flapjack/gateways/web/views/index.html.erb_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe 'web/views/checks.html.erb', :erb_view => true do
+
+  it "should escape unsafe check characters in URI parameters" do
+    @states = {'abc-xyz-01' => [['Disk / Utilisation', 'OK', 'Looking good', '-', '-', false, false, nil, nil]]}
+    @entities_sorted = ['abc-xyz-01']
+    @adjective = "all"
+
+    page = render_erb('checks.html.erb', binding)
+    page.should match(%r{\?entity=abc-xyz-01&check=Disk%20%2F%20Utilisation})
+  end
+
+end

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

@@ -43,17 +43,24 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
   end
 
   def expect_check_stats
-    redis.should_receive(:keys).with('check:*:*').and_return([])
-    redis.should_receive(:zcard).with('failed_checks')
+    Flapjack::Data::EntityCheck.should_receive(:count_all).
+      with(:redis => redis).and_return(1)
+    Flapjack::Data::EntityCheck.should_receive(:count_all_failing).
+      with(:redis => redis).and_return(1)
   end
 
   def expect_entity_stats
+    Flapjack::Data::Entity.should_receive(:find_all_with_checks).
+      with(:redis => redis).and_return([entity_name])
+    Flapjack::Data::Entity.should_receive(:find_all_with_failing_checks).
+      with(:redis => redis).and_return([entity_name])
   end
 
   def expect_entity_check_status(ec)
     time = Time.now.to_i
 
     ec.should_receive(:state).and_return('ok')
+    ec.should_receive(:summary).and_return('happy results are returned')
     ec.should_receive(:last_update).and_return(time - (3 * 60 * 60))
     ec.should_receive(:last_change).and_return(time - (3 * 60 * 60))
     ec.should_receive(:last_notification_for_state).with(:problem).and_return({:timestamp => time - ((3 * 60 * 60) + (5 * 60))})
@@ -67,8 +74,9 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
   # (for the methods that access redis directly)
 
   it "shows a page listing all checks" do
-    redis.should_receive(:keys).with('*:*:states').and_return(["#{entity_name}:#{check}"])
-
+    #redis.should_receive(:keys).with('*:*:states').and_return(["#{entity_name}:#{check}"])
+    Flapjack::Data::EntityCheck.should_receive(:find_all_by_entity).
+      with(:redis => redis).and_return({entity_name => [check]})
     expect_check_stats
 
     expect_entity_check_status(entity_check)
@@ -84,7 +92,7 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
   end
 
   it "shows a page listing failing checks" do
-    redis.should_receive(:zrange).with('failed_checks', 0, -1).and_return(["#{entity_name}:#{check}"])
+    #redis.should_receive(:zrange).with('failed_checks', 0, -1).and_return(["#{entity_name}:#{check}"])
 
     expect_check_stats
 
@@ -93,6 +101,9 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
     Flapjack::Data::Entity.should_receive(:find_by_name).
       with(entity_name, :redis => redis).and_return(entity)
 
+    Flapjack::Data::EntityCheck.should_receive(:find_all_failing_by_entity).
+      with(:redis => redis).and_return({entity_name => [check]})
+
     Flapjack::Data::EntityCheck.should_receive(:for_entity).
       with(entity, 'ping', :redis => redis).and_return(entity_check)
     get '/checks_failing'
@@ -100,8 +111,8 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
   end
 
   it "shows a page listing flapjack statistics" do
-    redis.should_receive(:keys).with('check:*').and_return([])
-    redis.should_receive(:zrange).with('failed_checks', 0, -1).and_return(["#{entity_name}:#{check}"])
+    #redis.should_receive(:keys).with('check:*').and_return([])
+    #redis.should_receive(:zrange).with('failed_checks', 0, -1).and_return(["#{entity_name}:#{check}"])
     expect_stats
     expect_check_stats
     expect_entity_stats
@@ -130,9 +141,10 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
     entity_check.should_receive(:current_maintenance).with(:scheduled => true).and_return(false)
     entity_check.should_receive(:current_maintenance).with(:scheduled => false).and_return(false)
     entity_check.should_receive(:contacts).and_return([])
-
     entity_check.should_receive(:historical_states).
       with(nil, time.to_i, :order => 'desc', :limit => 20).and_return([])
+    entity_check.should_receive(:enabled?).with().
+      and_return(true)
 
     Flapjack::Data::Entity.should_receive(:find_by_name).
       with(entity_name, :redis => redis).and_return(entity)

data/spec/lib/flapjack/logger_spec.rb

@@ -1,32 +1,34 @@
 require 'spec_helper'
-require 'flapjack/pikelet'
 
 describe Flapjack::Logger do
 
-  # let(:logger)     { mock(Log4r::Logger) }
-  # let(:stdout_out) { mock('stdout_out') }
-  # let(:syslog_out) { mock('syslog_out') }
-
-  it "creates a log4r logger"
-
-  it "changes the logging level via config hash"
-
-  it "passes a log command to its log4r logger"
-
-  # def setup_logger(type)
-  #   formatter = mock('Formatter')
-  #   Log4r::PatternFormatter.should_receive(:new).with(
-  #     :pattern => "[%l] %d :: #{type} :: %m",
-  #     :date_pattern => "%Y-%m-%dT%H:%M:%S%z").and_return(formatter)
-
-  #   stdout_out.should_receive(:formatter=).with(formatter)
-  #   syslog_out.should_receive(:formatter=).with(formatter)
-
-  #   Log4r::StdoutOutputter.should_receive(:new).and_return(stdout_out)
-  #   Log4r::SyslogOutputter.should_receive(:new).and_return(syslog_out)
-  #   logger.should_receive(:add).with(stdout_out)
-  #   logger.should_receive(:add).with(syslog_out)
-  #   Log4r::Logger.should_receive(:new).and_return(logger)
-  # end
-
-end
+  let(:logger)     { mock(::Logger) }
+
+  let(:sys_logger) { mock(::Logger) }
+  let(:syslog)     { mock(Syslog) }
+
+  it "creates a logger logging to STDOUT and syslog" do
+    logger.should_receive(:formatter=).with(an_instance_of(Proc))
+    logger.should_receive(:level=).and_return(Logger::DEBUG)
+    logger.should_receive(:warn).with("Yowza!")
+    ::Logger.should_receive(:new).with(STDOUT).and_return(logger)
+
+    if Syslog.const_defined?('Logger', false)
+      sys_logger.should_receive(:formatter=).with(an_instance_of(Proc))
+      sys_logger.should_receive(:level=).with(Logger::DEBUG)
+      sys_logger.should_receive(:warn).with("Yowza!")
+      Syslog.const_get('Logger', false).should_receive(:new).with('flapjack').and_return(sys_logger)
+    else
+      syslog.should_receive(:log).with(Syslog::Constants::LOG_WARNING, /\[WARN\] :: spec :: %s/, "Yowza!")
+      Syslog.should_receive(:"opened?").and_return(false)
+      Syslog.should_receive(:open).with('flapjack',
+        (Syslog::Constants::LOG_PID | Syslog::Constants::LOG_CONS),
+         Syslog::Constants::LOG_USER).and_return(syslog)
+      Syslog.should_receive(:mask=).with(Syslog::LOG_UPTO(Syslog::Constants::LOG_DEBUG))
+    end
+
+    flogger = Flapjack::Logger.new('spec', 'level' => 'debug')
+    flogger.warn "Yowza!"
+  end
+
+end

data/spec/lib/flapjack/notifier_spec.rb

@@ -0,0 +1,6 @@
+require 'spec_helper'
+require 'flapjack/notifier'
+
+describe Flapjack::Notifier do
+
+end

data/spec/lib/flapjack/pikelet_spec.rb

@@ -3,10 +3,10 @@ require 'flapjack/pikelet'
 
 describe Flapjack::Pikelet do
 
-  let(:config)       { mock('config') }
+  let(:config) { mock('config') }
   let(:redis_config) { mock('redis_config') }
 
-  let(:logger)     { mock(Flapjack::Logger) }
+  let(:logger) { mock(Flapjack::Logger) }
 
   let(:fiber) { mock(Fiber) }
 
@@ -16,21 +16,21 @@ describe Flapjack::Pikelet do
     Flapjack::Pikelet::Resque.class_variable_set(:@@resque_pool, nil)
   end
 
-  it "creates and starts an executive pikelet" do
+  it "creates and starts a processor pikelet" do
     Flapjack::Logger.should_receive(:new).and_return(logger)
 
     config.should_receive(:[]).with('logger').and_return(nil)
 
-    executive = mock('executive')
-    executive.should_receive(:start)
-    Flapjack::Executive.should_receive(:new).with(:config => config,
+    processor = mock('processor')
+    processor.should_receive(:start)
+    Flapjack::Processor.should_receive(:new).with(:config => config,
         :redis_config => redis_config, :boot_time => time, :logger => logger).
-      and_return(executive)
+      and_return(processor)
 
     fiber.should_receive(:resume)
     Fiber.should_receive(:new).and_yield.and_return(fiber)
 
-    pik = Flapjack::Pikelet.create('executive', :config => config,
+    pik = Flapjack::Pikelet.create('processor', :config => config,
       :redis_config => redis_config, :boot_time => time)
     pik.should be_a(Flapjack::Pikelet::Generic)
     pik.start

data/spec/lib/flapjack/{executive_spec.rb → processor_spec.rb}

@@ -1,9 +1,9 @@
 require 'spec_helper'
-require 'flapjack/executive'
+require 'flapjack/processor'
 
-describe Flapjack::Executive, :logger => true do
+describe Flapjack::Processor, :logger => true do
 
-  # NB: this is only testing the public API of the Executive class, which is pretty limited.
+  # NB: this is only testing the public API of the Processor class, which is pretty limited.
   # (initialize, main, stop). Most test coverage for this class comes from the cucumber features.
 
   # TODO this does too much -- split it up
@@ -40,7 +40,7 @@ describe Flapjack::Executive, :logger => true do
     Flapjack::Data::Event.should_receive(:pending_count).with(:redis => redis).and_return(0)
 
     Flapjack::RedisPool.should_receive(:new).and_return(redis)
-    executive = Flapjack::Executive.new(:config => {}, :logger => @logger)
+    executive = Flapjack::Processor.new(:config => {}, :logger => @logger)
 
     shutdown_evt = mock(Flapjack::Data::Event)
     shutdown_evt.should_receive(:inspect)

data/spec/spec_helper.rb

@@ -61,18 +61,6 @@ RSpec.configure do |config|
   #     --seed 1234
   config.order = 'random'
 
-  config.before(:each, :logger => true) do
-    def test_logger(class_name)
-      logger = Log4r::Logger.new(class_name)
-      outp = Log4r::FileOutputter.new(class_name,
-        :filename => File.join(File.dirname(__FILE__), '..', 'log', 'test.log'))
-      outp.formatter = Log4r::PatternFormatter.new(:pattern => "[%l] %d :: #{class_name} :: %m",
-        :date_pattern => "%Y-%m-%dT%H:%M:%S%z")
-      logger.add(outp)
-      logger
-    end
-  end
-
   config.around(:each, :redis => true) do |example|
     @redis = ::Redis.new(:db => 14, :driver => :ruby)
     @redis.flushdb
@@ -92,7 +80,7 @@ RSpec.configure do |config|
     Delorean.back_to_the_present
   end
 
-  config.include HamlViewHelper, :haml_view => true
+  config.include ErbViewHelper, :erb_view => true
   config.include Rack::Test::Methods, :sinatra => true
   config.include JsonSpec::Helpers, :json => true
 end

data/spec/support/erb_view_helper.rb

@@ -0,0 +1,23 @@
+require 'flapjack/utility'
+
+module ErbViewHelper
+
+  TEMPLATE_PATH = File.dirname(__FILE__) +
+      '/../../lib/flapjack/gateways/web/views/'
+
+  include Flapjack::Utility
+
+  def render_erb(file, bind)
+    erb = ERB.new(File.read(TEMPLATE_PATH + file))
+    erb.result(bind)
+  end
+
+  def h(text)
+    ERB::Util.h(text)
+  end
+
+  def u(text)
+    ERB::Util.u(text)
+  end
+
+end

data/tasks/profile.rake

@@ -278,7 +278,7 @@ namespace :profile do
             contents = msg.contents
             contents['event_count'] = n
             redis.rpush(config_env['jabber_gateway']['queue'],
-              Yajl::Encoder.encode(contents))
+              Oj.dump(contents))
           end
         end
 

data/tmp/acknowledge.rb

@@ -1,7 +1,9 @@
 #!/usr/bin/env ruby
 
 require 'redis'
-require 'json'
+
+require 'oj'
+Oj.default_options = { :indent => 0, :mode => :strict }
 
 if not id = ARGV.first then
   puts "Usage: acknowledge.rb <id>"

data/tmp/create_event_ok.rb

@@ -1,7 +1,9 @@
 #!/usr/bin/env ruby
 
 require 'redis'
-require 'json'
+
+require 'oj'
+Oj.default_options = { :indent => 0, :mode => :strict }
 
 #id = "%.2d" % (1..10).to_a[rand(9)]
 

data/tmp/create_event_unknown.rb

@@ -1,7 +1,9 @@
 #!/usr/bin/env ruby
 
 require 'redis'
-require 'json'
+
+require 'oj'
+Oj.default_options = { :indent => 0, :mode => :strict }
 
 #id = "%.2d" % (1..10).to_a[rand(9)]
 

data/tmp/create_events_failure.rb

@@ -1,7 +1,9 @@
 #!/usr/bin/env ruby
 
 require 'redis'
-require 'json'
+
+require 'oj'
+Oj.default_options = { :indent => 0, :mode => :strict }
 
 id = "%.2d" % (1..10).to_a[rand(9)]
 

data/tmp/create_events_ok.rb

@@ -1,7 +1,9 @@
 #!/usr/bin/env ruby
 
 require 'redis'
-require 'json'
+
+require 'oj'
+Oj.default_options = { :indent => 0, :mode => :strict }
 
 id = "%.2d" % (1..10).to_a[rand(9)]
 

data/tmp/create_events_ok_fail_ack_ok.rb

@@ -1,7 +1,9 @@
 #!/usr/bin/env ruby
 
 require 'redis'
-require 'json'
+
+require 'oj'
+Oj.default_options = { :indent => 0, :mode => :strict }
 
 id = "%.2d" % (1..10).to_a[rand(9)]
 

data/tmp/create_events_ok_failure.rb

@@ -1,7 +1,9 @@
 #!/usr/bin/env ruby
 
 require 'redis'
-require 'json'
+
+require 'oj'
+Oj.default_options = { :indent => 0, :mode => :strict }
 
 id = "%.2d" % (1..10).to_a[rand(9)]
 

data/tmp/create_events_ok_failure_ack.rb

@@ -1,7 +1,9 @@
 #!/usr/bin/env ruby
 
 require 'redis'
-require 'json'
+
+require 'oj'
+Oj.default_options = { :indent => 0, :mode => :strict }
 
 id = "%.2d" % (1..10).to_a[rand(9)]
 

data/tmp/test_json_post.rb

@@ -1,7 +1,9 @@
 #!/usr/bin/env ruby
 
-require 'HTTParty'
-require 'json'
+require 'httparty'
+
+require 'oj'
+Oj.default_options = { :indent => 0, :mode => :strict }
 
 @payload ={
     "email" => "phil@gmail.com",
@@ -12,5 +14,5 @@ require 'json'
     "auto_action" => "true"
  }
 
-HTTParty.post( 'http://localhost:4091/notification_rules', :body => JSON.dump(@payload), :options => { :headers => { 'ContentType' => 'application/json' } })
+HTTParty.post( 'http://localhost:4091/notification_rules', :body => Oj.dump(@payload), :options => { :headers => { 'ContentType' => 'application/json' } })