barometer 0.2.2 → 0.2.3

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 2
+:patch: 3
 :major: 0
 :minor: 2

data/bin/barometer

@@ -65,7 +65,7 @@ require 'yaml'
 KEY_FILE = File.expand_path(File.join('~', '.barometer'))
 
 class App
-  VERSION = '0.0.1'
+  VERSION = '0.2.3'
   
   attr_reader :options
 
@@ -353,6 +353,7 @@ end
 def pretty_info
   title("INFO", 1)
   value("GitHub", "http://github.com/attack/barometer")
+  value("Barometer Version", VERSION)
 end
 
 def pretty_output(barometer)
@@ -374,7 +375,9 @@ end
 
 def run_web_mode(query=nil)
   
-  raise "This is currently disabled"
+  puts
+  puts "This is currently disabled"
+  puts
   
   #require File.expand_path(File.dirname(__FILE__) + '/../lib/webometer/webometer.rb')
   #require 'vegas'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: barometer
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Mark G
@@ -57,23 +57,6 @@ files:
 - lib/barometer/services.rb
 - lib/barometer/weather.rb
 - lib/barometer.rb
-- lib/webometer
-- lib/webometer/public
-- lib/webometer/public/css
-- lib/webometer/public/css/master.css
-- lib/webometer/public/css/print.css
-- lib/webometer/public/css/syntax.css
-- lib/webometer/public/images
-- lib/webometer/public/images/go.png
-- lib/webometer/public/images/link-out.gif
-- lib/webometer/views
-- lib/webometer/views/contributing.erb
-- lib/webometer/views/forecast.erb
-- lib/webometer/views/index.erb
-- lib/webometer/views/layout.erb
-- lib/webometer/views/measurement.erb
-- lib/webometer/views/readme.erb
-- lib/webometer/webometer.rb
 - spec/barometer_spec.rb
 - spec/data_current_spec.rb
 - spec/data_distance_spec.rb

data/lib/webometer/public/css/master.css

