mangdown 0.20.8 → 0.21.0.beta1

data/lib/mangdown/support/logging.rb

@@ -2,6 +2,7 @@
 
 require 'logger'
 
+# Find, download and package manga from the web
 module Mangdown
   # Configure and access the Mangdown logger
   module Logging

data/lib/mangdown/support/tools.rb

@@ -9,6 +9,14 @@ module Mangdown
   # Common helpers
   module Tools
     class << self
+      # rubocop:disable Metrics/LineLength
+      TYPHOEUS_OPTIONS = {
+        headers: {
+          'User-Agent' => 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/62.0.3202.62 Safari/537.36'
+        }
+      }.freeze
+      # rubocop:enable Metrics/LineLength
+
       def get_doc(uri)
         data = get(uri)
         @doc = Nokogiri::HTML(data)
@@ -31,6 +39,12 @@ module Mangdown
         Pathname.new(Dir.pwd).join(*sub_paths)
       end
 
+      def file_join(safe_path, *unsafe_parts)
+        now_safe_parts = unsafe_parts.map { |part| part.tr('/', '') }
+
+        File.join(safe_path, *now_safe_parts)
+      end
+
       def valid_path_name(name)
         name.to_s.sub(/(\d+)(\.\w+)*\Z/) do
           digits, ext = Regexp.last_match[1..2]
@@ -47,6 +61,7 @@ module Mangdown
         mime_to_extension(mime)
       end
 
+      # rubocop:disable Metrics/MethodLength
       def hydra_streaming(objects, hydra_opts = {})
         hydra = Typhoeus::Hydra.new(hydra_opts)
 
@@ -56,7 +71,7 @@ module Mangdown
           request = typhoeus(obj.uri)
           request.on_headers do |response|
             status = response.success? ? :succeeded : :failed
-            yield(status, obj)
+            yield(status, obj, response)
           end
           request.on_body do |chunk|
             yield(:body, obj, chunk)
@@ -72,17 +87,10 @@ module Mangdown
         hydra.run
         requests
       end
+      # rubocop:enable Metrics/MethodLength
 
       def typhoeus(uri)
-        Typhoeus::Request.new(uri, typhoeus_options)
-      end
-
-      def typhoeus_options
-        {
-          headers: {
-            'User-Agent' => 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/62.0.3202.62 Safari/537.36'
-          }
-        }
+        Typhoeus::Request.new(uri, TYPHOEUS_OPTIONS)
       end
 
       private

data/lib/mangdown/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mangdown
-  VERSION = '0.20.8'
+  VERSION = '0.21.0.beta1'
 end

data/test/lib/mangdown/chapter_test.rb

@@ -1,98 +1,43 @@
+# frozen_string_literal: true
+
 require 'stringio'
 require 'test_helper'
 
 module Mangdown
   class ChapterTest < Minitest::Test
-    def test_adapter
-      TestAdapter.new(:uri, :doc, :name)
-    end
-
+    attr_reader :adapter, :chapter
     def setup
-      @chapter = Chapter.new('uri', 'name', 'manga', 1)
-      @chapter.adapter = test_adapter
+      register_test_adapter
+      @adapter = TestAdapter::Chapter.new(url: 'uri', name: 'name', number: 1)
+      @adapter.manga = TestAdapter::Manga.new(url: 'url', name: 'manga')
+      @chapter = Chapter.new(adapter)
     end
 
     def test_new
-      @chapter.adapter = 'adapter'
-
-      assert_equal 'uri', @chapter.uri
-      assert_equal 'name', @chapter.name
-      assert_equal [], @chapter.pages
-      assert_equal 1, @chapter.chapter
-      assert_equal 'adapter', @chapter.adapter
+      assert_equal 'uri', chapter.uri
+      assert_equal 'name', chapter.name
+      assert_equal [], chapter.pages
+      assert_equal 1, chapter.number
     end
 
     def test_cbz
-      CBZ.class_eval do
-        class << self
-          alias old_one one
-          def one(path)
-            path
-          end
-        end
-      end
-
-      @chapter.instance_variable_set(:@path, 'path')
+      chapter.instance_variable_set(:@path, 'path')
 
-      assert_equal 'path', @chapter.cbz
-
-      CBZ.class_eval do
-        class << self
-          alias one old_one
-        end
+      with_stubbed_cbz do
+        assert_equal %w[cbz_called path], chapter.cbz
       end
     end
 
-    def test_to_chapter
-      assert_equal @chapter, @chapter.to_chapter
-    end
-
     def test_to_path
+      assert_equal(chapter.manga.name, 'manga')
       assert_equal(
-        "#{Mangdown::DOWNLOAD_DIR}/manga/name", @chapter.to_path.to_s
+        "#{Mangdown::DOWNLOAD_DIR}/manga/name", chapter.to_path.to_s
       )
     end
 
     def test_setup_path
