zaikio-client-helpers 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d266642334866842da555510bf6da0a789a31a23a02ba39d33e72115d22752ef
-  data.tar.gz: 80db7cb3b8f18f4631382cef21bf60e7181a5a5c4e7a8538c9e30298353bf6c5
+  metadata.gz: 4cf5ba26a5d902d8754f9f415013df733258fec880ef3957ea9c6f24b9ca4a7f
+  data.tar.gz: e6a0e15a3d85f1817a2ae1c6020d5d7b37a616f86b527f7d7e3410e6f8d9da34
 SHA512:
-  metadata.gz: 9e125c503402d5b156be59ab0af6a0739db65588996a194c539b00a06578ee771db6e6d46caa2ba36390c1a56cfbdb694b2a4d3a438089160b23a6b1be9b310f
-  data.tar.gz: 7ba458d96f9f1fc0f5fa9030c39b5d06fe1d30352075e54cc79bd60631917606ae78157ec6aec788dbec20cdb4a9010f25ed721a749924d02fda565f2d3e0cc5
+  metadata.gz: c4f46bc71a87c569cc796f3c3174f431cd27f75514122c831b85a31db46068e5296cb345091ab7a88d0dd63bda4cd9d69b130472a6dbe1356f50dbe3a7017acd
+  data.tar.gz: 723a060aa1807cd9e78e272daaead50b6d556f7f209801067fbec01481416440fedf4711929b6660563e77335757c61a0d2b937d820d74175c425c0b62da9062

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [0.6.0] - 2023-03-20
+
+- Remove errors from data hash
+- Do include base error if server responds with a 422 to see that an error happened
+
+## [0.5.0] - 2023-03-17
+
+- Add new faraday middleware that automatically passes current `I18n.locale` to `Accept-Language` header
+
 ## [0.4.0] - 2023-02-09
 
 - Add a default read timeout for Faraday connection of 5 seconds, and open timeout of 1 second.

data/lib/zaikio/client/helpers/configuration.rb

@@ -4,7 +4,7 @@ module Zaikio
   module Client
     module Helpers
       class Configuration
-        attr_accessor :host
+        attr_accessor :host, :disable_i18n
         attr_reader :environment
         attr_writer :logger
 

data/lib/zaikio/client/helpers/json_parser.rb

@@ -13,7 +13,7 @@ module Zaikio::Client::Helpers
       case env.status
       when 404 then raise Spyke::ResourceNotFound.new(nil, url: env.url)
       when 429 then raise Zaikio::RateLimitedError.new(nil, url: env.url)
-      when (200..299), 422 then env.body = parse_body(env.body)
+      when (200..299), 422 then env.body = parse_body(env.body, status: env.status)
       else connection_error(env)
       end
     end
@@ -27,12 +27,14 @@ module Zaikio::Client::Helpers
       )
     end
 
-    def parse_body(body)
+    def parse_body(body, status: 200)
       json = MultiJson.load(body, symbolize_keys: true)
+      errors = json.is_a?(Hash) ? json.delete(:errors) || {} : {}
+      errors = { base: ['unknown'] } if status == 422 && errors.empty?
       {
         data: json,
         metadata: {},
-        errors: json.is_a?(Hash) ? json[:errors] : {}
+        errors: errors
       }
     rescue MultiJson::ParseError
       {

data/lib/zaikio/client/helpers/locale_middleware.rb

@@ -0,0 +1,22 @@
+require "faraday"
+
+module Zaikio
+  module Client
+    module Helpers
+      class LocaleMiddleware < Faraday::Middleware
+        def initialize(app, disable_i18n: false)
+          @disable_i18n = disable_i18n
+          super(app)
+        end
+
+        def call(request_env)
+          if !@disable_i18n && Object.const_defined?("I18n")
+            request_env[:request_headers]["Accept-Language"] = ::I18n.try(:locale)&.to_s
+          end
+
+          @app.call(request_env)
+        end
+      end
+    end
+  end
+end

data/lib/zaikio/client/helpers/version.rb

@@ -3,7 +3,7 @@
 module Zaikio
   module Client
     module Helpers
-      VERSION = "0.4.0"
+      VERSION = "0.6.0"
     end
   end
 end

data/lib/zaikio/client.rb

@@ -3,6 +3,7 @@ require "zaikio/client/helpers/json_parser"
 require "zaikio/client/helpers/pagination"
 require "zaikio/client/helpers/configuration"
 require "zaikio/client/helpers/authorization_middleware"
+require "zaikio/client/helpers/locale_middleware"
 
 module Zaikio
   module Client
@@ -25,6 +26,7 @@ module Zaikio
           c.use         Zaikio::Client::Helpers::Pagination::FaradayMiddleware
           c.use         Zaikio::Client::Helpers::JSONParser
           c.use         Zaikio::Client::Helpers::AuthorizationMiddleware
+          c.use         Zaikio::Client::Helpers::LocaleMiddleware, disable_i18n: configuration.disable_i18n
           c.adapter     Faraday.default_adapter
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zaikio-client-helpers
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Zaikio GMBH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-09 00:00:00.000000000 Z
+date: 2023-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -102,6 +102,7 @@ files:
 - lib/zaikio/client/helpers/authorization_middleware.rb
 - lib/zaikio/client/helpers/configuration.rb
 - lib/zaikio/client/helpers/json_parser.rb
+- lib/zaikio/client/helpers/locale_middleware.rb
 - lib/zaikio/client/helpers/pagination.rb
 - lib/zaikio/client/helpers/version.rb
 - lib/zaikio/client/model.rb