yahoo_weatherman 0.3 → 0.5

data/lib/yahoo_weatherman/response.rb

@@ -10,8 +10,7 @@ module Weatherman
 
     def initialize(raw, language = nil)
       @document_root = Nokogiri::XML.parse(raw).xpath('rss/channel')
-      @language = !!language
-      load_language_yaml!(language) if @language
+      @language = language
     end
 
     #
@@ -25,8 +24,7 @@ module Weatherman
     #
     def condition
       condition = item_attribute 'yweather:condition'
-      condition = do_convertions(condition, [:code, :to_i], [:temp, :to_i], [:date, :to_date], :text)
-      translate! condition
+      translate! do_convertions(condition, [:code, :to_i], [:temp, :to_i], [:date, :to_date], :text)
     end
 
     # 
@@ -38,8 +36,7 @@ module Weatherman
     #  wind['chill'] => 9.66
     #
     def wind
-      wind = attribute 'yweather:wind'
-      do_convertions(wind, [:chill, :to_i], [:direction, :to_i], [:speed, :to_f]) 
+      do_convertions(attribute('yweather:wind'), [:chill, :to_i], [:direction, :to_i], [:speed, :to_f]) 
     end
 
     #
@@ -54,7 +51,8 @@ module Weatherman
     #
     def forecasts
       item_attribute('yweather:forecast').collect do |forecast|
-        translate! do_convertions(forecast, [:date, :to_date], [:low, :to_i], [:high, :to_i], [:code, :to_i], :day, :text)
+        convertions = [[:date, :to_date], [:low, :to_i], [:high, :to_i], [:code, :to_i], :day, :text]
+        translate! do_convertions(forecast, *convertions)
       end
     end
 
@@ -67,8 +65,7 @@ module Weatherman
     #  location['city'] => Belo Horizonte
     #
     def location
-      location = attribute 'yweather:location'
-      translate! location
+      translate! attribute('yweather:location')
     end
 
     # Units:
@@ -126,11 +123,28 @@ module Weatherman
     end
 
     #
-    # A short HTML snippet with a simple weather description.
+    # Description image. You might gonna need this if you have to customize the 
+    # forecast summary.
+    #
+    def description_image
+      parsed_description.css('img').first # there's only one
+    end
+
+    #
+    # A short HTML snippet (raw text) with a simple weather description.
     # 
     def description
       text_attribute 'description'
     end
+    alias :summary :description
+
+    #
+    # Description parsed by Nokogiri. This is better then #description
+    # if you have to walk through its nodes.
+    #
+    def parsed_description
+      @parsed_description ||= Nokogiri::HTML(description) 
+    end
 
     private
       def attribute(attr, root = @document_root)
@@ -154,50 +168,57 @@ module Weatherman
 
       def do_convertions(attributes, *pairs)
         pairs.inject({}) do |hash, (attr, method)|
-          value = attributes[attr.to_s]
-          hash[attr.to_s] = convert(value, method)
+          key = attr.to_s
+          hash[key] = convert(attributes[key], method)
           hash
         end
       end
 
       def convert(value, method)
-        if method == :to_date
-          Date.parse(value)
-        else
-          method ? value.send(method) : value
-        end
+        return value unless method
+        method == :to_date ? Date.parse(value) : value.send(method)
       end
 
-      def load_language_yaml!(language)
-        stream = File.read(File.join([I18N_YAML_DIR, language + '.yml']))
-        @language_config = YAML.load(stream) 
+      def translate!(attribute)
+        if i18n?
+          translate_text! attribute
+          translate_locations! attribute
+        end
+        attribute
       end
 
-      def make_translations!(condition)
-        if condition['text']
-          condition['text'] = @language_config[condition['code']]
+      def translate_text!(attribute)
+        if attribute['text']
+          attribute['text'] = language_config[attribute['code']]
         end
+      end
 
-        %w(city country region).each do |attr|
-          next unless condition[attr]
-          if translated = @language_config['locations'][condition[attr]]
-            condition[attr] = translated
+      def translate_locations!(attribute)
+        locations_config = language_config['locations']
+
+        %w(city country region).each do |key|
+          next unless attribute[key]
+
+          if translated = locations_config[attribute[key]]
+            attribute[key] = translated
           end
         end
-
-        condition
       end
 
-      def translate!(attribute)
+      def language_config
         if i18n?
-          make_translations! attribute
-        else
-          attribute
+          @language_config ||= load_language_yaml!(@language)
         end
+        @language_config
       end
 
       def i18n?
-        @language
+        !!@language
+      end
+
+      def load_language_yaml!(language)
+        stream = File.read(File.join([I18N_YAML_DIR, language + '.yml']))
+        @language_config = YAML.load(stream) 
       end
   end
 end

data/spec/yahoo_weatherman/response_spec.rb

@@ -54,7 +54,7 @@ describe Weatherman::Response do
     last['code'].should == 38
   end
 
-  it 'it should provide latitude and longitude' do
+  it 'should provide latitude and longitude' do
     @response.latitude.should == -19.95
     @response.longitude.should == -43.93
   end
@@ -74,6 +74,7 @@ Sun - Scattered Thunderstorms. High: 27 Low: 18<br />
 DESCRIPTION
 
     @response.description.should == description
+    @response.description.should == @response.summary
   end
 
   it 'should provide the weather image attributes' do
@@ -85,12 +86,17 @@ DESCRIPTION
     image['url'].should == 'http://l.yimg.com/a/i/us/nws/th/main_142b.gif'
   end
 
+  it 'should provide the forecast description icon' do
+    image = @response.description_image
+    image['src'].should == 'http://l.yimg.com/a/i/us/we/52/28.gif'
+  end
+
   context 'using internationalization' do
     before do
       @response = Weatherman::Client.new(:lang => 'pt-br').lookup_by_woeid 455821
     end
 
-    it 'should translate the response#conditions attributes' do
+    it 'should translate the conditions details' do
       @response.condition['text'].should == 'Predominantemente Nublado'
     end
 
@@ -102,6 +108,5 @@ DESCRIPTION
       @response.forecasts.first['text'].should == 'Chuva'
       @response.forecasts.last['text'].should == 'Tempestades Intermitentes'
     end
-
   end
 end

data/yahoo_weatherman.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name = "yahoo_weatherman"
-  gem.version = "0.3"
+  gem.version = "0.5"
   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."

metadata

@@ -4,8 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
-  version: "0.3"
+  - 5
+  version: "0.5"
 platform: ruby
 authors: 
 - Dalto Curvelano Junior