anilibria-api-ruby 1.0.3 → 1.0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '028786323193407625b27994df9dd6386542f38e21b79f4356550820761687f0'
-  data.tar.gz: 753473973530bbd68be6d7427dd5460eec2c455f3938c39f65956734a33f31e5
+  metadata.gz: 305fa9f0e1d81906e47e59a2ef505cb8b353f13b176ab3188ef7aedbdbb806ab
+  data.tar.gz: 5164e486cf7fa39fd2cd449002d8f3369d684e0c642e9654927baf1cae848b24
 SHA512:
-  metadata.gz: adf4f3b6b6a29643f364475d32685ef1fc47c71735ffb1c26befc259fb817f122d45eec3614617963ee3e606753ec499f87122dfac8e3705f9e6224ec8a82b93
-  data.tar.gz: d80d1ca94d577e815ed8096c73d013bcf1476a46226b6d24c52f01a38840ade125f0196b8dd58cf15d9a0f2aa3a64b7671b5cf53c8514d1be306c9b2b8a3c6f1
+  metadata.gz: 49961302385788d1c28c02600ed035ff9cc42f6a2c8504f8bc0ce682bd29e832e242ddee32a4bc9074cd7c456463434b5a671698ba93b3059014f8493604c9fa
+  data.tar.gz: 3fdb581bf4fdbc0cc40f325dc1f508b7ab13cf25afc37733fdf31d34956daeaf3bb6e7ca4355269b361b16a979e3269079df6ce5322e5d42d4aa0d6c1ed6f131

data/Gemfile.lock

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

data/lib/anilibria/api/client/_methods.rb

@@ -10,19 +10,19 @@ module Anilibria
       api_method :get_random_title, returns: Types::Title
       api_method :get_youtube, 'getYouTube', returns: DryTypes::Array.of(Types::YouTube)
       api_method :get_feed, returns: Types::Feed
-      api_method :get_years, returns: DryTypes::Array.of(DryTypes::Strict::Integer)
-      api_method :get_genres, returns: DryTypes::Array.of(DryTypes::Strict::String)
-      api_method :get_caching_nodes, returns: DryTypes::Array.of(DryTypes::Strict::String)
+      api_method :get_years, returns: DryTypes::Array.of(DryTypes::Integer)
+      api_method :get_genres, returns: DryTypes::Array.of(DryTypes::String)
+      api_method :get_caching_nodes, returns: DryTypes::Array.of(DryTypes::String)
       api_method :get_team, returns: DryTypes.Constructor(Types::Team) { |team| team[:team] }
-      api_method :get_rss, 'getRSS', returns: DryTypes::Strict::String | DryTypes::Strict::Hash
+      api_method :get_rss, 'getRSS', returns: DryTypes::String | DryTypes::Hash
       api_method :get_seed_stats, returns: DryTypes::Array.of(Types::SeedStats)
       api_method :search_titles, returns: DryTypes::Array.of(Types::Title)
       api_method :advanced_search, returns: DryTypes::Array.of(Types::Title)
 
       # Methods that require authorization
       api_method :get_favorites, returns: DryTypes::Array.of(Types::Title)
-      api_method :add_favorite, http_method: :put, returns: DryTypes::Success
-      api_method :del_favorite, http_method: :delete, returns: DryTypes::Success
+      api_method :add_favorite, http_method: :put, returns: Types::T::Success
+      api_method :del_favorite, http_method: :delete, returns: Types::T::Success
     end
   end
 end

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/types/base.rb

@@ -2,7 +2,6 @@ module Anilibria
   module Api
     module Types
       class Base < Dry::Struct
-        # schema schema.strict
       end
     end
   end

data/lib/anilibria/api/types/dry_types.rb

@@ -3,9 +3,6 @@ module Anilibria
     module Types
       module DryTypes
         include Dry.Types()
-
-        Timestamp = Constructor(::Time, ::Time.method(:at))
-        Success = Constructor(Bool) { |value| value[:success] }
       end
     end
   end

data/lib/anilibria/api/types/schedule.rb

@@ -2,7 +2,7 @@ module Anilibria
   module Api
     module Types
       class Schedule < Base
-        attribute :day, DryTypes::Strict::Integer
+        attribute :day, T::Integer
         attribute :list, DryTypes::Array.of(Title)
       end
     end

data/lib/anilibria/api/types/seed_stats.rb

@@ -2,9 +2,9 @@ module Anilibria
   module Api
     module Types
       class SeedStats < Base
-        attribute? :downloaded, DryTypes::Strict::Integer
-        attribute? :uploaded, DryTypes::Strict::Integer
-        attribute? :user, DryTypes::Strict::String
+        attribute? :downloaded, T::Integer
+        attribute? :uploaded, T::Integer
+        attribute? :user, T::String
       end
     end
   end

