open-meteo 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c6c6b4ccb93360c8c3f27479f8bc01cc5cc37a7d14f2ff6942d745e3bd243a8
-  data.tar.gz: e10768db1766c5c7a48f8c68e6b15d2e367aefa0dc1bc3fc9a3fa263ce7cca93
+  metadata.gz: f89e15f29bfd187c332d5543477221061804b3a03e7a9773adebc62639284ab3
+  data.tar.gz: e2fd0e2e6c3b78a5448101ad8982da048e3532e4cb6089cfdc5b614d350184b5
 SHA512:
-  metadata.gz: 966bbb364b37dc3e4fe846516f862216c172e242949b5b64d45afded542336f704904e6725b7fcb867de0481a23988789c4392f7480c62dc24491d62b65740fa
-  data.tar.gz: 694c506e84309461346622763b562f34cd9f11d6fb34d7ab81b25faa7a808298cc07ecb58e02765ae9abd8a80b4122df388f9a57d657b7b63131e7cda07008ee
+  metadata.gz: e9e564dff02d8e28c5a3c45ef418b901da1dc5dc565231dd9608e8d0c02b8d1b340341d89ce2af7dcf7bec7f631cf38e4460a472d33cdcbec90cc5628767ef1d
+  data.tar.gz: f32d7c9de50a39a420aa64e8a7962f3c2fdf27f1bb04e5e86a0e2170077803ca9d31a14904fb0c839c3ef0f511e41d25667f90473501c2746f6beab717f980db

data/lib/open_meteo/client/config.rb

@@ -3,11 +3,13 @@ module OpenMeteo
     ##
     # The configuration for the OpenMeteo::Client.
     class Config
-      attr_reader :host, :logger
+      attr_reader :api_key, :host, :logger, :timeouts
 
-      def initialize(host: nil, logger: nil)
+      def initialize(api_key: nil, host: nil, logger: nil, timeouts: nil)
+        @api_key = api_key || OpenMeteo.configuration.api_key
         @host = host || OpenMeteo.configuration.host
         @logger = logger || OpenMeteo.configuration.logger
+        @timeouts = timeouts || OpenMeteo.configuration.timeouts
       end
 
       def url

data/lib/open_meteo/client/url_builder.rb

@@ -3,7 +3,7 @@ module OpenMeteo
     ##
     # The class that constructs the URLs for given endpoints.
     class UrlBuilder
-      API_PATHS = { forecast: "v1/forecast" }.freeze
+      API_PATHS = { forecast: "v1/forecast", forecast_dwd_icon: "v1/dwd-icon" }.freeze
 
       attr_reader :api_config
 

data/lib/open_meteo/client.rb

@@ -1,5 +1,4 @@
-require "faraday"
-
+require_relative "faraday_connection"
 require_relative "client/config"
 require_relative "client/url_builder"
 
@@ -12,24 +11,24 @@ module OpenMeteo
     class Timeout < StandardError
     end
 
-    attr_reader :api_config
+    attr_reader :api_config, :agent
 
     def initialize(
       api_config: OpenMeteo::Client::Config.new,
-      url_builder: OpenMeteo::Client::UrlBuilder.new,
-      agent: Faraday.new
+      url_builder: nil,
+      agent: FaradayConnection.new.connect
     )
       @api_config = api_config
-      @url_builder = url_builder
+      @url_builder = url_builder || UrlBuilder.new(api_config:)
       @agent = agent
     end
 
     def get(endpoint_name, *endpoint_args, **get_params)
       endpoint = url_builder.build_url(endpoint_name, *endpoint_args)
 
-      agent.get do |req|
-        req.params = get_params
-        req.url(endpoint)
+      agent.get do |request|
+        request.params = get_params.merge({ apikey: api_config.api_key }.compact)
+        request.url(endpoint)
       end
     rescue Faraday::ConnectionFailed => e
       raise ConnectionFailed, "Could not connect to OpenMeteo API: #{e.message}"
@@ -39,6 +38,6 @@ module OpenMeteo
 
     private
 
