my_manga 2.2.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66b65dd0d7cf22075a8f6f11cf291b7c7532f628d909adc2518cdfa020221b39
-  data.tar.gz: 448a42ed930931e3d07ef243ee8c0880a8eada0e7849ebe828023d271005fd11
+  metadata.gz: b65e2a63d07dfda14ee00f3ac66d4bd70b92b2b9b05e98400e3e22bd8c00f532
+  data.tar.gz: a52f7124ab1ec038212fa4990948acafc1e2b00d8fd29a9210f71a2a2163c800
 SHA512:
-  metadata.gz: 38fab144b34e63f4476e9d3e2f8df15e4037a4cb3e6d749376fe20e0f2dde8ecba08f6dcb58f19cdfc84b5982dec49095b48843d55db886c9aaf73d4bd176954
-  data.tar.gz: f244506189cd39a8d6271fd1f2a561fd1e4270d3d98bb027a89f93a9f92622937b3f896daf11ae28ec2021c423235061e6b53aa4bf0ebad44717728ae20aaad1
+  metadata.gz: 40e61d9b882b078c54a3dfb3c1734a64487fae84be1dff469143dd3fddcea390a18865cd361466b2423fcd4464a03215938766acf8b597cfbbd7d0f27e9f7b11
+  data.tar.gz: 1ac41fbc2ff0dcc1e01c98b03bdfcc123554799245c23edbc6ebcc692998192f211c1da96b4a8182f155990fda6bd8ede86ff5dff05baeadae602e7d0ea4cfb7

data/lib/my_manga.rb

@@ -6,12 +6,6 @@ require 'hanami/cli'
 require 'mangdown/client'
 
 require_relative 'my_manga/cli'
-require_relative 'mangdown/adapters/manga_here'
-require_relative 'mangdown/adapters/manga_bat'
-
-Mangdown.register_adapter(:manga_here, MangaHere)
-M.manga_pages << 'http://www.mangahere.cc/mangalist/'
-Mangdown.register_adapter(:manga_here, MangaBat)
 
 module MyManga
   module_function
@@ -21,7 +15,7 @@ module MyManga
   end
 
   def find(search)
-    M.find(Regexp.new(search, 'i'))
+    Mangdown::Client.find(search)
   end
 
   def package(dir)
@@ -47,7 +41,7 @@ module MyManga
   def add(uri)
     return if Manga.find_by_uri(uri)
 
-    md_manga = Mangdown::MDHash.new(uri: uri).to_manga
+    md_manga = Mangdown.manga(uri)
     Manga.from_md(md_manga)
   end
 
@@ -97,7 +91,7 @@ module MyManga
   end
 
   def mangdown_client_clean_up
-    M.clean_up
+    Mangdown::Client.index_manga
   end
 
   # @private

data/lib/my_manga/find.rb

@@ -16,10 +16,10 @@ module MyManga
 
           return if results.empty?
 
-          column_width = results.map { |r| r[:name].length }.max
+          column_width = results.map { |r| r.name.length }.max
           puts pad('Name', column_width) + 'Url'
           results.each do |result|
-            puts pad(result[:name], column_width) + result[:uri]
+            puts pad(result.name, column_width) + result.uri
           end
         end
       end

data/lib/my_manga/m_clean_up.rb

@@ -5,12 +5,12 @@ module MyManga
     module Commands
       # See desc
       class MCleanUp < MyManga::CLI::Command
-        desc 'Remove the manga cache for M, the mangdown client'
+        desc 'Remove the manga cache for the mangdown client'
 
         def call(*)
           return unless MyManga.mangdown_client_clean_up
 
-          puts 'M cache files removed'
+          puts 'Mangdown cache files removed'
         end
       end
     end

data/lib/my_manga/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MyManga
-  VERSION = '2.2.0'
+  VERSION = '3.0.0'
 end

data/models/chapter.rb

@@ -4,22 +4,18 @@ class Chapter < ActiveRecord::Base
   scope :read, Proc.new { where(read: true) }
   scope :unread, Proc.new { where(read: false) }
 
-  def self.from_md(md_hash)
-    uri = md_hash.uri
-    name = md_hash.name
-    site = md_hash.site
-    number = md_hash.chapter
+  def self.from_md(md_chapter)
+    md_chapter.chapter.load unless md_chapter.number
 
-    unless number
-      adapter = Mangdown.adapter!(uri, site, nil, name)
-      number = adapter.chapter[:chapter]
-    end
-
-    find_or_create_by(name: name, uri: uri, number: number)
+    find_or_create_by(
+      name: md_chapter.name,
+      uri: md_chapter.uri,
+      number: md_chapter.number
+    )
   end
 
   def to_md
