mangadex 5.8.0 → 5.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5a9dfc94c6c5866bc5c5cc6655c2a3a3f6553dd5fc3adeb1cbd0ca854b3b194
-  data.tar.gz: 46b48717c4943ab88d2e6f12d64cb6dc9bab74a41c407c88e206d63f4e99d83b
+  metadata.gz: 18087cc00534cd6237918795bf9a788ce418f09a9e6853507979a6152b3ed573
+  data.tar.gz: 9ba7ab45bd94fa41e13a4a7dc263bcf090ccc6b529a8bc7107ce8842cb46e4a4
 SHA512:
-  metadata.gz: adf076fba8b23de5486b741f9d4e3bf27ad8636059d16c991cd5538f9daea0211f223131349ab7e5b87d81f861ea04ef5580eff022b6c13e480b37886cd6fccd
-  data.tar.gz: 1632d1a344b5afd3bad0db012d835c736df4ab4eef830e387015b9187c3c4cd0b53bbbcb0e679f5725bb01add4f69ba7b04692cf1dc76abf689424c17669e0c6
+  metadata.gz: fa61b0946bfb0e13205500cabfb7083bd0585cf9f8eb5bf522c5bd96b786f58f57aca9d6660210e153beb735a979d208baa5c3f6210af47e146664c31adf493a
+  data.tar.gz: 8fffed4ae99b25713edb3b53031051663d86205d5b0794dd8f51282aca54f8469d34b16f27ad0b21455bfd8ccb3a81d1d0de15376dfdc3109897b010ad69e8b5

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    mangadex (5.8.0)
-      psych (~> 4.0.1)
+    mangadex (5.10.0)
+      psych (>= 4.0.1, < 5.2.0)
       rest-client (~> 2.1)
       sorbet-runtime
 
@@ -19,12 +19,12 @@ GEM
     method_source (1.0.0)
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2022.0105)
+    mime-types-data (3.2023.0218.1)
     netrc (0.11.0)
-    pry (0.14.1)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    psych (4.0.6)
+    psych (5.1.0)
       stringio
     rake (13.0.6)
     rest-client (2.1.0)
@@ -45,11 +45,11 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    sorbet (0.5.10539)
-      sorbet-static (= 0.5.10539)
-    sorbet-runtime (0.5.10597)
-    sorbet-static (0.5.10539-x86_64-linux)
-    stringio (3.0.4)
+    sorbet (0.5.10864)
+      sorbet-static (= 0.5.10864)
+    sorbet-runtime (0.5.10863)
+    sorbet-static (0.5.10864-x86_64-linux)
+    stringio (3.0.7)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8.2)

data/docker-compose.yml

@@ -2,7 +2,7 @@ version: "3"
 services:
   gem:
     build: .
-    command: bash
+    command: bin/console
     stdin_open: true
     tty: true
     volumes:

data/lib/mangadex/api/response.rb

@@ -36,6 +36,8 @@ module Mangadex
           coerce_entity(data)
         elsif data['response'] == 'collection'
           coerce_collection(data)
+        elsif data.keys.include?('statistics')
+          coerce_statistics(data)
         else
           data
         end
@@ -109,7 +111,10 @@ module Mangadex
 
         # Derive the class name from the type. "Convention over configuration"
         class_from_data = "Mangadex::#{object_type.split('_').collect(&:capitalize).join}"
-        return unless Object.const_defined?(class_from_data)
+        unless Object.const_defined?(class_from_data)
+          warn("Expected class #{class_from_data} to be defined")
+          return
+        end
 
         klass = Object.const_get(class_from_data)
         new(
@@ -142,6 +147,13 @@ module Mangadex
           raw_data: data,
         )
       end
+
+      def self.coerce_statistics(data)
+        new(
+          result: data['result'],
+          data: Mangadex::Statistic.from_data(data['statistics']),
+        )
+      end
     end
   end
 end

data/lib/mangadex/internal/definition.rb

@@ -4,6 +4,7 @@ require_relative "definitions/accepts"
 
 require_relative "definitions/base"
 require_relative "definitions/content_rating"
+require_relative "definitions/year"
 
 module Mangadex
   module Internal

data/lib/mangadex/internal/definitions/year.rb

@@ -0,0 +1,28 @@
+# typed: false
+
+module Mangadex
+  module Internal
+    module Definitions
+      class Year < Base
+        def initialize(value)
+          super(
+            value,
+            key: :year,
+            accepts: Accepts.new(
+              array: ["none"],
+              class: Integer,
+              condition: :or,
+            ),
+            required: false,
+          )
+        end
+
+        def validate_accepts
+          @accepts.validate!(converted_value)
+        rescue ArgumentError => error
+          add_error(error.message)
+        end
+      end
+    end
+  end
+end

