owmo 2.1.0 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fde6157e383b210aee0eb881e5607997e2de408d9fd63f36cfb33b84f221599f
-  data.tar.gz: b1e9310c8f042693cc6ff29abebdb6449d111c7281e7605a47fcb6799d0e7bec
+  metadata.gz: edf9511c6a44ae70b3f4823aef686e12f5b7f13e530526364a1f6dc9c476b96b
+  data.tar.gz: 0f10c539d774fc03f682d1c2977c12518f9e028288d9a7584d220e76dd2e55fe
 SHA512:
-  metadata.gz: 92e3df1af5aedba4b8aeeb2724a134e8dfc5ef13d8208420a3ce2a831cf328b51e93b14330c52a9bc725fb834d7eaaa4867ad4ce610472b3f48436d296f0bc10
-  data.tar.gz: 8418b07518cebc176310097358f933ccd95269df15c099b017f17c60ea0538afd8d450efbc769208774feb1eea16e3844846ccaf17b36d686695afc55990f38f
+  metadata.gz: 37250290ebe64c1bee4757b68dcfb79058765ab0c25776e8d556730899098a454ea8afa23fc6f7f5ec06a658789024d5460e8259e5117ba318e727e36838f415
+  data.tar.gz: 29d07afd68aecc136cbc7a6e4b60c302bd005fb0bd762721edc183c1a7ea40b4df0170c0b9d6c7f40a0228ed102b03e02ee6bfe020cc8ae8ac60318bbfeeb80d

data/bin/examples

@@ -0,0 +1,43 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'owmo'
+
+# Create a file at the root of the repo with your api key and call it api_key.txt
+api_key = File.read('api_key.txt')
+
+
+
+examples = [
+    { description: 'current_box', path: :box, query: { bbox: [12, 32, 15, 37, 10].join(',') } },
+    { description: 'current_circle', path: :circle, query: { lat: 55.5, lon: 37.5, cnt: 10 } },
+    #{ description: 'current_group', path: :group, query: { id: [4_850_751, 4_887_398, 2_643_743, 4_164_138, 5_368_361].join(',') } },
+    { description: 'current', path: :current, query: { city_name: 'London,UK' } },
+    { description: 'forecast16', path: :forecast16, query: { city_name: 'London,UK' } },
+    { description: 'forecast5', path: :forecast5, query: { city_name: 'London,UK' } },
+    { description: 'query_all', path: :current, query: { city_name: 'London,UK', mode: 'json', units: 'imperial', lang: 'fr' } },
+    { description: 'query_geocode', path: :current, query: { city_id: 5_328_041 } },
+    { description: 'query_geocode', path: :current, query: { city_name: 'Beverly Hills' } },
+    { description: 'query_geocode', path: :current, query: { id: 5_328_041 } },
+    { description: 'query_geocode', path: :current, query: { lon: -118.41, lat: 34.09 } },
+    { description: 'query_geocode', path: :current, query: { q: 'Beverly Hills' } },
+    { description: 'query_geocode', path: :current, query: { zip: 90_210 } },
+    { description: 'query_geocode', path: :current, query: { zip_code: 90_210 } },
+    { description: 'query_mode', path: :current, query: { city_name: 'London,UK' } },
+    { description: 'query_mode', path: :current, query: { city_name: 'London,UK', mode: :html } },
+    { description: 'query_mode', path: :current, query: { city_name: 'London,UK', mode: :json } },
+    { description: 'query_mode', path: :current, query: { city_name: 'London,UK', mode: :xml } },
+    { description: 'query_units', path: :current, query: { city_name: 'London,UK' } },
+    { description: 'query_units', path: :current, query: { city_name: 'London,UK', units: :imperial } },
+    { description: 'query_units', path: :current, query: { city_name: 'London,UK', units: :metric } }
+]
+
+puts "OWMO Version #{OWMO::VERSION}"
+
+OWMO.weather(api_key) do |weather|
+    examples.each do |example|
+        puts '', '/********************', example[:description], '********************/'
+        pp weather.get example[:path], **example[:query]
+    end
+end

data/lib/owmo/version.rb

@@ -3,5 +3,5 @@
 module OWMO
   # rdoc
   # Gem Version