@@ -1,254 +0,0 @@
-body {
-  color:#000;
-  font-family:'lucida grande', 'lucida sans unicade', sans-serif;
-  font-size:100%;
-  line-height:1.3;
-  background-color:#fff;
-  margin:0;
-  padding:0;
-}
-
-/* HEADER */
-#head {
-  text-align:center;
-}
-#head img {
-  vertical-align:middle;
-  margin:-10px 0 0 -82px;
-  padding:0 15px 0 0;
-  border:0;
-}
-#head h1 {
-  color:#000;
-  font-family:'georgia', 'bitstream vera serif', serif;
-  font-size:4em;
-  font-weight:normal;
-  letter-spacing:-3px;
-  line-height:1;
-  margin:0;
-  padding:20px 0 8px 0;
-}
-#head h1 a, #head h1 a:link, #head h1 a:visited, #head h1 a:hover {
-  color:#100;
-  text-decoration:none;
-}
-#head ul {
-  font-size:1.1em;
-  font-family:"lucida console", "monaco", "andale mono", "bitstream vera sans mono",
-    "consolas", monospace;
-  font-weight:normal;
-  text-transform:uppercase;
-  letter-spacing:2px;
-  text-align:center;
-  margin:0;
-  padding:0 40px 0.25em 40px;
-}
-#head ul li {
-  display:inline;
-  list-style-type:none;
-  padding:0 0.5em 0 0;
-}
-#head ul a, #head ul a:link, #head ul a:visited {
-  color:#56534f;
-  text-decoration:none;
-}
-#head ul a:hover {
-  color:#000;
-  text-decoration:underline
-}
-
-/* CONTENT */
-
-#content {
-  color:#333;
-  font-size:1.1em;
-  max-width:44em;
-  min-width:27em;
-  margin:7px auto;
-  border-top:2px solid #837d7c;
-}
-strong {
-  font-weight:bold;
-}
-
-/* HEADINGS */
-
-h1, h2, h3, h4, h5, h6 {
-  color:#000;
-}
-h1, h2 {
-  color:#211d1f;
-  font-family:'georgia', 'bitstream vera serif', serif;
-  font-weight:normal;
-}
-h1 a, h2 a { color:#222 }
-h1 {
-  font-size:2.25em;
-  letter-spacing:-1px;
-  margin-bottom:0;
-}
-h2 {
-  font-size:1.5em;
-  letter-spacing:-1px;
-  margin:1.25em 0 -0.32em 0;
-}
-h3 {
-  color:#211d1f;
-  font-size:1.02em;
-  font-weight:bold;
-  margin:1.8em 0 -0.25em 0;
-  letter-spacing:-1px;
-}
-h3 a {
-  color:#000;
-  text-decoration:underline;
-}
-
-/* LINKS */
-a {
-  color:#000;
-  text-decoration:underline;
-}
-a:hover {
-  color:#910;
-  text-decoration:underline;
-}
-a img {
-  border:none;
-}
-a.out {
-  background: url('/images/link-out.gif') center right no-repeat;
-  padding-right: 12px;
-}
-
-
-/* CODE */
-
-code, pre, textarea, tt {
-  font-family:"lucida console", "monaco", "andale mono", "bitstream vera sans mono",
-    "consolas", monospace;
-}
-pre {
-  font-size:0.85em;
-  background:#f4f5f5;
-  border:2px solid #d5d0d2;
-  padding:0.5em;
-  line-height:1.15;
-  color:#222;
-}
-code, tt {
-  font-size:0.85em;
-  color:#444;
-}
-h1 code, h2 code, h3 code, h4 code {
-  color:#333;
-}
-pre code {
-  font-size:1em;
-  color:#222;
-}
-
-/* MISC */
-
-hr {
-  margin:3em 0;
-  padding:0;
-  color:#eee;
-}
-
-/* HOME */
-
-body#home {
-  background: #fff url(../images/legend.gif) no-repeat fixed right 130px;
-}
-#home #content {
-  font-size:1.05em;
-  margin:20px 0 0 0;
-  padding:0 20px;
-  border-width:0;
-}
-#home #head, #home #foot {
-  display:none;
-}
-.pipe {
-  clear:both;
-  padding:50px 0;
-}
-.pipe p {
-  color:#000;
-  font-size:62px;
-  font-family:'georgia', 'bitstream vera serif', serif;
-  letter-spacing:-3px;
-  line-height:1;
-  text-align:right;
-  margin:0em 43% 0 0;
-  padding:0 60px 0 0;
-}
-.pipe pre {
-  float:right;
-  background:transparent;
-  font-size:28px;
-  margin:0;
-  padding:5px 0 0 0;
-  width:42%;
-  border-width:0;
-}
-.pipe pre code {
-  color:#666;
-  background:transparent;
-}
-.pipe.shell p {
-  font-size:56px;
-}
-.pipe.shell pre {
-  font-size:18px;
-}
-.pipe.nav p {
-  font-size:100px;
-  letter-spacing:-6px;
-}
-.pipe.nav pre {
-  font-size:36px;
-  padding-top:20px;
-  text-transform:uppercase;
-  letter-spacing:4px;
-  line-height:1.25;
-}
-.pipe.nav {
-  padding:25px 0 50px 0;
-}
-.pipe.nav a, .pipe.nav a:link, .pipe.nav a:visited {
-  color:#444;
-  text-decoration:none;
-}
-.pipe.nav a:hover {
-  color:#000;
-  text-decoration:underline;
-}
-
-form {
-	text-align: center;
-}
-	
-form .text-input input {
-	font-family: "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Helvetica, Arial, sans-serif;
-	margin: 10px 0 5px 10px;
-	color: #686868;
-	font-size: 40px;
-	text-align: left;
-	text-transform: lowercase;
-}
-
-form .submit-input input {
-	position: relative;
-	margin: 0 7% 0 0;
-	float: right;
-}
-
-form .options-input {
-	position: relative;
-	margin: 0 7% 0 0;
-	float: left;
-	text-align: left;
-}
-

data/lib/webometer/public/css/print.css