data/lib/mangadex/internal/with_attributes.rb

@@ -29,11 +29,13 @@ module Mangadex
           Mangadex::Utils.underscore(self.name.split('::').last)
         end
 
-        def from_data(data, related_type: nil, source_obj: nil)
+        def from_data(data, related_type: nil, source_obj: nil, direct: false)
           base_class_name = self.name.gsub('::', '_')
           klass_name = self.name
           target_attributes_class_name = "#{base_class_name}_Attributes"
 
+          return if data.nil? || data.empty?
+
           data = data.transform_keys(&:to_s)
 
           klass = if const_defined?(target_attributes_class_name)
@@ -58,22 +60,38 @@ module Mangadex
             Relationship.from_data(relationship_data, MangadexObject.new(**data))
           end
 
-          found_attributes = data['attributes'] || {}
-          attributes = klass.new(**Hash(found_attributes.symbolize_keys))
+          if direct
+            symbolized_data = data.symbolize_keys
+            symbolized_data.transform_keys! do |key|
+              Mangadex::Utils.underscore(key)
+            end
+            keys = symbolized_data.keys
+            keys.each do |key|
+              attr_accessor key
+            end
 
-          initialize_hash = {
-            id: data['id'],
-            type: data['type'] || self.type,
-            attributes: attributes,
-            related_type: related_type,
-          }
+            instance = new
+            keys.each do |key|
+              instance.send("#{key}=", symbolized_data[key])
+            end
 
-          relationships = [source_obj].compact unless relationships.present?
-          initialize_hash.merge!({relationships: relationships}) if relationships.present?
+            instance
+          else
+            found_attributes = data['attributes'] || {}
+            attributes = klass.new(**Hash(found_attributes.symbolize_keys))
+
+            initialize_hash = {
+              id: data['id'],
+              type: data['type'] || self.type,
+              attributes: attributes,
+              related_type: related_type,
+            }
 
-          # binding.pry
+            relationships = [source_obj].compact unless relationships.present?
+            initialize_hash.merge!({relationships: relationships}) if relationships.present?
 
-          new(**initialize_hash)
+            new(**initialize_hash)
+          end
         end
       end
 

data/lib/mangadex/manga.rb

@@ -36,7 +36,7 @@ module Mangadex
           author_or_artist: { accepts: String },
           authors: { accepts: [String], converts: :to_a },
           artists: { accepts: [String], converts: :to_a },
-          year: { accepts: Integer },
+          year: Mangadex::Internal::Definitions::Year,
           included_tags: { accepts: [String], converts: :to_a },
           included_tags_mode: { accepts: %w(OR AND) },
           excluded_tags: { accepts: [String], converts: :to_a },
@@ -224,5 +224,20 @@ module Mangadex
       chapter_args = args.merge({manga: id})
       Chapter.list(**chapter_args)
     end
+
+    sig { returns(T::Boolean) }
+    def has_comments?
+      !comments_info.nil? && comments_info.repliesCount > 0
+    end
+
+    def statistics
+      @statistics ||= Mangadex::Statistic.get(id).data
+    end
+    alias :stats :statistics
+
+    def comments_info
+      statistics.comments
+    end
+    alias :comments :comments_info
   end
 end

data/lib/mangadex/scanlation_group.rb

@@ -17,6 +17,7 @@ module Mangadex
       :focused_languages,
       :publish_delay,
       :inactive,
+      :ex_licensed,
       :manga_updates,
       :version,
       :created_at,

data/lib/mangadex/statistic.rb

@@ -2,30 +2,77 @@
 
 module Mangadex
   class Statistic < MangadexObject
-    has_attributes \
+    class Rating < MangadexObject
+      has_attributes \
+        :average,
+        :bayesian,
+        :distribution
+
+      def self.attributes_to_inspect
+        [:average, :bayesian]
+      end
+    end
+
+    class Comments < MangadexObject
+      has_attributes \
+        :thread_id,
+        :replies_count
+
+      def self.attributes_to_inspect
+        [:replies_count]
+      end
+    end
+
+    attr_accessor \
       :rating,
-      :average,
-      :bayesian,
-      :distribution,
-      :follows
+      :follows,
+      :comments
 
