mangadex 5.3.3 → 5.3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 166fb230b0125992e5168515129718a28f7d545c3c1cb07f9bc81e837ad8c2c7
-  data.tar.gz: cf310df080bb7fdce3df2fd885aa478de4ae050272e58d97ce6fdbe0b60459af
+  metadata.gz: cdf99fecbef4c256aa1f0b739a7051d68f7f79a864f2525d7a56d5ee6a2cca79
+  data.tar.gz: 7250ded43bef9892e3d13323a1cea91c8f45378df330534f1a4f229575a1ebee
 SHA512:
-  metadata.gz: 4babccf80e64908e70f612d5afb152b00fef108c827cbfc75a273478ee2f1230b6b2366318bab5a3fadb3b2025e0e7a64bed88746c04484d18a9c1a62a241e2a
-  data.tar.gz: aebcdeed93c99b1beb9e4723e8371875c21da6629311270cbf2b6ca5c58c55b0dca39e8a222bcd886180ee7b1059e40853948f90a25553da4dea8f1d261b4f44
+  metadata.gz: ef23c65119a28a69e2c060b69361be24e3558cdce80b6bed93e1a0fc7463e7f87bca81b59c770c4fb378d68368c0da1713723523f4fee445d829ac9d4e0a973b
+  data.tar.gz: 58b0f5ee9763465a0801ebfbaf825c0009b12138bd20996ac34d5183c68a16ed6d515c8555e02b669c29cdbcb5e12916bb7adfec4d0769edbc7e793597d97334

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mangadex (5.3.2)
+    mangadex (5.3.3.1)
       activesupport (~> 6.1)
       psych (~> 4.0.1)
       rest-client (~> 2.1)

data/lib/mangadex/api/context.rb

@@ -4,15 +4,23 @@ module Mangadex
     class Context
       extend T::Sig
 
+      DEFAULT_MANGADEX_CONTENT_RATING_VALUES = [
+        ContentRating::SAFE,
+        ContentRating::SUGGESTIVE,
+        ContentRating::EROTICA,
+      ].freeze
+
       @@user = nil
       @@version = nil
       @@force_raw_requests = nil
+      @@tags = nil
+      @@allowed_content_ratings = DEFAULT_MANGADEX_CONTENT_RATING_VALUES
 
       sig { returns(T.nilable(String)) }
       def self.version
         return @@version unless @@version.nil?
 
-        @@version = Mangadex::Api::Version.check_mangadex_version
+        @@version = Mangadex::Api::VersionChecker.check_mangadex_version
       end
 
       sig { returns(T.nilable(Mangadex::Api::User)) }
@@ -20,6 +28,18 @@ module Mangadex
         @@user&.with_valid_session
       end
 
+      sig { returns(T::Array[Mangadex::Tag]) }
+      def self.tags
+        return @@tags if @@tags
+
+        @@tags = Mangadex::Tag.list.data
+      end
+
+      sig { returns(T::Array[Mangadex::ContentRating]) }
+      def self.allowed_content_ratings
+        @@allowed_content_ratings.map { |value| ContentRating.new(value) }
+      end
+
       sig { params(user: T.nilable(T.any(Hash, Mangadex::Api::User, Mangadex::User))).void }
       def self.user=(user)
         if user.is_a?(Mangadex::Api::User)
@@ -30,7 +50,11 @@ module Mangadex
             data: user,
           )
         elsif user.is_a?(Hash)
