ya_yahoo_weather 0.0.2 → 0.0.3

data/lib/ya_yahoo_weather/client.rb

@@ -3,17 +3,26 @@ module YaYahooWeather
   class Client 
     @@YAHOO_WEATHER_API = "http://weather.yahooapis.com/forecastrss"
 
-    def get_weather_conditions_by_woeid(woeid) 
+    def get_detailed_weather_by_woeid(woeid) 
       begin 
         url = @@YAHOO_WEATHER_API + "?w=" + woeid.to_s + "&u=f"
         response = do_http_get(url)
         response_hash = Nori.parse(response)
-        response_hash['rss']['channel']['item']['yweather:condition']
+        # move some specific details to the item level
+        item_hash = response_hash['rss']['channel']['item']
+        ['yweather:location', 'yweather:wind', 'yweather:atmosphere', 'yweather:astronomy'].each do |key|
+          item_hash[key] = response_hash['rss']['channel'][key]
+        end 
+        item_hash
       rescue => e 
         raise RuntimeError.new("Failed to get weather.  woeid => #{woeid.inspect} url => #{url.inspect} e => #{e.inspect}")
       end 
     end 
 
+    def get_weather_conditions_by_woeid(woeid) 
+      get_detailed_weather_by_woeid(woeid)['yweather:condition']
+    end 
+
     private 
     def do_http_get(url)
       Net::HTTP.get_response(URI.parse(url)).body.to_s

data/lib/ya_yahoo_weather/version.rb

@@ -1,3 +1,3 @@
 module YaYahooWeather
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/ya_yahoo_weather/client_spec.rb

@@ -1,6 +1,7 @@
 require './lib/ya_yahoo_weather'
 
 def sample
+  # copied from http://developer.yahoo.com/weather/
   <<END 
 <?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#">
@@ -51,34 +52,67 @@ END
 end 
 
 describe YaYahooWeather::Client do 
-  # copied from http://developer.yahoo.com/weather/
   describe "#initialize" do 
     it "should instantiate" do 
       client = YaYahooWeather::Client.new 
     end 
   end 
-  describe "#get_weather_conditions_by_woeid" do 
+  describe "#get_detailed_weather_by_woeid" do 
     context "on success" do 
-    before :each do 
-      @client = YaYahooWeather::Client.new 
-      @client.stub!(:do_http_get).and_return(sample) 
+      before :each do 
+        @client = YaYahooWeather::Client.new 
+        @client.stub!(:do_http_get).and_return(sample) 
+        @response = @client.get_detailed_weather_by_woeid("mywoeid")
+      end 
+      it "should return non-null result" do 
+        @response.should_not be_nil
+      end 
+      it "should return conditions" do 
+        # check this value specifically as a sanity test
+        @response['yweather:condition']['@text'].should == 'Mostly Cloudy'
+      end 
+      it "should return the forecast" do 
+        # check this value specifically as a sanity test
+        @response['yweather:forecast'].first['@high'].should == '62'
+      end 
+      it "should return astronomy data" do 
+        @response['yweather:astronomy']['@sunrise'].should == '7:17 am'
+      end 
     end 
-    it "should return non-null result" do 
-      response = @client.get_weather_conditions_by_woeid("mywoeid")
-      response.should_not be_nil
+    context "on error" do 
+      before :each do 
+        @client = YaYahooWeather::Client.new 
+        @client.stub!(:do_http_get).and_raise("Yahoo hates you")
+      end 
+      it "should raise runtime exception" do 
+        lambda {
+          @client.get_weather_conditions_by_woeid("mywoeid")
+        }.should raise_exception
+      end 
     end 
-    describe "the result" do 
+  end 
+  describe "#get_weather_conditions_by_woeid" do 
+    context "on success" do 
       before :each do 
-        @response = @client.get_weather_conditions_by_woeid("mywoeid")
+        @client = YaYahooWeather::Client.new 
+        @client.stub!(:do_http_get).and_return(sample) 
       end 
-      it "should be a hash" do 
-        @response.instance_of?(Hash).should be_true
+      it "should return non-null result" do 
+        response = @client.get_weather_conditions_by_woeid("mywoeid")
+        response.should_not be_nil
       end 
-      it "should contain the condition code" do 
-        @response['@code'].to_i.should == 28
+      describe "the result" do 
+        before :each do 
+          @response = @client.get_weather_conditions_by_woeid("mywoeid")
+        end 
+        it "should be a hash" do 
+          @response.instance_of?(Hash).should be_true
+        end 
+        it "should contain the condition code" do 
+          @response['@code'].to_i.should == 28
+        end 
       end 
     end 
-    end 
     context "on error" do 
       before :each do 
         @client = YaYahooWeather::Client.new 

metadata

@@ -2,7 +2,7 @@
 name: ya_yahoo_weather
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - John Hinnegan
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-02 00:00:00 -07:00
+date: 2011-06-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency