lib/riemann/dash.rb in riemann-dash-0.1.1 vs lib/riemann/dash.rb in riemann-dash-0.2.0

@@ -1,7 +1,6 @@
 require 'rubygems'
-require 'riemann/client'
 require 'sinatra/base'
 
 module Riemann
   class Dash < Sinatra::Base
     # A little dashboard sinatra application.
@@ -11,36 +10,22 @@
     require 'erubis'
     require 'sass'
 
     def self.config
       @config ||= {
-        :client =>  {},
-        :age_scale => 60 * 30,
-        :state_order => {
-          'critical' => 3,
-          'warning' => 2,
-          'ok' => 1
-        },
-        :strftime => '%H:%M:%S',
         :controllers => [File.join(File.dirname(__FILE__), 'dash', 'controller')],
-        :helpers => [File.join(File.dirname(__FILE__), 'dash', 'helper')],
         :views => File.join(File.dirname(__FILE__), 'dash', 'views')
       }
     end
 
-    def self.client
-      @client ||= Riemann::Client.new(config[:client])
-    end
-
     def self.load(filename)
       unless load_config(filename || 'config.rb')
         # Configuration failed; load a default view.
         puts "No configuration loaded; using defaults."
       end
 
       config[:controllers].each { |d| load_controllers d }
-      config[:helpers].each { |d| load_helpers d }
       set :views, File.expand_path(config[:views])
 
       # Fallback pub dir
       public_dir(File.join(File.dirname(__FILE__), 'dash', 'public'))
     end
@@ -53,16 +38,17 @@
       rescue Errno::ENOENT
         false
       end
     end
 
-    # Load controllers.
-    # Controllers can be regular old one-file-per-class, but if you prefer a little
-    # more modularity, this method will allow you to define all controller methods
-    # in their own files.  For example, get "/posts/*/edit" can live in
-    # controller/posts/_/edit.rb. The sorting system provided here requires
-    # files in the correct order to handle wildcards appropriately.
+    # Load controllers. 
+    # Controllers can be regular old one-file-per-class, but
+    # if you prefer a little more modularity, this method will allow you to
+    # define all controller methods in their own files.  For example, get
+    # "/posts/*/edit" can live in controller/posts/_/edit.rb. The sorting
+    # system provided here requires files in the correct order to handle
+    # wildcards appropriately.
     def self.load_controllers(dir)
       rbs = []
       Find.find(
         File.expand_path(dir)
       ) do |path|
@@ -102,29 +88,12 @@
       rbs.each do |r|
         require r
       end 
     end 
 
-    # Load helpers
-    def self.load_helpers(dir)
-      Find.find(
-        File.expand_path(dir)
-      ) do |path|
-        require path if path =~ /\.rb$/
-      end
-    end
-
     # Add an additional public directory.
     def self.public_dir(dir)
       require 'riemann/dash/rack/static'
       use Riemann::Dash::Static, :root => dir
-    end
-
-    def client
-      self.class.client
-    end
-
-    def query(*a)
-      self.class.client.query(*a).events || []
     end
   end
 end