RubyGems - fozzie - Versions diffs - 0.0.15 → 0.0.16 - Mend

fozzie 0.0.15 → 0.0.16

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (26) hide show

data/Guardfile +3 -0
data/doc/lib/core_ext/hash.html +79 -0
data/doc/lib/fozzie.html +148 -0
data/doc/lib/fozzie/configuration.html +174 -0
data/doc/lib/fozzie/interface.html +288 -0
data/doc/lib/fozzie/rack/middleware.html +97 -0
data/doc/lib/fozzie/rails/middleware.html +97 -0
data/doc/lib/fozzie/socket.html +123 -0
data/doc/lib/fozzie/version.html +36 -0
data/fozzie.gemspec +6 -0
data/lib/fozzie.rb +52 -10
data/lib/fozzie/configuration.rb +16 -32
data/lib/fozzie/interface.rb +121 -0
data/lib/fozzie/rack/middleware.rb +3 -0
data/lib/fozzie/rails/middleware.rb +4 -0
data/lib/fozzie/socket.rb +44 -0
data/lib/fozzie/version.rb +1 -1
data/spec/lib/fozzie/configuration_spec.rb +9 -42
data/spec/lib/fozzie/interface_spec.rb +136 -0
data/spec/lib/fozzie/rack/middleware_spec.rb +3 -5
data/spec/lib/fozzie/rails/middleware_spec.rb +35 -29
data/spec/lib/fozzie_spec.rb +6 -138
metadata +69 -28
data/lib/fozzie/classes.rb +0 -146
data/lib/fozzie/config.rb +0 -19
data/spec/lib/fozzie/config_spec.rb +0 -24

data/doc/lib/fozzie/rack/middleware.html ADDED Viewed

