mangdown 0.17.5 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5cfc7286573cbf76d3a970d404c28cae3df14fa9
-  data.tar.gz: 7632ff0d23fbc2a957c1dc906c22d3dd8bfb0d39
+SHA256:
+  metadata.gz: 15dbe30001d42c8b18faefe1a248710f9826ec03275a069056121abb6bfaf61d
+  data.tar.gz: 3f610805ad69a367342d3461c666c24802f366b8d9da3d8b1fb8bdeadbad5ca0
 SHA512:
-  metadata.gz: 024fd523c89c29df2d92f6bf77a88c88c46e371ad58931e914730fc7e8eef6aa8bbba7d09f55952a131d2a4803523b5442dc70b4b776c5a26e08f54785588c5f
-  data.tar.gz: afe445ef654dd458a2ae0237ebf7f96ff509e0b9f374fa9f122b2bee3d5be38e19ab2f584652ab5912e559ad96aac5c3718d6ff727d6dd93ec0572bed4de16f2
+  metadata.gz: 0faea9b82fbabcf2ae2b21c51acef39539c9f0450a00b37c995ccdbbde302f0bb977b95b4701536f7309c325e55986a737f0a224f15939221f428f470812994e
+  data.tar.gz: 67e7fabd848e64fb2f246fedb3102d86f1d2c923b3d16387b9f018d6fab308213cd57e99fae4248f9f072e9f122a7088abf6f020619fd0bb211d3519cf232cc0

data/README.md