data/lib/anilibria/api/types/t.rb

@@ -0,0 +1,15 @@
+module Anilibria
+  module Api
+    module Types
+      module T
+        String = DryTypes::String.optional
+        Integer = DryTypes::Integer.optional
+        Bool = DryTypes::Bool.optional
+        Nil = DryTypes::Nil.optional
+
+        Timestamp = DryTypes.Constructor(Time, Time.method(:at)).optional
+        Success = DryTypes.Constructor(Bool) { |value| value[:success] }
+      end
+    end
+  end
+end

data/lib/anilibria/api/types/team.rb

@@ -3,7 +3,7 @@ module Anilibria
     module Types
       class Team < Base
         %i[voice translator editing decor timing].each do |t|
-          attribute? t, DryTypes::Array.of(DryTypes::Strict::String)
+          attribute? t, DryTypes::Array.of(DryTypes::String)
         end
       end
     end

data/lib/anilibria/api/types/title.rb

@@ -3,15 +3,15 @@ module Anilibria
     module Types
       class Title < Base
         class Series < Base
-          attribute? :first, DryTypes::Integer.optional
-          attribute? :last, DryTypes::Integer.optional
-          attribute? :string, DryTypes::String.optional
+          attribute? :first, T::Integer
+          attribute? :last, T::Integer
+          attribute? :string, T::String
         end
 
         class Posters < Base
           class Poster < Base
-            attribute? :url, DryTypes::String.optional
-            attribute? :raw_base64_file, DryTypes::String.optional
+            attribute? :url, T::String
+            attribute? :raw_base64_file, T::String
           end
 
           %i[small medium original].each do |size|
@@ -21,18 +21,18 @@ module Anilibria
 
         class Player < Base
           class Playlist < Base
-            attribute? :serie, DryTypes::Strict::Integer
-            attribute? :created_timestamp, DryTypes::Timestamp
+            attribute? :serie, T::Integer
+            attribute? :created_timestamp, T::Timestamp
 
             attribute? :hls, Base do
-              attribute? :fhd, DryTypes::String.optional
-              attribute? :hd, DryTypes::String.optional
-              attribute? :sd, DryTypes::String.optional
+              attribute? :fhd, T::String
+              attribute? :hd, T::String
+              attribute? :sd, T::String
             end
           end
 