@@ -0,0 +1,97 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta http-equiv="content-type" content="text/html;charset=utf-8">
+  <title>middleware.rb</title>
+  <link rel="stylesheet" href="http://jashkenas.github.com/docco/resources/docco.css">
+</head>
+<body>
+<div id='container'>
+  <div id="background"></div>
+  <div id="jump_to">
+    Jump To &hellip;
+    <div id="jump_wrapper">
+      <div id="jump_page">
+          <a class="source" href="../../core_ext/hash.html">hash.rb</a>
+          <a class="source" href="../../fozzie.html">fozzie.rb</a>
+          <a class="source" href="../configuration.html">configuration.rb</a>
+          <a class="source" href="../interface.html">interface.rb</a>
+          <a class="source" href="middleware.html">middleware.rb</a>
+          <a class="source" href="../rails/middleware.html">middleware.rb</a>
+          <a class="source" href="../socket.html">socket.rb</a>
+          <a class="source" href="../version.html">version.rb</a>
+      </div>
+    </div>
+  </div>
+  <table cellspacing=0 cellpadding=0>
+  <thead>
+    <tr>
+      <th class=docs><h1>middleware.rb</h1></th>
+      <th class=code></th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr id='section-1'>
+      <td class=docs>
+        <div class="pilwrap">
+          <a class="pilcrow" href="#section-1">&#182;</a>
+        </div>
+      </td>
+      <td class=code>
+        <div class='highlight'><pre><span class="k">module</span> <span class="nn">Fozzie</span>
+  <span class="k">module</span> <span class="nn">Rack</span></pre></div>
+      </td>
+    </tr>
+    <tr id='section-2'>
+      <td class=docs>
+        <div class="pilwrap">
+          <a class="pilcrow" href="#section-2">&#182;</a>
+        </div>
+        <p>Time and record each request through a given Rack app
+This middlewware times server processing for a resource, not view render.</p>
+      </td>
+      <td class=code>
+        <div class='highlight'><pre>    <span class="k">class</span> <span class="nc">Middleware</span>
+      <span class="kp">attr_reader</span> <span class="ss">:app</span>
+      <span class="k">def</span> <span class="nf">initialize</span><span class="p">(</span><span class="n">app</span><span class="p">)</span>
+        <span class="vi">@app</span> <span class="o">=</span> <span class="n">app</span>
+      <span class="k">end</span>
+      <span class="k">def</span> <span class="nf">call</span><span class="p">(</span><span class="n">env</span><span class="p">)</span>
+        <span class="n">k</span> <span class="o">=</span> <span class="n">generate_key</span><span class="p">(</span><span class="n">env</span><span class="p">)</span>
+        <span class="k">if</span> <span class="n">k</span><span class="o">.</span><span class="n">nil?</span>
+          <span class="nb">self</span><span class="o">.</span><span class="n">call_without_timer</span><span class="p">(</span><span class="n">env</span><span class="p">)</span>
+        <span class="k">else</span>
+          <span class="nb">self</span><span class="o">.</span><span class="n">call_with_timer</span><span class="p">(</span><span class="n">k</span><span class="p">,</span> <span class="n">env</span><span class="p">)</span>
+        <span class="k">end</span>
+      <span class="k">end</span>
+      <span class="k">def</span> <span class="nf">call_without_timer</span><span class="p">(</span><span class="n">env</span><span class="p">)</span>
+        <span class="vi">@app</span><span class="o">.</span><span class="n">call</span><span class="p">(</span><span class="n">env</span><span class="p">)</span>
+      <span class="k">end</span>
+      <span class="k">def</span> <span class="nf">call_with_timer</span><span class="p">(</span><span class="n">key</span><span class="p">,</span> <span class="n">env</span><span class="p">)</span>
+        <span class="n">S</span><span class="o">.</span><span class="n">time_to_do</span> <span class="n">key</span> <span class="k">do</span>
+          <span class="vi">@app</span><span class="o">.</span><span class="n">call</span><span class="p">(</span><span class="n">env</span><span class="p">)</span>
+        <span class="k">end</span>
+      <span class="k">end</span>
+      <span class="k">def</span> <span class="nf">generate_key</span><span class="p">(</span><span class="n">env</span><span class="p">)</span>
+        <span class="n">s</span> <span class="o">=</span> <span class="n">env</span><span class="o">[</span><span class="s1">&#39;PATH_INFO&#39;</span><span class="o">]</span>
+        <span class="k">return</span> <span class="kp">nil</span> <span class="k">if</span> <span class="n">s</span><span class="o">.</span><span class="n">nil?</span>
+        <span class="n">s</span> <span class="o">=</span> <span class="p">(</span><span class="n">s</span> <span class="o">==</span> <span class="s1">&#39;/&#39;</span> <span class="p">?</span> <span class="s1">&#39;index&#39;</span> <span class="p">:</span> <span class="n">s</span><span class="o">.</span><span class="n">gsub</span><span class="p">(</span><span class="sr">/.(\/)./</span><span class="p">)</span> <span class="p">{</span><span class="o">|</span><span class="n">m</span><span class="o">|</span> <span class="n">m</span><span class="o">.</span><span class="n">gsub</span><span class="p">(</span><span class="s1">&#39;/&#39;</span><span class="p">,</span> <span class="s1">&#39;.&#39;</span><span class="p">)</span> <span class="p">}</span><span class="o">.</span><span class="n">gsub</span><span class="p">(</span><span class="sr">/\//</span><span class="p">,</span> <span class="s1">&#39;&#39;</span><span class="p">)</span><span class="o">.</span><span class="n">strip</span><span class="p">)</span>
+        <span class="p">(</span><span class="n">s</span><span class="o">.</span><span class="n">nil?</span> <span class="o">||</span> <span class="n">s</span><span class="o">.</span><span class="n">empty?</span> <span class="p">?</span> <span class="kp">nil</span> <span class="p">:</span> <span class="s2">&quot;</span><span class="si">#{</span><span class="n">s</span><span class="si">}</span><span class="s2">.render&quot;</span><span class="p">)</span>
+      <span class="k">end</span>
+    <span class="k">end</span>
+  <span class="k">end</span>
+<span class="k">end</span></pre></div>
+      </td>
+    </tr>
+  </table>
+</div>
+</body>

data/doc/lib/fozzie/rails/middleware.html ADDED Viewed

@@ -0,0 +1,97 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta http-equiv="content-type" content="text/html;charset=utf-8">
+  <title>middleware.rb</title>
+  <link rel="stylesheet" href="http://jashkenas.github.com/docco/resources/docco.css">
+</head>
+<body>
+<div id='container'>
+  <div id="background"></div>
+  <div id="jump_to">
+    Jump To &hellip;
+    <div id="jump_wrapper">
+      <div id="jump_page">
+          <a class="source" href="../../core_ext/hash.html">hash.rb</a>
+          <a class="source" href="../../fozzie.html">fozzie.rb</a>
+          <a class="source" href="../configuration.html">configuration.rb</a>
+          <a class="source" href="../interface.html">interface.rb</a>
+          <a class="source" href="../rack/middleware.html">middleware.rb</a>
+          <a class="source" href="middleware.html">middleware.rb</a>
+          <a class="source" href="../socket.html">socket.rb</a>
+          <a class="source" href="../version.html">version.rb</a>
+      </div>
+    </div>
+  </div>
+  <table cellspacing=0 cellpadding=0>
+  <thead>
+    <tr>
+      <th class=docs><h1>middleware.rb</h1></th>
+      <th class=code></th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr id='section-1'>
+      <td class=docs>
+        <div class="pilwrap">
+          <a class="pilcrow" href="#section-1">&#182;</a>
+        </div>
+      </td>
+      <td class=code>
+        <div class='highlight'><pre><span class="nb">require</span> <span class="s1">&#39;fozzie/rack/middleware&#39;</span>
+<span class="k">module</span> <span class="nn">Fozzie</span>
+  <span class="k">module</span> <span class="nn">Rails</span></pre></div>
+      </td>
+    </tr>
+    <tr id='section-2'>
+      <td class=docs>
+        <div class="pilwrap">
+          <a class="pilcrow" href="#section-2">&#182;</a>
+        </div>
+        <p>Time and record each request through a given Rails app
+This middlewware times server processing for a resource, not view render.</p>
+      </td>
+      <td class=code>
+        <div class='highlight'><pre>    <span class="k">class</span> <span class="nc">Middleware</span> <span class="o">&lt;</span> <span class="no">Fozzie</span><span class="o">::</span><span class="no">Rack</span><span class="o">::</span><span class="no">Middleware</span></pre></div>
+      </td>
+    </tr>
+    <tr id='section-3'>
+      <td class=docs>
+        <div class="pilwrap">
+          <a class="pilcrow" href="#section-3">&#182;</a>
+        </div>
+        <p>Generates the statistics key for the current path</p>
+      </td>
+      <td class=code>
+        <div class='highlight'><pre>      <span class="k">def</span> <span class="nf">generate_key</span><span class="p">(</span><span class="n">env</span><span class="p">)</span>
+        <span class="n">path_str</span> <span class="o">=</span> <span class="n">env</span><span class="o">[</span><span class="s1">&#39;PATH_INFO&#39;</span><span class="o">]</span>
+        <span class="k">return</span> <span class="kp">nil</span> <span class="k">unless</span> <span class="n">path_str</span>
+        <span class="k">begin</span>
+          <span class="n">routing</span> <span class="o">=</span> <span class="p">(</span><span class="n">rails_version</span> <span class="o">==</span> <span class="mi">3</span> <span class="o">?</span> <span class="o">::</span><span class="no">Rails</span><span class="o">.</span><span class="n">application</span><span class="o">.</span><span class="n">routes</span> <span class="p">:</span> <span class="o">::</span><span class="no">ActionController</span><span class="o">::</span><span class="no">Routing</span><span class="o">::</span><span class="no">Routes</span><span class="p">)</span>
+          <span class="n">path</span>    <span class="o">=</span> <span class="n">routing</span><span class="o">.</span><span class="n">recognize_path</span><span class="p">(</span><span class="n">path_str</span><span class="p">)</span>
+          <span class="n">stat</span>    <span class="o">=</span> <span class="o">[</span><span class="n">path</span><span class="o">[</span><span class="ss">:controller</span><span class="o">]</span><span class="p">,</span> <span class="n">path</span><span class="o">[</span><span class="ss">:action</span><span class="o">]</span><span class="p">,</span> <span class="s2">&quot;render&quot;</span><span class="o">].</span><span class="n">join</span><span class="p">(</span><span class="s1">&#39;.&#39;</span><span class="p">)</span>
+          <span class="n">stat</span>
+        <span class="k">rescue</span> <span class="no">ActionController</span><span class="o">::</span><span class="no">RoutingError</span> <span class="o">=&gt;</span> <span class="n">exc</span>
+          <span class="n">S</span><span class="o">.</span><span class="n">increment</span> <span class="s2">&quot;routing.error&quot;</span>
+          <span class="kp">nil</span>
+        <span class="k">rescue</span> <span class="o">=&gt;</span> <span class="n">exc</span>
+          <span class="kp">nil</span>
+        <span class="k">end</span>
+      <span class="k">end</span>
+      <span class="k">def</span> <span class="nf">rails_version</span>
+        <span class="o">::</span><span class="no">Rails</span><span class="o">.</span><span class="n">version</span><span class="o">.</span><span class="n">to_i</span>
+      <span class="k">end</span>
+    <span class="k">end</span>
+  <span class="k">end</span>
+<span class="k">end</span></pre></div>
+      </td>
+    </tr>
+  </table>
+</div>
+</body>

data/doc/lib/fozzie/socket.html ADDED Viewed

@@ -0,0 +1,123 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta http-equiv="content-type" content="text/html;charset=utf-8">
+  <title>socket.rb</title>
+  <link rel="stylesheet" href="http://jashkenas.github.com/docco/resources/docco.css">
+</head>
+<body>
+<div id='container'>
+  <div id="background"></div>
+  <div id="jump_to">
+    Jump To &hellip;
+    <div id="jump_wrapper">
+      <div id="jump_page">
+          <a class="source" href="../core_ext/hash.html">hash.rb</a>
+          <a class="source" href="../fozzie.html">fozzie.rb</a>
+          <a class="source" href="configuration.html">configuration.rb</a>
+          <a class="source" href="interface.html">interface.rb</a>
+          <a class="source" href="rack/middleware.html">middleware.rb</a>
+          <a class="source" href="rails/middleware.html">middleware.rb</a>
+          <a class="source" href="socket.html">socket.rb</a>
+          <a class="source" href="version.html">version.rb</a>
+      </div>
+    </div>
+  </div>
+  <table cellspacing=0 cellpadding=0>
+  <thead>
+    <tr>
+      <th class=docs><h1>socket.rb</h1></th>
+      <th class=code></th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr id='section-1'>
+      <td class=docs>
+        <div class="pilwrap">
+          <a class="pilcrow" href="#section-1">&#182;</a>
+        </div>
+      </td>
+      <td class=code>
+        <div class='highlight'><pre><span class="k">module</span> <span class="nn">Fozzie</span>
+  <span class="k">module</span> <span class="nn">Socket</span>
+    <span class="no">RESERVED_CHARS_REGEX</span> <span class="o">=</span> <span class="sr">/[\:\|\@]/</span>
+    <span class="kp">private</span></pre></div>
+      </td>
+    </tr>
+    <tr id='section-2'>
+      <td class=docs>
+        <div class="pilwrap">
+          <a class="pilcrow" href="#section-2">&#182;</a>
+        </div>
+        <p>Send the statistic to the server</p>
+      </td>
+      <td class=code>
+        <div class='highlight'><pre>    <span class="k">def</span> <span class="nf">send</span><span class="p">(</span><span class="n">stat</span><span class="p">,</span> <span class="n">delta</span><span class="p">,</span> <span class="nb">type</span><span class="p">,</span> <span class="n">sample_rate</span><span class="p">)</span>
+      <span class="n">prefix</span> <span class="o">=</span> <span class="s2">&quot;%s.&quot;</span> <span class="o">%</span> <span class="no">Fozzie</span><span class="o">.</span><span class="n">c</span><span class="o">.</span><span class="n">data_prefix</span> <span class="k">unless</span> <span class="no">Fozzie</span><span class="o">.</span><span class="n">c</span><span class="o">.</span><span class="n">data_prefix</span><span class="o">.</span><span class="n">nil?</span>
+      <span class="n">stat</span>   <span class="o">=</span> <span class="n">stat</span><span class="o">.</span><span class="n">to_s</span><span class="o">.</span><span class="n">gsub</span><span class="p">(</span><span class="s1">&#39;::&#39;</span><span class="p">,</span> <span class="s1">&#39;.&#39;</span><span class="p">)</span><span class="o">.</span><span class="n">gsub</span><span class="p">(</span><span class="no">RESERVED_CHARS_REGEX</span><span class="p">,</span> <span class="s1">&#39;_&#39;</span><span class="p">)</span>
+      <span class="n">k</span> <span class="o">=</span> <span class="s2">&quot;%s%s:%s|%s&quot;</span> <span class="o">%</span> <span class="o">[</span><span class="n">prefix</span><span class="p">,</span> <span class="n">stat</span><span class="p">,</span> <span class="n">delta</span><span class="p">,</span> <span class="nb">type</span><span class="o">]</span>
+      <span class="n">k</span> <span class="o">&lt;&lt;</span> <span class="s1">&#39;|@%s&#39;</span> <span class="o">%</span> <span class="n">sample_rate</span><span class="o">.</span><span class="n">to_s</span> <span class="k">if</span> <span class="n">sample_rate</span> <span class="o">&lt;</span> <span class="mi">1</span>
+      <span class="n">sampled</span><span class="p">(</span><span class="n">sample_rate</span><span class="p">)</span> <span class="p">{</span> <span class="n">send_to_socket</span><span class="p">(</span><span class="n">k</span><span class="o">.</span><span class="n">strip</span><span class="p">)</span> <span class="p">}</span>
+    <span class="k">end</span></pre></div>
+      </td>
+    </tr>
+    <tr id='section-3'>
+      <td class=docs>
+        <div class="pilwrap">
+          <a class="pilcrow" href="#section-3">&#182;</a>
+        </div>
+        <p>If the statistic is sampled, generate a condition to check if it&rsquo;s good to send</p>
+      </td>
+      <td class=code>
+        <div class='highlight'><pre>    <span class="k">def</span> <span class="nf">sampled</span><span class="p">(</span><span class="n">sample_rate</span><span class="p">)</span>
+      <span class="k">yield</span> <span class="k">unless</span> <span class="n">sample_rate</span> <span class="o">&lt;</span> <span class="mi">1</span> <span class="ow">and</span> <span class="nb">rand</span> <span class="o">&gt;</span> <span class="n">sample_rate</span>
+    <span class="k">end</span></pre></div>
+      </td>
+    </tr>
+    <tr id='section-4'>
+      <td class=docs>
+        <div class="pilwrap">
+          <a class="pilcrow" href="#section-4">&#182;</a>
+        </div>
+        <p>Send data to the server via the socket</p>
+      </td>
+      <td class=code>
+        <div class='highlight'><pre>    <span class="k">def</span> <span class="nf">send_to_socket</span><span class="p">(</span><span class="n">message</span><span class="p">)</span>
+      <span class="k">begin</span>
+        <span class="no">Fozzie</span><span class="o">.</span><span class="n">logger</span><span class="o">.</span><span class="n">debug</span> <span class="p">{</span><span class="s2">&quot;Statsd: </span><span class="si">#{</span><span class="n">message</span><span class="si">}</span><span class="s2">&quot;</span><span class="p">}</span> <span class="k">if</span> <span class="no">Fozzie</span><span class="o">.</span><span class="n">logger</span>
+        <span class="no">Timeout</span><span class="o">.</span><span class="n">timeout</span><span class="p">(</span><span class="no">Fozzie</span><span class="o">.</span><span class="n">c</span><span class="o">.</span><span class="n">timeout</span><span class="p">)</span> <span class="p">{</span>
+          <span class="n">socket</span><span class="o">.</span><span class="n">send</span><span class="p">(</span><span class="n">message</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="no">Fozzie</span><span class="o">.</span><span class="n">c</span><span class="o">.</span><span class="n">host</span><span class="p">,</span> <span class="no">Fozzie</span><span class="o">.</span><span class="n">c</span><span class="o">.</span><span class="n">port</span><span class="p">)</span>
+          <span class="kp">true</span>
+        <span class="p">}</span>
+      <span class="k">rescue</span> <span class="o">=&gt;</span> <span class="n">exc</span>
+        <span class="no">Fozzie</span><span class="o">.</span><span class="n">ogger</span><span class="o">.</span><span class="n">debug</span> <span class="p">{</span><span class="s2">&quot;Statsd Failure: </span><span class="si">#{</span><span class="n">exc</span><span class="o">.</span><span class="n">message</span><span class="si">}</span><span class="se">\n</span><span class="si">#{</span><span class="n">exc</span><span class="o">.</span><span class="n">backtrace</span><span class="si">}</span><span class="s2">&quot;</span><span class="p">}</span> <span class="k">if</span> <span class="no">Fozzie</span><span class="o">.</span><span class="n">logger</span>
+        <span class="kp">false</span>
+      <span class="k">end</span>
+    <span class="k">end</span></pre></div>
+      </td>
+    </tr>
+    <tr id='section-5'>
+      <td class=docs>
+        <div class="pilwrap">
+          <a class="pilcrow" href="#section-5">&#182;</a>
+        </div>
+        <p>The Socket we want to use to send data</p>
+      </td>
+      <td class=code>
+        <div class='highlight'><pre>    <span class="k">def</span> <span class="nf">socket</span>
+      <span class="vi">@socket</span> <span class="o">||=</span> <span class="no">UDPSocket</span><span class="o">.</span><span class="n">new</span>
+    <span class="k">end</span>
+  <span class="k">end</span>
+<span class="k">end</span></pre></div>
+      </td>
+    </tr>
+  </table>
+</div>
+</body>

data/doc/lib/fozzie/version.html ADDED Viewed

@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta http-equiv="content-type" content="text/html;charset=utf-8">
+  <title>version.rb</title>
+  <link rel="stylesheet" href="http://jashkenas.github.com/docco/resources/docco.css">
+</head>
+<body>
+<div id='container'>
+  <div id="background"></div>
+  <div id="jump_to">
+    Jump To &hellip;
+    <div id="jump_wrapper">
+      <div id="jump_page">
+          <a class="source" href="../core_ext/hash.html">hash.rb</a>
+          <a class="source" href="../fozzie.html">fozzie.rb</a>
+          <a class="source" href="configuration.html">configuration.rb</a>
+          <a class="source" href="interface.html">interface.rb</a>
+          <a class="source" href="rack/middleware.html">middleware.rb</a>
+          <a class="source" href="rails/middleware.html">middleware.rb</a>
+          <a class="source" href="socket.html">socket.rb</a>
+          <a class="source" href="version.html">version.rb</a>
+      </div>
+    </div>
+  </div>
+  <table cellspacing=0 cellpadding=0>
+  <thead>
+    <tr>
+      <th class=docs><h1>version.rb</h1></th>
+      <th class=code></th>
+    </tr>
+  </thead>
+  <tbody>
+  </table>
+</div>
+</body>

data/fozzie.gemspec CHANGED Viewed

@@ -16,15 +16,21 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
+  s.add_dependency 'sys-uname'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'mocha'
   s.add_development_dependency 'syntax'
   s.add_development_dependency 'rack-test'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'sinatra'
   s.add_development_dependency 'actionpack'
   s.add_development_dependency 'guard'
   s.add_development_dependency 'guard-rspec'
+  s.add_development_dependency 'guard-rocco'
+  s.add_development_dependency 'fl-rocco'
 end

data/lib/fozzie.rb CHANGED Viewed

@@ -1,13 +1,55 @@
-# generic
-require "fozzie/config"
-require "fozzie/classes"
-require "fozzie/version"
+# Fozzie is an implementation of the Statsd statistics gathering tool,
+# designed to make gathering stastistics from applications easy, fast, and effective.
+#
+# Configuration can be applied through a block and/or configuration file ('config/fozzie.yml')
+#
+# Fozzie provides automatic namespacing for the current environment, and host.
+#
+# Rack and Rails middleware is avaliable to gather statistics on the processing time of Controller actions.
+#
+module Fozzie
-# middleware
-require "fozzie/rack/middleware"
-require "fozzie/rails/middleware"
+  require_relative 'fozzie/configuration'
+  require_relative "fozzie/interface"
+  require_relative "fozzie/version"
+  require_relative "fozzie/rack/middleware"
+  require_relative "fozzie/rails/middleware"
+  class << self
+    # Shortcut for `Fozzie.config`
+    def c
+      config
+    end
+    # Returns the current configuration. Creates configuration on first-time request
+    def config
+      @config ||= Configuration.new
+    end
+    # Allows the setting on valudes against the configuration
+    #
+    # `Fozzie.configure {|config| config.wat = :random }`
+    def configure
+      yield c if block_given?
+    end
+    # Set a logger
+    def logger=(logger)
+      @logger = logger
+    end
+    # Accessor for logger
+    def logger
+      @logger
+    end
+  end
+  # Loads each namespace for registering statistics
+  self.c.namespaces.each do |klas|
+    Kernel.const_set(klas, Interface.instance) unless const_defined?(klas)
+  end
-module Fozzie
-  extend Fozzie::Config
-  include Fozzie::Classes
 end

data/lib/fozzie/configuration.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 require 'core_ext/hash'
-require 'resolv'
+require 'sys/uname'
 require 'timeout'
 module Fozzie
@@ -7,44 +7,40 @@ module Fozzie
   # Fozzie configuration allows assignment of global properties
   # that will be used within the Fozzie codebase.
   class Configuration
+    include Sys
     attr_accessor :env, :config_path, :host, :port, :appname, :namespaces, :timeout
     def initialize(args = {})
       merge_and_assign_config(args)
-      self.ip_from_host
       self.origin_name
-      self
     end
+    # Returns the prefix for any stat requested to be registered
     def data_prefix
-      s = [appname, origin_name, env].collect {|s| s.empty? ? nil : s.gsub('.', '-') }.compact.join('.').strip
+      s = [appname, origin_name, env].collect do |s|
+        s.empty? ? nil : s.gsub('.', '-')
+      end.compact.join('.').strip
       (s.empty? ? nil : s)
     end
-    def ip_from_host
-      @ip_from_host ||= host_to_ip
-    end
+    # Returns the origin name of the current machine to register the stat against
     def origin_name
-      @origin_name ||= %x{uname -n}.strip
+      @origin_name ||= Uname.uname.nodename
     end
     private
     # Handle the merging of the given configuaration, and the default config.
-    # @return [Hash]
     def merge_and_assign_config(args = {})
       arg = self.class.default_configuration.merge(args.symbolize_keys)
-      arg.delete_if {|key, val| !self.respond_to?(key.to_sym) }
       arg.merge!(config_from_yaml(arg))
-      arg.each {|a,v| self.send("#{a}=", v) }
+      arg.each {|a,v| self.send("#{a}=", v) if self.respond_to?(a.to_sym) }
       arg
     end
     # Default configuration settings
-    # @return [Hash]
     def self.default_configuration
       {
         :host        => '127.0.0.1',
@@ -53,28 +49,11 @@ module Fozzie
         :env         => (ENV['RACK_ENV'] || ENV['RAILS_ENV'] || 'development'),
         :appname     => '',
         :namespaces  => %w{Stats S Statistics Warehouse},
-        :timeout     => 5
+        :timeout     => 0.5
       }.dup
     end
-    def host_to_ip
-      return self.host unless self.host.match(ip_address_regex).nil?
-      ips = begin
-        Timeout.timeout(self.timeout) { Resolv.getaddresses(self.host) }
-      rescue Timeout::Error => exc
-        []
-      end
-      (ips.empty? ? "" : ips.compact.reject {|ip| ip.to_s.match(ip_address_regex).nil? }.first || "")
-    end
-    def ip_address_regex
-      /^(?:\d{1,3}\.){3}\d{1,3}$/
-    end
-    def full_config_path(path)
-      File.expand_path('config/fozzie.yml', path)
-    end
+    # Loads the configuration from YAML, if possible
     def config_from_yaml(args)
       fp = full_config_path(args[:config_path])
       return {} unless File.exists?(fp)
@@ -82,6 +61,11 @@ module Fozzie
       (cnf.kind_of?(Hash)) ? cnf.symbolize_keys : {}
     end
+    # Returns the absolute file path for the Fozzie configuration, relative to the given path
+    def full_config_path(path)
+      File.expand_path('config/fozzie.yml', path)
+    end
   end
 end