barometer 0.5.0 → 0.6.1

data/lib/barometer/web_services/geocode.rb

@@ -8,6 +8,7 @@ module Barometer
     
     def self.fetch(query)
       raise ArgumentError unless _is_a_query?(query)
+      puts "geocoding: #{query.q}" if Barometer::debug?
       return nil unless _has_geocode_key?
       location = self.get(
         "http://maps.google.com/maps/geo",

data/lib/barometer/web_services/timezone.rb

@@ -0,0 +1,40 @@
+module Barometer
+  #
+  # Web Service: Timezone
+  #
+  # uses geonames.org to obtain the full timezone for given coordinates
+  #
+  class WebService::Timezone < WebService
+    
+    # get the full timezone for given coordinates
+    #
+    def self.fetch(latitude, longitude)
+      puts "timezone: #{latitude}, #{longitude}"
+      return nil unless latitude && longitude
+      _fetch_via_wunderground(latitude, longitude)
+    end
+    
+    def self._fetch_via_geonames(latitude, longitude)
+      response = self.get(
+        "http://ws.geonames.org/timezone",
+        :query => { :lat => latitude, :lng => longitude },
+        :format => :xml,
+        :timeout => Barometer.timeout
+      )['geonames']['timezone']  
+      response ? Data::Zone.new(response['timezoneId']) : nil
+    end
+    
+    def self._fetch_via_wunderground(latitude, longitude)
+      response = self.get(
+        "http://api.wunderground.com/auto/wui/geo/ForecastXML/index.xml",
+        :query => {:query => "#{latitude},#{longitude}"},
+        :format => :xml,
+        :timeout => Barometer.timeout
+      )['forecast']['simpleforecast']['forecastday'].first
+      response ? Data::Zone.new(response['date']['tz_long']) : nil
+    end
+    
+  end
+end
+
+

data/lib/barometer/web_services/weather_id.rb

@@ -9,11 +9,13 @@ module Barometer
     # get the weather_id for a given query
     #
     def self.fetch(query)
+      puts "fetch weather_id: #{query.q}" if Barometer::debug?
       return nil unless query
       raise ArgumentError unless _is_a_query?(query)
-      response = self.get(
+      
+      self.get(
         "http://xoap.weather.com/search/search",
-        :query => { :where => query.q }, :format => :plain,
+        :query => { :where => _adjust_query(query.q) }, :format => :plain,
         :timeout => Barometer.timeout
       )
     end
@@ -21,6 +23,7 @@ module Barometer
     # get the location_date (geocode) for a given weather_id
     #
     def self.reverse(query)
+      puts "reverse weather_id: #{query.q}" if Barometer::debug?
       return nil unless query
       raise ArgumentError unless _is_a_query?(query)
       self.get(
@@ -30,6 +33,18 @@ module Barometer
         :timeout => Barometer.timeout
       )['rss']['channel']["yweather:location"]
     end
+    
+    # filter out words that weather.com has trouble geo-locating
+    # mostly these are icao related
+    #
+    def self._adjust_query(query)
+      output = query.dup
+      words_to_remove = %w(international airport municipal)
+      words_to_remove.each do |word|
+        output.gsub!(/#{word}/i, "")
+      end
+      output
+    end
 
   end
 end

data/lib/demometer/demometer.rb

@@ -32,6 +32,23 @@ class Demometer < Sinatra::Default
     { :weather_dot_com => { :keys => { :partner => partner_key, :license => license_key } } }
   end
 
+  def config_weather_bug
+    if File.exists?(@@config_file)
+    	keys = YAML.load_file(@@config_file)
+    	if keys["weather_bug"] && keys["weather_bug"]["code"]
+    	  code = keys["weather_bug"]["code"].to_s
+      else
+        raise RunTimeError "no weatherbug.com keys"
+        exit
+      end
+    else
+      File.open(@@config_file, 'w') {|f| f << "\weather_bug:\n  code: API_CODE" }
+      raise RunTimeError "no weatherbug.com keys"
+      exit
+    end
+    { :weather_bug => { :keys => { :code => code } } }
+  end
+
   helpers do
     def data(title, value)
       return if value.nil?
@@ -58,6 +75,13 @@ class Demometer < Sinatra::Default
       Barometer::Base.config[1] << config_weather_dot_com
     end
     
+    # setup weatherbug.com
+    if Barometer::Base.config && Barometer::Base.config[1] &&
+      Barometer::Base.config[1].include?(:weather_bug)
+      Barometer::Base.config[1].delete(:weather_bug)
+      Barometer::Base.config[1] << config_weather_bug
+    end
+    
     if params[:query] && !params[:query][:q].empty?
       @barometer = Barometer.new(params[:query][:q])
       @weather = @barometer.measure(metric)
@@ -72,5 +96,9 @@ class Demometer < Sinatra::Default
   get '/readme.html' do
     erb :readme
   end
+  
+  get '/about.html' do
+    erb :about
+  end
 
 end

data/lib/demometer/public/css/master.css

@@ -1 +1,259 @@
-/* nothing to see here */
+/*
+	Copyright: Blake Mizerany, www.sinatrarb.com
+	Permission Pending
+*/
+
+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/demometer/public/css/print.css

@@ -0,0 +1,94 @@
+/*
+	Copyright: Blake Mizerany, www.sinatrarb.com
+	Permission Pending
+*/
+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;
+}