@@ -1,90 +0,0 @@
-body
-  { color: #000;
-    background: #fff;
-    font-size: 85%; 
-    font-family: Helvetica, sans-serif;
-    line-height: 130%;
-    margin: 0.5cm; }
-
-a
-  { color: #000;
-    text-decoration: underline; }
-
-a img
-  { border: none; }
-
-/* HEADER */
-#head {
-  text-align: center;
-}
-#head img {
-  vertical-align:middle;
-  margin:-10px 0 0 -82px;
-  padding:0 15px 0 0;
-  border:0;
-}
-#head h1 {
-  color: #172533;
-  font-family: Georgia, "Times New Roman", 'bitstream vera serif', serif;
-  font-size: 500%;
-  font-weight: normal;
-  letter-spacing: -0.1em;
-  line-height: 1;
-  margin: 0;
-  padding: 20px 0 16px 0;
-}
-#head h1 a, #head h1 a:link, #head h1 a:visited, #head h1 a:hover {
-  color: #172533;
-  text-decoration: none;
-}
-#head ul {
-  font-size:1.1em;
-  font-family: 'Lucida Grande', 'lucida sans unicade', Verdana, sans-serif;
-  font-weight: normal;
-  text-transform: uppercase;
-  text-align: center;
-  margin: 0;
-  padding: 0 40px 10px 40px;
-}
-#head ul li {
-  display: inline;
-  list-style-type: none;
-  padding: 0 1.5em 0 0;
-}
-#head ul a, #head ul a:link, #head ul a:visited {
-  color: #1d2e40;
-  text-decoration: none;
-}
-#head ul a:hover {
-  color: #0e1c29;
-  text-decoration:underline
-}
-
-
-
-h2 {
-  font-size: 1.5em;
-  letter-spacing: -0.05em;
-  padding: 1.15em 0 0 0;
-  margin: 1.25em 0 0.25em 0;
-  border-top: 1mm solid #999;
-}
-
-h3 {
-  font-size: 1.1em;
-  font-weight:bold;
-  margin: 1.8em 0 0.25em 0;
-  letter-spacing: -0.05em;
-}
-
-h3 a {
-  text-decoration:underline;
-}
-
-
-
-pre {
-  border: 1pt solid #ccc;
-  padding: 0.5em;
-  white-space: pre-wrap; white-space: -moz-pre-wrap !important;
-}

data/lib/webometer/public/css/syntax.css