@@ -1,5 +1,3 @@
-![Gitten badge](http://gittens.r15.railsrumble.com//badge/jphager2/mangdown)
-
 ## Adapters [New]
 Check out lib/mangdown/adapter.rb and lib/mangdown/adapters/mangareader.rb for examples of how to build an adapter.
 
@@ -21,7 +19,7 @@ require 'mangdown/client'
 # Search for an exact match
 results = M.find("Dragon Ball")
 
-# Or if you need more flexibilty when searching for a manga, 
+# Or if you need more flexibilty when searching for a manga,
 # use are Regex
 results = M.find(/dragon ball(\ssd)?$/i)
 
@@ -34,7 +32,7 @@ manga.count
 # Download everything
 manga.download
 
-# Download a specific range 
+# Download a specific range
 manga.download(0, 99)
 
 # Convert all downloaded chapters to CBZ

data/lib/mangdown/adapter/mangareader.rb

@@ -20,11 +20,11 @@ module Mangdown
     end
 
     def is_manga?(uri = @uri)
-      uri.slice(/#{root}(\/\d+)?(\/[^\/]+)(\.html)?/i) == uri
+      uri.slice(%r{#{root}(/\d+)?(/[^/]+)(\.html)?}i) == uri
     end
 
     def is_chapter?(uri = @uri)
-      uri.slice(/#{root}(\/[^\/]+){1,2}\/(\d+|chapter-\d+\.html)/i) == uri
+      uri.slice(%r{#{root}(/[^/]+){1,2}/(\d+|chapter-\d+\.html)}i) == uri
     end
 
     def is_page?(uri = @uri)

data/lib/mangdown/adapter/proxy.rb

@@ -18,7 +18,7 @@ module Mangdown
         return super unless @adapter.respond_to?(method)
 
         adapter.public_send(method, *args, &block)
-      rescue => error
+      rescue StandardError => error
         logger.error(debug_error(method, error))
         raise Mangdown::Error, "Adapter failed: #{error.message}"
       end

data/lib/mangdown/chapter.rb

@@ -25,11 +25,12 @@ module Mangdown
       self
     end
 
-    def to_path
-      @path ||= set_path
+    def path
+      @path ||= setup_path
     end
+    alias to_path path
 
-    def set_path(dir = nil)
+    def setup_path(dir = nil)
       dir ||= File.join(DOWNLOAD_DIR, manga)
       path = File.join(dir, name)
       path = Tools.valid_path_name(path)
@@ -82,7 +83,7 @@ module Mangdown
     private
 
     def setup_download_dir!(dir)
-      set_path(dir)
+      setup_path(dir)
       FileUtils.mkdir_p(to_path) unless Dir.exist?(to_path)
     end
 

data/lib/mangdown/client.rb

@@ -22,7 +22,7 @@ module M
     # cbz all subdirectories in a directory
     def cbz(dir)
       Mangdown::CBZ.all(dir)
-    rescue => error
+    rescue StandardError => error
       raise Mangdown::Error, "Failed to package #{dir}: #{error.message}"
     end
 
@@ -48,8 +48,8 @@ module M
     end
 
     # check if the data file is current
-    def file_current?(f)
-      File.exist?(f) && File.mtime(f) > (Time.now - 604_800)
+    def file_current?(file)
+      File.exist?(file) && File.mtime(file) > (Time.now - 604_800)
     end
 
     # attempt to get the list from the data file
@@ -69,7 +69,7 @@ module M
       end
       File.open(path, 'w+') { |f| f.write(list.to_yaml) }
       list
-    rescue => error
+    rescue StandardError => error
       raise Mangdown::Error, "#{path} may be corrupt: #{error.message}"
     end
   end

data/lib/mangdown/manga.rb

@@ -43,7 +43,9 @@ module Mangdown
         elsif chapter_result[:skipped].any?
           skipped << chapter
         end
+
         next unless chapter_result[:failed].any?
+
         logger.error({
           msg: 'Chapter was not fully downloaded',
           uri: chapter.uri,
@@ -57,11 +59,12 @@ module Mangdown
       self
     end
 
-    def to_path
-      @path ||= set_path
+    def path
+      @path ||= setup_path
     end
+    alias to_path path
 
-    def set_path(dir = nil)
+    def setup_path(dir = nil)
       dir ||= DOWNLOAD_DIR
       path = File.join(dir, name)
       @path = Tools.relative_or_absolute_path(path)
@@ -86,7 +89,7 @@ module Mangdown
     end
 
     def setup_download_dir!(dir)
-      set_path(dir)
+      setup_path(dir)
       FileUtils.mkdir_p(to_path) unless Dir.exist?(to_path)
     end
 

data/lib/mangdown/page.rb

@@ -20,14 +20,15 @@ module Mangdown
       self
     end
 
-    def to_path
-      @path ||= set_path
+    def path
+      @path ||= setup_path
     end
+    alias to_path path
 
     # Set path of page to file path if a file exists or to path
     # without file extension if file is not found. File extensions
     # are appended only after the file has been downloaded.
-    def set_path(dir = nil)
+    def setup_path(dir = nil)
       dir ||= File.join(manga, chapter)
       dir = Tools.valid_path_name(dir)
       file = Dir.entries(dir).find { |f| f[name] } if Dir.exist?(dir)
@@ -45,7 +46,7 @@ module Mangdown
 
       append_file_data(dir, image)
       append_file_ext(dir)
-    rescue => error
+    rescue StandardError => error
       logger.error({
         msg: 'Failed to download page',
         page: self,
@@ -61,7 +62,7 @@ module Mangdown
     end
 
     def append_file_ext(dir = nil)
-      set_path(dir) if dir
+      setup_path(dir) if dir
       path = to_path
       ext = Tools.image_extension(path)
       filename = "#{path}.#{ext}"
@@ -70,14 +71,14 @@ module Mangdown
     end
 
     def file_exist?(dir = nil)
-      set_path(dir) if dir
+      setup_path(dir) if dir
 
       Dir.entries(dir).any? { |file| file.to_s[to_path.basename.to_s] }
     end
 
     # cleanup existing file (all extensions)
     def delete_files!(dir)
-      File.delete(to_path) while set_path(dir) && File.exist?(to_path)
+      File.delete(to_path) while setup_path(dir) && File.exist?(to_path)
     end
   end
 end

data/lib/mangdown/support/cbz.rb

@@ -22,7 +22,7 @@ module Mangdown
       private
 
       def cbz_dir(dir)
-        dir = dir.to_s.sub(/\/*$/, '')
+        dir = dir.to_s.sub(%r{/*$}, '')
 
         zip_filename = dir + '.cbz'
         return if File.exist?(zip_filename)
@@ -47,6 +47,7 @@ module Mangdown
       def each_dir_or_page(dir)
         Dir.glob(dir + '/*').each do |filename|
           next if filename.include?('.cbz')
+
           yield(filename)
         end
       end

data/lib/mangdown/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mangdown
-  VERSION = '0.17.5'
+  VERSION = '0.18.0'
 end

data/test/lib/mangdown/chapter_test.rb

@@ -53,8 +53,8 @@ module Mangdown
       )
     end
 
-    def test_set_path
-      @chapter.set_path(Dir.pwd)
+    def test_setup_path
+      @chapter.setup_path(Dir.pwd)
       assert_equal "#{Dir.pwd}/name", @chapter.to_path.to_s
     end
 
@@ -64,7 +64,7 @@ module Mangdown
           alias old_hydra_streaming hydra_streaming
 
           def hydra_streaming(objects, *other_args)
-            objects.map do |obj| 
+            objects.map do |obj|
               next unless yield(:before, obj)
               yield(:succeeded, obj)
               yield(:body, obj, 'data')

data/test/lib/mangdown/manga_test.rb

@@ -51,10 +51,10 @@ module Mangdown
       assert_equal "#{Mangdown::DOWNLOAD_DIR}/name", manga.to_path.to_s
     end
 
-    def test_set_path
+    def test_setup_path
       manga = Manga.new('uri', 'name')
 
-      manga.set_path(Dir.pwd)
+      manga.setup_path(Dir.pwd)
       assert_equal "#{Dir.pwd}/name", manga.to_path.to_s
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mangdown
 version: !ruby/object:Gem::Version
-  version: 0.17.5
+  version: 0.18.0
 platform: ruby
 authors:
 - jphager2
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-21 00:00:00.000000000 Z
+date: 2018-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: ruby-filemagic
   requirement: !ruby/object:Gem::Requirement
@@ -195,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Download Manga