yahoo_weatherman 1.2.2 → 2.0.0

data/i18n/gr.yml

@@ -0,0 +1,62 @@
+0: Ανεμοστρόβιλος
+1: Τροπική Θύελλα
+2: Τυφώνας
+3: Ισχυρές Βροχοπτώσεις
+4: Βροχοπτώσεις
+5: Βροχή και χιόνι
+6: Βροχή και χιονόνερο
+7: Βροχές και χιόνια
+8: Ψιλόχροβο
+9: Ψιχαλίζει
+10: Κρύα βροχή
+11: Καταιγίδες
+12: Καταιγίδες
+13: Νιφάδες χιονιού
+14: Χιονοπτώσεις
+15: Χιόνι κι άνεμοι
+16: Χιόνι
+17: Χαλάζι
+18: Χαλάζι
+19: Σκόνη
+20: Ομιχλώδης
+21: Ομίχλη
+22: Ομίχλη
+23: Θυελλώδης
+24: Ανεμώδης
+25: Κρύο
+26: Συννεφιασμένος
+27: Νεφελώδης (νύχτα)
+28: Νεφελώδης (ημέρα)
+29: Πυκνή συννεφιά (νύχτα)
+30: Πυκνή συννεφιά (ημέρα)
+31: Hλιοφάνεια
+32: Hλιοφάνεια
+33: Ξαστεριά
+34: Hλιοφάνεια χωρίς σύννεφα
+35: Μείγμα χιόνι και χαλάζι
+36: Καύσωνας
+37: Καταιγίδες
+38: Περιοδικές καταιγίδες
+39: Περιοδικές καταιγίδες
+40: Βροχή
+41: Χιονοθέλλα
+42: Χιόνι περιοδικά
+43: Πολύ χιόνι
+44: Αίθριος
+45: Καταιγίδες
+46: Καταιγίδα χιονιού
+47: Καταιγίδες
+3200: Χωρίς περιγραφή
+
+locations:
+  Greece: 
+
+forecasts:
+  days:
+    Mon: Δευτέρα
+    Tue: Τρίτη
+    Wed: Τετάρτη
+    Thu: Πέμπτη
+    Fri: Παρασκευή
+    Sat: Σάββατο
+    Sun: Κυριακή

data/lib/yahoo_weatherman.rb

@@ -13,7 +13,7 @@ require 'yahoo_weatherman/response'
 
 module Weatherman
   
-  VERSION = '1.2.2'
+  VERSION = '2.0.0'
 
   URI = 'http://weather.yahooapis.com/forecastrss'
 
@@ -35,12 +35,9 @@ module Weatherman
     #
     #  +lang+: the language used in the response
     #
-    #  +app_id+: your yahoo app id (necessary for searching by location).
-    #
     def initialize(options = {})
       @options = options
       @uri = options[:url] || URI
-      @app_id = options[:app_id]
     end
     
     #
@@ -55,7 +52,7 @@ module Weatherman
     # Looks up weather by location.
     #
     def lookup_by_location(location)
-      lookup = WoeidLookup.new(@app_id)
+      lookup = WoeidLookup.new
       woeid = lookup.get_woeid(location)
       lookup_by_woeid(woeid)
     end

data/lib/yahoo_weatherman/woeid_lookup.rb

@@ -3,21 +3,17 @@ require 'cgi'
 module Weatherman
   class WoeidLookup
 
-    def initialize(app_id)
-      @app_id = app_id
-    end
-
     def get_woeid(location)
       raw = get query_string(location)
       Nokogiri::HTML(raw).at_xpath('.//woeid').content
     rescue
       nil
     end
-    
+
     private
 
       def query_string(location)
-        "http://where.yahooapis.com/v1/places.q('#{::CGI.escape(location)}')?appid=#{@app_id}"
+        "http://query.yahooapis.com/v1/public/yql?q=select%20*%20from%20geo.placefinder%20where%20text%3D%22#{::CGI.escape(location)}%22%20and%20gflags%3D%22R%22"
       end
 
       def get(url)

data/spec/spec_helper.rb

@@ -43,11 +43,17 @@ module WoeidHelper
     File.open(File.dirname(__FILE__) + "/files/#{file}.xml").read
   end
 
-  def self.register_this_woeid_lookup_result(result, app_id, location)
-    FakeWeb.register_uri(:get, "http://where.yahooapis.com/v1/places.q('#{location}')?appid=#{app_id}", :body => result)
+  def self.register_this_woeid_lookup_result(result, location)
+    FakeWeb.register_uri(:get, lookup_uri(location), :body => result)
   end
 
-  def self.register_this_woeid_lookup_to_fail(app_id, location)
-    FakeWeb.register_uri(:get, "http://where.yahooapis.com/v1/places.q('#{location}')?appid=#{app_id}", :exception => Net::HTTPError)
+  def self.register_this_woeid_lookup_to_fail(location)
+    FakeWeb.register_uri(:get, lookup_uri(location), :exception => Net::HTTPError)
+  end
+
+  private
+
+  def self.lookup_uri(location)
+    "http://query.yahooapis.com/v1/public/yql?q=select%20*%20from%20geo.placefinder%20where%20text%3D%22#{location}%22%20and%20gflags%3D%22R%22"
   end
 end

data/spec/yahoo_weatherman/woeid_lookup_spec.rb

@@ -2,14 +2,13 @@ require 'spec_helper'
 Dir[File.dirname(__FILE__) + '/directory/*.rb'].each {|file| require file }
 
 describe Weatherman::WoeidLookup do
-  describe "example with test_api_id and 66061" do 
+  describe "example with 66061" do 
     before do