-    sig { params(uuid: String).returns(T::Api::GenericResponse) }
-    def self.get(uuid)
+    class << self
+      def from_data(data)
+        results = if data.is_a?(Array)
+          data.map do |item|
+            from_data(item)
+          end
+        else
+          data.keys.map do |manga_id|
+            statistics = data[manga_id]
+            new(
+              rating: Mangadex::Statistic::Rating.from_data(statistics['rating'], direct: true),
+              comments: Mangadex::Statistic::Comments.from_data(statistics['comments'], direct: true),
+              follows: statistics['follows'],
+            )
+          end
+        end
+
+        return results.first if results.length == 1
+        Mangadex::Api::Response::Collection.new(results)
+      end
+    end
+
+    sig { params(uuid: String, raw: T::Boolean).returns(T::Api::GenericResponse) }
+    def self.get(uuid, raw: false)
       Mangadex::Internal::Definition.must(uuid)
 
       Mangadex::Internal::Request.get(
         '/statistics/manga/%{uuid}' % {uuid: uuid},
+        raw: raw,
       )
     end
 
-    sig { params(args: T::Api::Arguments).returns(T::Api::GenericResponse) }
-    def self.list(**args)
+    sig { params(raw: T::Boolean, args: T::Api::Arguments).returns(T::Api::GenericResponse) }
+    def self.list(raw: false, **args)
       Mangadex::Internal::Request.get(
         '/statistics/manga',
         Mangadex::Internal::Definition.validate(args, {
           manga: { accepts: [String], converts: :to_a },
-        })
+        }),
+        raw: raw,
       )
     end
+
+    def self.attributes_to_inspect
+      [:follows, :rating, :comments]
+    end
   end
 end

data/lib/mangadex/thread.rb

@@ -0,0 +1,24 @@
+module Mangadex
+  class Thread < MangadexObject
+    has_attributes \
+      :replies_count
+
+    class << self
+      def create(type:, id:)
+        payload = {type: type, id: id}
+        Mangadex::Internal::Request.post(
+          '/forums/thread',
+          payload: Mangadex::Internal::Definition.validate(payload, {
+            type: { accepts: %w(manga group chapter), converts: :to_s, required: true },
+            id: { accepts: String, required: true },
+          }),
+          auth: true,
+        )
+      end
+    end
+
+    def self.attributes_to_inspect
+      [:id, :type, :replies_count]
+    end
+  end
+end

data/lib/mangadex/types.rb

@@ -22,6 +22,7 @@ require_relative "report_reason"
 require_relative "report"
 require_relative "rating"
 require_relative "statistic"
+require_relative "thread"
 
 # Relationship
 require_relative "relationship"

data/lib/mangadex/utils.rb

@@ -10,9 +10,13 @@ module Mangadex
       end
 
       def underscore(string)
-        string.gsub(/([A-Z]+)(?=[A-Z][a-z])|([a-z\d])(?=[A-Z])/) do
+        is_symbol = string.kind_of?(Symbol)
+        data = string.to_s
+        result = data.gsub(/([A-Z]+)(?=[A-Z][a-z])|([a-z\d])(?=[A-Z])/) do
           ($1 || $2) << "_"
         end.tr('-', '_').downcase
+
+        is_symbol ? result.to_sym : result
       end
     end
   end

data/lib/mangadex/version.rb

@@ -2,7 +2,7 @@
 module Mangadex
   module Version
     MAJOR = "5"
-    MINOR = "8"
+    MINOR = "10"
     TINY = "0"
     PATCH = nil
 

data/mangadex.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "psych", "~> 4.0.1"
+  spec.add_dependency "psych", ">= 4.0.1", "< 5.2.0"
   spec.add_dependency "rest-client", "~> 2.1"
   spec.add_dependency "sorbet-runtime"
 

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: mangadex
 version: !ruby/object:Gem::Version
-  version: 5.8.0
+  version: 5.10.0
 platform: ruby
 authors:
 - Akinyele Cafe-Febrissy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-12-20 00:00:00.000000000 Z
+date: 2023-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: psych
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -174,6 +180,7 @@ files:
 - lib/mangadex/internal/definitions/accepts.rb
 - lib/mangadex/internal/definitions/base.rb
 - lib/mangadex/internal/definitions/content_rating.rb
+- lib/mangadex/internal/definitions/year.rb
 - lib/mangadex/internal/request.rb
 - lib/mangadex/internal/with_attributes.rb
 - lib/mangadex/manga.rb
@@ -190,6 +197,7 @@ files:
 - lib/mangadex/storage/memory.rb
 - lib/mangadex/storage/none.rb
 - lib/mangadex/tag.rb
+- lib/mangadex/thread.rb
 - lib/mangadex/types.rb
 - lib/mangadex/upload.rb
 - lib/mangadex/user.rb
@@ -246,7 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Your next favourite Ruby gem for interacting with Mangadex.org