-      @chapter.setup_path(Dir.pwd)
-      assert_equal "#{Dir.pwd}/name", @chapter.to_path.to_s
-    end
-
-    def test_load_pages
-      Tools.class_eval do
-        class << self
-          alias old_hydra_streaming hydra_streaming
-
-          def hydra_streaming(objects, *other_args)
-            objects.map do |obj|
-              next unless yield(:before, obj)
-              yield(:succeeded, obj)
-              yield(:body, obj, 'data')
-              yield(:complete, obj)
-            end
-          end
-        end
-      end
-
-      @chapter.load_pages
-
-      refute_empty @chapter.pages
-
-      Tools.class_eval do
-        class << self
-          alias hydra_streaming old_hydra_streaming
-        end
-      end
-    end
-
-    def test_each
-      @chapter.pages.concat(Array.new(10, {}))
-
-      assert_equal @chapter.pages.length, @chapter.each.count
-
-      @chapter.each.with_index do |page, i|
-        assert_equal @chapter.pages[i].object_id, page.object_id
-      end
+      chapter.setup_path(Dir.pwd)
+      assert_equal "#{Dir.pwd}/name", chapter.to_path.to_s
     end
 
     def test_download_to
@@ -100,4 +45,3 @@ module Mangdown
     end
   end
 end
-

data/test/lib/mangdown/manga_test.rb

@@ -1,147 +1,43 @@
+# frozen_string_literal: true
+
 require 'stringio'
 require 'test_helper'
 
 module Mangdown
   class MangaTest < Minitest::Test
-    def test_adapter
-      TestAdapter.new(:uri, :doc, :name)
+    attr_reader :adapter, :manga
+
+    def setup
+      register_test_adapter
+      @adapter = TestAdapter::Manga.new(url: 'uri', name: 'name')
+      @manga = Manga.new(adapter)
     end
 
     def test_new
-      manga = Manga.new('uri', 'name')
-      manga.adapter = 'adapter'
-
       assert_equal 'uri', manga.uri
       assert_equal 'name', manga.name
       assert_equal [], manga.chapters
-      assert_equal 'adapter', manga.adapter
     end
 
     def test_cbz
-      CBZ.class_eval do
-        class << self
-          alias old_all all
-          def all(path)
-            path
-          end
-        end
-      end
-
-      manga = Manga.new('uri', 'name')
       manga.instance_variable_set(:@path, 'path')
 
-      assert_equal 'path', manga.cbz
-
-      CBZ.class_eval do
-        class << self
-          alias all old_all
-        end
+      with_stubbed_cbz do
+        assert_equal %w[cbz_called path], manga.cbz
       end
     end
 
-    def test_to_manga
-      manga = Manga.new('uri', 'name')
-
-      assert_equal manga, manga.to_manga
-    end
-
     def test_to_path
-      manga = Manga.new('uri', 'name')
-
       assert_equal "#{Mangdown::DOWNLOAD_DIR}/name", manga.to_path.to_s
     end
 
     def test_setup_path
-      manga = Manga.new('uri', 'name')
-
       manga.setup_path(Dir.pwd)
       assert_equal "#{Dir.pwd}/name", manga.to_path.to_s
     end
 
-    def test_load_chapters
-      manga = Manga.new('uri', 'name')
-      manga.adapter = test_adapter
-      manga.load_chapters
-
-      refute_empty manga.chapters
-    end
-
-    def test_each
-      manga = Manga.new('uri', 'name')
-      manga.chapters.concat(Array.new(10, {}))
-
-      assert_equal manga.chapters.length, manga.each.count
-
-      manga.each.with_index do |chapter, i|
-        assert_equal manga.chapters[i].object_id, chapter.object_id
-      end
-    end
-
-    def test_download_passes_args_to_download_to_with_nil_dir
-      Manga.class_eval do
-        alias old_download_to download_to
-
-        def download_to(*args)
-          args
-        end
-      end
-
-      manga = Manga.new('uri', 'name')
-      assert_equal [nil, 1, 2, 3], manga.download(1, 2, 3)
-
-      Manga.class_eval do
-        alias download_to old_download_to
-      end
-    end
-
     def test_download_to
