weather_by_ip 0.1.0 → 0.2.0

data/Gemfile.lock

@@ -1,9 +1,8 @@
 PATH
   remote: .
   specs:
-    weather_by_ip (0.0.1)
-      api_object (>= 0.3)
-      geo_ip
+    weather_by_ip (0.2.0)
+      api_object (>= 0.5.1)
 
 GEM
   remote: https://rubygems.org/
@@ -11,8 +10,9 @@ GEM
     activesupport (3.2.6)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    api_object (0.3.3)
+    api_object (0.5.1)
       activesupport
+      geo_ip
       nori (>= 1.1)
       rest-client (>= 1.6)
     geo_ip (0.5.0)
@@ -21,7 +21,7 @@ GEM
     i18n (0.6.0)
     json (1.7.3)
     mime-types (1.18)
-    minitest (3.0.1)
+    minitest (3.1.0)
     multi_json (1.3.6)
     nori (1.1.0)
     rest-client (1.6.7)

data/lib/weather_by_ip/version.rb

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

data/lib/weather_by_ip.rb

@@ -7,11 +7,8 @@ class WeatherByIp
   
       include WeatherInfo
             
-      def get_weather ip, key
-        Weather.new(Weather.get_results_by_ip(ip, key, :weather => :zip_code))
-        rescue
-          puts "Cannot obtain location or weather. Verify that you've obtained and set the api_key for the ipinfodb.com webservice"
-          return
+      def get_weather ip, key = GeoIp.api_key
+        Weather.new(Weather.get_results_by_ip(ip, :key => key, :weather => :zip_code))
       end
             
   end

data/test/unit/weather_by_ip_test.rb

@@ -7,8 +7,18 @@ class WeatherByIpTest < MiniTest::Unit::TestCase
     IP = '99.156.82.20'
   
     def test_should_get_correct_weather
-        weather = WeatherByIp.get_weather(IP, ARGV.last)
-        unless weather.nil?
+        check_weather WeatherByIp.get_weather(IP, ARGV.last)
+
+    end
+    
+    def test_should_get_correct_weather_with_key_preset
+        GeoIp.api_key = ARGV.last
+        check_weather WeatherByIp.get_weather(IP)
+    end
+    
+private
+    def check_weather weather
+       unless weather.nil?
           refute_nil(weather.forecast_information)
           refute_nil(weather.current_conditions)
           refute_nil(weather.forecast_conditions)

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.4')
+  gem.add_dependency('api_object', '>= 0.5.1')
   
 end

metadata

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