yahoo_weatherman 0.5 → 0.6

data/lib/yahoo_weatherman/response.rb

@@ -6,8 +6,13 @@ module Weatherman
   # We also use this class to do the i18n stuff.
   #
   class Response
+
     attr_accessor :document_root
 
+    attr_accessor :language
+  
+    LANGUAGES = {} 
+
     def initialize(raw, language = nil)
       @document_root = Nokogiri::XML.parse(raw).xpath('rss/channel')
       @language = language
@@ -179,46 +184,43 @@ module Weatherman
         method == :to_date ? Date.parse(value) : value.send(method)
       end
 
-      def translate!(attribute)
+      def translate!(attributes)
         if i18n?
-          translate_text! attribute
-          translate_locations! attribute
+          translate_text! attributes
+          translate_locations! attributes
         end
-        attribute
+        attributes
       end
 
-      def translate_text!(attribute)
-        if attribute['text']
-          attribute['text'] = language_config[attribute['code']]
+      def translate_text!(attributes)
+        if attributes['text']
+          attributes['text'] = language_translations[attributes['code']]
         end
       end
 
-      def translate_locations!(attribute)
-        locations_config = language_config['locations']
+      def translate_locations!(attributes)
+        locations_translations = language_translations['locations']
 
         %w(city country region).each do |key|
-          next unless attribute[key]
+          next unless attributes.key? key
 
-          if translated = locations_config[attribute[key]]
-            attribute[key] = translated
+          if translated = locations_translations[attributes[key]]
+            attributes[key] = translated
           end
         end
       end
 
-      def language_config
-        if i18n?
-          @language_config ||= load_language_yaml!(@language)
-        end
-        @language_config
+      def language_translations
+        LANGUAGES[language] ||= load_language_yaml!
       end
 
-      def i18n?
-        !!@language
+      def load_language_yaml!
+        stream = File.read(File.join([I18N_YAML_DIR, language + '.yml']))
+        YAML.load(stream) 
       end
 
-      def load_language_yaml!(language)
-        stream = File.read(File.join([I18N_YAML_DIR, language + '.yml']))
-        @language_config = YAML.load(stream) 
+      def i18n?
+        !!@language
       end
   end
 end

data/lib/yahoo_weatherman.rb

@@ -23,6 +23,17 @@ module Weatherman
   class Client
     attr_reader :options
 
+    #
+    # Accepts a optional hash containing the client options.
+    #
+    # Options:
+    #
+    #  +unit+: the unit used for the temperature (defaults to Celsius).
+    #  "f" => Fahrenheight
+    #  "c" => Celsius
+    #
+    #  +lang+: the language used in the response
+    #
     def initialize(options = {})
       @options = options
     end
@@ -45,7 +56,7 @@ module Weatherman
       end
 
       def degrees_units
-        options[:degrees_units] || 'c'
+        (options[:unit] || 'c').downcase
       end
 
       def get(url)

data/spec/files/belo_horizonte_f.rss

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<rss version="2.0" xmlns:yweather="http://xml.weather.yahoo.com/ns/rss/1.0" xmlns:geo="http://www.w3.org/2003/01/geo/wgs84_pos#">
+<channel>
+
+<title>Yahoo! Weather - Belo Horizonte, BR</title>
+<link>http://us.rd.yahoo.com/dailynews/rss/weather/Belo_Horizonte__BR/*http://weather.yahoo.com/forecast/BRXX0033_f.html</link>
+<description>Yahoo! Weather for Belo Horizonte, BR</description>
+<language>en-us</language>
+<lastBuildDate>Thu, 18 Mar 2010 12:00 am LST</lastBuildDate>
+<ttl>60</ttl>
+<yweather:location city="Belo Horizonte" region="MG"   country="Brazil"/>
+
+<yweather:units temperature="F" distance="mi" pressure="in" speed="mph"/>
+<yweather:wind chill="66"   direction="100"   speed="2" />
+<yweather:atmosphere humidity="88"  visibility="6.21"  pressure="30.15"  rising="0" />
+<yweather:astronomy sunrise="5:59 am"   sunset="6:08 pm"/>
+<image>
+<title>Yahoo! Weather</title>
+<width>142</width>
+<height>18</height>
+<link>http://weather.yahoo.com</link>
+<url>http://l.yimg.com/a/i/us/nws/th/main_142b.gif</url>
+</image>
+<item>
+
+<title>Conditions for Belo Horizonte, BR at 12:00 am LST</title>
+<geo:lat>-19.95</geo:lat>
+<geo:long>-43.93</geo:long>
+<link>http://us.rd.yahoo.com/dailynews/rss/weather/Belo_Horizonte__BR/*http://weather.yahoo.com/forecast/BRXX0033_f.html</link>
+<pubDate>Thu, 18 Mar 2010 12:00 am LST</pubDate>
+<yweather:condition  text="Fair"  code="33"  temp="66"  date="Thu, 18 Mar 2010 12:00 am LST" />
+<description><![CDATA[
+<img src="http://l.yimg.com/a/i/us/we/52/33.gif"/><br />
+<b>Current Conditions:</b><br />
+Fair, 66 F<BR />
+<BR /><b>Forecast:</b><BR />
+Thu - Showers. High: 75 Low: 63<br />
+Fri - Scattered Thunderstorms. High: 79 Low: 63<br />
+<br />
+<a href="http://us.rd.yahoo.com/dailynews/rss/weather/Belo_Horizonte__BR/*http://weather.yahoo.com/forecast/BRXX0033_f.html">Full Forecast at Yahoo! Weather</a><BR/><BR/>
+(provided by <a href="http://www.weather.com" >The Weather Channel</a>)<br/>
+]]></description>
+<yweather:forecast day="Thu" date="18 Mar 2010" low="63" high="75" text="Showers" code="11" />
+<yweather:forecast day="Fri" date="19 Mar 2010" low="63" high="79" text="Scattered Thunderstorms" code="38" />
+<guid isPermaLink="false">BRXX0033_2010_03_18_0_00_LST</guid>
+</item>
+
+</channel>
+</rss>