-    attr_reader :agent, :url_builder
+    attr_reader :url_builder
   end
 end

data/lib/open_meteo/configuration.rb

@@ -27,5 +27,7 @@ module OpenMeteo
 
     add_setting :logger, -> { Logger.new($stdout) }
     add_setting :host, "api.open-meteo.com"
+    add_setting :api_key, -> { ENV.fetch("OPEN_METEO_API_KEY", nil) }
+    add_setting :timeouts, -> { { timeout: 5, open_timeout: 5 } }
   end
 end

data/lib/open_meteo/entities/forecast/minutely_15.rb

@@ -0,0 +1,35 @@
+module OpenMeteo
+  module Entities
+    class Forecast
+      ##
+      # A forecast Entity for 15 minute data returned by OpenMeteo
+      class Minutely15
+        attr_reader :items, :units, :raw_json_hourly, :raw_json_hourly_units
+
+        def initialize(json_minutely_15, json_minutely_15_units)
+          @items = initialize_items(json_minutely_15)
+          @units =
+            json_minutely_15_units &&
+              OpenMeteo::Entities::Forecast::Units.new(json_minutely_15_units)
+
+          @raw_json_minutely_15 = json_minutely_15
+          @raw_json_minutely_15_units = json_minutely_15_units
+        end
+
+        private
+
+        def initialize_items(json_minutely_15)
+          json_minutely_15["time"]
+            .map do |element|
+              json_minutely_15
+                .keys
+                .each_with_object({}) do |attr, json_item|
+                  json_item[attr] = json_minutely_15[attr][json_minutely_15["time"].index(element)]
+                end
+            end
+            .map { |json_item| OpenMeteo::Entities::Forecast::Item.new(json_item) }
+        end
+      end
+    end
+  end
+end

data/lib/open_meteo/entities/forecast.rb

@@ -1,4 +1,5 @@
 require_relative "forecast/current"
+require_relative "forecast/minutely_15"
 require_relative "forecast/hourly"
 require_relative "forecast/daily"
 require_relative "forecast/units"
@@ -9,29 +10,35 @@ module OpenMeteo
     #
     # A forecast Entity with data returned by OpenMeteo
     class Forecast
-      attr_reader :attributes, :current, :hourly, :daily, :raw_json
+      attr_reader :attributes, :current, :minutely_15, :hourly, :daily, :raw_json
 
       def initialize(json_body)
         @raw_json = json_body
 
-        @current =
-          json_body["current"] &&
-            OpenMeteo::Entities::Forecast::Current.new(
-              json_body["current"],
-              json_body["current_units"],
-            )
-        @hourly =
-          json_body["hourly"] &&
-            OpenMeteo::Entities::Forecast::Hourly.new(
-              json_body["hourly"],
-              json_body["hourly_units"],
-            )
-        @daily =
-          json_body["daily"] &&
-            OpenMeteo::Entities::Forecast::Daily.new(json_body["daily"], json_body["daily_units"])
+        init_data_for(OpenMeteo::Entities::Forecast::Current)
+        init_data_for(OpenMeteo::Entities::Forecast::Minutely15)
+        init_data_for(OpenMeteo::Entities::Forecast::Hourly)
+        init_data_for(OpenMeteo::Entities::Forecast::Daily)
 
         @attributes = json_body.keys
       end
+
+      private
+
+      def init_data_for(klass)
+        name = name_for_klass(klass)
+
+        return if raw_json[name.to_s].nil?
+
+        instance_variable_set("@#{name}", klass.new(raw_json[name.to_s], raw_json["#{name}_units"]))
+      end
+
+      def name_for_klass(klass)
+        # Extract that last part of the class name, e.g. "Minutely15"
+        # from "OpenMeteo::Entities::Forecast::Minutely15"
+        # but as snake_case version e.g. "minutely_15"
+        klass.to_s.split("::").last.downcase.gsub(/(\d+)/, '_\1').to_sym
+      end
     end
   end
 end

data/lib/open_meteo/faraday_connection.rb

