owmo 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4f5a0571e3deeb308b950109d1e2ce5e260e4a6
-  data.tar.gz: aaad5a9604b18c99c0f73c694f83d3ae4ad6ad0f
+  metadata.gz: a412e9d668b31fda079d98755fc42eda2ecb0914
+  data.tar.gz: 74ae3e5e9d8069f5c8466f28ba47a271aa72032f
 SHA512:
-  metadata.gz: 01267656624f05395af9020be406e7d3bd2b7c09fad5f590a1194b5dfb16d373a0c5e849932945ecc5f89d5c51885fe6d037545b31c62d3684b228dd12534cb0
-  data.tar.gz: 1f35d90931232807f5635038734d117d40c5e39dccebd855b4b72481fbdd36454107186ab51e7bc7c562dcf8f72417259cf2942da055aca83eae0138be4bb3cb
+  metadata.gz: a06e37fd046e4fa840ba9b2e04e8a176ceb8db775575a3c8ad3b673321f103bf161d766202f249b60a4ad1def192a80c7073b618caa97e3d2ae9b98d836d6484
+  data.tar.gz: 7bc73c2851eb22dbfc95e7a6f2cb701774dbad74e04972fcc96b7c0bcabb2c060522c07319c68ed6f1be0ae53645aba4f19d03c6213523b25183a4df1b000978

data/README.md

@@ -29,6 +29,12 @@ Complete examples can be found under owmo/examples.
 ----
 ### Quick Start
 
+```ruby
+require 'owmo'
+api_key = "<api key here>"
+puts OWMO::weather(api_key).get :current, city_name: "London,UK"
+```
+
 ```ruby
 require 'owmo'
 api_key = "<api key here>"
@@ -45,19 +51,24 @@ OWMO::weather(api_key) { |weather| puts weather.get :current, city_name: "London
 ### Weather Information
 #### [Current weather data](http://openweathermap.org/current)
 ```ruby
-weather.get :current, city_name: "London,UK"
+OWMO::weather(api_key).get :current, city_name: "London,UK"
 ```
 [Full example](https://github.com/robb-randall/owmo/blob/master/examples/current.rb)
 
+### [Current weather data for multiple cities](http://openweathermap.org/current#severalid)
+```ruby
+OWMO::weather(api_key).get :group, city_id: [4850751,4887398,2643743,4164138,5368361].join(",")
+```
+
 #### [5 day weather forecast](http://openweathermap.org/forecast5)
 ```ruby
-weather.get :forecast5, city_name: "London,UK"
+OWMO::weather(api_key).get :forecast5, city_name: "London,UK"
 ```
 [Full example](https://github.com/robb-randall/owmo/blob/master/examples/forecast5.rb)
 
 #### [16 day weather forecast](http://openweathermap.org/forecast16)
 ```ruby
-weather.get :forecast16, city_name: "London,UK"
+OWMO::weather(api_key).get :forecast16, city_name: "London,UK"
 ```
 [Full example](https://github.com/robb-randall/owmo/blob/master/examples/forecast16.rb)
 
@@ -67,46 +78,46 @@ weather.get :forecast16, city_name: "London,UK"
 #### Geocode (required)
 ```ruby
 # Geocode by City ID
-weather.get :current, city_id: 5328041
-weather.get :current, id: 5328041
+OWMO::weather(api_key).get :current, city_id: 5328041
+OWMO::weather(api_key).get :current, id: 5328041
 
 # Geocode by City Name
-weather.get :current, city_name: "Beverly Hills"
-weather.get :current, q: "Beverly Hills"
+OWMO::weather(api_key).get :current, city_name: "Beverly Hills"
+OWMO::weather(api_key).get :current, q: "Beverly Hills"
 
 # Geocode by Zip Code
-weather.get :current, zip: 90210
-weather.get :current, zip_code: 90210
+OWMO::weather(api_key).get :current, zip: 90210
+OWMO::weather(api_key).get :current, zip_code: 90210
 
 # Geocode by Coordinance
-weather.get :current, lon: -118.41, lat: 34.09
+OWMO::weather(api_key).get :current, lon: -118.41, lat: 34.09
 ```
 [Full example](https://github.com/robb-randall/owmo/blob/master/examples/query_geocode.rb)
 
 #### Mode
 ```ruby
 # Response in JSON format (default)
-weather.get :current, city_name: "London,UK"
-weather.get :current, city_name: "London,UK", mode: :json
+OWMO::weather(api_key).get :current, city_name: "London,UK"
+OWMO::weather(api_key).get :current, city_name: "London,UK", mode: :json
 
 # Response in XML format
