mangadex 5.4.11 → 5.4.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29160bf116b71505a8b9697dd7c3940054e7f0b7a837c4f34470b5bff896879c
-  data.tar.gz: a245fdd04997fbc3ce6db61d2b3ab831d80df24db6431efc8a9a516a55111617
+  metadata.gz: 218bf0139f5a11b6445ad29f382ad9f9257414088727ab4afc9c87d153f31518
+  data.tar.gz: 03ce56cb2634505f7f1e94a0ed522aa7d2579d2039605302ab3fb43e64a9d3a2
 SHA512:
-  metadata.gz: 0234ba9078a3927eecc7bf84acfde344612c4b4ae3ae0b8b30074daf320d874540bf2dfd4a4e82b7b23cfa534ed919271fa398ad22d0bdd8045ed6c2b2c5d1b6
-  data.tar.gz: 4ac033f5cfa89f851d2e8842b50b2bf487b5310c7c92391e0466bf6183a0b0fee1be1bb0b97765e6b8cf4597285edf8c84f7ee38f9892d7592d3cd4171180199
+  metadata.gz: 3641d66ea546c28dbb34c7a2ee4fdd696883d27c195d17c6da31cfb7520a945921cf0dfbbde2ad81831c7f2fbc49810f945f9a317aa90b1514a78e83bc2ebba5
+  data.tar.gz: fb15e12d3a7c3bffa5b234c5ca6e3ca5a6f4238e7588e05f8ede946b9357391bc6cd29152d8f6178b1325fa6d1b03ce81a785664679cd68f7684ef622573f4b3

data/Gemfile.lock

@@ -1,8 +1,7 @@
 PATH
   remote: .
   specs:
-    mangadex (5.4.11)
-      activesupport (~> 6.1)
+    mangadex (5.4.15)
       psych (~> 4.0.1)
       rest-client (~> 2.1)
       sorbet-runtime
