open-weather-ruby-client 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 317dd6924aee3127f7a350a47ad0d4873db645af7d307d07a2f7f5102a058c03
-  data.tar.gz: cd4a8bd78a0170ada43260fd0897ba388c54ddff5f9233ea79477c292affd5e4
+  metadata.gz: 3b61381c999fcbbcefa63521936ee96cc28eb7648a9b2b13cc9d01a608d8b12f
+  data.tar.gz: aaa00190d52e86a471f2dca1e52c5c4f5fbf67cdfdf5639fe9302d793d1326e2
 SHA512:
-  metadata.gz: df44462ca143dcd462d45ba7cb2cfc38ba1c951a705709e4b4b59d80b1b1d78057fff3cfa8aedc2d9f9c26fce1cf2b9c4a5c66178ed939055c0b4afca5083c15
-  data.tar.gz: 256c0bac00841ba60a5ce65e10e3b66103c8756e5c619bf93479b74660d092e22973b6e8e07eaac4cdd370be243eb6382ea7f33829fd2db9d65bbe675b61d736
+  metadata.gz: 890ef7edc806545a9b83f99a87133d7ff83900593f17e5aadcf76f7389cfa7c6a3249d0f4911d6d257d493a00dd572880f8848ee68a6ba0cd5ffd9561c53c75f
+  data.tar.gz: 3094f7b9d058070590db2ddfabc99d9f799f00b3b185fb9efd93b348d9abd8f124ec8d2f0552f7430850bf08dc7cb698e802c648a32aa9dbaf333b343c0521b4

data/CHANGELOG.md