-weather.get :current, city_name: "London,UK", mode: :xml
+OWMO::weather(api_key).get :current, city_name: "London,UK", mode: :xml
 
 # Response in HTML format
-weather.get :current, city_name: "London,UK", mode: :html
+OWMO::weather(api_key).get :current, city_name: "London,UK", mode: :html
 ```
 [Full example](https://github.com/robb-randall/owmo/blob/master/examples/query_mode.rb)
 
 #### Units
 ```ruby
 # Kelvin (default)
-weather.get :current, city_name: "London,UK"
+OWMO::weather(api_key).get :current, city_name: "London,UK"
 
 # Imperial
-weather.get :current, city_name: "London,UK", units: :imperial
+OWMO::weather(api_key).get :current, city_name: "London,UK", units: :imperial
 
 # Metric
-weather.get :current, city_name: "London,UK", units: :metric
+OWMO::weather(api_key).get :current, city_name: "London,UK", units: :metric
 ```
 [Full example](https://github.com/robb-randall/owmo/blob/master/examples/query_units.rb)
 
@@ -119,7 +130,7 @@ query = {
   lang: 'fr'
 }
 
-weather.get :current, query
+OWMO::weather(api_key).get :current, query
 ```
 [Full example](https://github.com/robb-randall/owmo/blob/master/examples/query_all.rb)
 

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

@@ -25,7 +25,7 @@ Returns the response code
         public
         def weather_code
           parse_weather
-          return @weather['cod'].to_i if @weather.is_a? Hash
+          return (@weather['cod'] || "200").to_i if @weather.is_a? Hash
           200
         end # weather_error
 

data/lib/owmo/api.rb

@@ -33,7 +33,7 @@ Sends the GET request to OpenWeatherMap.org, and returns the response
     end # response
 
     # Check the response
-    raise OWMO::API::WeatherResponseError.new(response) if response.has_error?
+    raise WeatherResponseError.new(response) if response.has_error?
 
     return response.weather
 

data/lib/owmo/version.rb

@@ -3,6 +3,6 @@ module OWMO
 =begin rdoc
 Gem Version
 =end
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 
 end # OWMO

data/lib/owmo/weather/parameters.rb

@@ -1,4 +1,6 @@
 module WeatherParameters
+  attr_reader :Paths, :Geocodes
+
 =begin rdoc
 Access current or forecasted conditions by (required):
 * +:current+ - {Current weather data}[http://openweathermap.org/current]
@@ -6,6 +8,7 @@ Access current or forecasted conditions by (required):
 * +:forecast16+ - {16 day / daily forecast}[http://openweathermap.org/forecast16]
 =end
   Paths = {
+    group: 'group', # Current weather w/multiple IDs
     current: 'weather', # Current weather data
     forecast5: 'forecast', # 5 day / 3 hour forecast
     forecast16: 'forecast/daily' # 16 day / daily forecast

data/lib/owmo/weather.rb

@@ -19,11 +19,11 @@ A weather class for retrieving current and forecasted weather conditions.
 
 =end
   class Weather
+    include WeatherAPI
     include WeatherExceptions
     include WeatherParameters
-    include WeatherAPI
 
-    attr_reader :api_key, :Paths, :Geocodes
+    attr_reader :api_key
 
     def initialize(api_key, **kwargs) #:notnew:
       @api_key = api_key
@@ -51,7 +51,7 @@ A weather class for retrieving current and forecasted weather conditions.
 
       # Create the uri
       raise InvalidPathSpecified.new(path) if Paths[path].nil?
-      uri = URI "#{OWMO::URL}/#{Paths[path]}?#{URI.encode_www_form(query)}"
+      uri = URI "#{OWMO::URL}/#{Paths[path]}?#{URI.encode_www_form(query).gsub('%2C', ',')}"
 
       # Get the weather data
       get_weather(uri)
@@ -63,7 +63,7 @@ Ensure appropriate query options are applied to the final URI
 =end
   def check_geocodes(**query)
 
-    # May never be called since query is required
+    # May never be called since query is requiredcity_name
     raise MissingGeocodes if query.size == 0
 
     Geocodes.each do |name, geocodes|

data/lib/owmo.rb

@@ -31,7 +31,7 @@ Yield a weather object for querying weather data
       yield weather
     else
       return weather
-    end
+    end # if
   end # weather
 
 end # OWMO

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: owmo
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Robb