@@ -10,32 +9,31 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.4.1)
+    activesupport (7.0.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     coderay (1.1.3)
     concurrent-ruby (1.1.9)
     crack (0.4.5)
       rexml
-    diff-lcs (1.4.4)
+    diff-lcs (1.5.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     hashdiff (1.0.1)
     http-accept (1.7.0)
     http-cookie (1.0.4)
       domain_name (~> 0.5)
-    i18n (1.8.10)
+    i18n (1.9.1)
       concurrent-ruby (~> 1.0)
     method_source (1.0.0)
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2022.0105)
-    minitest (5.14.4)
+    minitest (5.15.0)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
     netrc (0.11.0)
@@ -65,27 +63,26 @@ GEM
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
       rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
+    rspec-core (3.10.2)
       rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec-expectations (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+    rspec-mocks (3.10.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
+    rspec-support (3.10.3)
     ruby2_keywords (0.0.5)
     sinatra (2.1.0)
       mustermann (~> 1.0)
       rack (~> 2.2)
       rack-protection (= 2.1.0)
       tilt (~> 2.0)
-    smart_properties (1.16.3)
-    sorbet (0.5.9152)
-      sorbet-static (= 0.5.9152)
-    sorbet-runtime (0.5.9542)
-    sorbet-static (0.5.9152-universal-darwin-20)
-    sorbet-static (0.5.9152-x86_64-linux)
+    smart_properties (1.17.0)
+    sorbet (0.5.9619)
+      sorbet-static (= 0.5.9619)
+    sorbet-runtime (0.5.9619)
+    sorbet-static (0.5.9619-x86_64-linux)
     stringio (3.0.1)
     tilt (2.0.10)
     tzinfo (2.0.4)
@@ -97,10 +94,8 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    zeitwerk (2.4.2)
 
 PLATFORMS
-  x86_64-darwin-20
   x86_64-linux
 
 DEPENDENCIES

data/README.md

@@ -4,6 +4,15 @@
 
 Welcome to `mangadex`, your next favourite Ruby gem for interacting with [Mangadex](https://mangadex.org).
 
+## Important information
+
+**By using this gem you accept**:
+- To **credit [Mangadex](https://mangadex.org)**. This gem is your friendly neighbourhood wrapper on _their_ API.
+- To **credit scanlation groups**, especially if you offer the ability to read chapters.
+- **Not to run any ads** on the service that will use this gem. Please do not make money off of Mangadex's services.
+
+These are Mangadex's [rules](https://api.mangadex.org/docs.html#section/Acceptable-use-policy), please follow them.
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -81,6 +90,8 @@ found_manga = response.data
 
 #### Authenticate
 
+with a block...:
+
 ```ruby
 Mangadex::Auth.login(username: 'username', password: 'password') do |user|
   # `user` is of type Mangadex::Api::User
@@ -91,6 +102,18 @@ Mangadex::Auth.login(username: 'username', password: 'password') do |user|
 end
 ```
 
+...or inline...:
+
+```ruby
+# `user` is of type Mangadex::Api::User
+user = Mangadex::Auth.login(username: 'username', password: 'password')
+
+puts(user.mangadex_user_id)
+puts(user.session)
+puts(user.refresh)
+puts(user.session_valid_until)
+```
+
 You can access the authenticated user by using context:
 
 ```ruby

data/lib/extensions.rb

@@ -1,12 +1,202 @@
 # typed: true
-require "active_support/hash_with_indifferent_access"
+
+class Array
+  def to_query(key)
+    prefix = "#{key}[]"
+
+    if empty?
+      nil.to_query(prefix)
+    else
+      collect { |value| value.to_query(prefix) }.join "&"
+    end
+  end
+
+  def to_param
+    collect(&:to_param).join "/"
+  end
+end
 
 class Hash
-  def with_indifferent_access
-    ActiveSupport::HashWithIndifferentAccess.new(self)
+  def symbolize_keys
+    transform_keys { |key| key.to_sym rescue key }
+  end
+
+  def to_query(namespace = nil)
+    query = collect do |key, value|
+      unless (value.is_a?(Hash) || value.is_a?(Array)) && value.empty?
+        value.to_query(namespace ? "#{namespace}[#{key}]" : key)
+      end
+    end.compact
+
+    query.sort! unless namespace.to_s.include?("[]")
+    query.join("&")
+  end
+  alias_method :to_param, :to_query
+
+  def deep_transform_keys(&block)
+    _deep_transform_keys_in_object(self, &block)
+  end
+
+  private
+
+  def _deep_transform_keys_in_object(object, &block)
+    case object
+    when Hash
+      object.each_with_object({}) do |(key, value), result|
+        result[yield(key)] = _deep_transform_keys_in_object(value, &block)
+      end
+    when Array
+      object.map { |e| _deep_transform_keys_in_object(e, &block) }
+    else
+      object
+    end
+  end
+end
+
+class Object
+  def blank?
+    respond_to?(:empty?) ? !!empty? : !self
+  end
+
+  def present?
+    !blank?
+  end
+
+  def presence
+    present? ? self : nil
+  end
+
+  def to_param
+    to_s
+  end
+end
+
+class NilClass
+  def to_param
+    self
+  end
+end
+
+class TrueClass
+  def to_param
+    self
+  end
+end
+
+class FalseClass
+  def to_param
+    self
+  end
+end
+
+class String
+  def to_query(key)
+    "#{CGI.escape(key.to_param)}=#{CGI.escape(to_param.to_s)}"
+  end
+
+  def to_param
+    to_s
+  end
+end
+
+class Symbol
+  def to_query(key)
+    "#{CGI.escape(key.to_param)}=#{CGI.escape(to_param.to_s)}"
+  end
+end
+
+class StringInquirer < String
+  private
+
+  def respond_to_missing?(method_name, include_private = false)
+    method_name.end_with?("?") || super
+  end
+
+  def method_missing(method_name, *arguments)
+    if method_name.end_with?("?")
+      self == method_name[0..-2]
+    else
+      super
+    end
   end
+end
+
+module Concern
+  class MultipleIncludedBlocks < StandardError # :nodoc:
+    def initialize
+      super "Cannot define multiple 'included' blocks for a Concern"
+    end
+  end
+
+  class MultiplePrependBlocks < StandardError # :nodoc:
+    def initialize
+      super "Cannot define multiple 'prepended' blocks for a Concern"
+    end
+  end
+
+  def self.extended(base) # :nodoc:
+    base.instance_variable_set(:@_dependencies, [])
+  end
+
+  def append_features(base) # :nodoc:
+    if base.instance_variable_defined?(:@_dependencies)
+      base.instance_variable_get(:@_dependencies) << self
+      false
+    else
+      return false if base < self
+      @_dependencies.each { |dep| base.include(dep) }
+      super
+      base.extend const_get(:ClassMethods) if const_defined?(:ClassMethods)
+      base.class_eval(&@_included_block) if instance_variable_defined?(:@_included_block)
+    end
+  end
+
+  def prepend_features(base) # :nodoc:
+    if base.instance_variable_defined?(:@_dependencies)
+      base.instance_variable_get(:@_dependencies).unshift self
+      false
+    else
+      return false if base < self
+      @_dependencies.each { |dep| base.prepend(dep) }
+      super
+      base.singleton_class.prepend const_get(:ClassMethods) if const_defined?(:ClassMethods)
+      base.class_eval(&@_prepended_block) if instance_variable_defined?(:@_prepended_block)
+    end
+  end
+
+  def included(base = nil, &block)
+    if base.nil?
+      if instance_variable_defined?(:@_included_block)
+        if @_included_block.source_location != block.source_location
+          raise MultipleIncludedBlocks
+        end
+      else
+        @_included_block = block
+      end
+    else
+      super
+    end
+  end
+
+  def prepended(base = nil, &block)
+    if base.nil?
+      if instance_variable_defined?(:@_prepended_block)
+        if @_prepended_block.source_location != block.source_location
+          raise MultiplePrependBlocks
+        end
+      else
+        @_prepended_block = block
+      end
+    else
+      super
+    end
+  end
+
+  def class_methods(&class_methods_module_definition)
+    mod = const_defined?(:ClassMethods, false) ?
+      const_get(:ClassMethods) :
+      const_set(:ClassMethods, Module.new)
 
-  def nested_under_indifferent_access
-    ActiveSupport::HashWithIndifferentAccess.new(self)
+    mod.module_eval(&class_methods_module_definition)
   end
 end

data/lib/mangadex/api/response.rb

@@ -57,6 +57,8 @@ module Mangadex
       def count
         data.is_a?(Array) ? data.count : nil
       end
+      alias_method :size, :count
+      alias_method :length, :count
 
       def each(&block)
         if data.is_a?(Array)
@@ -70,6 +72,14 @@ module Mangadex
         each.to_a
       end
 
+      def first
+        to_a.first
+      end
+
+      def last
+        to_a.last
+      end
+
       def as_json(*)
         Hash(raw_data)
       end

data/lib/mangadex/artist.rb

@@ -20,6 +20,8 @@ module Mangadex
       :fantia,
       :tumblr,
       :youtube,
+      :weibo,
+      :naver,
       :website,
       :version,
       :created_at,

data/lib/mangadex/chapter.rb

@@ -15,6 +15,7 @@ module Mangadex
       :uploader,
       :external_url,
       :version,
+      :readable_at,
       :created_at,
       :updated_at,
       :publish_at
@@ -75,31 +76,11 @@ module Mangadex
       attributes&.title.presence || chapter.presence && "Chapter #{chapter}" || "N/A"
     end
 
-    sig { returns(T.nilable(String)) }
-    def locale
-      found_locale = translated_language.split('-').first
-      return if found_locale.nil?
-
-      ISO_639.find(found_locale)
-    end
-
-    sig { returns(T.nilable(String)) }
-    def locale_name
-      locale&.english_name
-    end
-
     sig { params(data_saver: T::Boolean).returns(T.nilable(T::Array[String])) }
     def page_urls(data_saver: true)
       Mangadex::AtHome.page_urls(id, data_saver: data_saver)
     end
 
-    def as_json(*)
-      super.merge({
-        locale_name: locale_name,
-        preview_image_url: preview_image_url,
-      })
-    end
-
     def self.attributes_to_inspect
       [:id, :type, :title, :volume, :chapter, :pages, :publish_at]
     end

data/lib/mangadex/content_rating.rb

@@ -1,7 +1,4 @@
 # typed: false
-require "active_support/string_inquirer"
-require "active_support/core_ext/module/delegation"
-
 module Mangadex
   class ContentRating
     extend T::Sig
@@ -21,8 +18,6 @@ module Mangadex
       PORNOGRAPHIC => 3,
     }.freeze
 
-    delegate_missing_to :value
-
     sig { params(content_rating: T::Api::ContentRating).returns(T::Array[ContentRating]) }
     def self.anything_below(content_rating)
       SCORES.keys.map { |key| ContentRating.new(key) }.select { |record| record <= content_rating }.sort
@@ -38,9 +33,9 @@ module Mangadex
       @value = ensure_value!(value.to_s)
     end
 
-    sig { returns(ActiveSupport::StringInquirer) }
+    sig { returns(StringInquirer) }
     def value
-      ActiveSupport::StringInquirer.new(@value)
+      StringInquirer.new(@value)
     end
 
     sig { params(other: T.any(ContentRating, String, Symbol)).returns(Integer) }
@@ -67,6 +62,10 @@ module Mangadex
       value.to_s
     end
 
+    def method_missing(method_name, *args, **kwargs)
+      value.send(method_name, *args, **kwargs)
+    end
+
     private
 
     sig { params(value: T.any(T::Api::Text, T::Api::ContentRating)).returns(T.any(T::Api::Text, T::Api::ContentRating)) }

data/lib/mangadex/cover_art.rb

@@ -7,6 +7,7 @@ module Mangadex
       :description,
       :volume,
       :file_name,
+      :locale,
       :created_at,
       :updated_at,
       :version

data/lib/mangadex/internal/definition.rb

@@ -140,8 +140,8 @@ module Mangadex
         end
 
         def validate(args, definition)
-          args = Hash(args).with_indifferent_access
-          definition = Hash(definition).with_indifferent_access
+          args = Hash(args)
+          definition = Hash(definition)
           return args if definition.empty?
 
           errors = []

data/lib/mangadex/internal/request.rb

@@ -1,8 +1,6 @@
 # typed: false
 require 'rest-client'
 require 'json'
-require 'active_support/core_ext/object/to_query'
-require 'active_support/core_ext/hash/keys'
 
 module Mangadex
   module Internal
@@ -84,7 +82,7 @@ module Mangadex
         return path if params.blank?
 
         params = params.deep_transform_keys do |key|
-          key.to_s.camelize(:lower)
+          Mangadex::Utils.camelize(key.to_s)
         end
         "#{path}?#{params.to_query}"
       end

data/lib/mangadex/internal/with_attributes.rb

@@ -1,11 +1,9 @@
 # typed: false
 
-require "active_support/hash_with_indifferent_access"
-
 module Mangadex
   module Internal
     module WithAttributes
-      extend ActiveSupport::Concern
+      extend Concern
 
       attr_accessor \
           :id,
@@ -28,16 +26,18 @@ module Mangadex
         end
 
         def type
-          self.name.split('::').last.underscore
+          Mangadex::Utils.underscore(self.name.split('::').last)
         end
 
         def from_data(data, related_type: nil, source_obj: nil)
           base_class_name = self.name.gsub('::', '_')
           klass_name = self.name
           target_attributes_class_name = "#{base_class_name}_Attributes"
-          
+
+          data = data.transform_keys(&:to_s)
+
           klass = if const_defined?(target_attributes_class_name)
-            target_attributes_class_name.constantize
+            Object.const_get(target_attributes_class_name)
           else
             class_contents = <<-END
               # typed: true
@@ -54,13 +54,12 @@ module Mangadex
             Object.const_get(target_attributes_class_name)
           end
 
-          data = data.with_indifferent_access
-
           relationships = data['relationships']&.map do |relationship_data|
             Relationship.from_data(relationship_data, MangadexObject.new(**data))
           end
 
-          attributes = klass.new(**Hash(data['attributes']))
+          found_attributes = data['attributes'] || {}
+          attributes = klass.new(**Hash(found_attributes.symbolize_keys))
 
           initialize_hash = {
             id: data['id'],
@@ -101,17 +100,13 @@ module Mangadex
             attributes.send(method_name)
           elsif any_relationships?
             existing_relationships = relationships.map(&:type)
-            original_relationship = method_name.to_s
-            looking_for_relationship = original_relationship.singularize
-            is_looking_for_many = original_relationship != looking_for_relationship
+            looking_for_relationship = method_name.to_s
 
             if existing_relationships.include?(looking_for_relationship)
-              search_method = is_looking_for_many ? :select : :find
-              relationships.send(search_method) do |relationship|
+              result = relationships.select do |relationship|
                 relationship.type == looking_for_relationship
               end
-            elsif is_looking_for_many
-              []
+              result.size == 1 ? result.first : result
             else
               super
             end

data/lib/mangadex/manga.rb

@@ -19,6 +19,7 @@ module Mangadex
       :tags,
       :state,
       :version,
+      :chapter_numbers_reset_on_new_volume,
       :created_at,
       :updated_at
 

data/lib/mangadex/mangadex_object.rb

@@ -1,5 +1,4 @@
 # typed: false
-require "active_support/inflector"
 require_relative "internal/with_attributes"
 
 module Mangadex
@@ -19,7 +18,7 @@ module Mangadex
     def initialize(**args)
       args.keys.each do |attribute|
         original_attribute = attribute
-        attribute = attribute.to_s.underscore
+        attribute = Mangadex::Utils.underscore(attribute.to_s)
         attribute_to_set = "#{attribute}="
 
         if respond_to?(attribute_to_set)

data/lib/mangadex/relationship.rb

@@ -25,7 +25,7 @@ module Mangadex
       # data: Relationship data
       # source_obj: The object to witch the object belongs to
       def from_data(data, source_obj = nil)
-        data = data.with_indifferent_access
+        data = data.transform_keys(&:to_s)
         klass = class_for_relationship_type(data['type'])
 
         if klass && data['attributes']&.any?

data/lib/mangadex/scanlation_group.rb

@@ -14,7 +14,7 @@ module Mangadex
       :locked,
       :official,
       :verified,
-      :focused_language,
+      :focused_languages,
       :publish_delay,
       :inactive,
       :manga_updates,

data/lib/mangadex/utils.rb

@@ -0,0 +1,19 @@
+# typed: false
+
+module Mangadex
+  class Utils
+    class << self
+      def camelize(string, uppercase_first_letter = false)
+        string.split('_').each_with_index.map do |x, i|
+          i == 0 && !uppercase_first_letter ? x : x.capitalize
+        end.join
+      end
+
+      def underscore(string)
+        string.gsub(/([A-Z]+)(?=[A-Z][a-z])|([a-z\d])(?=[A-Z])/) do
+          ($1 || $2) << "_"
+        end.tr('-', '_').downcase
+      end
+    end
+  end
+end

data/lib/mangadex/version.rb

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

data/lib/mangadex.rb

@@ -1,8 +1,8 @@
 # typed: true
 require 'sorbet-runtime'
 
-require 'active_support'
 require_relative 'extensions'
+require "mangadex/utils"
 
 # The insides of the gem
 require "mangadex/version"

data/mangadex.gemspec

@@ -24,7 +24,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "psych", "~> 4.0.1"
   spec.add_dependency "rest-client", "~> 2.1"
-  spec.add_dependency "activesupport", "~> 6.1"
   spec.add_dependency "sorbet-runtime"
 
   spec.add_development_dependency "bundler", "~> 2.2.19"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mangadex
 version: !ruby/object:Gem::Version
-  version: 5.4.11
+  version: 5.4.16
 platform: ruby
 authors:
 - Akinyele Cafe-Febrissy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-22 00:00:00.000000000 Z
+date: 2022-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: psych
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: sorbet-runtime
   requirement: !ruby/object:Gem::Requirement
@@ -210,6 +196,7 @@ files:
 - lib/mangadex/types.rb
 - lib/mangadex/upload.rb
 - lib/mangadex/user.rb
+- lib/mangadex/utils.rb
 - lib/mangadex/version.rb
 - mangadex.gemspec
 - sorbet/config