yahoo_weatherman 1.0.1 → 1.0.2

data/lib/yahoo_weatherman/i18n.rb

@@ -1,56 +1,57 @@
-class I18N
-  I18N_YAML_DIR = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'i18n'))
+module Weatherman
+  class I18N
+    I18N_YAML_DIR = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'i18n'))
 
-  LANGUAGES = {} 
+    LANGUAGES = {}
 
-  attr_accessor :language
+    attr_accessor :language
 
-  def initialize(language)
-    @language = language
-  end
-
-  def translate!(attributes)
-    if i18n?
-      translate_text! attributes
-      translate_days! attributes
-      translate_locations! attributes
+    def initialize(language)
+      @language = language
     end
-    attributes
-  end
 
-  private
-    def translate_text!(attributes)
-      translate_attribute('text', attributes, language_translations, 'code')
+    def translate!(attributes)
+      if i18n?
+        translate_text! attributes
+        translate_days! attributes
+        translate_locations! attributes
+      end
+      attributes
     end
 
-    def translate_days!(attributes)
-      translate_attribute('day', attributes, language_translations['forecasts']['days'])
-    end
+    private
+      def translate_text!(attributes)
+        translate_attribute('text', attributes, language_translations, 'code')
+      end
 
-    def translate_locations!(attributes)
-      (%w[city country region] & attributes.keys).each do |key|
-        translate_attribute(key, attributes, language_translations['locations'])
+      def translate_days!(attributes)
+        translate_attribute('day', attributes, language_translations['forecasts']['days'])
+      end
+
+      def translate_locations!(attributes)
+        (%w(city country region) & attributes.keys).each do |key|
+          translate_attribute(key, attributes, language_translations['locations'])
+        end
       end
-    end
 
-    def translate_attribute(name, attributes, translations, change_by = nil)
-      translation_key = attributes[(change_by || name)]
+      def translate_attribute(name, attributes, translations, change_by = nil)
+        translation_key = attributes[(change_by || name)]
 
-      if attributes[name] and translations[translation_key]
-        attributes[name] = translations[translation_key]
+        if attributes[name] and translations[translation_key]
+          attributes[name] = translations[translation_key]
+        end
       end
-    end
 
-    def language_translations
-      LANGUAGES[language] ||= load_language_yaml!
-    end
+      def language_translations
+        LANGUAGES[language] ||= load_language_yaml!
+      end
 
-    def load_language_yaml!
-      stream = File.read(File.join(I18N_YAML_DIR, language + '.yml'))
-      YAML::load(stream) 
-    end
+      def load_language_yaml!
+        YAML::load File.read(File.join(I18N_YAML_DIR, language + '.yml'))
+      end
 
-    def i18n?
-      !!@language
-    end
+      def i18n?
+        !!@language
+      end
+  end
 end

data/lib/yahoo_weatherman/response.rb

@@ -10,8 +10,8 @@ module Weatherman
     attr_accessor :document_root
 
     def initialize(raw, language = nil)
-      @document_root = Nokogiri::XML.parse(raw).xpath('rss/channel')
-      @i18n = I18N.new(language)
+      @document_root = Nokogiri::XML(raw).xpath('rss/channel')
+      @i18n = Weatherman::I18N.new(language)
     end
 
     #
@@ -154,13 +154,11 @@ module Weatherman
       end
 
       def item_attribute(attr)
-        item = document_root.xpath('item').first
-        attribute(attr, item)
+        attribute(attr, document_root.xpath('item').first)
       end
 
       def geo_attribute(attr)
-        geo = item_attribute('geo:' + attr)
-        geo.children.first.text.to_f
+        item_attribute('geo:' + attr).children.first.text.to_f
       end
 
       def text_attribute(attr)

data/lib/yahoo_weatherman.rb

@@ -1,9 +1,11 @@
 path = File.expand_path(File.dirname(__FILE__))
 $LOAD_PATH.unshift(path) unless $LOAD_PATH.include?(path)
 
+require 'rubygems'
+
+require 'yaml'
 require 'open-uri'
 require 'nokogiri'
-require 'yaml'
 
 require 'yahoo_weatherman/i18n'
 require 'yahoo_weatherman/image'
@@ -11,7 +13,7 @@ require 'yahoo_weatherman/response'
 
 module Weatherman
   
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 
   URI = 'http://weather.yahooapis.com/forecastrss'
 
@@ -35,6 +37,7 @@ module Weatherman
     #
     def initialize(options = {})
       @options = options
+      @uri = options[:url] || URI
     end
     
     #
@@ -47,7 +50,7 @@ module Weatherman
 
     private
       def request_url(woeid)
-        URI + query_string(woeid)
+        @uri + query_string(woeid)
       end
 
       def query_string(woeid)
@@ -59,7 +62,7 @@ module Weatherman
       end
 
       def get(url)
-        open(url) { |stream| stream.read } 
+        open(url).read
       end
   end
 end

data/spec/yahoo_weatherman/i18n_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe I18N do
+describe Weatherman::I18N do
   before do
     @response = Weatherman::Client.new(:lang => 'pt-br').lookup_by_woeid 455821
   end
@@ -11,6 +11,8 @@ describe I18N do
 
   it 'should translate the location details' do
     @response.location['country'].should == 'Brasil'
+    @response.location['city'].should == 'Santa Luzia'
+    @response.location['region'].should == 'Minas Gerais'
   end
 
   it 'should translate the forecasts details' do

data/yahoo_weatherman.gemspec

@@ -1,14 +1,22 @@
 Gem::Specification.new do |gem|
   gem.name = "yahoo_weatherman"
-  gem.version = "1.0.1"
+  gem.version = "1.0.2"
   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/i18n.rb", "lib/yahoo_weatherman.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", "spec/yahoo_weatherman/i18n_spec.rb"
+    "lib/yahoo_weatherman/image.rb",
+    "lib/yahoo_weatherman/response.rb",
+    "lib/yahoo_weatherman/i18n.rb",
+    "lib/yahoo_weatherman.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",
+    "spec/yahoo_weatherman/i18n_spec.rb"
   ]
   gem.homepage = "http://github.com/dlt/yahoo_weatherman"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Dalto Curvelano Junior
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-03 00:00:00 -03:00
+date: 2010-05-06 00:00:00 -03:00
 default_executable: 
 dependencies: []