-    ::Mangdown::MDHash.new(name: name, uri: uri).to_chapter
+    ::Mangdown.chapter(uri)
   end
 
   def self.numbers

data/models/manga.rb

@@ -24,7 +24,7 @@ class Manga < ActiveRecord::Base
   end
 
   def to_md
-    ::Mangdown::MDHash.new(name: name, uri: uri).to_manga
+    ::Mangdown.manga(uri)
   end
 
   def chapters

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: my_manga
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 3.0.0
 platform: ruby
 authors:
 - jphager2
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-14 00:00:00.000000000 Z
+date: 2019-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,8 +109,6 @@ files:
 - db/environment.rb
 - db/migrate/001_add_tables.rb
 - db/migrate/002_add_zine_to_manga.rb
-- lib/mangdown/adapters/manga_bat.rb
-- lib/mangdown/adapters/manga_here.rb
 - lib/my_manga.rb
 - lib/my_manga/add.rb
 - lib/my_manga/cli.rb
@@ -127,7 +125,6 @@ files:
 - lib/my_manga/zine.rb
 - models/chapter.rb
 - models/manga.rb
-- test/adapters_test.rb
 - test/features_test.rb
 - test/test_helper.rb
 homepage: https://github.com/jphager2/my_manga

data/lib/mangdown/adapters/manga_bat.rb