-      Chapter.class_eval do
-        @@counter = 0
-
-        alias old_download_to download_to
-
-        def download_to(*args)
-          @@counter += 1
-
-          if @@counter % 3 == 1
-            { failed: [], succeeded: [:some], skipped: [] }
-          elsif @@counter % 3 == 2
-            { failed: [], succeeded: [], skipped: [:some] }
-          else
-            { failed: [:some], succeeded: [], skipped: [] }
-          end
-        end
-
-        alias old_fetch_each_page fetch_each_page
-
-        def fetch_each_page(*)
-        end
-      end
-
-      io = StringIO.new
-      Mangdown.configure_logger(file: io)
-
-      manga = Manga.new('uri', 'name')
-      manga.adapter = test_adapter
-      manga.load_chapters
-
-      result = manga.download_to(Dir.pwd)
-
-      assert_equal 5, manga.count
-      assert_equal 5, result.values.flatten.length
-      assert_equal 2, result[:succeeded].length
-      assert_equal 2, result[:skipped].length
-      assert_equal 1, result[:failed].length
-
-      assert_equal 1, io.string.scan(/ERROR/).length
-
-      Mangdown.configure_logger(file: STDOUT)
-
-      Chapter.class_eval do
-        alias download_to old_download_to
-        alias fetch_each_page old_fetch_each_page
-      end
+      skip
     end
   end
 end
-

data/test/lib/mangdown/support/cbz_test.rb

@@ -1,30 +1,37 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'fileutils'
 
 module Mangdown
   class CBZTest < Minitest::Test
+    # rubocop:disable Metrics/AbcSize
+    # rubocop:disable Metrics/MethodLength
     def setup
       @temp = Pathname.new(__dir__).join('tmp')
       @root_dir = @temp.join('root 1')
-      @sub_dir_1 = @root_dir.join('sub_dir 1')
-      @sub_dir_2 = @root_dir.join('sub_dir 2')
+      @sub_dir1 = @root_dir.join('sub_dir 1')
+      @sub_dir2 = @root_dir.join('sub_dir 2')
 
       Dir.mkdir(@temp)
       Dir.mkdir(@root_dir)
-      Dir.mkdir(@sub_dir_1)
-      Dir.mkdir(@sub_dir_2)
+      Dir.mkdir(@sub_dir1)
+      Dir.mkdir(@sub_dir2)
 
       (1..9).each do |i|
         filename = "file #{i}.ext"
-        FileUtils.touch(@sub_dir_1.join(filename))
-        FileUtils.touch(@sub_dir_2.join(filename))
+        FileUtils.touch(@sub_dir1.join(filename))
+        FileUtils.touch(@sub_dir2.join(filename))
       end
     end
+    # rubocop:enable Metrics/AbcSize
+    # rubocop:enable Metrics/MethodLength
 
     def teardown
       FileUtils.rm_r(@temp)
     end
 
+    # rubocop:disable Metrics/MethodLength
     def test_all
       CBZ.all(@root_dir)
 
@@ -45,13 +52,16 @@ module Mangdown
 
       assert_equal 9, count
     end
+    # rubocop:enable Metrics/MethodLength
 
+    # rubocop:disable Metrics/AbcSize
+    # rubocop:disable Metrics/MethodLength
     def test_one
-      CBZ.one(@sub_dir_1)
+      CBZ.one(@sub_dir1)
 
       list = Dir.new(@root_dir).entries
-      refute File.exist?(@sub_dir_1), list.inspect
-      assert File.exist?(@sub_dir_2), 'Should only validate the correct dir'
+      refute File.exist?(@sub_dir1), list.inspect
+      assert File.exist?(@sub_dir2), 'Should only validate the correct dir'
 
       assert_includes list, 'sub_dir 00001'
       assert_includes list, 'sub_dir 00001.cbz'
@@ -66,5 +76,7 @@ module Mangdown
 
       assert_equal 9, count
     end
+    # rubocop:enable Metrics/MethodLength
+    # rubocop:enable Metrics/AbcSize
   end
 end

data/test/lib/mangdown/support/equality_test.rb

@@ -1,7 +1,11 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 module Mangdown
   class EqualityTest < Minitest::Test
+    # rubocop:disable Metrics/MethodLength
+    # rubocop:disable Metrics/AbcSize
     def test_spaceship_operator
       name_struct = Struct.new(:name) do
         include Equality
@@ -12,13 +16,16 @@ module Mangdown
       assert name_struct.new('Name') < name_struct.new('Other Name')
       assert name_struct.new('Other Name') > name_struct.new('Name')
 
+      # rubocop:disable Lint/UselessComparison
       assert_equal 0, name_struct.new('Name') <=> name_struct.new('Name')
+      # rubocop:enable Lint/UselessComparison
 
-      names = %w(a b c d e f).map { |name| name_struct.new(name) }
+      names = %w[a b c d e f].map { |name| name_struct.new(name) }
 
       assert_equal names, names.shuffle.sort
       assert_equal names.reverse, names.shuffle.sort.reverse
     end
+    # rubocop:enable Metrics/MethodLength
+    # rubocop:enable Metrics/AbcSize
   end
 end
-