@@ -1,7 +1,7 @@ module Visage class Config - class << self + class << self def use @configuration ||= {} yield @configuration @@ -20,5 +20,30 @@ module Visage @configuration end end + + class Profiles + class << self + attr_accessor :profiles + + def get(id) + id.gsub!(/\s+/, '+') + if found = @profiles.find {|p| p[1]["splatpart"] == id } + OpenStruct.new(found[1]) + else + nil + end + end + + def all + # here be ugliness + profiles = @profiles.to_a.sort_by { |profile| + profile[1]["order"] + }.map { |profile| + OpenStruct.new(profile[1].merge({'name' => profile[0]})) + } + end + end + end + end end lib/visage-config.rb @@ -9,7 +9,6 @@ require 'RRDtool' require 'yajl' require 'haml' require 'lib/collectd-json' -require 'lib/collectd-profile' require 'lib/visage-config' set :public, __DIR__ + '/public' @@ -19,7 +18,7 @@ configure do require 'config/init' CollectdJSON.rrddir = Visage::Config.rrddir - CollectdProfile.profiles = Visage::Config.profiles + Visage::Config::Profiles.profiles = Visage::Config.profiles end template :layout do @@ -43,15 +42,15 @@ end get '/:host' do @hosts = CollectdJSON.hosts - @profiles = CollectdProfile.all + @profiles = Visage::Config::Profiles.all haml :index end get '/:host/:profile' do @hosts = CollectdJSON.hosts - @profiles = CollectdProfile.all - @profile = CollectdProfile.get(params[:profile]) + @profiles = Visage::Config::Profiles.all + @profile = Visage::Config::Profiles.get(params[:profile]) haml :index end visage.rb c4e18262238247bbd0fa2ab4c2cae4e4f8ede3a8 jf jfs.world@gmail.com http://github.com/jf/visage/commit/6c012677b77e53e52f375dc72ce62f62ee27e121 6c012677b77e53e52f375dc72ce62f62ee27e121 2009-10-11T09:16:15-07:00 2009-10-11T09:16:15-07:00 refactor - profiles have more to do with 'Visage::Config', than 'Collectd' d7a49116067704bfba791d638b1d8cd650859023 jf jfs.world@gmail.com