@@ -1,114 +0,0 @@
-class MangaBat < Mangdown::Adapter::Base
-  site :manga_bat
-
-  ROOT = 'https://mangabat.com/'.freeze
-  CDNS = [
-    %r{^https://s\d.mkklcdnv\d.com/mangakakalot}
-  ].freeze
-
-  attr_reader :root
-
-  def self.for?(uri_or_site)
-    uri_or_site.to_s.start_with?(ROOT) ||
-      cdn_uri?(uri_or_site) ||
-      uri_or_site.to_s == 'manga_bat'
-  end
-
-  def self.cdn_uri?(uri)
-    CDNS.any? { |cdn| uri.match?(cdn) }
-  end
-
-  def initialize(uri, doc, name)
-    super
-
-    @root = ROOT
-  end
-
-  def hydra_opts
-    { max_concurrency: 10 }
-  end
-
-  def is_manga_list?(uri = @uri)
-    uri =~ /#{root}manga_list/
-  end
-
-  # Must return true/false if uri represents a manga for adapter
-  def is_manga?(uri = @uri)
-    uri =~ /#{root}manga\//
-  end
-
-  # Must return true/false if uri represents a chapter for adapter
-  def is_chapter?(uri = @uri)
-    uri =~ /#{root}chapter-serie\/\d+\/chap_\d+/
-  end
-
-  # Must return true/false if uri represents a page for adapter
-  def is_page?(uri = @uri)
-    self.class.cdn_uri?(uri)
-  end
-
-  # Return Array of Hash with keys: :uri, :name, :site
-  def manga_list
-    doc.css('.update_item h3 a').map { |a|
-      uri = URI.join(root, a[:href]).to_s
-
-      { uri: uri, name: a.text.strip, site: site }}
-  end
-
-  # Return Hash with keys: :uri, :name, :site
-  def manga
-    name ||= doc.css('h1.entry-title').first.text.strip
-
-    { uri: uri, name: name, site: site }
-  end
-
-  # Return Array of Hash with keys: :uri, :name, :site
-  def chapter_list
-    chapters = doc.css('.chapter-list .row a')
-    chapters.reverse.map.with_index do |a, i|
-      uri = URI.join(root, a[:href]).to_s
-      name = a.text.strip
-
-      { uri: uri, name: name, chapter: i + 1, site: site }
-    end
-  end
-
-  # Return Hash with keys: :uri, :name, :chapter, :manga, :site
-  #
-  def chapter
-    name ||= chapter_name
-    chapter ||= name.slice(/[\d\.]+$/)
-    manga = chapter_manga_name
-
-    { uri: uri, name: name, chapter: chapter, manga: manga, site: site }
-  end
-
-  # Return Array of Hash with keys: :uri, :name, :site
-  def page_list
-    doc.css('.vung_doc img').map do |img|
-      uri = img['src']
-      name = img.text
-
-      { uri: uri, name: name, site: site }
-    end
-  end
-
-  # Return Hash with keys: :uri, :name, :site
-  def page
-    name = File.basename(uri.split('/').last) if name.nil?
-
-    { uri: uri, name: name, site: site }
-  end
-
-  private
-
-  def chapter_name
-    CGI.unescapeHTML(doc.css('h1.name_chapter').text.strip)
-  end
-
-  def chapter_manga_name
-    CGI.unescapeHTML(doc.css('.breadcrumb_doc span:nth-child(3)').text.strip)
-  end
-end
-
-

data/lib/mangdown/adapters/manga_here.rb

@@ -1,116 +0,0 @@
-class MangaHere < Mangdown::Adapter::Base
-  site :manga_here
-
-  ROOT = 'http://www.mangahere.cc/'.freeze
-  CDNS = [
-    'http://l.mhcdn.net/store/manga/',
-    'https://mhcdn.secure.footprint.net/store/manga/'
-  ].freeze
-
-  attr_reader :root
-
-  def self.for?(uri_or_site)
-    uri_or_site.to_s.start_with?(ROOT) ||
-      cdn_uri?(uri_or_site) ||
-      uri_or_site.to_s == 'manga_here'
-  end
-
-  def self.cdn_uri?(uri)
-    CDNS.any? { |cdn| uri.to_s.start_with?(cdn) }
-  end
-
-  def initialize(uri, doc, name)
-    super
-
-    @root = ROOT
-  end
-
-  def hydra_opts
-    { max_concurrency: 1 }
-  end
-
-  def is_manga_list?(uri = @uri)
-    uri =~ /#{root}mangalist/
-  end
-
-  # Must return true/false if uri represents a manga for adapter
-  def is_manga?(uri = @uri)
-    uri =~ /#{root}manga\//
-  end
-
-  # Must return true/false if uri represents a chapter for adapter
-  def is_chapter?(uri = @uri)
-    uri =~ /#{root}.+\/c\d{3}\/?/
-  end
-
-  # Must return true/false if uri represents a page for adapter
-  def is_page?(uri = @uri)
-    self.class.cdn_uri?(uri)
-  end
-
-  # Return Array of Hash with keys: :uri, :name, :site
-  def manga_list
-    doc.css('.list_manga a.manga_info').map { |a|
-      uri = URI.join(root, a[:href]).to_s
-
-      { uri: uri, name: a.text.strip, site: site }}
-  end
-
-  # Return Hash with keys: :uri, :name, :site
-  def manga
-    name ||= doc.css('h1.title').first.text.strip
-
-    { uri: uri, name: name, site: site }
-  end
-
-  # Return Array of Hash with keys: :uri, :name, :site
-  def chapter_list
-    chapters = doc.css('.manga_detail .detail_list ul').first.css('li a')
-    chapters.reverse.map.with_index do |a, i|
-      uri = URI.join(root, a[:href]).to_s
-      name = a.text.strip
-
-      { uri: uri, name: name, chapter: i + 1, site: site }
-    end
-  end
-
-  # Return Hash with keys: :uri, :name, :chapter, :manga, :site
-  #
-  def chapter
-    name ||= chapter_name
-    chapter ||= name.slice(/[\d\.]+$/)
-    manga = name.sub(/ #{chapter}\Z/, '').strip
-
-    { uri: uri, name: name, chapter: chapter, manga: manga, site: site }
-  end
-
-  # Return Array of Hash with keys: :uri, :name, :site
-  def page_list
-    doc.css('.wid60').first.css('option').map do |option|
-      uri = URI.join(root, option[:value]).to_s
-      name = option.text
-
-      { uri: uri, name: name, site: site }
-    end
-  end
-
-  # Return Hash with keys: :uri, :name, :site
-  def page
-    if name.nil?
-      option = doc.css('.wid60 option[selected]').first
-      name = "#{chapter_name} - #{option.text.strip.rjust(3, '0')}"
-    end
-
-    image = doc.css('.read_img img')[1]
-    uri = image[:src]
-
-    { uri: uri, name: name, site: site }
-  end
-
-  private
-
-  def chapter_name
-    CGI.unescapeHTML(doc.css('.title h1').text.strip)
-  end
-end
-

data/test/adapters_test.rb

@@ -1,33 +0,0 @@
-require_relative 'test_helper'
-require_relative '../../mangdown/lib/mangdown/client'
-require_relative '../lib/mangdown/adapters/manga_here'
-require 'timeout'
-
-Mangdown.register_adapter(:manga_here, MangaHere)
-
-class AdaptersTest < Minitest::Test
-  def setup
-    @manga_uri = 'http://www.mangahere.co/manga/bokutachi_wa_benkyou_ga_dekinai/'
-  end
-
-  def build_manga
-    Mangdown::MDHash.new(uri: @manga_uri).to_manga
-  end
-  
-  def test_creates_manga
-    assert_silent do
-      build_manga
-    end
-  end
-
-  def test_chapter
-    manga = build_manga
-    chapter = nil
-
-    Timeout.timeout(10) do
-      chapter = manga.chapters[-1].to_chapter
-    end
-
-    assert chapter
-  end
-end