data/spec/spec_helper.rb

@@ -6,10 +6,16 @@ require 'fakeweb'
 require 'yahoo_weatherman'
 require 'spec'
 
-def fixture
-  filepath = File.expand_path(File.dirname(__FILE__) + "/files/belo_horizonte.rss")
+def celsius_fixture
+  filepath = File.expand_path(File.dirname(__FILE__) + "/files/belo_horizonte_c.rss")
+  File.read filepath
+end
+
+def fahrenheight_fixture
+  filepath = File.expand_path(File.dirname(__FILE__) + "/files/belo_horizonte_f.rss")
   File.read filepath
 end
 
 FakeWeb.allow_net_connect = false
-FakeWeb.register_uri(:get, "http://weather.yahooapis.com/forecastrss?w=455821&u=c", :body => fixture)
+FakeWeb.register_uri(:get, "http://weather.yahooapis.com/forecastrss?w=455821&u=c", :body => celsius_fixture)
+FakeWeb.register_uri(:get, "http://weather.yahooapis.com/forecastrss?w=455821&u=f", :body => fahrenheight_fixture)

data/spec/yahoo_weatherman/response_spec.rb

@@ -109,4 +109,20 @@ DESCRIPTION
       @response.forecasts.last['text'].should == 'Tempestades Intermitentes'
     end
   end
+
+  context 'using fahrenheiht as temperature unit' do
+
+    it 'should return the temperature as fahrenheight' do
+      client = Weatherman::Client.new :unit => 'F'
+      response = client.lookup_by_woeid 455821
+
+      response.units['temperature'].should == 'F'
+      response.forecasts.first['low'].should == 63
+      response.forecasts.last['low'].should == 63
+      response.forecasts.first['high'].should == 75
+      response.forecasts.last['high'].should == 79
+      response.condition['temp'].should == 66
+    end
+  end
+
 end

data/yahoo_weatherman.gemspec

@@ -1,13 +1,13 @@
 Gem::Specification.new do |gem|
   gem.name = "yahoo_weatherman"
-  gem.version = "0.5"
+  gem.version = "0.6"
   gem.authors = ["Dalto Curvelano Junior"]
   gem.description = "A ruby wrapper to the Yahoo! Weather feed with i18n support."
   gem.summary = "A ruby wrapper to the Yahoo! Weather feed with i18n support."
   gem.files = [
     "yahoo_weatherman.gemspec",
     "lib/yahoo_weatherman/image.rb", "lib/yahoo_weatherman/response.rb", "lib/yahoo_weatherman.rb",
-    "i18n/pt-br.yml", "spec/files/belo_horizonte.rss", "spec/spec_helper.rb",
+    "i18n/pt-br.yml", "spec/files/belo_horizonte_c.rss", "spec/files/belo_horizonte_f.rss", "spec/spec_helper.rb",
     "spec/yahoo_weatherman/response_spec.rb", "spec/yahoo_weatherman/yahoo_weatherman_spec.rb"
   ]
   gem.homepage = "http://github.com/dlt/yahoo_weatherman"

metadata

@@ -4,8 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 5
-  version: "0.5"
+  - 6
+  version: "0.6"
 platform: ruby
 authors: 
 - Dalto Curvelano Junior
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-17 00:00:00 -03:00
+date: 2010-03-18 00:00:00 -03:00
 default_executable: 
 dependencies: []
 
@@ -31,7 +31,8 @@ files:
 - lib/yahoo_weatherman/response.rb
 - lib/yahoo_weatherman.rb
 - i18n/pt-br.yml
-- spec/files/belo_horizonte.rss
+- spec/files/belo_horizonte_c.rss
+- spec/files/belo_horizonte_f.rss
 - spec/spec_helper.rb
 - spec/yahoo_weatherman/response_spec.rb
 - spec/yahoo_weatherman/yahoo_weatherman_spec.rb