mangdown 0.15.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f61dfdfea20214539cb4f4ef676aca5dadbbf02
-  data.tar.gz: 4bad97970c5889d3e0f6be782efbc93387d6af00
+  metadata.gz: 7c55c78329762e6af9921776a2c8c643ea563ec5
+  data.tar.gz: 3556d64b7a4dfb176e13929c3560b37d09c9c8f6
 SHA512:
-  metadata.gz: c29430c607fd9de1f654ef11631e5cf7ae6cbe21f3a4f34b36d59a074b5955aa1f0f2fa153b4dfadf7e2dc4f64cedc90e0f0805c019f0784a3b686b7e8e7fe5a
-  data.tar.gz: 8d0bfe6dd9dbbe1cafe1297430f9e4f11e263bdf3dd1eede206bdf83139ea0da7edae7224a5af59df2f1c04e0dc82ebaa76c5c9de8182e4a4ae24bb03f512915
+  metadata.gz: 22dba31e19428a793823ad4afd6ec132c02307254d349bccd23b1b9036d08e20d2487b2571629ec7952826bbe8d2d7d533da2304a948314c3bb26fd3718b4b1b
+  data.tar.gz: 683f50a23e461e3ffd0728217c6fe6a15247495f8aa06621fcb914683252654c7659c40bc7de0d6950c47f74a138aec966a63c76cd305aef483026fd2edf49e5

data/lib/mangdown/adapter/mangareader.rb

@@ -1,3 +1,5 @@
+require 'cgi'
+
 module Mangdown
   class Mangareader < Adapter::Base
 
