anilibria-api-ruby 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '028786323193407625b27994df9dd6386542f38e21b79f4356550820761687f0'
-  data.tar.gz: 753473973530bbd68be6d7427dd5460eec2c455f3938c39f65956734a33f31e5
+  metadata.gz: 69881766a2287e012e03871b9997435a9d8f7080eed1377c267847b865c9a0be
+  data.tar.gz: c70122a1d4aafea3218cc3f9b9323df801289733f394e7b1f5e847dff72ea466
 SHA512:
-  metadata.gz: adf4f3b6b6a29643f364475d32685ef1fc47c71735ffb1c26befc259fb817f122d45eec3614617963ee3e606753ec499f87122dfac8e3705f9e6224ec8a82b93
-  data.tar.gz: d80d1ca94d577e815ed8096c73d013bcf1476a46226b6d24c52f01a38840ade125f0196b8dd58cf15d9a0f2aa3a64b7671b5cf53c8514d1be306c9b2b8a3c6f1
+  metadata.gz: c25155e4d2fe623944cfa58b6b5ff8836132c4963980db42ea52cc0431301c052dd4accb81722d36d9d8faf148bd26c7d064f10bbfc92602744d13b45fa84b17
+  data.tar.gz: 57c3db01725fe8fc00a193269777b9d491816503b996ad105fda3c6210d1d5d9b3c6014317c8138cb8772614b982ecd209f3fe81452de6b27aa3886f84df096f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    anilibria-api-ruby (1.0.3)
+    anilibria-api-ruby (1.0.4)
       dry-struct (~> 1.4)
       faraday (~> 2)
 

data/lib/anilibria/api/client.rb

@@ -63,7 +63,7 @@ module Anilibria
       def auth(mail, passwd)
         response = auth_response(mail, passwd)
 
-        return unless response[:key] == 'success'
+        return unless auth_successful?(response)
 
         response[:sessionId]
       end
@@ -71,7 +71,12 @@ module Anilibria
       def auth!(mail, passwd)
         response = auth_response(mail, passwd)
 
-        raise Exceptions::AuthError, response unless response[:key] == 'success'
+        unless auth_successful?(response)
+          raise(
+            Exceptions::AuthError.new(response),
+            'Failed authorization attempt'
+          )
+        end
 
         response[:sessionId]
       end
@@ -82,23 +87,34 @@ module Anilibria
 
       private
 
+      def check_response!(response)
+        return if response.status == 200
+
+        if !response.body.respond_to?(:to_hash) ||
+           !response.body[:error].respond_to?(:to_hash)
+          raise Exceptions::ResponseError.new(
+            'Unexpected response from API', response
+          )
+        end
+
+        raise Exceptions::ApiError.new(response), response.body.dig(:error, :message)
+      end
+
       def auth_response(mail, passwd)
         response = connection.post(
           AUTH_ENDPOINT,
           { mail: mail, passwd: passwd }
         )
 
-        JSON.parse(response.body, { symbolize_names: true })
-      end
-
-      def check_response!(response)
-        return if response.status == 200
-
-        if !response.body.respond_to?(:to_hash) || !response.body.key?(:error)
-          raise Exceptions::ResponseError.new('Unexpected response from API', response)
+        begin
+          JSON.parse(response.body, { symbolize_names: true })
+        rescue JSON::ParserError
+          {}
         end
+      end
 
-        raise Exceptions::ApiError, response
+      def auth_successful?(response)
+        response[:key] == 'success' && response.key?(:sessionId)
       end
     end
   end

data/lib/anilibria/api/exceptions/api_error.rb

@@ -7,7 +7,8 @@ module Anilibria
         def initialize(response)
           error = response.body[:error].to_h
           @code = error[:code]
-          super("#{error[:code]} #{error[:message]}", response)
+
+          super(error[:message], response)
         end
       end
     end

data/lib/anilibria/api/exceptions/auth_error.rb

@@ -2,14 +2,25 @@ module Anilibria
   module Api
     module Exceptions
       class AuthError < Base
-        attr_reader :err, :key, :mes
+        attr_reader :data
+
+        def initialize(data = {})
+          @data = data
 
-        def initialize(response_body)
-          @err = response_body[:err]
-          @key = response_body[:key]
-          @mes = response_body[:mes]
           super("#{mes} (#{key})")
         end
+
+        def err
+          data[:err]
+        end
+
+        def mes
+          data[:mes]
+        end
+
+        def key
+          data[:key]
+        end
       end
     end
   end

data/lib/anilibria/api/exceptions/response_error.rb

@@ -4,9 +4,10 @@ module Anilibria
       class ResponseError < Base
         attr_reader :response
 
-        def initialize(message, response)
+        def initialize(msg = nil, response = nil)
           @response = response
-          super(message)
+
+          super(msg)
         end
       end
     end

data/lib/anilibria/api/version.rb

@@ -1,6 +1,6 @@
 module Anilibria
   module Api
-    VERSION = '1.0.3'.freeze
+    VERSION = '1.0.4'.freeze
     public_constant :VERSION
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anilibria-api-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Roman Kozachenko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-07 00:00:00.000000000 Z
+date: 2022-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-struct