-          attribute? :alternative_player, DryTypes::String.optional
-          attribute? :host, DryTypes::String.optional
+          attribute? :alternative_player, T::String
+          attribute? :host, T::String
           attribute? :series, Title::Series
 
           attribute?(
@@ -47,92 +47,92 @@ module Anilibria
           class Torrent < Base
             class Metadata < Base
               class FilesList < Base
-                attribute? :file, DryTypes::Strict::String
-                attribute? :size, DryTypes::Strict::Integer
-                attribute? :offset, DryTypes::Strict::Integer
+                attribute? :file, T::String
+                attribute? :size, T::Integer
+                attribute? :offset, T::Integer
               end
 
               undef hash
 
-              attribute? :hash, DryTypes::Strict::String
-              attribute? :name, DryTypes::Strict::String
-              attribute? :announce, DryTypes::Array.of(DryTypes::Strict::String)
-              attribute? :created_timestamp, DryTypes::Timestamp
+              attribute? :hash, T::String
+              attribute? :name, T::String
+              attribute? :announce, DryTypes::Array.of(T::String)
+              attribute? :created_timestamp, T::Timestamp
               attribute? :files_list, DryTypes::Array.of(FilesList)
             end
 
             undef hash
 
-            attribute? :torrent_id, DryTypes::Strict::Integer
+            attribute? :torrent_id, T::Integer
             attribute? :series, Title::Series
 
             attribute? :quality, Base do
-              attribute? :string, DryTypes::Strict::String
-              attribute? :type, DryTypes::Strict::String
-              attribute? :resolution, DryTypes::Strict::Integer
-              attribute? :encoder, DryTypes::Strict::String
-              attribute? :lq_audio, DryTypes::Strict::Bool
+              attribute? :string, T::String
+              attribute? :type, T::String
+              attribute? :resolution, T::String
+              attribute? :encoder, T::String
+              attribute? :lq_audio, T::Bool
             end
 
             %i[leechers seeders downloads total_size].each do |i|
-              attribute? i, DryTypes::Strict::Integer
+              attribute? i, T::Integer
             end
 
-            attribute? :url, DryTypes::Strict::String
-            attribute? :uploaded_timestamp, DryTypes::Timestamp
-            attribute? :hash, DryTypes::Strict::String
-            attribute? :metadata, DryTypes::Strict::Nil | Metadata
-            attribute? :raw_base64_file, DryTypes::String.optional
+            attribute? :url, T::String
+            attribute? :uploaded_timestamp, T::Timestamp
+            attribute? :hash, T::String
+            attribute? :metadata, Metadata.optional
+            attribute? :raw_base64_file, T::String
           end
 
           attribute? :series, Title::Series
           attribute? :list, DryTypes::Array.of(Torrent)
         end
 
-        attribute? :id, DryTypes::Strict::Integer
-        attribute? :code, DryTypes::Strict::String
+        attribute? :id, T::Integer
+        attribute? :code, T::String
 
         attribute? :names, Base do
-          attribute? :ru, DryTypes::String.optional
-          attribute? :en, DryTypes::String.optional
-          attribute? :alternative, DryTypes::String.optional
+          attribute? :ru, T::String
+          attribute? :en, T::String
+          attribute? :alternative, T::String
         end
 
-        attribute? :announce, DryTypes::String.optional
+        attribute? :announce, T::String
 
         attribute? :status, Base do
-          attribute? :string, DryTypes::Strict::String
-          attribute? :code, DryTypes::Strict::Integer
+          attribute? :string, T::String
+          attribute? :code, T::Integer
         end
 
         attribute? :posters, Posters
-        attribute? :updated, DryTypes::Timestamp.optional
-        attribute? :last_change, DryTypes::Timestamp.optional
+        attribute? :updated, T::Timestamp
+        attribute? :last_change, T::Timestamp
 
         attribute? :type, Base do
-          attribute? :full_string, DryTypes::String.optional
-          attribute? :string, DryTypes::String.optional
-          attribute? :length, DryTypes::String.optional
-          attribute? :series, DryTypes::Integer.optional
-          attribute? :code, DryTypes::Integer.optional
+          attribute? :full_string, T::String
+          attribute? :string, T::String
+          attribute? :length, T::Integer
+          attribute? :series, T::Integer
+          attribute? :code, T::Integer
         end
 
-        attribute? :genres, DryTypes::Array.of(DryTypes::Strict::String)
+        attribute? :genres, DryTypes::Array.of(T::String)
         attribute? :team, Types::Team
 
         attribute? :season, Base do
-          attribute? :string, DryTypes::String.optional
-          attribute? :code, DryTypes::Integer.optional
-          attribute? :year, DryTypes::Integer.optional
-          attribute? :week_day, DryTypes::Integer.optional
+          attribute? :string, T::String
+          attribute? :code, T::Integer
+          attribute? :year, T::Integer
+          attribute? :week_day, T::Integer
         end
 
-        attribute? :description, DryTypes::String.optional
-        attribute? :in_favorites, DryTypes::Integer.optional
+        attribute? :description, T::String
+        attribute? :in_favorites, T::Integer
 
         attribute? :blocked, Base do
-          attribute? :blocked, DryTypes::Strict::Bool
-          attribute? :bakanim, DryTypes::Strict::Bool
+          attribute? :blocked, T::Bool
+          attribute? :bakanim, T::Bool
         end
 
         attribute? :player, Player

data/lib/anilibria/api/types/youtube.rb

@@ -2,12 +2,12 @@ module Anilibria
   module Api
     module Types
       class YouTube < Base
-        attribute? :id, DryTypes::Strict::Integer
-        attribute? :image, DryTypes::Strict::String
-        attribute? :youtube_id, DryTypes::Strict::String
-        attribute? :comments, DryTypes::Strict::Integer
-        attribute? :views, DryTypes::Strict::Integer
-        attribute? :timestamp, DryTypes::Timestamp
+        attribute? :id, T::Integer
+        attribute? :image, T::String
+        attribute? :youtube_id, T::String
+        attribute? :comments, T::Integer
+        attribute? :views, T::Integer
+        attribute? :timestamp, T::Timestamp
       end
     end
   end

data/lib/anilibria/api/types.rb

@@ -1,4 +1,5 @@
 require 'anilibria/api/types/dry_types'
+require 'anilibria/api/types/t'
 require 'anilibria/api/types/base'
 require 'anilibria/api/types/team'
 require 'anilibria/api/types/title'

data/lib/anilibria/api/version.rb

@@ -1,6 +1,6 @@
 module Anilibria
   module Api
-    VERSION = '1.0.3'.freeze
+    VERSION = '1.0.5.1'.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.5.1
 platform: ruby
 authors:
 - Roman Kozachenko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-07 00:00:00.000000000 Z
+date: 2022-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-struct
@@ -67,6 +67,7 @@ files:
 - lib/anilibria/api/types/feed.rb
 - lib/anilibria/api/types/schedule.rb
 - lib/anilibria/api/types/seed_stats.rb
+- lib/anilibria/api/types/t.rb
 - lib/anilibria/api/types/team.rb
 - lib/anilibria/api/types/title.rb
 - lib/anilibria/api/types/youtube.rb