owmo 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84b6f969b10f394d6c8f9c0fda1ac2dbd6929811
-  data.tar.gz: 0ebeca0df38b5d6104890759bdf756feccf3fd68
+  metadata.gz: 4256e7133f1d73d8d3c4c4c542547eb3be368eee
+  data.tar.gz: 8184cb85272239ffacc56931eec0c91f8698a135
 SHA512:
-  metadata.gz: 10dcefd739e026f47f6e3b4adfbef8101fbfee1ecf1477b483a5d8b418eb3b04aa4c0591687ccc794446dc100514c7f98d1a8cda64faa57533ac99fbc1a1cc1d
-  data.tar.gz: 87a157f21b913e319187b28569e058cdd85401217af165ed00e031528f1d53c601c80a2c30dc6e8b8615d80235779623ba690608f5f0f0f274515800f6bb4cee
+  metadata.gz: d6be96efc7ca3e8d335e8161c29478b02d839741b0ede3c350551368a13bed0588272c7cbfcf141fe1623ebb081eb911bf29e129571a2f35dc2df7100044d17d
+  data.tar.gz: 1907e7585125a51c66a96abfdc173318e7d5e0878c6e3b6a1afd8dc73000a4c294152abe937edd13e50cb2777d9e189e02983db5ae8188f0d034e7dd61045641

data/lib/core_extensions/net/http_response/weather_response.rb

@@ -18,7 +18,7 @@ Returns the response code
 =end
         def weather_code
           parse_weather
-          return (@weather['cod'] || "200").to_i if @weather.is_a? Hash
+          return (weather['cod'] || "200").to_i if weather.is_a? Hash
           200
         end
 
@@ -27,7 +27,7 @@ Returns the response message
 =end
         def weather_message
           parse_weather
-          return @weather['message'] if @weather.is_a? Hash
+          return weather['message'] if weather.is_a? Hash
           "None"
         end
 
@@ -38,18 +38,28 @@ Returns boolean if the response contains an error or not.
           weather_code != 200
         end
 
+        private
+
+=begin rdoc
+Sets the weather variable
+=end
+          def weather=(weather)
+            @weather = weather if @weather.nil?
+          end
+
 =begin rdoc
 Attempts to parse the body to JSON.  This is so we don't have to continually
 parse the raw JSON.
 =end
-        private
-        def parse_weather
-          begin
-            @weather = JSON.parse(self.body)
-          rescue
-            @weather = self.body
-          end if @weather.nil?
-        end
+          def parse_weather
+            begin
+              # Try to parse the response and return a hash
+              @weather = JSON.parse(self.body)
+            rescue
+              # Return the body string if parsing fails (used for html and xml responses)
+              @weather = self.body
+            end
+          end
 
       end
     end

data/lib/owmo.rb

@@ -34,7 +34,7 @@ Yield a weather object for querying weather data
       if block_given?
         yield weather
       else
-        return weather
+        weather
       end
     end
   end

data/lib/owmo/version.rb

@@ -3,6 +3,6 @@ module OWMO
 =begin rdoc
 Gem Version
 =end
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 
 end

data/lib/owmo/weather.rb

@@ -1,5 +1,6 @@
+require 'logger'
 require 'net/http'
-require 'time'
+
 require 'core_extensions/net/http_response/weather_response'
 
 
@@ -57,7 +58,8 @@ Geocode aliases
       city_id: :id,
       zip_code: :zip,
       latitude: :lat,
-      longitude: :lon
+      longitude: :lon,
+      box: :bbox
     }
 
 =begin rdoc
@@ -67,18 +69,10 @@ Either yeild the class, or instanciate it.
 * +**kwargs+ - Any additional paramters
 =end
     def initialize(api_key, **kwargs)
-      @debug = kwargs[:debug] || FALSE
-      log "Debug= #{@debug}"
-
       @api_key = api_key
-      log "Api Key= #{@api_key}"
-
-      log "Args= #{kwargs}"
 
       if block_given?
-        log "Yielding"
         yield self
-        log "Yield complete."
       end
     end
 
@@ -94,77 +88,60 @@ A weather class for retrieving current and forecasted weather conditions.
 =end
     public
     def get(path, **query)
-      log "Starting request= #{path} -> #{query}"
-      start = Time.now
 
       # Format Geocode info
       query = alias_geocodes(query)
 
       # Add the api key
-      query[:APPID] = @api_key
+      query[:APPID] = api_key
 
       # Create the uri
       uri = format_uri(OWMO::URL, Paths[path], query)
 
       # Get the weather data
-      weather = GET(uri)
+      GET(uri)
+    end
 
-      elapsed_sec = (Time.now - start).round 5
-      log "Request completed in #{elapsed_sec} seconds."
+    private
 
-      weather
-    end
+=begin rdoc
+Retruns the geocode keys from specified query.
+=end
+      def query_geocode_keys(**query)
+        query.keys & Geocode_Aliases.keys
+      end
 
 =begin rdoc
 Aliases some geocode parameters to the correct ones, for example :city_name is
 easier to read than :q
 =end
-    private
-    def alias_geocodes(**query)
-      log "Query before= #{query}"
-
-      (query.keys & Geocode_Aliases.keys).each do |key|
-        query[Geocode_Aliases[key]] = query.delete(key)
+      def alias_geocodes(**query)
+        query_geocode_keys(query).each do |key|
+          query[Geocode_Aliases[key]] = query.delete(key)
+        end
+        query
       end
 
-      log "Query after= #{query}"
-      query
-    end
-
 =begin rdoc
 Formats the url with the given url, path, and query
 =end
-    private
-    def format_uri(url, path, query)
-      uri = URI "#{url}/#{path}?#{URI.encode_www_form(query).gsub('%2C', ',')}"
-      log "URI= #{uri}"
-      uri
-    end
+      def format_uri(url, path, query)
+        URI "#{url}/#{path}?#{URI.encode_www_form(query).gsub('%2C', ',')}"
+      end
 
 =begin rdoc
 Sends the GET request to OpenWeatherMap.org
 =end
-    private
-    def GET(uri)
-      log "Starting GET request"
-      response = Net::HTTP.start(uri.hostname, uri.port) do |http|
-        http.request(Net::HTTP::Get.new(uri))
-      end
-      log "Request returned= #{response.weather_code}: #{response.weather_message}".gsub(/: $/, '')
-
-      # Check the response
-      raise WeatherResponseError.new(response) if response.has_error?
+      def GET(uri)
+        response = Net::HTTP.start(uri.hostname, uri.port) do |http|
+          http.request(Net::HTTP::Get.new(uri))
+        end
 
-      response.weather
-    end
+        # Check the response
+        raise WeatherResponseError.new(response) if response.has_error?
 
-=begin rdoc
-Simple log method for debugging purposes
-=end
-    private
-    def log(msg)
-      puts "#{DateTime.now} :~> #{msg}" if @debug
-    end
+        response.weather
+      end
 
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: owmo
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Robb
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-23 00:00:00.000000000 Z
+date: 2017-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler