Refactored code by moving common function to base class

Author: coderhs

lib/open_weather_api.rb

@@ -2,7 +2,8 @@ module OpenWeather
   $LOAD_PATH<< "../lib"
 
   autoload :Base,    "open_weather_api/base"
-  autoload :Current, "open_weather_api/current_weather"
+  autoload :Current, "open_weather_api/current"
+  autoload :Forecast, "open_weather_api/forecast"
   autoload :VERSION, "open_weather_api/version"
 
   require "open_weather_api/api.rb"

lib/open_weather_api/base.rb

@@ -1,8 +1,49 @@
 require 'httparty'
 require 'addressable/uri'
+
 module OpenWeather
   class Base
-    def self.send_request(request)
+
+    attr_reader :url, :options, :weather_info, :status, :message
+
+    def initialize url, options
+      @status = false
+      @url = url
+      @options = extract_options!(options)
+    end
+
+    def retrive
+      @response = send_request(self) unless @options.empty?
+      parse_response if @response
+    end
+
+    def success?
+      @status == 200
+    end
+
+    private
+
+    def extract_options!(options)
+      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
+
+      options
+    end
+
+    def parse_response
+      @weather_info = @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)

lib/open_weather_api/current.rb

@@ -0,0 +1,7 @@
+module OpenWeather
+  class Current < Base
+    def initialize(options = {})
+      super("http://api.openweathermap.org/data/2.5/weather", options)
+    end
+  end
+end