diff --git a/Gemfile.lock b/Gemfile.lock index 23ab5ab..b14d14e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - yahoo_weatherman (1.1.5) + yahoo_weatherman (2.0.0) nokogiri GEM @@ -9,7 +9,9 @@ GEM specs: diff-lcs (1.1.3) fakeweb (1.3.0) - nokogiri (1.5.5) + mini_portile2 (2.0.0) + nokogiri (1.6.7.2) + mini_portile2 (~> 2.0.0.rc2) rspec (2.11.0) rspec-core (~> 2.11.0) rspec-expectations (~> 2.11.0) @@ -26,3 +28,6 @@ DEPENDENCIES fakeweb rspec yahoo_weatherman! + +BUNDLED WITH + 1.12.3 diff --git a/lib/yahoo_weatherman.rb b/lib/yahoo_weatherman.rb index 1963308..9e7158e 100644 --- a/lib/yahoo_weatherman.rb +++ b/lib/yahoo_weatherman.rb @@ -12,10 +12,10 @@ require 'yahoo_weatherman/response' module Weatherman - - VERSION = '2.0.0' - URI = 'http://weather.yahooapis.com/forecastrss' + VERSION = '2.0.1' + + URI = 'http://xml.yahooapis.com/forecastrss' # = Client # @@ -39,9 +39,9 @@ def initialize(options = {}) @options = options @uri = options[:url] || URI end - + # - # Looks up weather by woeid. + # Looks up weather by woeid. # def lookup_by_woeid(woeid) raw = get request_url(woeid) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 8be4a31..5c2c867 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -17,22 +17,22 @@ def fahrenheight_fixture end FakeWeb.allow_net_connect = false -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) -FakeWeb.register_uri(:get, "http://weather.yahooapis.com/forecastrss?w=123456&u=f", :body => celsius_fixture) -FakeWeb.register_uri(:get, "http://weather.yahooapis.com/forecastrss?w=4729347&u=c", :body => celsius_fixture) -FakeWeb.register_uri(:get, "http://weather.yahooapis.com/forecastrss?w=12786745&u=c", :body => celsius_fixture) +FakeWeb.register_uri(:get, "http://xml.yahooapis.com/forecastrss?w=455821&u=c", :body => celsius_fixture) +FakeWeb.register_uri(:get, "http://xml.yahooapis.com/forecastrss?w=455821&u=f", :body => fahrenheight_fixture) +FakeWeb.register_uri(:get, "http://xml.yahooapis.com/forecastrss?w=123456&u=f", :body => celsius_fixture) +FakeWeb.register_uri(:get, "http://xml.yahooapis.com/forecastrss?w=4729347&u=c", :body => celsius_fixture) +FakeWeb.register_uri(:get, "http://xml.yahooapis.com/forecastrss?w=12786745&u=c", :body => celsius_fixture) module YAML class << self - + alias original_load load def load(ignored_arg) original_load(test_translation_file_stream) end def test_translation_file_stream - File.read(File.join(File.dirname(__FILE__), 'files', 'test_i18n.yml')) + File.read(File.join(File.dirname(__FILE__), 'files', 'test_i18n.yml')) end end