-      @app_id = 'test_api_id'
       @location = '66061'
-      @lookup = Weatherman::WoeidLookup.new(@app_id)
+      @lookup = Weatherman::WoeidLookup.new
 
       xml_result = WoeidHelper.open_test_file('woeid_result_that_returns_12786745') 
-      WoeidHelper.register_this_woeid_lookup_result(xml_result, @app_id, @location)
+      WoeidHelper.register_this_woeid_lookup_result(xml_result, @location)
     end
 
     it "should retrieve the woeid" do
@@ -20,12 +19,11 @@ describe Weatherman::WoeidLookup do
 
   describe "example with another_api and 90210" do 
     before do
-      @app_id = 'another_api'
       @location = '90210'
-      @lookup = Weatherman::WoeidLookup.new(@app_id)
+      @lookup = Weatherman::WoeidLookup.new
 
       xml_result = WoeidHelper.open_test_file('woeid_result_that_returns_4729347') 
-      WoeidHelper.register_this_woeid_lookup_result(xml_result, @app_id, @location)
+      WoeidHelper.register_this_woeid_lookup_result(xml_result, @location)
     end
 
     it "should retrieve the woeid" do
@@ -34,28 +32,11 @@ describe Weatherman::WoeidLookup do
     end
   end
 
-  describe "invalid api key" do 
-    before do
-      @app_id = 'invalid_api'
-      @location = '12345'
-      @lookup = Weatherman::WoeidLookup.new(@app_id)
-
-      xml_result = WoeidHelper.open_test_file('woeid_result_for_invalid_app_id') 
-      WoeidHelper.register_this_woeid_lookup_result(xml_result, @app_id, @location)
-    end
-
-    it "should return nil" do
-      response = @lookup.get_woeid(@location)
-      response.should == nil
-    end
-  end
-
   describe "failed net request" do 
     before do
-      @app_id = 'net_failure'
       @location = '78902'
-      @lookup = Weatherman::WoeidLookup.new(@app_id)
-      WoeidHelper.register_this_woeid_lookup_to_fail @app_id, @location
+      @lookup = Weatherman::WoeidLookup.new
+      WoeidHelper.register_this_woeid_lookup_to_fail @location
     end
 
     it "should return nil" do
@@ -66,11 +47,10 @@ describe Weatherman::WoeidLookup do
 
   describe "request with spaces" do
     before do
-      @app_id = 'test_api_id'
-      @lookup = Weatherman::WoeidLookup.new(@app_id)
+      @lookup = Weatherman::WoeidLookup.new
 
       xml_result = WoeidHelper.open_test_file('woeid_result_that_returns_12786745')
-      WoeidHelper.register_this_woeid_lookup_result(xml_result, @app_id, "San+Francisco%2C+CA")
+      WoeidHelper.register_this_woeid_lookup_result(xml_result, "San+Francisco%2C+CA")
     end
 
     it "should retrieve the woeid" do

data/spec/yahoo_weatherman/yahoo_weatherman_spec.rb

@@ -15,13 +15,12 @@ describe Weatherman::Client do
   describe "#lookup_by_location" do
     describe "4729347 example" do
       it "should lookup by location" do
-        app_id = 'test_id'
         location = '78923'
 
         xml_result = WoeidHelper.open_test_file 'woeid_result_that_returns_4729347'
-        WoeidHelper.register_this_woeid_lookup_result xml_result, app_id, location
+        WoeidHelper.register_this_woeid_lookup_result xml_result, location
 
-        @client = Weatherman::Client.new( { :app_id => app_id } )
+        @client = Weatherman::Client.new()
         response = @client.lookup_by_location location
 
         response.should be_instance_of(Weatherman::Response)
@@ -30,13 +29,12 @@ describe Weatherman::Client do
 
     describe "12786745 example" do
       it "should lookup by location" do
-        app_id = 'apple'
         location = 'orange'
 
         xml_result = WoeidHelper.open_test_file 'woeid_result_that_returns_12786745'
-        WoeidHelper.register_this_woeid_lookup_result xml_result, app_id, location
+        WoeidHelper.register_this_woeid_lookup_result xml_result, location
 
-        @client = Weatherman::Client.new( { :app_id => app_id } )
+        @client = Weatherman::Client.new()
         response = @client.lookup_by_location location
 
         response.should be_instance_of(Weatherman::Response)

data/yahoo_weatherman.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name = "yahoo_weatherman"
-  gem.version = "1.2.2"
+  gem.version = "2.0.0"
   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."
@@ -11,9 +11,10 @@ Gem::Specification.new do |gem|
     "lib/yahoo_weatherman/i18n.rb",
     "lib/yahoo_weatherman/woeid_lookup.rb",
     "lib/yahoo_weatherman.rb",
+    "i18n/es.yml",
+    "i18n/gr.yml",
     "i18n/pt-br.yml",
     "i18n/ru.yml",
-    "i18n/es.yml",
     "i18n/zh-cn.yml",
     "spec/files/belo_horizonte_c.rss",
     "spec/files/belo_horizonte_f.rss",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yahoo_weatherman
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-20 00:00:00.000000000 Z
+date: 2013-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -71,9 +71,10 @@ files:
 - lib/yahoo_weatherman/i18n.rb
 - lib/yahoo_weatherman/woeid_lookup.rb
 - lib/yahoo_weatherman.rb
+- i18n/es.yml
+- i18n/gr.yml
 - i18n/pt-br.yml
 - i18n/ru.yml
-- i18n/es.yml
 - i18n/zh-cn.yml
 - spec/files/belo_horizonte_c.rss
 - spec/files/belo_horizonte_f.rss