open-weather 0.9.1 → 0.9.2

data/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")
 

data/lib/open_weather/base.rb

@@ -1,5 +1,5 @@
-require 'httparty'
-require 'addressable/uri'
+require 'net/http'
+require 'json'
 
 module OpenWeather
   class Base
@@ -24,7 +24,7 @@ module OpenWeather
     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]
@@ -37,16 +37,16 @@ module OpenWeather
     end
 
     def parse_response
-      @weather_info = @response
+      @weather_info = JSON.parse(@response)
       @status = @weather_info["cod"]
       @message = @weather_info["message"] unless @status
       @weather_info
     end
 
     def send_request(request)
-      uri = Addressable::URI.parse(request.url)
-      uri.query_values = request.options
-      HTTParty.get(uri.to_s)
+      uri = URI(request.url)
+      uri.query = URI.encode_www_form(request.options)
+      Net::HTTP.get(uri)
     end
   end
 end

data/lib/open_weather/version.rb

@@ -1,3 +1,3 @@
 module OpenWeather
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

data/open_weather.gemspec

@@ -14,7 +14,5 @@ Gem::Specification.new do |gem|
   gem.executables          = gem.files.grep(/^bin/).map{ |f| File.basename(f) }
   gem.require_paths        = ["lib"]
   gem.add_development_dependency "rspec"
-
-  gem.add_runtime_dependency 'httparty'
-  gem.add_runtime_dependency 'addressable'
+  gem.add_runtime_dependency 'json'
 end

data/spec/open_weather/api_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 # success response
-# 
+#
 # {"coord"=>{"lon"=>76.26, "lat"=>9.94},
 #  "sys"=>
 #   {"message"=>0.1938,
@@ -31,14 +31,6 @@ require 'spec_helper'
 #
 # {"message"=>"Error: Not found city", "cod"=>"404"}
 
-describe 'Connection Error' do
-  it 'return error when the network is unreachable' do
-      response = OpenWeather::Current.city('Cochin, In')
-      response['cod'].should eq(200)
-  end
-end
-
-
 describe 'Open weather Current API' do
   context '.city' do
     it 'return current weather for cochi' do
@@ -75,6 +67,19 @@ describe 'Open weather Current API' do
       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
@@ -113,4 +118,17 @@ describe 'Open weather Forecast API' do
       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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: open-weather
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-18 00:00:00.000000000 Z
+date: 2014-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -29,23 +29,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: httparty
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: addressable
+  name: json
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements: