owmo 2.0.4 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f28d1ded9dc4ec39373a376183985f837af3034fc18780defc7bae3158c6fd82
-  data.tar.gz: 9de5b4bca2d86f98cc4b252b46c7688f74cbbd55d80b52ecb500426909036174
+  metadata.gz: 125a82a8915262a016d7b78461f403abf325d76d177d97700e1be023ad3e22eb
+  data.tar.gz: 6d47d5e59c2d3b31322a478dc252a33cfdbc88139d86d641f29cc67861d9c88c
 SHA512:
-  metadata.gz: e5adf0b05d8cc03aac2363cfec8eadce4390ba84007b7475d40912fce0711808bae275a34a0b7358afa20ae4f996061ccdca4b418eb9c6bf3c294b4b1da89ff1
-  data.tar.gz: ff5e5372699efc0668f520f30e9df3f2d2b0c00d7cacd954b6a56726835759d85b8df1c30ee1ede3ca1a28bde423f129094664accffb7a239dd91150bf8cb632
+  metadata.gz: a574a3a6a6b8f81bb77da1a4e8f10809fe8f43012b214061c269c7c91c22768543357e280d18cc7ef72e0f2cce04f9af35ae3c70c3370f5364257cae4fdd79eb
+  data.tar.gz: 9a93faefecb90ae2147ef9d20b2fe1f280ba582fba580e8588d7bf6084ab2e9b400e9b0a2e162c0dfc5efac105860fa8b15e28850d26c4215c7d96c80db4640d

data/CONTRIBUTING.MD

@@ -0,0 +1,10 @@
+----
+## Development
+
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/robb-randall/owmo.

data/Gemfile

@@ -4,4 +4,5 @@ source 'https://rubygems.org'
 
 gemspec
 
+gem 'rspec'
 gem 'simplecov', require: false, group: :test

data/README.md

@@ -153,18 +153,6 @@ Then navigate to: http://localhost:4567/current/London,UK
 
 [Full example](https://github.com/robb-randall/owmo/blob/master/examples/sinatra_example.rb)
 
-----
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/robb-randall/owmo.
-
-
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/bin/rspec

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
+
+bundle_binstub = File.expand_path("bundle", __dir__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rspec-core", "rspec")

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'json'
+require 'net/http'
 
 module CoreExtensions
   module Net
@@ -17,7 +18,8 @@ module CoreExtensions
         # Returns the response code
         def weather_code
           parse_weather
-          return (weather['cod'] || '200').to_i if weather.is_a? Hash
+
+          return (weather['cod'] || '500').to_i if weather.is_a? Hash
 
           200
         end
@@ -59,3 +61,5 @@ module CoreExtensions
     end
   end
 end
+
+Net::HTTPResponse.include CoreExtensions::Net::HTTPResponse::WeatherResponse

data/lib/owmo/version.rb

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

data/lib/owmo/weather.rb

@@ -1,13 +1,10 @@
 # frozen_string_literal: true
 
-require 'logger'
-require 'net/http'
-
 require 'core_extensions/net/http_response/weather_response'
 
-# rdoc
-# Include some weather response info into Net::HTTPResponse
-Net::HTTPResponse.include CoreExtensions::Net::HTTPResponse::WeatherResponse
+require 'json'
+require 'logger'
+require 'net/http'
 
 module OWMO
   # rdoc
@@ -23,8 +20,7 @@ module OWMO
     # Weather response error to handle errors received from OpenWeatherMap.orgs API
     class WeatherResponseError < StandardError
       def initialize(response)
-        @response = response
-        super("ERROR #{@response.weather_code}: #{@response.weather_message}")
+        super("ERROR #{response.weather_code}: #{response.message}")
       end
     end
 
@@ -88,7 +84,11 @@ module OWMO
       uri = format_uri(OWMO::URL, PATHS[path], query)
 
       # Get the weather data
-      GET(uri)
+      response = http_get(uri)
+
+      raise(WeatherResponseError, response) if response.error?
+
+      response.weather
     end
 
     private
@@ -117,15 +117,14 @@ module OWMO
 
     # rdoc
     # Sends the GET request to OpenWeatherMap.org
-    def GET(uri)
+    # :nocov:
+    def http_get(uri)
       response = Net::HTTP.start(uri.hostname, uri.port) do |http|
         http.request(Net::HTTP::Get.new(uri))
       end
 
-      # Check the response
-      raise WeatherResponseError, response if response.error?
-
-      response.weather
+      response
     end
   end
+  # :nocov:
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: owmo
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.1.1
 platform: ruby
 authors:
 - Robb Randall
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-12-30 00:00:00.000000000 Z
+date: 2023-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -64,12 +64,14 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CONTRIBUTING.MD
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - _config.yml
 - bin/console
+- bin/rspec
 - bin/setup
 - examples/current.rb
 - examples/current_box.rb