@@ -1,60 +0,0 @@
-.highlight  { background: #ffffff; }
-.highlight .c { color: #999988; font-style: italic } /* Comment */
-.highlight .err { color: #a61717; background-color: #e3d2d2 } /* Error */
-.highlight .k { font-weight: bold; } /* Keyword */
-.highlight .o { font-weight: bold } /* Operator */
-.highlight .cm { color: #999988; font-style: italic } /* Comment.Multiline */
-.highlight .cp { color: #999999; font-weight: bold } /* Comment.Preproc */
-.highlight .c1 { color: #999988; font-style: italic } /* Comment.Single */
-.highlight .cs { color: #999999; font-weight: bold; font-style: italic } /* Comment.Special */
-.highlight .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
-.highlight .gd .x { color: #000000; background-color: #ffaaaa } /* Generic.Deleted.Specific */
-.highlight .ge { font-style: italic } /* Generic.Emph */
-.highlight .gr { color: #aa0000 } /* Generic.Error */
-.highlight .gh { color: #999999 } /* Generic.Heading */
-.highlight .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
-.highlight .gi .x { color: #000000; background-color: #aaffaa } /* Generic.Inserted.Specific */
-.highlight .go { color: #888888 } /* Generic.Output */
-.highlight .gp { color: #555555 } /* Generic.Prompt */
-.highlight .gs { font-weight: bold } /* Generic.Strong */
-.highlight .gu { color: #aaaaaa } /* Generic.Subheading */
-.highlight .gt { color: #aa0000 } /* Generic.Traceback */
-.highlight .kc { font-weight: bold } /* Keyword.Constant */
-.highlight .kd { font-weight: bold } /* Keyword.Declaration */
-.highlight .kp { font-weight: bold } /* Keyword.Pseudo */
-.highlight .kr { font-weight: bold } /* Keyword.Reserved */
-.highlight .kt { color: #445588; font-weight: bold } /* Keyword.Type */
-.highlight .m { color: #009999 } /* Literal.Number */
-.highlight .s { color: #444 } /* Literal.String */
-.highlight .na { color: #008080 } /* Name.Attribute */
-.highlight .nb { color: #0086B3 } /* Name.Builtin */
-.highlight .nc { color: #445588; font-weight: bold } /* Name.Class */
-.highlight .no { color: #008080 } /* Name.Constant */
-.highlight .ni { color: #800080 } /* Name.Entity */
-.highlight .ne { color: #990000; font-weight: bold } /* Name.Exception */
-.highlight .nf { color: #990000; font-weight: bold } /* Name.Function */
-.highlight .nn { color: #555555 } /* Name.Namespace */
-.highlight .nt { color: #000080 } /* Name.Tag */
-.highlight .nv { color: #008080 } /* Name.Variable */
-.highlight .ow { font-weight: bold } /* Operator.Word */
-.highlight .w { color: #bbbbbb } /* Text.Whitespace */
-.highlight .mf { color: #009999 } /* Literal.Number.Float */
-.highlight .mh { color: #009999 } /* Literal.Number.Hex */
-.highlight .mi { color: #009999 } /* Literal.Number.Integer */
-.highlight .mo { color: #009999 } /* Literal.Number.Oct */
-.highlight .sb { color: #444 } /* Literal.String.Backtick */
-.highlight .sc { color: #444 } /* Literal.String.Char */
-.highlight .sd { color: #444 } /* Literal.String.Doc */
-.highlight .s2 { color: #444 } /* Literal.String.Double */
-.highlight .se { color: #444 } /* Literal.String.Escape */
-.highlight .sh { color: #444 } /* Literal.String.Heredoc */
-.highlight .si { color: #444 } /* Literal.String.Interpol */
-.highlight .sx { color: #444 } /* Literal.String.Other */
-.highlight .sr { color: #009926 } /* Literal.String.Regex */
-.highlight .s1 { color: #444 } /* Literal.String.Single */
-.highlight .ss { color: #990073 } /* Literal.String.Symbol */
-.highlight .bp { color: #999999 } /* Name.Builtin.Pseudo */
-.highlight .vc { color: #008080 } /* Name.Variable.Class */
-.highlight .vg { color: #008080 } /* Name.Variable.Global */
-.highlight .vi { color: #008080 } /* Name.Variable.Instance */
-.highlight .il { color: #009999 } /* Literal.Number.Integer.Long */

data/lib/webometer/views/contributing.erb

@@ -1,32 +0,0 @@
-<h1 id='contribute'>Contribute</h1>
-
-<p>Want to advance Barometer? Help out by contributing!</p>
-
-<h2 id='find_a_bug'>Find a bug?</h2>
-
-<p>Add it to GitHub by <a href='http://github.com/attack/barometer/issues'>creating a new issue</a>. Be sure to include all relevant information, like the versions of Barometer and Ruby you&#8217;re using. A <a href='http://gist.github.com/'>gist</a> of the code that caused the issue as well as any error messages are also very helpful.</p>
-
-<h2 id='have_a_patch'>Have a patch?</h2>
-
-<p>Bugs and feature requests that include patches are much more likely to get attention. Here are some guidelines that will help ensure your patch can be applied as quickly as possible:</p>
-
-<ol>
-<li>
-<p><strong>Use <a href='http://git-scm.com'>Git</a> and <a href='http://github.com'>GitHub</a>:</strong> The easiest way to get setup is to fork the <a href='http://github.com/attack/barometer/'>attack/barometer repo</a>.
-</p>
-
-</li>
-
-<li>
-<p><strong>Write spec tests:</strong> If you add or modify functionality, it must include spec tests.</p>
-</li>
-
-<li>
-<p><strong>Mind the <code>README</code>:</strong> If the patch adds or modifies a major feature, modify the <code>README.rdoc</code> file to reflect that.</p>
-
-</li>
-
-<li>
-<p><strong>Push it:</strong> Once you&#8217;re ready, push your changes to a topic branch and add a note to the ticket with the URL to your branch. Or, say something like, &#8220;you can find the patch on johndoe/foobranch&#8221;.</p>
-</li>
-</ol>

data/lib/webometer/views/forecast.erb

@@ -1,14 +0,0 @@
-<h4>for: <%= forecast.date %></h4>
-<p>
-  <ul>
-    <li>Date: <%= forecast.date %></li>
-    <li>Icon: <%= forecast.icon %></li>
-    <li>Condition: <%= forecast.condition %></li>
-    <li>High: <%= forecast.high %></li>
-    <li>Low: <%= forecast.low %></li>
-    <li>POP: <%= forecast.pop %></li>
-    <% if forecast.sun %>
-    <li>Sun: rise - <%= forecast.sun.rise %>, set - <%= forecast.sun.set %></li>
-    <% end %>
-  </ul>
-</p>

data/lib/webometer/views/index.erb

@@ -1,66 +0,0 @@
-<h2 id='demo'>Measure the weather for:</h2>
-
-<br/>
-<form action="/" class="" id="" method="post">
-  <div class="text-input">
-    <input id="query_q" name="query[q]" size="25" type="text" />
-  </div>
-  <div class="submit-input">
-    <input src="/images/go.png" type="image" value="go &rarr;" />
-  </div>
-  <br/>
-  <div class="options-input">
-    Metric? :
-      <input id="query_metric" name="query[metric]" type="checkbox" value="1" checked="checked" />
-    <br/>
-    Source :
-      <input type="radio" name="query[source]" value="wunderground" checked="checked" /> Wunderground
-      <input type="radio" name="query[source]" value="yahoo" /> Yahoo
-      <input type="radio" name="query[source]" value="google" /> Google
-    <br/>
-    Force Geocode? :
-      <input id="query_geocode" name="query[geocode]" type="checkbox" value="1" checked="checked" />
-  </div>
-</form>
-
-<p>&nbsp;</p>
-<br/>
-
-<% if params[:query] && !params[:query][:q].empty? %>
-<h2>query: "<%= params[:query][:q] %>"</h2>
-<% end %>
-
-<% if @weather %>
-
-  <h2>Summary</h2>
-  <p>
-    <ul>
-      <li>Day?: <%= @weather.day? %></li>
-      <li>Sunny?: <%= @weather.sunny? %></li>
-      <li>Windy?: <%= @weather.windy? %></li>
-      <li>Wet?: <%= @weather.wet? %></li>
-    </ul>
-  </p>
-  
-  <% if @barometer.query %>
-  <h3>Query</h3>
-  <p>
-    <ul>
-      <li>Format: <%= @barometer.query.format %></li>
-      <% if @barometer.query.geo %>
-      <li>Locality: <%= @barometer.query.geo.locality %></li>
-      <li>Region: <%= @barometer.query.geo.region %></li>
-      <li>Country: <%= @barometer.query.geo.country %></li>
-      <li>Country Code: <%= @barometer.query.geo.country_code %></li>
-      <li>Latitude: <%= @barometer.query.geo.latitude %></li>
-      <li>Longitude: <%= @barometer.query.geo.longitude %></li>
-      <% end %>
-    </ul>
-  </p>
-  <% end %>
-
-  <% @weather.measurements.each do |measurement| %>
-    <%= erb(:measurement, :locals => { :measurement => measurement }, :layout => false) %>
-  <% end %>
-  
-<% end %>

data/lib/webometer/views/layout.erb

@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-  <title>Barometer</title>
-  <link rel='stylesheet' href='/css/master.css' type='text/css' media="screen, projection">
-  <link rel='stylesheet' href='/css/syntax.css' type='text/css' media="screen, projection">
-  <link rel='stylesheet' href='/css/print.css' type='text/css' media="print">
-  <link rel='shortcut icon' href='/images/favicon.ico'>
-  <link rel='alternate' href='http://attack.github.com/feed.xml' type='application/atom+xml' title='Sinatra Blog'>
-
-</head>
-<body id=''>
-
-<div id='wrap'>
-
-  <div id='head'>
-    <h1><a href='/'>Barometer</a></h1>
-    <ul>
-      <li><a href='/'>Demo</a></li>
-      <li><a href='/readme.html'>README</a></li>
-      <li><a href='/contributing.html'>Contribute</a></li>
-      <li><a class="out" href='http://github.com/attack/barometer'>Code</a></li>
-    </ul>
-  </div>
-
-  <div id='content'>
-  <%= yield %>
-  </div>
-
-  <div id='foot'>
-  </div>
-
-</div>
-
-<a href="http://github.com/attack/barometer"><img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_gray_6d6d6d.png" alt="Fork me on GitHub" /></a>
-</body>
-</html>

data/lib/webometer/views/measurement.erb

@@ -1,88 +0,0 @@
-<h2><%= measurement.source.to_s.capitalize %></h2>
-<p>
-  <ul>
-    <li>Source: <%= measurement.source %></li>
-    <li>Time: <%= measurement.time %></li>
-    <li>Metric: <%= measurement.metric? %></li>
-    <li>Success: <%= measurement.success? %></li>
-  </ul>
-</p>
-
-<% if measurement.location %>
-<h3>Location</h3>
-<p>
-  <ul>
-    <li>id: <%= measurement.location.id %></li>
-    <li>Name: <%= measurement.location.name %></li>
-    <li>City: <%= measurement.location.city %> %</li>
-    <li>State Name: <%= measurement.location.state_name %></li>
-    <li>State Code: <%= measurement.location.state_code %></li>
-    <li>Country: <%= measurement.location.country %></li>
-    <li>Country Code: <%= measurement.location.country_code %></li>
-    <li>Zip Code: <%= measurement.location.zip_code %></li>
-    <li>Latitude: <%= measurement.location.latitude %></li>
-    <li>Longitude: <%= measurement.location.longitude %></li>
-  </ul>
-</p>
-<% end %>
-
-<% if measurement.station %>
-<h3>Station</h3>
-<p>
-  <ul>
-    <li>id: <%= measurement.station.id %></li>
-    <li>Name: <%= measurement.station.name %></li>
-    <li>City: <%= measurement.station.city %> %</li>
-    <li>State Name: <%= measurement.station.state_name %></li>
-    <li>State Code: <%= measurement.station.state_code %></li>
-    <li>Country: <%= measurement.station.country %></li>
-    <li>Country Code: <%= measurement.station.country_code %></li>
-    <li>Zip Code: <%= measurement.station.zip_code %></li>
-    <li>Latitude: <%= measurement.station.latitude %></li>
-    <li>Longitude: <%= measurement.station.longitude %></li>
-  </ul>
-</p>
-<% end %>
-
-<% if measurement.timezone %>
-<h3>Timezone</h3>
-<p>
-  <ul>
-    <li>Long: <%= measurement.timezone.timezone %></li>
-    <li>Code: <%= measurement.timezone.code %></li>
-    <li>DST?: <%= measurement.timezone.dst? %></li>
-  </ul>
-</p>
-<% end %>
-
-<% if measurement.current %>
-<h3>Current</h3>
-<p>
-  <ul>
-    <li>Time: <%= measurement.current.time %></li>
-    <li>Local Time: <%= measurement.current.local_time %></li>
-    <li>Humidity: <%= measurement.current.humidity %> %</li>
-    <li>Icon: <%= measurement.current.icon %></li>
-    <li>Condition: <%= measurement.current.condition %></li>
-    <li>Temperature: <%= measurement.current.temperature %></li>
-    <li>Dew Point: <%= measurement.current.dew_point %></li>
-    <li>Heat Index: <%= measurement.current.heat_index %></li>
-    <li>Wind Chill: <%= measurement.current.wind_chill %></li>
-    <li>Wind: <%= measurement.current.wind %> @ <%= measurement.current.wind.direction %> [<%= measurement.current.wind.degrees %> degrees]</li>
-    <li>Pressure: <%= measurement.current.pressure %></li>
-    <li>Visibility: <%= measurement.current.visibility %></li>
-    <% if measurement.current.sun %>
-    <li>Sun: rise - <%= measurement.current.sun.rise %>, set - <%= measurement.current.sun.set %></li>
-    <% end %>
-  </ul>
-</p>
-<% end %>
-
-<% if measurement.forecast %>
-<h3>Forecast</h3>
-
-<% measurement.forecast.each do |forecast| %>
-  <%= erb(:forecast, :locals => { :forecast => forecast }, :layout => false) %>
-<% end %>
-
-<% end %>

data/lib/webometer/views/readme.erb

@@ -1,338 +0,0 @@
-<h1>barometer</h1>
-<p>
-A multi API consuming weather forecasting superstar.
-
-</p>
-<p>
-Barometer provides a common public API to one or more weather services
-(APIs) of your choice. Weather services can co-exist to retrieve extensive
-information, or they can be used in a hierarchical configuration where
-lower preferred weather services are only used if previous services are
-unavailable.
-</p>
-<h2>status</h2>
-<p>
-Currently this project is in development and will only work for a few
-weather services (wunderground, google, yahoo).
-</p>
-<p>
-Features to be added before first release:
-</p>
-<ul>
-<li>gem setup/config, apply to rubyforge
-
-</li>
-</ul>
-<p>
-
-Features to be added in future releases:
-</p>
-<ul>
-<li>even more weather service drivers (noaa, weather.com, weatherbug)
-
-</li>
-<li>ability to query multiple services and combine/average the results
-
-</li>
-<li>support iaco as a query format
-
-</li>
-</ul>
-<h1>dependencies</h1>
-<h3>HTTParty</h3>
-<p>
-Why? HTTParty was created and designed specifically for consuming web
-services. I choose to use this over using the Net::HTTP library directly to
-allow for faster development of this project.
-</p>
-
-<p>
-HTTParty is also extended to include configurable Timoout support.
-</p>
-<h3>tzinfo</h3>
-<p>
-Why? Barometer deals with time information for locations all over the
-world. This information doesn&#8217;t mean that much if it can&#8217;t be
-converted to times that don&#8217;t correspond to the applicable timezone.
-Tzinfo handles this time zone manipulation.
-</p>
-<h3>graticule (very soft dependency)</h3>
-<p>
-Why? Barometer returns the weather for a given location. Most weather
-service APIs are somewhat restricted on the query format they receive. To
-bridge this gap and allow for maximum flexibility on the
-&#8216;barometer&#8217; query format, the query will be geo-coded using the
-Google geocoding service, if required. Graticule can provide this geocoding
-interface.
-
-</p>
-<p>
-Using Graticule requires a free Google API key for geocoding. It is
-possible to use barometer without geocoding, though your query format will
-be limited to that of the weather service API.
-</p>
-<p>
-ALTERNATE: If you supply a Google API key but don&#8217;t install the
-Graticule gem, HTTParty will be used instead to provide the same geocoding.
-Basically Graticule is only used if it exists.
-</p>
-<p>
-NOTE: you can force Barometer not to use Graticule, even if you have it
-installed using the following:
-</p>
-<pre>
-  Barometer.skip_graticule = true
-</pre>
-<h1>usage</h1>
-
-<p>
-You can use barometer right out of the box, as it is configured to use one
-register-less (no API key required) international weather service
-(wunderground.com).
-</p>
-<p>
-For better results, signup for a google-map key and enhance your barometer
-with geo-coding.
-</p>
-<pre>
-  require 'barometer'
-
-  Barometer.google_geocode_key = &quot;THE_GOOGLE_API_KEY&quot;
-  barometer = Barometer.new(&quot;Paris&quot;)
-  weather = barometer.measure
-
-  puts weather.current.temperture
-</pre>
-<h2>multiple weather API, with hierarchy</h2>
-
-<pre>
-  require 'barometer'
-
-  Barometer.google_geocode_key = &quot;THE_GOOGLE_API_KEY&quot;
-  # use yahoo and google, if they both fail, use wunderground
-  Barometer.selection = { 1 =&gt; [:yahoo, :google], 2 =&gt; :wunderground }
-
-  barometer = Barometer.new(&quot;Paris&quot;)
-  weather = barometer.measure
-
-  puts weather.current.temperture
-</pre>
-<h2>command line</h2>
-<p>
-
-You can use barometer from the command line.
-</p>
-<pre>
-  # barometer berlin
-</pre>
-<p>
-This will output the weather information for the given query.
-</p>
-<h3>fail</h3>
-<p>
-What would cause a weather service to fail? The most obvious is that the
-particular weather service in currently unavailable or not reachable. Other
-possible reasons would include not having the API (or a valid API key for
-the particular weather service, if required), not providing a valid query,
-or providing a query for a location not supported by the weather service.
-</p>
-<p>
-For example, if you look at the example above, the query of
-&quot;Paris&quot; refers to a city in France. Yahoo weather services only
-supports weather results for USA (at least at the time of writing).
-Therefore, Barometer would not use Yahoo, just Google and failover to use
-Wunderground (if needed).
-
-</p>
-<h3>bootstrapping</h3>
-<p>
-You can use weather service drivers directly. Below is an example to use
-Wunderground, but since the driver interface is abstracted it will be the
-same for all supported services.
-</p>
-<pre>
-  require 'barometer'
-  Barometer.google_geocode_key = &quot;THE_GOOGLE_API_KEY&quot;
-
-  query = Barometer::Query.new(&quot;Paris&quot;)
-  weather = Barometer::Service.source(:wunderground).measure(query)
-
-  puts weather.current.temperture
-
-  # OR, even more raw
-
-  measurement = Barometer::Measurement.new
-  weather = Barometer::Wunderground.measure_all(measurement, &quot;Paris&quot;)
-
-  puts weather.current.temperture
-
-</pre>
-<p>
-NOTE: The disadvantage to using the drivers directly is that you lose the
-advantage of redundancy/failover added by the Module as a whole.
-</p>
-<p>
-NOTE: You still must create the Barometer::Query object with your query
-string instead of directly feeding the query string to the service (as in
-bootstrap example #1). The Barometer::Query object has behavior required by
-the service that a regular String doesn&#8217;t have. Using a driver
-directly WILL accept a String (as in bootstrap example #2).
-</p>
-<h2>searching</h2>
-<p>
-After you have measured the data, Barometer provides several methods to
-help you get the data you are after. All examples assume you already have
-measured the data as shown in the above examples.
-</p>
-<h3>by preference (default service)</h3>
-<pre>
-  weather.default         # returns measurement for default source
-  weather.current         # returns current_measurement for default
-  weather.now             # returns current_measurement for default
-  weather.forecast        # returns all forecast_measurements for default
-  weather.today           # returns forecast_measurement for default today
-  weather.tomorrow        # returns forecast_measurement for default tomorrow
-
-  puts weather.now.temperature.c
-  puts weather.tomorrow.high.c
-
-</pre>
-<h3>by source</h3>
-<pre>
-  weather.source(:wunderground)   # returns measurement for specified source
-  weather.sources                 # lists all successful sources
-
-  puts weather.source(:wunderground).current.temperature.c
-</pre>
-<h3>by date</h3>
-<pre>
-  # note, the date is the date of the locations weather, not the date of the
-  # user measuring the weather
-  date = Date.parse(&quot;01-01-2009&quot;)
-  weather.for(date)       # returns forecast_measurement for default on date
-  weather.source(:wunderground).for(date)   # same as above but specific source
-
-  puts weather.source(:wunderground).for(date).high.c
-</pre>
-<h3>by time</h3>
-
-<pre>
-  # note, the time is the time of the locations weather, not the time of the
-  # user measuring the weather
-  time = Time.parse(&quot;13:00 01-01-2009&quot;)
-  weather.for(time)       # returns forecast_measurement for default at time
-  weather.source(:wunderground).for(time)   # same as above but specific source
-
-  puts weather.source(:wunderground).for(time).low.f
-</pre>
-<h2>simple answers</h2>
-<p>
-After you have measured the data, Barometer provides several &quot;simple
-answer&quot; methods to help you get answers to some basic questions. All
-examples assume you already have measured the data as shown in the above
-examples.
-</p>
-<p>
-All of these questions are ultimately specific to the weather source(s) you
-are configured to use. All sources that have successfully measured data
-will be asked, but if there is no data that can answer the question then
-there will be no answer.
-</p>
-
-<h3>is it windy?</h3>
-<pre>
-  # 1st parameter is the threshold wind speed for being windy
-  # 2nd parameter is the utc_time for which you want to know the answer,
-  #   this defaults to the current time
-  # NOTE: in my example the values are metric, so the threshold is 10 kph
-
-  weather.windy?(10)
-</pre>
-<h3>is it wet?</h3>
-<pre>
-  # 1st parameter is the threshold pop (%) for being wet
-  # 2nd parameter is the utc_time for which you want to know the answer,
-  #   this defaults to the current time
-  # NOTE: in my example the threshold is 50 %
-
-  weather.wet?(50)
-</pre>
-<h3>is it sunny?</h3>
-<pre>
-  # 1st parameter is the utc_time for which you want to know the answer,
-  #   this defaults to the current time
-
-  weather.sunny?
-
-</pre>
-<h3>is it day?</h3>
-<pre>
-  # 1st parameter is the utc_time for which you want to know the answer,
-  #   this defaults to the current time
-
-  weather.day?
-</pre>
-<h3>is it night?</h3>
-<pre>
-  # 1st parameter is the utc_time for which you want to know the answer,
-  #   this defaults to the current time
-
-  weather.night?
-</pre>
-<h1>design</h1>
-<ul>
-<li>create a Barometer instance
-
-
-</li>
-<li>supply a query, there are very little restrictions on the format:
-
-<ul>
-<li>city, country, specific address (basically anything Google will geocode)
-
-</li>
-<li>US zip code (skips geocoding if weather service accepts this directly)
-
-</li>
-<li>postal code (skips geocoding if weather service accepts this directly)
-
-</li>
-<li>latitude and longitude (skips geocoding if weather service accepts this
-directly)
-
-</li>
-<li>TODO: international airport code (skips geocoding if weather service
-accepts this directly)
-
-</li>
-</ul>
-</li>
-<li>if geocoding required, geocode the query
-
-</li>
-
-<li>determine which weather services will be queried (one or multiple)
-
-</li>
-<li>query the weather services
-
-</li>
-<li>save the data
-
-</li>
-<li>repeat weather service queries as needed
-
-</li>
-</ul>
-<h1>extending</h1>
-<p>
-Barometer attempts to be a common API to any weather service API. I have
-included several weather service &#8216;drivers&#8217;, but I know there
-are many more available. Please use the provided ones as examples to create
-more.
-</p>
-<h2>copyright</h2>
-
-<p>
-Copyright &#169; 2009 Mark G. See LICENSE for details.
-</p>

data/lib/webometer/webometer.rb

@@ -1,34 +0,0 @@
-require 'rubygems'
-require 'sinatra'
-
-require 'barometer'
-Barometer.google_geocode_key ||= "ABQIAAAAq8TH4offRcGrok8JVY_MyxRi_j0U6kJrkFvY4-OX2XYmEAa76BSFwMlSow1YgX8BOPUeve_shMG7xw"
-
-class Webometer < Sinatra::Default
-
-  get '/' do
-    erb :index
-  end
-  
-  post '/' do
-    # apply options
-    Barometer.force_geocode = (params[:query][:geocode].to_s == "1" ? true : false)
-    Barometer.selection = { 1 => [ params[:query][:source].to_sym ] }
-    metric = (params[:query][:metric].to_s == "1" ? true : false)
-    
-    if params[:query] && !params[:query][:q].empty?
-      @barometer = Barometer.new(params[:query][:q])
-      @weather = @barometer.measure(metric)
-    end
-    erb :index
-  end
-
-  get '/contributing.html' do
-    erb :contributing
-  end
-  
-  get '/readme.html' do
-    erb :readme
-  end
-
-end