@@ -62,7 +64,7 @@ module Mangdown
     def page_list
       last_page = doc.css('select')[1].css('option').length
       (1..last_page).map { |page|  
-        slug = manga_name.gsub(' ', '-').gsub(/[:,]/, '')
+        slug = manga_name.gsub(' ', '-').gsub(/[:,!]/, '')
         uri = "#{root}/#{slug}/#{chapter_number}/#{page}"
         uri = URI.escape(uri).downcase 
 

data/lib/mangdown/adapter/proxy.rb

@@ -0,0 +1,34 @@
+module Mangdown
+  module Adapter
+    # Wraps Adapters to provide error reporting
+    class Proxy
+      include Logging
+
+      attr_reader :adapter
+
+      def initialize(adapter)
+        @adapter = adapter
+      end
+
+      private
+
+      def method_missing(method, *args, &block)
+        return super unless @adapter.respond_to?(method)
+
+        adapter.public_send(method, *args, &block)
+      rescue => e
+        logger.error({
+          msg: 'Adapter method failed',
+          adapter: adapter.class,
+          uri: adapter.uri,
+          doc: adapter.doc.to_s,
+          method: method,
+          error: e,
+          error_msg: e.message,
+          backtrace: e.backtrace
+        }.to_s)
+        raise Mangdown::Error, "Adapter failed: #{e.message}"
+      end
+    end
+  end
+end

data/lib/mangdown/adapter.rb

@@ -1,7 +1,6 @@
 module Mangdown
   module Adapter
     class Base
-
       # Returns something truthy if this adapter should be used for the 
       # given url or adapter name
       def self.for?(url_or_adapter_name)

data/lib/mangdown/manga.rb

@@ -49,7 +49,11 @@ module Mangdown
           skipped << chapter
         end
         if chapter_result[:failed].any?
-          logger.error "#{chapter.name} was not fully downloaded"
+          logger.error({
+            msg: "Chapter was not fully downloaded",
+            uri: chapter.uri,
+            chapter: chapter.name
+          }.to_s)
         end
       end
       { failed: failed, succeeded: succeeded, skipped: skipped }

data/lib/mangdown/page.rb

@@ -28,7 +28,7 @@ module Mangdown
       dir ||= File.join(manga, chapter)
       dir = Tools.valid_path_name(dir)
       if Dir.exist?(dir)
-        file = Dir.entries(dir).find { |file| file[name] }
+        file = Dir.entries(dir).find { |f| f[name] }
       end
       path = File.join(dir, file || name)
       @path = Tools.relative_or_absolute_path(path)
@@ -40,13 +40,20 @@ module Mangdown
       delete_files!(dir) if opts[:force_download]
 
       return if file_exist?(dir)
-      
+
       image = Tools.get(uri)
 
       append_file_data(dir, image)
       append_file_ext(dir)
-    rescue => error # SocketError not defined?
-      logger.error "#{error.message} | #{name} | #{uri}"
+    rescue => error
+      logger.error({
+        msg: 'Failed to download page',
+        page: self,
+        uri: uri,
+        error: error,
+        error_msg: error.message,
+        backtrace: error.backtrace
+      }.to_s)
     end
 
     def append_file_data(dir, data)

data/lib/mangdown/version.rb

@@ -1,3 +1,3 @@
 module Mangdown
-  VERSION = "0.15.0"
+  VERSION = "0.15.1"
 end

data/lib/mangdown.rb

@@ -16,6 +16,7 @@ require_relative 'mangdown/manga_list.rb'
 require_relative 'mangdown/md_hash'
 
 require_relative 'mangdown/adapter'
+require_relative 'mangdown/adapter/proxy'
 require_relative 'mangdown/adapter/no_adapter_error'
 require_relative 'mangdown/adapter/mangareader.rb'
 
@@ -36,11 +37,12 @@ module Mangdown
     adapter_name = (uri || site).to_s
     klass = ADAPTERS.values.find { |adapter| adapter.for?(adapter_name) }
 
-    if klass
-      klass.new(uri, doc, name)
-    else
-      raise Adapter::NoAdapterError.new(adapter_name)
-    end
+    raise Adapter::NoAdapterError, adapter_name unless klass
+
+    Adapter::Proxy.new(klass.new(uri, doc, name))
+  end
+
+  class Error < StandardError
   end
 end
 

data/test/lib/mangdown/chapter_test.rb

@@ -75,7 +75,7 @@ module Mangdown
         class << self
           alias old_hydra_streaming hydra_streaming
 
-          def hydra_streaming(objects)
+          def hydra_streaming(objects, *other_args)
             objects.map do |obj| 
               next unless yield(:before, obj)
               yield(:succeeded, obj)

data/test/lib/mangdown_test.rb

@@ -20,14 +20,17 @@ class MangdownTest < Minitest::Test
 
   def test_adapter
     assert_equal TestAdapter, Mangdown.adapter(:test)
+    assert_equal TestAdapter, Mangdown.adapter(:test)
   end
 
   def test_adapter!
-    assert_instance_of TestAdapter, Mangdown.adapter!("test")
-    assert_instance_of TestAdapter, Mangdown.adapter!(nil, "test")
+    assert_instance_of Mangdown::Adapter::Proxy, Mangdown.adapter!("test")
+
+    assert_instance_of TestAdapter, Mangdown.adapter!("test").adapter
+    assert_instance_of TestAdapter, Mangdown.adapter!(nil, "test").adapter
     assert_instance_of TestAdapter, Mangdown.adapter!(
       "test", nil, doc, "test"
-    )
+    ).adapter
 
     adapters = Mangdown::ADAPTERS.dup
     Mangdown::ADAPTERS.clear

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mangdown
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.15.1
 platform: ruby
 authors:
 - jphager2
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-21 00:00:00.000000000 Z
+date: 2017-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Download Manga
 email: jphager2@gmail.com
 executables: []
@@ -120,6 +134,7 @@ files:
 - lib/mangdown/adapter.rb
 - lib/mangdown/adapter/mangareader.rb
 - lib/mangdown/adapter/no_adapter_error.rb
+- lib/mangdown/adapter/proxy.rb
 - lib/mangdown/chapter.rb
 - lib/mangdown/client.rb
 - lib/mangdown/manga.rb