@@ -0,0 +1,26 @@
+require "faraday"
+require "faraday/retry"
+
+module OpenMeteo
+  ##
+  # The Faraday connection
+  class FaradayConnection
+    # See https://github.com/lostisland/faraday-retry/tree/main#usage
+    RETRY_OPTIONS = { max: 3, interval: 0.05, interval_randomness: 0.5, backoff_factor: 3 }.freeze
+
+    attr_reader :config
+
+    def initialize(config: OpenMeteo::Client::Config.new)
+      @config = config
+    end
+
+    def connect
+      Faraday.new do |conn|
+        conn.options[:timeout] = config.timeouts[:timeout]
+        conn.options[:open_timeout] = config.timeouts[:open_timeout]
+
+        conn.request :retry, RETRY_OPTIONS
+      end
+    end
+  end
+end

data/lib/open_meteo/forecast/variables.rb

@@ -9,6 +9,10 @@ module OpenMeteo
         :current,
         OpenMeteo::Types::Strict::Array.of(OpenMeteo::Types::Strict::Symbol).default([].freeze),
       )
+      attribute(
+        :minutely_15,
+        OpenMeteo::Types::Strict::Array.of(OpenMeteo::Types::Strict::Symbol).default([].freeze),
+      )
       attribute(
         :hourly,
         OpenMeteo::Types::Strict::Array.of(OpenMeteo::Types::Strict::Symbol).default([].freeze),
@@ -17,13 +21,17 @@ module OpenMeteo
         :daily,
         OpenMeteo::Types::Strict::Array.of(OpenMeteo::Types::Strict::Symbol).default([].freeze),
       )
+      attribute(
+        :models,
+        OpenMeteo::Types::Strict::Array.of(OpenMeteo::Types::Strict::Symbol).default([].freeze),
+      )
 
       def to_get_params
         get_params = {}
 
-        get_params[:current] = current.join(",") if current != []
-        get_params[:hourly] = hourly.join(",") if hourly != []
-        get_params[:daily] = daily.join(",") if daily != []
+        %i[current minutely_15 hourly daily models].each do |key|
+          get_params[key] = send(key).join(",") if send(key) != []
+        end
 
         get_params
       end

data/lib/open_meteo/forecast.rb

@@ -3,7 +3,7 @@ require_relative "forecast/variables"
 
 module OpenMeteo
   ##
-  # Perform a forecase request to the OpenMeteo API.
+  # Perform a forecast request to the OpenMeteo API.
   #
   # See https://open-meteo.com/en/docs
   class Forecast
@@ -36,6 +36,10 @@ module OpenMeteo
         # See https://open-meteo.com/en/docs
         endpoint: :forecast,
       },
+      dwd_icon: {
+        # See https://open-meteo.com/en/docs/dwd-api
+        endpoint: :forecast_dwd_icon,
+      },
     }.freeze
 
     def get_model_definition(model)

data/lib/open_meteo/version.rb

@@ -1,3 +1,3 @@
 module OpenMeteo
-  VERSION = "0.2.0".freeze
+  VERSION = "0.3.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: open-meteo
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Peter Morgenstern
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-08 00:00:00.000000000 Z
+date: 2024-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-struct
@@ -70,6 +70,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: faraday-retry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 description:
 email:
 - gundel.peter@gmail.com
@@ -89,9 +109,11 @@ files:
 - lib/open_meteo/entities/forecast/daily.rb
 - lib/open_meteo/entities/forecast/hourly.rb
 - lib/open_meteo/entities/forecast/item.rb
+- lib/open_meteo/entities/forecast/minutely_15.rb
 - lib/open_meteo/entities/forecast/units.rb
 - lib/open_meteo/entities/location.rb
 - lib/open_meteo/errors.rb
+- lib/open_meteo/faraday_connection.rb
 - lib/open_meteo/forecast.rb
 - lib/open_meteo/forecast/variables.rb
 - lib/open_meteo/response_wrapper.rb
@@ -117,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.21
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: A client for OpenMeteo weather data