what 0.0.6 → 0.0.7

data/lib/what/config.rb

@@ -40,15 +40,4 @@ class What::Config
   def self.all
     @config
   end
-
-  def self.formatter
-    @formatter ||= case @config['formatter']
-                   when 'json'
-                     What::JsonFormatter.new
-                   when 'yaml'
-                     What::YamlFormatter.new
-                   else
-                     What::JsonFormatter.new
-                   end
-  end
 end

data/lib/what/formatter.rb

@@ -0,0 +1,20 @@
+class What::Formatter
+  def self.use(name)
+    @formatter = case name
+                 when 'json'
+                   What::Formatters::JSON.new
+                 when 'yaml'
+                   What::Formatters::YAML.new
+                 else
+                   What::Formatters::JSON.new
+                 end
+  end
+
+  def self.mime
+    @formatter.mime
+  end
+
+  def self.format(hash)
+    @formatter.format(hash)
+  end
+end

data/lib/what/formatters/base.rb

@@ -0,0 +1,9 @@
+class What::Formatters::Base
+  def mime
+    raise "Formatter #{self.class.name} doesn't override 'mime'"
+  end
+
+  def format(_)
+    raise "Formatter #{self.class.name} doesn't override 'format'"
+  end
+end

data/lib/what/formatters/json.rb

@@ -0,0 +1,9 @@
+class What::Formatters::JSON < What::Formatters::Base
+  def mime
+    'application/json'
+  end
+
+  def format(hash)
+    JSON.unparse(hash) + "\n"
+  end
+end

data/lib/what/formatters/yaml.rb

@@ -0,0 +1,9 @@
+class What::Formatters::YAML < What::Formatters::Base
+  def mime
+    'application/x-yaml'
+  end
+
+  def format(hash)
+    hash.to_yaml
+  end
+end

data/lib/what/formatters.rb

@@ -1,19 +1,23 @@
-class What::JsonFormatter
-  def mime
-    'application/json'
-  end
+module What::Formatters
+  def self.load_all
+    # load all formatters defined in what/formatters, in addition to any paths
+    # specified in the config file.
+    require 'what/formatters/base'
 
-  def format(hash)
-    JSON.unparse(hash) + "\n"
-  end
-end
+    globs = [File.join(File.dirname(__FILE__), 'formatters', '*.rb')]
 
-class What::YamlFormatter
-  def mime
-    'application/x-yaml'
-  end
+    if What::Config['formatter_paths']
+      What::Config['formatter_paths'].each do |formatter_path|
+        globs << File.join(What::Config['base'], formatter_path, '*.rb')
+      end
+    end
+
+    globs.each do |glob|
+      Dir[glob].each do |fn|
+        require fn
+      end
+    end
 
-  def format(hash)
-    hash.to_yaml
+    What::Formatter.use(What::Config['formatter'])
   end
 end

data/lib/what/server.rb

@@ -1,14 +1,15 @@
 class What::Server
   def initialize
     What::Modules.load_all
+    What::Formatters.load_all
     What::Monitor.go!
   end
 
   def call(_)
     [
       What::Status[:health] != :alert ? 200 : 503,
-      {'Content-Type' => What::Config.formatter.mime},
-      What::Config.formatter.format(What::Status.all)
+      {'Content-Type' => What::Formatter.mime},
+      What::Formatter.format(What::Status.all)
     ]
   end
 end

data/lib/what/version.rb

@@ -1,3 +1,3 @@
 module What
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/what.rb

@@ -6,11 +6,12 @@ require 'yaml'
 require 'webrick'
 require 'rack'
 
-require 'what/version'
-require 'what/helpers'
-require 'what/formatters'
 require 'what/config'
-require 'what/status'
+require 'what/formatter'
+require 'what/formatters'
+require 'what/helpers'
 require 'what/modules'
 require 'what/monitor'
 require 'what/server'
+require 'what/status'
+require 'what/version'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: what
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Ryan Lower
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-11 00:00:00 -07:00
+date: 2011-05-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -68,7 +68,11 @@ files:
 - example/what.yml
 - lib/what.rb
 - lib/what/config.rb
+- lib/what/formatter.rb
 - lib/what/formatters.rb
+- lib/what/formatters/base.rb
+- lib/what/formatters/json.rb
+- lib/what/formatters/yaml.rb
 - lib/what/helpers.rb
 - lib/what/modules.rb
 - lib/what/modules/base.rb