weather_by_ip 0.2.0 → 0.5.1

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    weather_by_ip (0.2.0)
-      api_object (>= 0.5.1)
+    weather_by_ip (0.5.1)
+      api_object (>= 0.7)
 
 GEM
   remote: https://rubygems.org/
@@ -10,11 +10,17 @@ GEM
     activesupport (3.2.6)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    api_object (0.5.1)
+    api_object (0.7.1)
       activesupport
+      freegeoip
       geo_ip
       nori (>= 1.1)
       rest-client (>= 1.6)
+    faraday (0.8.0.rc2)
+      multipart-post (~> 1.1)
+    freegeoip (0.1.0)
+      faraday (= 0.8.0.rc2)
+      multi_json (= 1.2.0)
     geo_ip (0.5.0)
       json (~> 1.4)
       rest-client (~> 1.6.1)
@@ -22,7 +28,8 @@ GEM
     json (1.7.3)
     mime-types (1.18)
     minitest (3.1.0)
-    multi_json (1.3.6)
+    multi_json (1.2.0)
+    multipart-post (1.1.5)
     nori (1.1.0)
     rest-client (1.6.7)
       mime-types (>= 1.16)

data/README.md

@@ -26,15 +26,30 @@ Consider making a donation to [ipinfodb.com](http://ipinfodb.com/) at [http://ip
 
 The gem also uses Google weather service to the weather information by location. It doesn't require any key. 
 
+It's also has functionality to get weather information by city name or zip code. In this case, registration with ipinfodb.com is not needed. 
+
 The weather information then is obtained as the following:
 
 ```
-WeatherByIp.get_weather(<your ip>, <your ipinfodb_key>)
+WeatherByIp.get_weather('<your ip>', '<your ipinfodb_key>')
+
+or 
+
+GeoIp.api_key = <your key>
+WeatherByIp.get_weather('<your ip>')
+
+or
+
+WeatherByIp.get_weather('<your city, state or zip code>')
+WeatherByIp.get_weather('Santa Clara, CA')
+WeatherByIp.get_weather('78744')
 ```
 
 ## Limitations
 
-THe location by ip service is free and doesn't always give the correct location. 
+* The location by ip service is free and doesn't always give the correct location.
+* Retrieval by zip code has been tested on the US and Canadian zip codes. It's recommended to use city names if retrieval by zip code doesn't work. 
+ 
 
 ## Testing
 

data/lib/weather_by_ip.rb

@@ -1,5 +1,6 @@
 require "weather_by_ip/version"
 require 'weather_by_ip/weather'
+require 'uri'
 
 class WeatherByIp
 
@@ -7,8 +8,15 @@ class WeatherByIp
   
       include WeatherInfo
             
-      def get_weather ip, key = GeoIp.api_key
-        Weather.new(Weather.get_results_by_ip(ip, :key => key, :weather => :zip_code))
+      def get_weather location, key = GeoIp.api_key
+        zipcode_opt = key.nil? ? :zipcode : :zip_code #difference between freegeoip and ipinfodb services
+        results = (location_ip? location) ? Weather.get_results_by_ip(location, :key => key, :weather => zipcode_opt) : Weather.get_results(:weather => URI.escape(location))
+        Weather.new(results)
+      end
+      
+private
+      def location_ip? loc
+        loc =~ /(?:\d{1,3}\.){3}\d{1,3}/
       end
             
   end

data/lib/weather_by_ip/version.rb

@@ -1,3 +1,3 @@
 module WeatherInfo
-  VERSION = "0.2.0"
+  VERSION = "0.5.1"
 end

data/lib/weather_by_ip/weather.rb

@@ -2,6 +2,7 @@ require 'api_object'
 module WeatherInfo 
 
   URL = "http://www.google.com"
+  IMG_URL = "http://g0.gstatic.com"
   
   def self.included(base)
     base.send(:include, ActiveApi)
@@ -11,8 +12,8 @@ module WeatherInfo
     def to_s
       inspect
     end
-    def get_icon_path icon
-      "#{URL.chomp('/')}/#{icon}"
+    def get_icon_path
+      "#{IMG_URL.chomp('/')}/#{self.icon}" if self.icon
     end
   end
   
@@ -31,7 +32,7 @@ module WeatherInfo
       return false if other_info.nil?
       self.city == other_info.city
     end
-    
+     
   end
   
   class CurrentWeather < ActiveApi::ApiObject
@@ -44,6 +45,7 @@ module WeatherInfo
     def inspect
       "Today #{@temp_f}F (#{@temp_c}C), #{@sky}, #{@humidity}, #{@wind}"
     end
+    
   end
   
   class WeatherForecast < ActiveApi::ApiObject

data/test/unit/weather_by_ip_test.rb

@@ -5,10 +5,9 @@ require 'weather_by_ip/weather'
 class WeatherByIpTest < MiniTest::Unit::TestCase  
     
     IP = '99.156.82.20'
-  
-    def test_should_get_correct_weather
+ 
+    def test_should_get_correct_weather_by_ip
         check_weather WeatherByIp.get_weather(IP, ARGV.last)
-
     end
     
     def test_should_get_correct_weather_with_key_preset
@@ -16,13 +15,31 @@ class WeatherByIpTest < MiniTest::Unit::TestCase
         check_weather WeatherByIp.get_weather(IP)
     end
     
+    def test_should_get_correct_weather_by_location
+        check_weather WeatherByIp.get_weather('78744')
+        check_weather WeatherByIp.get_weather('San Jose, CA'), 'San Jose, CA'
+    end
+    
+    def test_should_get_correct_weather_with_key_missing
+        GeoIp.api_key = nil
+        weather = WeatherByIp.get_weather(IP)
+        check_weather WeatherByIp.get_weather(IP), "Round Rock, TX"
+        #assert_empty(weather, "weather object should be empty")
+    end
+   
+    def test_should_get_empty_weather_with_incorrect_location
+        weather = WeatherByIp.get_weather('999999')
+        assert_empty(weather, "weather object should be empty")
+    end
+
+    
 private
-    def check_weather weather
+    def check_weather weather, city = 'Austin, TX'
        unless weather.nil?
           refute_nil(weather.forecast_information)
           refute_nil(weather.current_conditions)
           refute_nil(weather.forecast_conditions)
-          assert_equal(weather.forecast_information.city, "Austin, TX")
+          assert_equal(weather.forecast_information.city, city)
           assert_equal(weather.forecast_information.current_date, Date.today.to_s)
           assert_match(/^\/ig\/images\/weather\/.+\.gif/, weather.current_conditions.icon)
           assert(weather.forecast_conditions.size > 3)

data/weather_by_ip.gemspec

@@ -16,6 +16,6 @@ Gem::Specification.new do |gem|
   gem.version       = WeatherInfo::VERSION
   
   gem.add_development_dependency "minitest"
-  gem.add_dependency('api_object', '>= 0.5.1')
+  gem.add_dependency('api_object', '>= 0.7')
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weather_by_ip
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-13 00:00:00.000000000 Z
+date: 2012-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &73543910 !ruby/object:Gem::Requirement
+  requirement: &85402070 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,18 +21,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *73543910
+  version_requirements: *85402070
 - !ruby/object:Gem::Dependency
   name: api_object
-  requirement: &73543430 !ruby/object:Gem::Requirement
+  requirement: &85400790 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *73543430
+  version_requirements: *85400790
 description: An interface to load weather information based on an approximate user
   location
 email: