owmo 2.0.3 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7e4b64ccdb32db93f751f28f7c07923244770d68eda25301b1939ac21de38bb
-  data.tar.gz: f67520f2b29f4bbf95f0bef27a60827fd1f04906ab2fa72da49a7ebefc834f3f
+  metadata.gz: fde6157e383b210aee0eb881e5607997e2de408d9fd63f36cfb33b84f221599f
+  data.tar.gz: b1e9310c8f042693cc6ff29abebdb6449d111c7281e7605a47fcb6799d0e7bec
 SHA512:
-  metadata.gz: e072a5ccce24a3c24032b5d88141feabe29806e6f1825c21700b751b5a9b91e3f43e9218cbed9bcd0a095b9335115979da775374d7093ec46059a51185cff42a
-  data.tar.gz: 1cd83a94eec07bfcb4d9a96d0a087395fea3b7f4a227cc8665bad66175a9fc4738d3c3813c25db1967768db2a7e32d8488fa857282b957cc1b43dc8bf2cb6e39
+  metadata.gz: 92e3df1af5aedba4b8aeeb2724a134e8dfc5ef13d8208420a3ce2a831cf328b51e93b14330c52a9bc725fb834d7eaaa4867ad4ce610472b3f48436d296f0bc10
+  data.tar.gz: 8418b07518cebc176310097358f933ccd95269df15c099b017f17c60ea0538afd8d450efbc769208774feb1eea16e3844846ccaf17b36d686695afc55990f38f

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/owmo/version.rb

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

data/lib/owmo/weather.rb

@@ -3,11 +3,6 @@
 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
 
 module OWMO
   # rdoc
@@ -23,8 +18,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[:cod]}: #{response[:message]}")
       end
     end
 
@@ -79,7 +73,7 @@ module OWMO
 
     def get(path, **query)
       # Format Geocode info
-      query = alias_geocodes(query)
+      query = alias_geocodes(**query)
 
       # Add the api key
       query[:APPID] = api_key
@@ -88,7 +82,11 @@ module OWMO
       uri = format_uri(OWMO::URL, PATHS[path], query)
 
       # Get the weather data
-      GET(uri)
+      weather = http_get(uri)
+
+      raise WeatherResponseError, weather unless weather.fetch(:cod) == 200
+
+      weather
     end
 
     private
@@ -103,7 +101,7 @@ module OWMO
     # Aliases some geocode parameters to the correct ones, for example :city_name is
     # easier to read than :q
     def alias_geocodes(**query)
-      query_geocode_keys(query).each do |key|
+      query_geocode_keys(**query).each do |key|
         query[GEOCODE_ALIASES[key]] = query.delete(key)
       end
       query
@@ -117,15 +115,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
+      JSON.parse(response.weather)
     end
   end
+  # :nocov:
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: owmo
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.0
 platform: ruby
 authors:
 - Robb Randall
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-12-29 00:00:00.000000000 Z
+date: 2023-01-02 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