@@ -1,3 +1,19 @@
-### 0.1.0 (5/1/2020)
+### 0.3.0 (2023/03/25)
+
+* [#30](https://github.com/dblock/open-weather-ruby-client/pull/30): Added support for Ruby 3.2 - [@petergoldstein](https://github.com/petergoldstein).
+* [#27](https://github.com/dblock/open-weather-ruby-client/pull/27): Removed default values for Faraday’s SSL settings ca_file and ca_path - [@sunny](https://github.com/sunny).
+* [#21](https://github.com/dblock/open-weather-ruby-client/pull/21), [#20](https://github.com/dblock/open-weather-ruby-client/pull/20), [#19](https://github.com/dblock/open-weather-ruby-client/pull/19), [#18](https://github.com/dblock/open-weather-ruby-client/pull/18): Added support for Stations API - [@wasabigeek](https://github.com/wasabigeek).
+* [#22](https://github.com/dblock/open-weather-ruby-client/pull/23): Removed API version from `Config#endpoint` - [@dblock](https://github.com/dblock).
+
+### 0.2.0 (2020/05/17)
+
+* [#14](https://github.com/dblock/open-weather-ruby-client/pull/14): Added support for One Call API - [@dblock](https://github.com/dblock).
+* [#16](https://github.com/dblock/open-weather-ruby-client/pull/16): Added support for temperature and wind speed conversion - [@dblock](https://github.com/dblock).
+* [#16](https://github.com/dblock/open-weather-ruby-client/pull/16): Added `weather#icon_url` returning a parsed `URI` - [@dblock](https://github.com/dblock).
+* [#15](https://github.com/dblock/open-weather-ruby-client/pull/15): Renamed `CityWeather` to `OpenWeather::Models::City::Weather` - [@dblock](https://github.com/dblock).
+* [#12](https://github.com/dblock/open-weather-ruby-client/pull/12): Cache `Faraday::Connection` for persistent adapters - [@dblock](https://github.com/dblock).
+* [#13](https://github.com/dblock/open-weather-ruby-client/pull/13): Require Faraday >= 1.0 - [@dblock](https://github.com/dblock).
+
+### 0.1.0 (2020/05/01)
 
 * Initial public release - [@dblock](https://github.com/dblock).

data/README.md

@@ -2,11 +2,11 @@ OpenWeather Ruby Client
 =======================
 
 [![Gem Version](https://badge.fury.io/rb/open-weather-ruby-client.svg)](https://badge.fury.io/rb/open-weather-ruby-client)
-[![Build Status](https://travis-ci.org/dblock/open-weather-ruby-client.svg?branch=master)](https://travis-ci.org/dblock/open-weather-ruby-client)
+[![Tests Status](https://github.com/dblock/open-weather-ruby-client/actions/workflows/test.yml/badge.svg)](https://github.com/dblock/open-weather-ruby-client/actions)
 
-A Ruby client for the [OpenWeather API v3](https://openweathermap.org/api).
+A Ruby client for the [OpenWeather API v2.5 and v3.0](https://openweathermap.org/api).
 
-Unlike other clients, including [open-weather](https://github.com/coderhs/ruby_open_weather_map), provides a rich first class interface to OpenWeather models, implements more consistent error handling, and is built with thorough test coverage using actual OpenWeather data.
+Unlike other clients, including [open-weather](https://github.com/coderhs/ruby_open_weather_map), provides a rich first class interface to OpenWeather models, structured timestamps, built-in metrics conversion for temperature and wind speed, offers more consistent error handling, and is implemented with thorough test coverage using actual OpenWeather data.
 
 ## Table of Contents
 
@@ -17,8 +17,21 @@ Unlike other clients, including [open-weather](https://github.com/coderhs/ruby_o
     - [Cities Within a Rectangle Zone](#cities-within-a-rectangle-zone)
     - [Cities Within a Circle](#cities-within-a-circle)
     - [Multiple Cities by Id](#multiple-cities-by-id)
+  - [One Call](#one-call)
+    - [Current and Forecast Weather](#current-and-forecast-weather)
+    - [Historical Weather](#historical-weather)
+  - [Stations](#stations)
+    - [Register a Station](#register-a-station)
+    - [List Stations](#list-stations)
+    - [Get Station](#get-station)
+    - [Update Station](#update-station)
+    - [Delete Station](#delete-station)
+    - [Create Measurements](#create-measurements)
+    - [Get Measurements](#get-measurements)
 - [Configuration](#configuration)
   - [Units](#units)
+    - [Converting Temperature](#converting-temperature)
+    - [Converting Wind Speed](#converting-wind-speed)
   - [Language](#language)
 - [Errors](#errors)
 - [Resources](#resources)
@@ -50,21 +63,24 @@ client = OpenWeather::Client.new(
 Returns [current weather](https://openweathermap.org/current).
 
 ```ruby
-data = client.current_weather(city: 'London') # => OpenWeather::Models::CityWeather
+data = client.current_weather(city: 'London') # => OpenWeather::Models::City::Weather
 
 data.name # => 'London'
+data.dt # => Time
 data.main.feels_like # => 277.73
 data.main.humidity # => 81
 data.main.pressure # => 1005
 data.main.temp # => 282.57
-data.main.temp_max # => 283.15
+data.main.temp_max # => 283.15, degrees Kelvin
+data.main.temp_max_c # => 10, degrees Celcius
+data.main.temp_max_f # => 50.0, degrees Farenheit
 data.main.temp_min # => 281.48
 ```
 
 Returns the current weather in metric units and Russian metadata.
 
 ```ruby
-data = client.current_weather(city: 'Moscow', units: 'metric', lang: 'ru') # => OpenWeather::Models::CityWeather
+data = client.current_weather(city: 'Moscow', units: 'metric', lang: 'ru') # => OpenWeather::Models::City::Weather
 
 data.name # => 'Москва'
 data.main.temp # => 12
@@ -98,10 +114,12 @@ client.current_zip(10018, 'US') # => weather in New York, 10018
 client.current_weather(zip: 10018, country: 'US') # => weather in New York, 10018
 ```
 
-See [OpenWeather::Models::CityWeather](lib/open_weather/models/data.rb) for all available properties.
+See [OpenWeather::Models::City::Weather](lib/open_weather/models/city/weather.rb) and related [OpenWeather::Models](lib/open_weather/models) for all available properties.
 
 ### Current Weather for Several Cities
 
+Collection APIs return [OpenWeather::Models::List](lib/open_weather/models/list.rb), which includes multiple instances of [OpenWeather::Models::City::Weather](lib/open_weather/models/city/weather.rb).
+
 #### Cities Within a Rectangle Zone
 
 ```ruby
@@ -147,6 +165,132 @@ data.first.name # 'Moscow'
 data.main.temp # => 285.15
 ```
 
+### One Call
+
+[One Call API](https://openweathermap.org/api/one-call-api) provides current weather, minute forecast for 1 hour, hourly forecast for 48 hours, daily forecast for 7 days, and historical weather data for 5 previous days for any geographical coordinate.
+
+See [OpenWeather::Models::OneCall](lib/open_weather/models/one_call) for all available models and properties.
+
+#### Current and Forecast Weather
+
+```ruby
+data = client.one_call(lat: 33.441792, lon: -94.037689) # => OpenWeather::Models::OneCall::Weather
+data.lat # => 33.44
+data.lon # => -94.04
+data.timezone # => 'America/Chicago'
+data.current # => OpenWeather::Models::OneCall::CurrentWeather
+data.minutely # => Array[OpenWeather::Models::OneCall::MinutelyWeather]
+data.hourly # => Array[OpenWeather::Models::OneCall::HourlyWeather]
+data.daily # => Array[OpenWeather::Models::OneCall::DailyWeather]
+```
+
+Exclude minutely and hourly data.
+
+```ruby
+client.one_call(lat: 33.441792, lon: -94.037689, exclude: ['minutely', 'hourly'])
+```
+
+#### Historical Weather
+
+```ruby
+data = client.one_call(lat: 33.441792, lon: -94.037689, dt: Time.now - 24 * 60 * 60) # => OpenWeather::Models::OneCall::Weather
+data.lat # => 33.44
+data.lon # => -94.04
+data.timezone # => 'America/Chicago'
+data.current # => OpenWeather::Models::OneCall::CurrentWeather
+data.hourly # => Array[OpenWeather::Models::OneCall::HourlyWeather]
+```
+
+### Stations
+
+The [Stations API](https://openweathermap.org/stations) lets your manage personal weather stations and measurements.
+
+#### Register a Station
+
+To register a station, you can call the client method:
+```ruby
+data = client.register_station(external_id: 'SF_TEST001', ...) # => OpenWeather::Models::Station
+data.id # => '5ed2118acca8ce0001f1aeg1'
+data.external_id # => 'SF_TEST001'
+```
+Alternatively, call `register!` on an instance of `Station`:
+```ruby
+model = OpenWeather::Models::Station.new(external_id: 'SF_TEST001', ...)
+model.register!
+model.id # => '5ed2118acca8ce0001f1aeg1'
+```
+
+#### List Stations
+
+To list all stations, call the client method:
+```ruby
+client.list_stations # => Array[OpenWeather::Models::Station]
+```
+
+#### Get Station
+
+To get a station, call the client method:
+```ruby
+client.get_station('5ed2118acca8ce0001f1aeg1') # => OpenWeather::Models::Station
+```
+
+#### Update Station
+
+To update a station, call the client method:
+```ruby
+client.update_station('5ed2118acca8ce0001f1aeg1', external_id: 'SF_TEST002') # => OpenWeather::Models::Station
+```
+Alternatively, call `update!` on an instance of `Station`:
+```ruby
+model = OpenWeather::Models::Station.new(external_id: 'SF_TEST001', ...)
+model.register!
+model.update!(external_id: 'SF_TEST002')
+model.external_id # => 'SF_TEST002'
+```
+
+#### Delete Station
+
+To delete a station, call the client method:
+```ruby
+data = client.delete_station('5ed2118acca8ce0001f1aeg1') # => nil
+```
+
+#### Create Measurements
+
+To create measurements, call the client method:
+```ruby
+client.create_measurements([
+  {
+    "station_id": -1,
+    "dt": 1479817340,
+    "temperature": 18.7,
+    "wind_speed": 1.2,
+    "wind_gust": 3.4,
+    "pressure": 1021,
+    "humidity": 87,
+    "rain_1h": 2,
+    "clouds": [
+      {
+        "condition": 'NSC'
+      }
+    ]
+  }
+]) # => nil
+```
+
+#### Get Measurements
+
+To get measurements, call the client method with the required parameters:
+```ruby
+client.get_measurements(
+  station_id: '5ed21a12cca8ce0001f1aef1',
+  type: 'd',
+  limit: 100,
+  from: 1469817340,
+  to: 1591620047
+) # => Array[OpenWeather::Models::Stations::Measurement]
+```
+
 ## Configuration
 
 You can configure client options, globally.
@@ -165,7 +309,7 @@ setting             | description
 api_key             | Required API key.
 lang                | Default language in API responses.
 units               | Default units in API responses.
-endpoint            | Defaults to `https://api.openweathermap.org/data/2.5/`.
+endpoint            | Defaults to `https://api.openweathermap.org/data`.
 user_agent          | User-agent, defaults to _OpenWeather Ruby Client/version_.
 proxy               | Optional HTTP proxy.
 ca_path             | Optional SSL certificates path.
@@ -181,7 +325,7 @@ The OpenWeather API returns responses in `standard`, `metric`, and `imperial` un
 ```ruby
 data = client.weather(id: 2643743, units: 'metric')
 data.name # => 'London'
-data.main.temp # => 12 (degrees Celsius)
+data.main.temp # => 12, degrees Celcius
 ```
 
 ```ruby
@@ -191,7 +335,30 @@ end
 
 data = client.weather(id: 2643743)
 data.name # => 'London'
-data.main.temp # => 12 (degrees Celsius)
+data.main.temp # => 12, degrees Celcius
+```
+
+#### Converting Temperature
+
+APIs that return temperature support conversion between default, metric and imperial units, regardless of what units were requested. The following example requests current weather in metric units in Moscow. Use `_k` for Kelvin, `_c` for Celcius and `_f` for Farenheit.
+
+```ruby
+data = client.current_weather(city: 'Moscow', units: 'metric') # => OpenWeather::Models::City::Weather
+
+data.main.temp_max # => 12, degrees Celcius, metric as requested
+data.main.temp_max_c # => 12, degrees Celcius
+data.main.temp_max_k # => 285.15, degrees Kelvin
+data.main.temp_max_f # => 53.6, degrees Farenheit
+```
+
+#### Converting Wind Speed
+
+Use `_mps` for wind speed in meters-per-second, and `_mph` for miles-per-second.
+
+```ruby
+data.wind.speed # => 3, in meters per second, metric as requested
+data.main.speed_mph # => 6.71, miles per hour
+data.main.speed_mps # 3, meters per second
 ```
 
 ### Language
@@ -214,7 +381,7 @@ data.name # => 'Лондон'
 
 ## Errors
 
-All errors that return HTTP codes 400-600 result in either `Faraday::Error::ResourceNotFound`, `Faraday::Error::ConnectionFailed` or [OpenWeather::Errors::Fault](lib/open_weather/errors/fault.rb) exceptions.
+All errors that return HTTP codes 400-600 result in either `Faraday::ResourceNotFound`, `Faraday::ConnectionFailed` or [OpenWeather::Errors::Fault](lib/open_weather/errors/fault.rb) exceptions.
 
 ## Resources
 

data/lib/open-weather-ruby-client.rb

@@ -16,13 +16,11 @@ require_relative 'open_weather/logger'
 
 require_relative 'open_weather/errors/fault'
 
-require_relative 'open_weather/models/model'
-
+require_relative 'open_weather/models'
 require_relative 'open_weather/raise_error'
 require_relative 'open_weather/connection'
 require_relative 'open_weather/request'
 require_relative 'open_weather/config'
 require_relative 'open_weather/errors'
-require_relative 'open_weather/models'
 require_relative 'open_weather/endpoints'
 require_relative 'open_weather/client'

data/lib/open_weather/client.rb

@@ -5,6 +5,8 @@ module OpenWeather
     include Connection
     include Request
     include Endpoints::Current
+    include Endpoints::OneCall
+    include Endpoints::Stations
 
     attr_accessor(*Config::ATTRIBUTES)
 

data/lib/open_weather/config.rb

@@ -21,11 +21,11 @@ module OpenWeather
     attr_accessor(*Config::ATTRIBUTES)
 
     def reset
-      self.endpoint = 'https://api.openweathermap.org/data/2.5'
+      self.endpoint = 'https://api.openweathermap.org/data'
       self.api_key = nil
       self.user_agent = "OpenWeather Ruby Client/#{OpenWeather::VERSION}"
-      self.ca_path = defined?(OpenSSL) ? OpenSSL::X509::DEFAULT_CERT_DIR : nil
-      self.ca_file = defined?(OpenSSL) ? OpenSSL::X509::DEFAULT_CERT_FILE : nil
+      self.ca_path = nil
+      self.ca_file = nil
       self.proxy = nil
       self.logger = nil
       self.timeout = nil

data/lib/open_weather/connection.rb

@@ -9,26 +9,31 @@ module OpenWeather
     end
 
     def connection
-      options = {
-        headers: headers.merge('Accept' => 'application/json; charset=utf-8')
-      }
+      @connection ||= begin
+        options = {
+          headers: headers.merge(
+            'Accept' => 'application/json; charset=utf-8',
+            'Content-Type' => 'application/json'
+          )
+        }
 
-      options[:headers]['User-Agent'] = user_agent if user_agent
-      options[:proxy] = proxy if proxy
-      options[:ssl] = { ca_path: ca_path, ca_file: ca_file } if ca_path || ca_file
+        options[:headers]['User-Agent'] = user_agent if user_agent
+        options[:proxy] = proxy if proxy
+        options[:ssl] = { ca_path: ca_path, ca_file: ca_file } if ca_path || ca_file
 
-      request_options = {}
-      request_options[:timeout] = timeout if timeout
-      request_options[:open_timeout] = open_timeout if open_timeout
-      options[:request] = request_options if request_options.any?
+        request_options = {}
+        request_options[:timeout] = timeout if timeout
+        request_options[:open_timeout] = open_timeout if open_timeout
+        options[:request] = request_options if request_options.any?
 
-      ::Faraday::Connection.new(endpoint, options) do |connection|
-        connection.use ::Faraday::Request::Multipart
-        connection.use ::Faraday::Request::UrlEncoded
-        connection.use ::OpenWeather::Response::RaiseError
-        connection.use ::FaradayMiddleware::ParseJson, content_type: /\bjson$/
-        connection.response :logger, logger if logger
-        connection.adapter ::Faraday.default_adapter
+        ::Faraday::Connection.new(endpoint, options) do |connection|
+          connection.use ::Faraday::Request::Multipart
+          connection.use ::Faraday::Request::UrlEncoded
+          connection.use ::OpenWeather::Response::RaiseError
+          connection.use ::FaradayMiddleware::ParseJson, content_type: /\bjson$/
+          connection.response :logger, logger if logger
+          connection.adapter ::Faraday.default_adapter
+        end
       end
     end
   end

data/lib/open_weather/endpoints/current.rb

@@ -38,7 +38,7 @@ module OpenWeather
             options.delete(:country)
           ].compact.join(',')
         end
-        OpenWeather::Models::CityWeather.new(get('weather', options))
+        OpenWeather::Models::City::Weather.new(get('2.5/weather', options), options)
       end
 
       def current_cities_geo_box(*args)
@@ -51,7 +51,7 @@ module OpenWeather
           options.delete(:lat_top),
           options.delete(:zoom)
         ].join(',')
-        OpenWeather::Models::List.new(get('box/city', options))
+        OpenWeather::Models::List.new(get('2.5/box/city', options), options)
       end
 
       def current_cities_geo_circle(*args)
@@ -63,7 +63,7 @@ module OpenWeather
           options[:cnt] = args.shift || 1
         end
 
-        OpenWeather::Models::List.new(get('find', options))
+        OpenWeather::Models::List.new(get('2.5/find', options), options)
       end
 
       def current_cities_id(*args)
@@ -71,7 +71,7 @@ module OpenWeather
         options[:id] = args.join(',') if args.any?
         options[:id] = options.delete(:ids) if options.key?(:ids)
         options[:id] = options[:id].join(',') if options[:id].is_a?(Array)
-        OpenWeather::Models::List.new(get('group', options))
+        OpenWeather::Models::List.new(get('2.5/group', options), options)
       end
     end
   end

data/lib/open_weather/endpoints/one_call.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module OpenWeather
+  module Endpoints
+    module OneCall
+      def one_call(lat, lon = nil, options = {})
+        options = lat.is_a?(Hash) ? options.merge(lat) : options.merge(lat: lat, lon: lon)
+        options[:exclude] = options[:exclude].join(',') if options[:exclude].is_a?(Array)
+        options[:dt] = options[:dt].to_i if options[:dt].is_a?(Time)
+        path = options.key?(:dt) ? '2.5/onecall/timemachine' : '2.5/onecall'
+        OpenWeather::Models::OneCall::Weather.new(get(path, options), options)
+      end
+    end
+  end
+end

data/lib/open_weather/endpoints/stations.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module OpenWeather
+  module Endpoints
+    module Stations
+      def register_station(options = {})
+        OpenWeather::Models::Station.new(post('3.0/stations', options))
+      end
+
+      def list_stations
+        get('3.0/stations').map { |data| OpenWeather::Models::Station.new(data) }
+      end
+
+      def get_station(id)
+        validate_id(id)
+
+        OpenWeather::Models::Station.new(get("3.0/stations/#{id}"))
+      end
+
+      def update_station(id, options = {})
+        validate_id(id)
+
+        OpenWeather::Models::Station.new(put("3.0/stations/#{id}", options))
+      end
+
+      def delete_station(id)
+        validate_id(id)
+
+        delete("3.0/stations/#{id}")
+        nil
+      end
+
+      def create_measurements(measurements, options = {})
+        post('3.0/measurements', options.merge(body: measurements))
+        nil
+      end
+
+      def get_measurements(options)
+        required_keys = %i[station_id type limit from to]
+        missing_keys = required_keys - options.keys
+        raise ArgumentError, "Missing params: #{missing_keys.join(', ')}" if missing_keys.any?
+
+        get('3.0/measurements', options).map { |m| OpenWeather::Models::Stations::Measurement.new(m) }
+      end
+
+      private
+
+      def validate_id(id)
+        raise ArgumentError, 'Invalid ID' unless id&.is_a?(String)
+      end
+    end
+  end
+end

data/lib/open_weather/endpoints.rb

@@ -1,3 +1,5 @@
 # frozen_string_literal: true
 
 require_relative 'endpoints/current'
+require_relative 'endpoints/one_call'
+require_relative 'endpoints/stations'

data/lib/open_weather/models/city/weather.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module OpenWeather
+  module Models
+    module City
+      class Weather < Model
+        property 'coord'
+        property 'weather'
+        property 'base' # internal parameter
+        property 'main'
+        property 'visibility'
+        property 'wind'
+        property 'clouds'
+        property 'rain'
+        property 'snow'
+        property 'dt', transform_with: ->(v) { Time.at(v).utc } # time of data calculation, UTC
+        property 'sys'
+        property 'id' # city id
+        property 'timezone' # shift in seconds from UTC
+        property 'name' # city name
+        property 'cod' # internal parameter
+
+        def initialize(args = nil, options = {})
+          super args, options
+
+          self.coord = OpenWeather::Models::Coord.new(coord, options) if coord
+          self.weather = weather.map { |i| OpenWeather::Models::Weather.new(i, options) } if weather
+          self.main = OpenWeather::Models::Main.new(main, options) if main
+          self.wind = OpenWeather::Models::Wind.new(wind, options) if wind
+          self.clouds = OpenWeather::Models::Clouds.new(clouds, options) if clouds
+          self.rain = OpenWeather::Models::Rain.new(rain, options) if rain
+          self.snow = OpenWeather::Models::Snow.new(snow, options) if snow
+          self.sys = OpenWeather::Models::Sys.new(sys, options) if sys
+        end
+      end
+    end
+  end
+end

data/lib/open_weather/models/city.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require_relative 'city/weather'

data/lib/open_weather/models/list.rb

@@ -8,9 +8,15 @@ module OpenWeather
       property 'cod'
       property 'calctime'
       property 'cnt', from: 'count'
-      property 'list', transform_with: ->(v) { v.map { |i| OpenWeather::Models::CityWeather.new(i) } }
+      property 'list'
       property 'message'
 
+      def initialize(args = nil, options = {})
+        super args, options
+
+        self.list = list.map { |i| OpenWeather::Models::City::Weather.new(i, options) } if list
+      end
+
       def each(&block)
         list.each(&block)
       end

data/lib/open_weather/models/main.rb

@@ -3,12 +3,12 @@
 module OpenWeather
   module Models
     class Main < Model
-      property 'temp' # temperature in requested unit
+      temperature_property 'temp' # temperature in requested unit
       property 'pressure' # atmospheric pressure on the sea_level or grnd_level when unavailable, hPa
       property 'humidity' # humidity in %
-      property 'feels_like' # temperature, accounting for the human perception of weather, in requested unit
-      property 'temp_min' # minimal currently observed temperature
-      property 'temp_max' # maximal currently observed temperature
+      temperature_property 'feels_like' # temperature, accounting for the human perception of weather, in requested unit
+      temperature_property 'temp_min' # minimal currently observed temperature
+      temperature_property 'temp_max' # maximal currently observed temperature
       property 'sea_level' # atmospheric pressure on the sea level, hPa
       property 'grnd_level' # atmospheric pressure on the ground level, hPa
     end

data/lib/open_weather/models/mixins/speed.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module OpenWeather
+  module Models
+    module Mixins
+      module Speed
+        extend ActiveSupport::Concern
+
+        class_methods do
+          def speed_property(field)
+            property field
+
+            define_method "#{field}_mps" do
+              to_meters_per_sec(send(field))
+            end
+
+            define_method "#{field}_mph" do
+              to_miles_per_hour(send(field))
+            end
+          end
+        end
+
+        private
+
+        def to_meters_per_sec(value)
+          case units
+          when :imperial
+            (value.to_f / 2.23694).round(2)
+          else
+            value
+          end
+        end
+
+        def to_miles_per_hour(value)
+          case units
+          when :metric
+            (value * 2.23694).round(2)
+          else
+            value
+          end
+        end
+      end
+    end
+  end
+end

data/lib/open_weather/models/mixins/temp.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module OpenWeather
+  module Models
+    module Mixins
+      module Temp
+        extend ActiveSupport::Concern
+
+        class_methods do
+          def temperature_property(field)
+            property field
+
+            define_method "#{field}_k" do
+              to_kelvin(send(field))
+            end
+
+            define_method "#{field}_c" do
+              to_celcius(send(field))
+            end
+
+            define_method "#{field}_f" do
+              to_farenheit(send(field))
+            end
+          end
+        end
+
+        private
+
+        def to_kelvin(value)
+          case units
+          when :metric
+            (value.to_f + 273.15).round(2)
+          when :imperial
+            ((value.to_f - 32) * 5 / 9 + 273.15).round(2)
+          else
+            value
+          end
+        end
+
+        def to_celcius(value)
+          case units
+          when :metric
+            value
+          when :imperial
+            ((value.to_f - 32) * 5 / 9).round(2)
+          else
+            (value.to_f - 273.15).round(2)
+          end
+        end
+
+        def to_farenheit(value)
+          case units
+          when :metric
+            ((value.to_f * 9 / 5) + 32).round(2)
+          when :imperial
+            value
+          else
+            ((value.to_f - 273.15) * 9 / 5 + 32).round(2)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/open_weather/models/mixins.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require_relative 'mixins/temp'
+require_relative 'mixins/speed'

data/lib/open_weather/models/model.rb

@@ -4,6 +4,20 @@ module OpenWeather
   module Models
     class Model < Hashie::Trash
       include Hashie::Extensions::IgnoreUndeclared
+      include OpenWeather::Models::Mixins::Temp
+      include OpenWeather::Models::Mixins::Speed
+
+      attr_reader :options
+
+      def initialize(args = nil, options = {})
+        transformed_args = args.respond_to?(:transform_keys) ? args.transform_keys(&:to_s) : args
+        super transformed_args
+        @options = { units: OpenWeather.config.units }.merge(options || {})
+      end
+
+      def units
+        options && options[:units]&.to_sym
+      end
     end
   end
 end

data/lib/open_weather/models/one_call/current_weather.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module OpenWeather
+  module Models
+    module OneCall
+      class CurrentWeather < Model
+        property 'dt', transform_with: ->(v) { Time.at(v).utc } # time of the forecasted data UTC
+        property 'sunrise', transform_with: ->(v) { Time.at(v).utc } # sunrise time, UTC
+        property 'sunset', transform_with: ->(v) { Time.at(v).utc } # sunset time, UTC
+        temperature_property 'temp' # temperature
+        temperature_property 'feels_like' # temperature, accounts for the human perception of weather
+        property 'pressure' # atmospheric pressure on the sea level, hPa
+        property 'humidity' # humidity, %
+        temperature_property 'dew_point' # atmospheric temperature (varying according to pressure and humidity) below which water droplets begin to condense and dew can form
+        property 'clouds' # cloudiness, %
+        property 'uvi' # UV index
+        property 'visibility' # average visibility, meters
+        speed_property 'wind_speed' # wind speed
+        speed_property 'wind_gust' # wind gust
+        property 'wind_deg' # wind direction, degrees (meteorological)
+        property 'rain'
+        property 'snow'
+        property 'weather'
+
+        def initialize(args = nil, options = {})
+          super args, options
+
+          self.rain = OpenWeather::Models::Rain.new(rain, options) if rain
+          self.snow = OpenWeather::Models::Snow.new(snow, options) if snow
+          self.weather = weather.map { |i| OpenWeather::Models::Weather.new(i, options) } if weather
+        end
+      end
+    end
+  end
+end

data/lib/open_weather/models/one_call/daily_weather.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module OpenWeather
+  module Models
+    module OneCall
+      class DailyWeather < Model
+        property 'dt', transform_with: ->(v) { Time.at(v).utc } # time of the forecasted data UTC
+        property 'sunrise', transform_with: ->(v) { Time.at(v).utc } # sunrise time, UTC
+        property 'sunset', transform_with: ->(v) { Time.at(v).utc } # sunset time, UTC
+        property 'temp'
+        property 'feels_like'
+        property 'pressure' # atmospheric pressure on the sea level, hPa
+        property 'humidity' # humidity, %
+        temperature_property 'dew_point' # atmospheric temperature (varying according to pressure and humidity) below which water droplets begin to condense and dew can form
+        speed_property 'wind_speed' # wind speed
+        speed_property 'wind_gust' # wind gust
+        property 'wind_deg' # wind direction, degrees (meteorological)
+        property 'clouds' # cloudiness, %
+        property 'uvi' # UV index
+        property 'rain' # precipitation volume, mm
+        property 'snow' # snow volume, mm
+        property 'weather'
+
+        def initialize(args = nil, options = {})
+          super args, options
+
+          self.temp = OpenWeather::Models::OneCall::Temp.new(temp, options) if temp
+          self.feels_like = OpenWeather::Models::OneCall::FeelsLike.new(feels_like, options) if feels_like
+          self.weather = weather.map { |i| OpenWeather::Models::Weather.new(i, options) } if weather
+        end
+      end
+    end
+  end
+end

data/lib/open_weather/models/one_call/feels_like.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module OpenWeather
+  module Models
+    module OneCall
+      class FeelsLike < Model
+        temperature_property 'morn'
+        temperature_property 'day'
+        temperature_property 'eve'
+        temperature_property 'night'
+      end
+    end
+  end
+end

data/lib/open_weather/models/one_call/hourly_weather.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module OpenWeather
+  module Models
+    module OneCall
+      class HourlyWeather < Model
+        property 'dt', transform_with: ->(v) { Time.at(v).utc } # Time of the forecasted data UTC
+        temperature_property 'temp'
+        temperature_property 'feels_like'
+        property 'pressure' # atmospheric pressure on the sea level, hPa
+        property 'humidity' # humidity, %
+        temperature_property 'dew_point' # atmospheric temperature (varying according to pressure and humidity) below which water droplets begin to condense and dew can form
+        property 'clouds' # cloudiness, %
+        property 'visibility' # average visibility, meters
+        speed_property 'wind_speed' # wind speed.
+        speed_property 'wind_gust' # wind gust.
+        property 'wind_deg' # wind direction, degrees (meteorological)
+        property 'rain'
+        property 'snow'
+        property 'weather'
+
+        def initialize(args = nil, options = {})
+          super args, options
+
+          self.rain = OpenWeather::Models::Rain.new(rain, options) if rain
+          self.snow = OpenWeather::Models::Snow.new(snow, options) if snow
+          self.weather = weather.map { |i| OpenWeather::Models::Weather.new(i, options) } if weather
+        end
+      end
+    end
+  end
+end

data/lib/open_weather/models/one_call/minutely_weather.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module OpenWeather
+  module Models
+    module OneCall
+      class MinutelyWeather < Model
+        property 'dt', transform_with: ->(v) { Time.at(v).utc } # time of the forecasted data UTC
+        property 'precipitation'
+      end
+    end
+  end
+end

data/lib/open_weather/models/one_call/temp.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module OpenWeather
+  module Models
+    module OneCall
+      class Temp < Model
+        temperature_property 'morn'
+        temperature_property 'day'
+        temperature_property 'eve'
+        temperature_property 'night'
+        temperature_property 'min'
+        temperature_property 'max'
+      end
+    end
+  end
+end

data/lib/open_weather/models/one_call/weather.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module OpenWeather
+  module Models
+    module OneCall
+      class Weather < Model
+        property 'lat' #  geographical coordinates of the location (latitude)
+        property 'lon' # geographical coordinates of the location (longitude)
+        property 'timezone' # timezone name for the requested location
+        property 'current' # current weather
+        property 'minutely' # minute forecast weather
+        property 'hourly' # hourly forecast weather
+        property 'daily' # daily forecast weather
+
+        def initialize(args = nil, options = {})
+          super args, options
+
+          self.current = OpenWeather::Models::OneCall::CurrentWeather.new(current, options) if current
+          self.minutely = minutely.map { |i| OpenWeather::Models::OneCall::MinutelyWeather.new(i, options) } if minutely
+          self.hourly = hourly.map { |i| OpenWeather::Models::OneCall::HourlyWeather.new(i, options) } if hourly
+          self.daily = daily.map { |i| OpenWeather::Models::OneCall::DailyWeather.new(i, options) } if daily
+        end
+      end
+    end
+  end
+end

data/lib/open_weather/models/one_call.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require_relative 'one_call/temp'
+require_relative 'one_call/feels_like'
+require_relative 'one_call/current_weather'
+require_relative 'one_call/daily_weather'
+require_relative 'one_call/hourly_weather'
+require_relative 'one_call/minutely_weather'
+require_relative 'one_call/weather'

data/lib/open_weather/models/station.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module OpenWeather
+  module Models
+    class Station < Model
+      property 'id', from: 'ID' # internal identifier for the station
+      property 'external_id' # external identifier for the station
+      property 'name' # name of the station
+      property 'latitude' #  geographical coordinates of the location (latitude)
+      property 'longitude' # geographical coordinates of the location (longitude)
+      property 'altitude' # height of station above sea level
+      property 'created_at' # timestamp when station was created
+      property 'updated_at' # timestamp when station was updated
+      property 'rank' # rank of station
+
+      def register!
+        data = OpenWeather::Client.new.register_station(to_h)
+        update_attributes!(data)
+
+        self
+      end
+
+      def update!(attributes)
+        data = OpenWeather::Client.new.update_station(id, attributes)
+        update_attributes!(data)
+
+        self
+      end
+
+      def delete!
+        OpenWeather::Client.new.delete_station(id)
+      end
+    end
+  end
+end

data/lib/open_weather/models/stations/humidity.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module OpenWeather
+  module Models
+    module Stations
+      class Humidity < Model
+        property 'average'
+        property 'weight'
+      end
+    end
+  end
+end

data/lib/open_weather/models/stations/measurement.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module OpenWeather
+  module Models
+    module Stations
+      class Measurement < Model
+        property 'station_id' # The internal ID of the station
+        property 'type' # Type of the aggregated data - minute, hour or day. Specifies the letters m, h or d respectively
+        property 'date' # Time of measurement
+        property 'temp'
+        property 'humidity'
+        property 'wind'
+        property 'precipitation'
+        property 'pressure'
+
+        def initialize(args = nil, options = {})
+          super args, options
+
+          self.temp = OpenWeather::Models::Stations::Temp.new(temp, options) if temp
+          self.humidity = OpenWeather::Models::Stations::Humidity.new(humidity, options) if humidity
+          self.pressure = OpenWeather::Models::Stations::Pressure.new(pressure, options) if pressure
+          self.precipitation = OpenWeather::Models::Stations::Precipitation.new(precipitation, options) if precipitation
+        end
+      end
+    end
+  end
+end

data/lib/open_weather/models/stations/precipitation.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module OpenWeather
+  module Models
+    module Stations
+      class Precipitation < Model
+        property 'rain'
+      end
+    end
+  end
+end

data/lib/open_weather/models/stations/pressure.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module OpenWeather
+  module Models
+    module Stations
+      class Pressure < Model
+        property 'min'
+        property 'max'
+        property 'average'
+        property 'weight'
+      end
+    end
+  end
+end

data/lib/open_weather/models/stations/temp.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module OpenWeather
+  module Models
+    module Stations
+      class Temp < Model
+        temperature_property 'min'
+        temperature_property 'max'
+        temperature_property 'average'
+        property 'weight'
+      end
+    end
+  end
+end

data/lib/open_weather/models/sys.rb

@@ -3,6 +3,7 @@
 module OpenWeather
   module Models
     class Sys < Model
+      property 'timezone' # shift in seconds from UTC
       property 'type' # internal parameter
       property 'id' # internal parameter
       property 'message' # internal parameter

data/lib/open_weather/models/weather.rb

@@ -6,6 +6,7 @@ module OpenWeather
       property 'id' # weather condition id
       property 'main' # group of weather parameters (Rain, Snow, Extreme, etc.)
       property 'description' # weather condition within the group, in your language
+      property 'icon_uri', from: 'icon', transform_with: ->(v) { URI.parse("http://openweathermap.org/img/wn/#{v}@2x.png") }
       property 'icon' # weather icon id
     end
   end

data/lib/open_weather/models/wind.rb

@@ -3,7 +3,7 @@
 module OpenWeather
   module Models
     class Wind < Model
-      property 'speed' # wind speed in meter/sec or miles/hour
+      speed_property 'speed' # wind speed in meter/sec or miles/hour
       property 'deg' # wind direction in degrees (meteorological)
     end
   end

data/lib/open_weather/models.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
+require_relative 'models/mixins'
 require_relative 'models/model'
 require_relative 'models/clouds'
 require_relative 'models/coord'
-require_relative 'models/city_weather'
 require_relative 'models/main'
 require_relative 'models/sys'
 require_relative 'models/weather'
@@ -11,3 +11,11 @@ require_relative 'models/wind'
 require_relative 'models/rain'
 require_relative 'models/snow'
 require_relative 'models/list'
+require_relative 'models/city'
+require_relative 'models/one_call'
+require_relative 'models/station'
+require_relative 'models/stations/measurement'
+require_relative 'models/stations/temp'
+require_relative 'models/stations/humidity'
+require_relative 'models/stations/pressure'
+require_relative 'models/stations/precipitation'

data/lib/open_weather/raise_error.rb

@@ -6,10 +6,10 @@ module OpenWeather
       def on_complete(env)
         case env[:status]
         when 404
-          raise Faraday::Error::ResourceNotFound, response_values(env)
+          raise Faraday::ResourceNotFound, response_values(env)
         when 407
           # mimic the behavior that we get with proxy requests with HTTPS
-          raise Faraday::Error::ConnectionFailed, %(407 "Proxy Authentication Required ")
+          raise Faraday::ConnectionFailed, %(407 "Proxy Authentication Required ")
         when (400...600).freeze
           raise OpenWeather::Errors::Fault, response_values(env)
         end

data/lib/open_weather/request.rb

@@ -20,6 +20,14 @@ module OpenWeather
 
     private
 
+    #
+    # @param [Symbol] method - Faraday HTTP method.
+    # @param [String] path - URL to send.
+    # @param [Hash] options - :appid, :lang, :units, :endpoint, :body keys will configure the request.
+    #   The rest will be converted to query params for GET/DELETE, or jsonified for POST/PUT.
+    #
+    # @return [Object] - the Faraday::Response#body.
+    #
     def request(method, path, options)
       options = options.dup
       options[:appid] ||= api_key if api_key.present?
@@ -33,7 +41,12 @@ module OpenWeather
           request.url(path, options)
         when :post, :put
           request.path = path
-          request.body = options unless options.empty?
+          request.params = { appid: options.delete(:appid) }
+          if options.key?(:body)
+            request.body = options.delete(:body).to_json
+          elsif !options.empty?
+            request.body = options.to_json
+          end
         end
         request.options.merge!(options.delete(:request)) if options.key?(:request)
       end

data/lib/open_weather/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OpenWeather
-  VERSION = '0.1.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: open-weather-ruby-client
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Daniel Doubrovkine
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-01 00:00:00.000000000 Z
+date: 2023-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email: dblock@dblock.org
 executables: []
 extensions: []
@@ -81,18 +81,38 @@ files:
 - lib/open_weather/connection.rb
 - lib/open_weather/endpoints.rb
 - lib/open_weather/endpoints/current.rb
+- lib/open_weather/endpoints/one_call.rb
+- lib/open_weather/endpoints/stations.rb
 - lib/open_weather/errors.rb
 - lib/open_weather/errors/fault.rb
 - lib/open_weather/logger.rb
 - lib/open_weather/models.rb
-- lib/open_weather/models/city_weather.rb
+- lib/open_weather/models/city.rb
+- lib/open_weather/models/city/weather.rb
 - lib/open_weather/models/clouds.rb
 - lib/open_weather/models/coord.rb
 - lib/open_weather/models/list.rb
 - lib/open_weather/models/main.rb
+- lib/open_weather/models/mixins.rb
+- lib/open_weather/models/mixins/speed.rb
+- lib/open_weather/models/mixins/temp.rb
 - lib/open_weather/models/model.rb
+- lib/open_weather/models/one_call.rb
+- lib/open_weather/models/one_call/current_weather.rb
+- lib/open_weather/models/one_call/daily_weather.rb
+- lib/open_weather/models/one_call/feels_like.rb
+- lib/open_weather/models/one_call/hourly_weather.rb
+- lib/open_weather/models/one_call/minutely_weather.rb
+- lib/open_weather/models/one_call/temp.rb
+- lib/open_weather/models/one_call/weather.rb
 - lib/open_weather/models/rain.rb
 - lib/open_weather/models/snow.rb
+- lib/open_weather/models/station.rb
+- lib/open_weather/models/stations/humidity.rb
+- lib/open_weather/models/stations/measurement.rb
+- lib/open_weather/models/stations/precipitation.rb
+- lib/open_weather/models/stations/pressure.rb
+- lib/open_weather/models/stations/temp.rb
 - lib/open_weather/models/sys.rb
 - lib/open_weather/models/weather.rb
 - lib/open_weather/models/wind.rb
@@ -103,7 +123,7 @@ homepage: http://github.com/dblock/open-weather-ruby-client
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -118,8 +138,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.3
+signing_key:
 specification_version: 4
 summary: OpenWeather API Ruby client.
 test_files: []

data/lib/open_weather/models/city_weather.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module OpenWeather
-  module Models
-    class CityWeather < Model
-      property 'coord', transform_with: ->(v) { OpenWeather::Models::Coord.new(v) }
-      property 'weather', transform_with: ->(v) { v.map { |i| OpenWeather::Models::Weather.new(i) } }
-      property 'base' # internal parameter
-      property 'main', transform_with: ->(v) { OpenWeather::Models::Main.new(v) }
-      property 'visibility'
-      property 'wind', transform_with: ->(v) { OpenWeather::Models::Wind.new(v) }
-      property 'clouds', transform_with: ->(v) { OpenWeather::Models::Clouds.new(v) }
-      property 'rain', transform_with: ->(v) { OpenWeather::Models::Rain.new(v) }
-      property 'snow', transform_with: ->(v) { OpenWeather::Models::Snow.new(v) }
-      property 'dt', transform_with: ->(v) { Time.at(v).utc } # time of data calculation, UTC
-      property 'sys', transform_with: ->(v) { OpenWeather::Models::Sys.new(v) }
-      property 'id' # city id
-      property 'timezone' # shift in seconds from UTC
-      property 'name' # city name
-      property 'cod' # internal parameter
-    end
-  end
-end