Merge pull request #4 from 42races/master

public apis added for Current weather

Author: coderhs

Gemfile

@@ -2,4 +2,7 @@ source 'http://rubygems.org'
 
 gem 'httparty'
 gem 'addressable'
-gem 'rspec'
+gem 'rspec'
+
+
+gem 'pry'

Gemfile.lock

@@ -2,12 +2,18 @@ GEM
   remote: http://rubygems.org/
   specs:
     addressable (2.3.4)
+    coderay (1.0.9)
     diff-lcs (1.2.2)
     httparty (0.11.0)
       multi_json (~> 1.0)
       multi_xml (>= 0.5.2)
+    method_source (0.8.2)
     multi_json (1.7.3)
     multi_xml (0.5.3)
+    pry (0.9.12.2)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.4)
     rspec (2.13.0)
       rspec-core (~> 2.13.0)
       rspec-expectations (~> 2.13.0)
@@ -16,11 +22,13 @@ GEM
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.13.0)
+    slop (3.4.6)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   addressable
   httparty
+  pry
   rspec

lib/open_weather_api.rb

@@ -4,4 +4,6 @@ module OpenWeather
   autoload :Base,    "open_weather_api/base"
   autoload :Current, "open_weather_api/current_weather"
   autoload :VERSION, "open_weather_api/version"
+
+  require "open_weather_api/api.rb"
 end

lib/open_weather_api/api.rb

@@ -0,0 +1,22 @@
+require_relative 'current_weather'
+
+module OpenWeather
+  class Current
+    #City format : Eg, Cochin,IN
+    #Useage: OpenWeather::Current.city('Cochin,In')
+    def self.city(city, options = {})
+      new(options.merge(city: city)).retrive
+    end
+
+    #City Id, an integer value. Eg, 2172797
+    #Useage: OpenWeather::Current.city_id(2172797)
+    def self.city_id(id, options = {})
+      new(options.merge(id: id)).retrive
+    end
+
+    #City Geographics Cordingates : Eg, lat 35 lon 139
+    def self.geocode(lat, lon, options = {})
+      new(options.merge(lat: lat, lon: lon)).retrive
+    end
+ end
+end

lib/open_weather_api/current_weather.rb

@@ -9,7 +9,7 @@ def initialize(options = {})
     end
 
     def retrive
-      @response = Base.public_send(:send_request, self) unless @options.empty?
+      @response = Base.send_request(self) unless @options.empty?
       parse_response if @response
     end
 
@@ -20,23 +20,20 @@ def success?
     private
 
     def extract_options!(options)
-      valid_options = [:lat, :lon, :city, :country, :city_id]
+      valid_options = [:lat, :lon, :city, :country, :id]
       options.keys.each { |k| options.delete(k) unless valid_options.include?(k) }
+
       if options[:city] || options[:country]
         options[:q] = "#{options[:country]},#{options[:city]}"
         options.delete(:city)
         options.delete(:country)
       end
 
-      if options[:city_id]
-        options[:id] = options[:city_id]
-        options.delete(:city_id)
-      end
       options
     end
 
     def parse_response
-      @weather_info = @response.to_h
+      @weather_info = @response
       @status = @weather_info["cod"]
       @message = @weather_info["message"] unless @status
       @weather_info

spec/ruby_weather_api/api_spec.rb

@@ -0,0 +1,67 @@
+require 'spec_helper'
+
+# success
+# response = {"coord"=>{"lon"=>76.26, "lat"=>9.94},
+#  "sys"=>
+#   {"message"=>0.1938,
+#    "country"=>"India",
+#    "sunrise"=>1390007802,
+#    "sunset"=>1390049651},
+#  "weather"=>
+#   [{"id"=>800, "main"=>"Clear", "description"=>"Sky is Clear", "icon"=>"01d"}],
+#  "base"=>"gdps stations",
+#  "main"=>
+#   {"temp"=>303.534,
+#    "temp_min"=>303.534,
+#    "temp_max"=>303.534,
+#    "pressure"=>1022.72,
+#    "sea_level"=>1026.59,
+#    "grnd_level"=>1022.72,
+#    "humidity"=>72},
+#  "wind"=>{"speed"=>1.21, "deg"=>143.5},
+#  "clouds"=>{"all"=>0},
+#  "dt"=>1390029526,
+#  "id"=>1273874,
+#  "name"=>"Kochi",
+#  "cod"=>200}
+
+# failure
+# {"message"=>"Error: Not found city", "cod"=>"404"}
+
+describe 'Open weather API' do
+  context '.city' do
+    it 'return current weather for cochi' do
+      response = OpenWeather::Current.city('Cochin, In')
+      response['cod'].should eq(200)
+    end
+
+    it 'returns error if the city is invalid' do
+      response = OpenWeather::Current.city('Cochiiiiiin, In')
+      response['cod'].should eq("404")
+    end
+  end
+
+  context '.city_id' do
+    it 'return current weather for city id of cochi' do
+      response = OpenWeather::Current.city_id('1273874')
+      response['cod'].should eq(200)
+    end
+
+    it 'returns error if the city id is invalid' do
+      response = OpenWeather::Current.city('invalidid')
+      response['cod'].should eq("404")
+    end
+  end
+
+  context '.geocode' do
+    it 'return current weather for geocode of cochi' do
+      response = OpenWeather::Current.geocode('9.94', '76.26')
+      response['cod'].should eq(200)
+    end
+
+    it 'returns error if the geocode is invalid' do
+      response = OpenWeather::Current.geocode('181', '181')
+      response['cod'].should eq("404")
+    end
+  end
+end

spec/spec_helper.rb

@@ -1,2 +1,3 @@
 # spec helper
 require 'open_weather_api'
+require 'pry'