-  VERSION = '2.1.0'
+  VERSION = '2.1.2'
 end

data/lib/owmo/weather.rb

@@ -1,9 +1,11 @@
 # frozen_string_literal: true
 
+require 'owmo/weather_response'
+
+require 'json'
 require 'logger'
 require 'net/http'
 
-
 module OWMO
   # rdoc
   # A weather class for retrieving current and forecasted weather conditions.
@@ -17,8 +19,8 @@ module OWMO
     # rdoc
     # Weather response error to handle errors received from OpenWeatherMap.orgs API
     class WeatherResponseError < StandardError
-      def initialize(response)
-        super("ERROR #{response[:cod]}: #{response[:message]}")
+      def initialize(weather_response)
+        super("ERROR #{weather_response.code}: #{weather_response.weather}")
       end
     end
 
@@ -82,11 +84,13 @@ module OWMO
       uri = format_uri(OWMO::URL, PATHS[path], query)
 
       # Get the weather data
-      weather = http_get(uri)
+      http_response = http_get(uri)
+
+      weather_response = WeatherResponse.new(http_response)
 
-      raise WeatherResponseError, weather unless weather.fetch(:cod) == 200
+      raise(WeatherResponseError, weather_response) if weather_response.error?
 
-      weather
+      weather_response.weather
     end
 
     private
@@ -121,7 +125,7 @@ module OWMO
         http.request(Net::HTTP::Get.new(uri))
       end
 
-      JSON.parse(response.weather)
+      response
     end
   end
   # :nocov:

data/lib/owmo/weather_response.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'json'
+
+module OWMO
+
+    class WeatherResponse
+
+        attr_reader :weather, :code
+
+        def initialize http_response
+            begin
+                # JSON
+                @weather = JSON.parse(http_response.body)
+                @code = self.weather["cod"].to_i
+            rescue JSON::ParserError, TypeError
+                # Assume XML or HTML
+                @weather = http_response.body
+                @code = self.weather.length > 10 ? 200 : 500
+            end
+        end
+
+        def error?
+            self.code != 200
+        end
+
+    end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: owmo
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.2
 platform: ruby
 authors:
 - Robb Randall
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-01-02 00:00:00.000000000 Z
+date: 2023-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,6 +71,7 @@ files:
 - Rakefile
 - _config.yml
 - bin/console
+- bin/examples
 - bin/rspec
 - bin/setup
 - examples/current.rb
@@ -84,10 +85,10 @@ files:
 - examples/query_mode.rb
 - examples/query_units.rb
 - examples/sinatra_example.rb
-- lib/core_extensions/net/http_response/weather_response.rb
 - lib/owmo.rb
 - lib/owmo/version.rb
 - lib/owmo/weather.rb
+- lib/owmo/weather_response.rb
 - owmo.gemspec
 homepage: https://github.com/robb-randall/owmo
 licenses:

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

@@ -1,61 +0,0 @@
-# frozen_string_literal: true
-
-require 'json'
-
-module CoreExtensions
-  module Net
-    module HTTPResponse
-      module WeatherResponse
-        # rdoc
-        # Returns the weather
-        def weather
-          parse_weather
-          @weather
-        end
-
-        # rdoc
-        # Returns the response code
-        def weather_code
-          parse_weather
-          return (weather['cod'] || '200').to_i if weather.is_a? Hash
-
-          200
-        end
-
-        # rdoc
-        # Returns the response message
-        def weather_message
-          parse_weather
-          return weather['message'] if weather.is_a? Hash
-
-          'None'
-        end
-
-        # rdoc
-        # Returns boolean if the response contains an error or not.
-        def error?
-          weather_code != 200
-        end
-
-        private
-
-        # rdoc
-        # Sets the weather variable
-        def weather=(weather)
-          @weather = weather if @weather.nil?
-        end
-
-        # rdoc
-        # Attempts to parse the body to JSON.  This is so we don't have to continually
-        # parse the raw JSON.
-        def parse_weather
-          # Try to parse the response and return a hash
-          @weather = JSON.parse(body)
-        rescue StandardError
-          # Return the body string if parsing fails (used for html and xml responses)
-          @weather = body
-        end
-      end
-    end
-  end
-end