Merge pull request #11 from dNitza/Units

Adding units as a valid options

Author: coderhs

README.md

@@ -25,11 +25,17 @@ Add the following to your **Gemfile**
     # get current weather by geocode. (lat, lon)
     OpenWeather::Current.geocode(9.94, 76.26)
 
+    # get the current weather in degrees celsius
+    OpenWeather::Current.city("Cochin, IN", units: 'metric')
+
     # weather forecast APIs
 
     # get weather forecast by city name
     OpenWeather::Forecast.city("Cochin, IN")
 
+    # get weather forecast by city name in fahrenheit
+    OpenWeather::Forecast.city("Cochin, IN", units: 'imperial')
+
     # get weather forecast by city id
     OpenWeather::Forecast.city_id("1273874")
 

lib/open_weather/base.rb

@@ -24,7 +24,7 @@ def success?
     private
 
     def extract_options!(options)
-      valid_options = [:lat, :lon, :city, :country, :id]
+      valid_options = [:lat, :lon, :city, :country, :id, :units]
       options.keys.each { |k| options.delete(k) unless valid_options.include?(k) }
 
       if options[:city] || options[:country]

spec/open_weather/api_spec.rb

@@ -67,6 +67,19 @@
       response['cod'].should eq("404")
     end
   end
+
+  context 'units option' do
+    it 'returns the current temperature in requested units' do
+      response = OpenWeather::Current.city('Cochin, In', units: 'metric')
+      temp_metric = response['main']['temp']
+
+      response = OpenWeather::Current.city('Cochin, In', units: 'imperial')
+      temp_imperial = response['main']['temp']
+      farenheit_to_celsius = ((temp_imperial - 32) / 1.8000)
+
+      expect(farenheit_to_celsius).to be_within(0.01).of(temp_metric)
+    end
+  end
 end
 
 describe 'Open weather Forecast API' do
@@ -105,4 +118,17 @@
       response['cod'].to_s.should eq("404")
     end
   end
-end
+
+  context 'units option' do
+    it 'returns the forecast in requested units' do
+      response = OpenWeather::Forecast.city('Cochin, In', units: 'metric')
+      temp_metric = response['list'].first['main']['temp']
+
+      response = OpenWeather::Forecast.city('Cochin, In', units: 'imperial')
+      temp_imperial = response['list'].first['main']['temp']
+      farenheit_to_celsius = ((temp_imperial - 32) / 1.8000)
+
+      expect(farenheit_to_celsius).to be_within(0.01).of(temp_metric)
+    end
+  end
+end