yahoo_weatherman 1.1.5 → 1.2.0

data/lib/yahoo_weatherman.rb

@@ -8,11 +8,12 @@ require 'nokogiri'
 
 require 'yahoo_weatherman/i18n'
 require 'yahoo_weatherman/image'
+require 'yahoo_weatherman/woeid_lookup'
 require 'yahoo_weatherman/response'
 
 module Weatherman
   
-  VERSION = '1.1.5'
+  VERSION = '1.2.0'
 
   URI = 'http://weather.yahooapis.com/forecastrss'
 
@@ -34,19 +35,31 @@ 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
     
     #
-    # Just pass in a +woeid+ and it will return a Weatherman::Response object:w
+    # Looks up weather by woeid. 
     #
     def lookup_by_woeid(woeid)
       raw = get request_url(woeid)
       Response.new(raw, options[:lang])
     end
 
+    #
+    # Looks up weather by location.
+    #
+    def lookup_by_location(location)
+      lookup = WoeidLookup.new(@app_id)
+      woeid = lookup.get_woeid(location)
+      lookup_by_woeid(woeid)
+    end
+
     private
       def request_url(woeid)
         @uri + query_string(woeid)

data/spec/spec_helper.rb

@@ -19,6 +19,9 @@ 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)
 
 module YAML
   class << self
@@ -34,3 +37,17 @@ module YAML
 
   end
 end
+
+module WoeidHelper
+  def self.open_test_file(file)
+    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)
+  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)
+  end
+end

data/spec/yahoo_weatherman/yahoo_weatherman_spec.rb

@@ -1,13 +1,47 @@
 require 'spec_helper'
 
 describe Weatherman::Client do
-  before do
-    @client = Weatherman::Client.new
+  describe "#lookup_by_woeid" do
+    before do
+      @client = Weatherman::Client.new
+    end
+
+    it 'should lookup by woeid' do
+      response = @client.lookup_by_woeid 455821
+      response.should be_instance_of(Weatherman::Response)
+    end
   end
 
-  it 'should lookup by woeid' do
-    response = @client.lookup_by_woeid 455821
-    response.should be_instance_of(Weatherman::Response)
+  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
+
+        @client = Weatherman::Client.new( { :app_id => app_id } )
+        response = @client.lookup_by_location location
+
+        response.should be_instance_of(Weatherman::Response)
+      end
+    end
+
+    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
+
+        @client = Weatherman::Client.new( { :app_id => app_id } )
+        response = @client.lookup_by_location location
+
+        response.should be_instance_of(Weatherman::Response)
+      end
+    end
   end
 
 end

data/yahoo_weatherman.gemspec

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yahoo_weatherman
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-28 00:00:00.000000000 Z
+date: 2012-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &20671160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20671160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &20670580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20670580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &20670040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +53,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20670040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A ruby wrapper to the Yahoo! Weather feed with i18n support.
 email: 
 executables: []
@@ -83,8 +98,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A ruby wrapper to the Yahoo! Weather feed with i18n support.
 test_files: []
+has_rdoc: