open-meteo 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f89e15f29bfd187c332d5543477221061804b3a03e7a9773adebc62639284ab3
-  data.tar.gz: e2fd0e2e6c3b78a5448101ad8982da048e3532e4cb6089cfdc5b614d350184b5
+  metadata.gz: df57745eac4454ef8165b7e202ac8b794ffa21e4e91f3a2888245fae72c2247d
+  data.tar.gz: a94961154f9f325b5194956236fe2153071d91711a194eabcf9b8968766183ba
 SHA512:
-  metadata.gz: e9e564dff02d8e28c5a3c45ef418b901da1dc5dc565231dd9608e8d0c02b8d1b340341d89ce2af7dcf7bec7f631cf38e4460a472d33cdcbec90cc5628767ef1d
-  data.tar.gz: f32d7c9de50a39a420aa64e8a7962f3c2fdf27f1bb04e5e86a0e2170077803ca9d31a14904fb0c839c3ef0f511e41d25667f90473501c2746f6beab717f980db
+  metadata.gz: b3bc0b7c5530498b4a099503665e29c6f582aa4453a3bd564b612fa346ae56a18173f19e7a53677ba811015604a77eaaf408dbb52fde980afc6b887501843e22
+  data.tar.gz: f35900d202b03f878497d260ec54f6293f595a33848182b9ad106b587f60421124c9aa9b079605d4b62e4071743c883fa7dea3861354d98fe8502cb011700fb3

data/lib/open_meteo/client/url_builder.rb

@@ -5,17 +5,17 @@ module OpenMeteo
     class UrlBuilder
       API_PATHS = { forecast: "v1/forecast", forecast_dwd_icon: "v1/dwd-icon" }.freeze
 
-      attr_reader :api_config
+      attr_reader :config
 
-      def initialize(api_config: OpenMeteo::Client::Config.new)
-        @api_config = api_config
+      def initialize(config: OpenMeteo::Client::Config.new)
+        @config = config
       end
 
-      def build_url(endpoint, *args)
+      def build_url(endpoint, path_params = {})
         relative_path = API_PATHS.fetch(endpoint.to_sym)
-        full_path = [api_config.url, relative_path].join("/")
+        full_path = [config.url, relative_path].join("/")
 
-        URI::DEFAULT_PARSER.escape(format(full_path, args))
+        URI::DEFAULT_PARSER.escape(format(full_path, path_params))
       end
     end
   end

data/lib/open_meteo/client.rb

@@ -11,23 +11,23 @@ module OpenMeteo
     class Timeout < StandardError
     end
 
-    attr_reader :api_config, :agent
+    attr_reader :config, :agent
 
     def initialize(
-      api_config: OpenMeteo::Client::Config.new,
-      url_builder: nil,
-      agent: FaradayConnection.new.connect
+      config: OpenMeteo::Client::Config.new,
+      url_builder: UrlBuilder.new(config:),
+      agent: FaradayConnection.new(config:)
     )
-      @api_config = api_config
-      @url_builder = url_builder || UrlBuilder.new(api_config:)
+      @config = config
+      @url_builder = url_builder
       @agent = agent
     end
 
-    def get(endpoint_name, *endpoint_args, **get_params)
-      endpoint = url_builder.build_url(endpoint_name, *endpoint_args)
+    def get(endpoint_name, path_params: {}, query_params: {})
+      endpoint = url_builder.build_url(endpoint_name, path_params)
 
-      agent.get do |request|
-        request.params = get_params.merge({ apikey: api_config.api_key }.compact)
+      agent.connect.get do |request|
+        request.params = query_params.merge({ apikey: config.api_key }.compact)
         request.url(endpoint)
       end
     rescue Faraday::ConnectionFailed => e

data/lib/open_meteo/entities/location.rb

@@ -12,7 +12,7 @@ module OpenMeteo
         OpenMeteo::Entities::Contracts::LocationContract.validate!(to_hash)
       end
 
-      def to_get_params
+      def to_query_params
         { latitude:, longitude: }
       end
     end

data/lib/open_meteo/faraday_connection.rb

@@ -20,6 +20,7 @@ module OpenMeteo
         conn.options[:open_timeout] = config.timeouts[:open_timeout]
 
         conn.request :retry, RETRY_OPTIONS
+        conn.response :logger, config.logger
       end
     end
   end

data/lib/open_meteo/forecast/variables.rb

@@ -25,15 +25,18 @@ module OpenMeteo
         :models,
         OpenMeteo::Types::Strict::Array.of(OpenMeteo::Types::Strict::Symbol).default([].freeze),
       )
+      attribute(:timezone, OpenMeteo::Types::Strict::String.optional.default(nil))
 
-      def to_get_params
-        get_params = {}
+      def to_query_params
+        query_params = {}
 
         %i[current minutely_15 hourly daily models].each do |key|
-          get_params[key] = send(key).join(",") if send(key) != []
+          query_params[key] = send(key).join(",") if send(key) != []
         end
 
-        get_params
+        %i[timezone].each { |key| query_params[key] = send(key) if send(key) }
+
+        query_params
       end
     end
   end

data/lib/open_meteo/forecast.rb

@@ -12,7 +12,11 @@ module OpenMeteo
     class WrongLocationType < StandardError
     end
 
-    def initialize(client: OpenMeteo::Client.new, response_wrapper: OpenMeteo::ResponseWrapper.new)
+    def initialize(
+      config: OpenMeteo::Client::Config.new,
+      client: OpenMeteo::Client.new(config:),
+      response_wrapper: OpenMeteo::ResponseWrapper.new(config:)
+    )
       @client = client
       @response_wrapper = response_wrapper
     end
@@ -53,8 +57,8 @@ module OpenMeteo
     end
 
     def get_forecast(endpoint, location, variables)
-      get_params = { **location.to_get_params, **variables.to_get_params }
-      response = client.get(endpoint, **get_params)
+      query_params = { **location.to_query_params, **variables.to_query_params }
+      response = client.get(endpoint, query_params:)
 
       @response_wrapper.wrap(response, entity: OpenMeteo::Entities::Forecast)
     end

data/lib/open_meteo/response_wrapper.rb

@@ -3,6 +3,8 @@ module OpenMeteo
   # Wrap the JSON body response from the OpenMeteo request.
   #
   class ResponseWrapper
+    attr_reader :config
+
     def initialize(config: OpenMeteo::Client::Config.new)
       @config = config
     end

data/lib/open_meteo/version.rb

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

data/lib/open_meteo.rb

@@ -1,3 +1,4 @@
+require "open_meteo/faraday_connection"
 require "open_meteo/types"
 require "open_meteo/configuration"
 require "open_meteo/entities/location"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: open-meteo
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Peter Morgenstern
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-08 00:00:00.000000000 Z
+date: 2024-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-struct