-          user = user.with_indifferent_access
+          user = Mangadex::Internal::Definition.validate(user, {
+            mangadex_user_id: { accepts: String, required: true },
+            session: { accepts: String },
+            refresh: { accepts: String },
+          })
 
           @@user = Mangadex::Api::User.new(
             user[:mangadex_user_id],
@@ -44,13 +68,9 @@ module Mangadex
 
       sig { params(user: T.nilable(T.any(Hash, Mangadex::Api::User, Mangadex::User)), block: T.proc.returns(T.untyped)).returns(T.untyped) }
       def self.with_user(user, &block)
-        current_user = @@user
-        @@user = user
-        response = yield
-        @@user = current_user
-        response
-      ensure
-        @@user = current_user
+        temp_set_value("user", user) do
+          yield
+        end
       end
 
       sig { params(block: T.proc.returns(T.untyped)).returns(T.untyped) }
@@ -62,7 +82,7 @@ module Mangadex
 
       def self.force_raw_requests(&block)
         if block_given?
-          temp_force_raw_requests do
+          temp_set_value("force_raw_requests", true) do
             yield
           end
         else
@@ -74,16 +94,43 @@ module Mangadex
         @@force_raw_requests = value
       end
 
+      def self.allow_content_ratings(*content_ratings, &block)
+        content_ratings = if content_ratings.empty?
+          allowed_content_ratings
+        else
+          Mangadex::ContentRating.parse(content_ratings)
+        end
+        if block_given?
+          # set temporarily
+          temp_set_value("allowed_content_ratings", content_ratings) do
+            yield
+          end
+        elsif content_ratings.any?
+          # set "permanently"
+          @@allowed_content_ratings = content_ratings
+        else
+          # This is to throw an exception prompting to pass a block if there no params.
+          yield
+        end
+      end
+
+      def self.with_allowed_content_ratings(*other_content_ratings, &block)
+        T.unsafe(self).allow_content_ratings(*(allowed_content_ratings + other_content_ratings)) do
+          yield
+        end
+      end
+
       private
 
-      def self.temp_force_raw_requests(&block)
-        current_force_raw_requests = @@force_raw_requests
-        @@force_raw_requests = true
+      def self.temp_set_value(name, value, &block)
+        var_name = "@@#{name}"
+        current_value = class_variable_get(var_name)
+        class_variable_set(var_name, value)
         response = yield
-        @@force_raw_requests = current_force_raw_requests
+        class_variable_set(var_name, current_value)
         response
       ensure
-        @@force_raw_requests = current_force_raw_requests
+        class_variable_set(var_name, current_value) if current_value
       end
     end
   end

data/lib/mangadex/api/version_checker.rb

@@ -3,7 +3,7 @@ require "psych"
 
 module Mangadex
   module Api
-    class Version
+    class VersionChecker
       extend T::Sig
 
       sig { returns(T.nilable(String)) }

data/lib/mangadex/author.rb

@@ -13,7 +13,7 @@ module Mangadex
       :melon_book,
       :fan_box,
       :booth,
-      :nicovideo,
+      :nico_video,
       :skeb,
       :fantia,
       :tumblr,

data/lib/mangadex/chapter.rb

@@ -26,6 +26,7 @@ module Mangadex
       Mangadex::Internal::Request.get(
         '/chapter',
         Mangadex::Internal::Definition.chapter_list(args),
+        content_rating: true,
       )
     end
 

data/lib/mangadex/content_rating.rb

@@ -28,6 +28,11 @@ module Mangadex
       SCORES.keys.map { |key| ContentRating.new(key) }.select { |record| record <= content_rating }.sort
     end
 
+    sig { params(content_ratings: T::Array[T.any(T::Api::Text, T::Api::ContentRating)]).returns(T::Array[ContentRating]) }
+    def self.parse(content_ratings)
+      content_ratings.map { |content_rating| ContentRating.new(content_rating) }.uniq
+    end
+
     sig { params(value: T.any(T::Api::Text, T::Api::ContentRating)).void }
     def initialize(value)
       @value = ensure_value!(value.to_s)

data/lib/mangadex/custom_list.rb

@@ -62,6 +62,7 @@ module Mangadex
       Mangadex::Internal::Request.get(
         '/list/%{id}/feed' % {id: id},
         Mangadex::Internal::Definition.chapter_list(args),
+        content_rating: true,
       )
     end
 

data/lib/mangadex/internal/definition.rb

@@ -157,7 +157,7 @@ module Mangadex
           if errors.any?
             error_message = errors.map do |error|
               if error[:extra]
-                "paalidate_required!rams[:#{error[:extra]}] does not exist and cannot be passed to this request"
+                "params[:#{error[:extra]}] does not exist and cannot be passed to this request"
               elsif error[:message]
                 error[:message]
               else

data/lib/mangadex/internal/request.rb

@@ -13,9 +13,9 @@ module Mangadex
       attr_accessor :path, :headers, :payload, :method, :raw
       attr_reader :response
 
-      def self.get(path, params={}, auth: false, headers: nil, raw: false)
+      def self.get(path, params={}, auth: false, headers: nil, raw: false, content_rating: false)
         new(
-          path_with_params(path, params),
+          path_with_params(path, params, content_rating),
           method: :get,
           headers: headers,
           payload: nil,
@@ -78,7 +78,8 @@ module Mangadex
 
       private
 
-      def self.path_with_params(path, params)
+      def self.path_with_params(path, params, content_rating)
+        params = content_rating ? self.with_content_rating(params) : params
         return path if params.blank?
 
         params = params.deep_transform_keys do |key|
@@ -87,6 +88,14 @@ module Mangadex
         "#{path}?#{params.to_query}"
       end
 
+      def self.with_content_rating(data)
+        content_rating = data.has_key?(:content_rating) ? data[:content_rating] : []
+        Mangadex::Api::Context.allow_content_ratings(*content_rating) do
+          data[:content_rating] = Mangadex::Api::Context.allowed_content_ratings
+        end
+        data
+      end
+
       def request_url
         request_path = path.start_with?('/') ? path : "/#{path}"
         "#{BASE_URI}#{request_path}"

data/lib/mangadex/manga.rb

@@ -50,6 +50,7 @@ module Mangadex
           order: { accepts: Hash },
           includes: { accepts: Array, converts: to_a },
         }),
+        content_rating: true,
       )
     end
 
@@ -101,6 +102,7 @@ module Mangadex
       Mangadex::Internal::Request.get(
         '/manga/%{id}/feed' % {id: id},
         Mangadex::Internal::Definition.chapter_list(args),
+        content_rating: true,
       )
     end
 

data/lib/mangadex/sorbet.rb

@@ -18,7 +18,6 @@ module T
       T.any(
         Mangadex::Api::Response[Mangadex::Manga],
         Mangadex::Api::Response[T::Array[Mangadex::Manga]],
-        Hash,
       )
     end
     ChapterResponse = T.type_alias do

data/lib/mangadex/tag.rb

@@ -3,6 +3,11 @@ module Mangadex
   class Tag < MangadexObject
     has_attributes :name, :description, :group, :version
 
+    sig { returns(Mangadex::Api::Response[Mangadex::Tag]) }
+    def self.list
+      Mangadex::Manga.tag_list
+    end
+
     def self.attributes_to_inspect
       %i(name)
     end

data/lib/mangadex/user.rb

@@ -11,6 +11,7 @@ module Mangadex
       Mangadex::Internal::Request.get(
         '/user/follows/manga/feed',
         Mangadex::Internal::Definition.chapter_list(args),
+        content_rating: true,
         auth: true,
       )
     end

data/lib/mangadex/version.rb

@@ -4,7 +4,7 @@ module Mangadex
     MAJOR = "5"
     MINOR = "3"
     TINY = "3"
-    PATCH = nil
+    PATCH = "1"
 
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
     FULL = [MAJOR, MINOR, TINY, PATCH].compact.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mangadex
 version: !ruby/object:Gem::Version
-  version: 5.3.3
+  version: 5.3.3.1
 platform: ruby
 authors:
 - Akinyele Cafe-Febrissy