mangdown 0.13.2 → 0.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4619032c750ec3a18f5427f6d51ed5d0ea934b20
-  data.tar.gz: defdc99d480348dd4e17f72eec385596224d5df1
+  metadata.gz: 5b4edce6f4511a5513de3fc39acbee0bbadeb6a7
+  data.tar.gz: 10f48a8789a42a744029aa07812a6d506d0388ae
 SHA512:
-  metadata.gz: 5dc4f1d2436738e29f96f729e85248c2e4d87d46c308cca0a31c245971b9439e9455f8fc9b04cbf9572637647c7d560e9836215f61e93078958f467a051e15e7
-  data.tar.gz: f280db306b9dd05717a644b2b66dc19b5c28d255b67af05fae7003c928d89406c92d9f8c1a6f312e474875b1c19e85703a8e4ec496f6dda96316f015532ca4d4
+  metadata.gz: 1af096493c7ea75518ec6e7ddfd8c802d9f8af70744828b6573269f7dfcc0e2d990dc3fffa3780773cab1b79622ab49442dd1b236622e2614efc6c6d26cbea9c
+  data.tar.gz: 2dacfd63034bb0f519e7cc414573e363d3337f3fa1259ad1e7d3648173541af4c91df9acefa090ec8d80b68817f1daa251d3c81bdd746dd33164b0b221f460c1

data/lib/mangdown.rb

@@ -26,6 +26,6 @@ require_relative 'mangdown/manga'
 require_relative 'mangdown/manga_list.rb'
 require_relative 'mangdown/cbz'
 require_relative 'mangdown/commands'
-require_relative 'mangdown/mangdown_hash'
+require_relative 'mangdown/md_hash'
 
 

data/lib/mangdown/chapter.rb

@@ -62,12 +62,17 @@ module Mangdown
     end
 
     # download all pages in a chapter
-    def download_to(dir = nil)
+    def download_to(dir = nil, opts = { force_download: false })
       pages = map(&:to_page)
       failed = []
       succeeded = []
+      skipped = []
 
       setup_download_dir!(dir)
+      if opts[:force_download]
+        FileUtils.rm_r(to_path)
+        setup_download_dir!(dir)
+      end
 
       Tools.hydra_streaming(pages) do |stage, page, data = nil|
         case stage
@@ -76,7 +81,7 @@ module Mangdown
         when :succeeded
           succeeded << page
         when :before
-          !page.file_exist?(to_path)
+          !(page.file_exist?(to_path) && skipped << page)
         when :body
           page.append_file_data(to_path, data) unless failed.include?(page)
         when :complete
@@ -84,9 +89,9 @@ module Mangdown
         end
       end
 
-      FileUtils.rm_r(to_path) if succeeded.empty?
+      FileUtils.rm_r(to_path) if succeeded.empty? && skipped.empty?
 
-      { failed: failed, succeeded: succeeded }
+      { failed: failed, succeeded: succeeded, skipped: skipped }
     end
 
     private

data/lib/mangdown/manga.rb

@@ -39,7 +39,7 @@ module Mangdown
     end
     
     # download using enumerable
-    def download_to(dir, start = 0, stop = -1)
+    def download_to(dir, start = 0, stop = -1, opts = { force_download: false })
       start, stop = validate_indeces!(start, stop)
       setup_download_dir!(dir)
 
@@ -47,7 +47,7 @@ module Mangdown
       chapters[start..stop].each do |md_hash|
         chapter = md_hash.to_chapter
 
-        if chapter.download_to(to_path)
+        if chapter.download_to(to_path, opts)
           bar.increment!
         else
           STDERR.puts("error: #{chapter.name} was not downloaded") 

data/lib/mangdown/page.rb

@@ -26,16 +26,18 @@ module Mangdown
       dir = Tools.valid_path_name(dir)
       path = File.join(dir, name)
       if Dir.exist?(dir)
-        @path = Dir.entries(dir).find { |file| file.to_s[path] }
+        path = Dir.entries(dir).find { |file| file.to_s[path] } || path
       end
-      @path ||= path
-      @path = Tools.valid_path_name(@path)
-      @path = Tools.relative_or_absolute_path(@path)
+      path = Tools.valid_path_name(path)
+      @path = Tools.relative_or_absolute_path(path)
     end
 
     # downloads to specified directory
-    def download_to(dir = Dir.pwd)
-      return if file_exist?(dir)
+    def download_to(dir = Dir.pwd, opts = { force_download: false })
+      return if file_exist?(dir) && !opts[:force_download]
+
+      # cleanup existing file (all extensions)
+      delete_files!(dir) if opts[:force_download]
       
       image = Tools.get(uri)
 
@@ -46,8 +48,6 @@ module Mangdown
     end
 
     def append_file_data(dir, data)
-      set_path(dir)
-
       File.open(to_path, 'ab') { |file| file.write(data) } 
     end
 
@@ -63,7 +63,13 @@ module Mangdown
     def file_exist?(dir = nil)
       set_path(dir) if dir
 
-      Dir.entries(dir).any? { |file| file.to_s[to_path.to_s] }
+      Dir.entries(dir).any? { |file| file.to_s[to_path.basename.to_s] }
+    end
+
+    def delete_files!(dir)
+      while set_path(dir) && File.exist?(to_path)
+        File.delete(to_path)
+      end
     end
   end
 end

data/lib/mangdown/version.rb

@@ -1,3 +1,3 @@
 module Mangdown
-  VERSION = "0.13.2"
+  VERSION = "0.13.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mangdown
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.13.3
 platform: ruby
 authors:
 - jphager2
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-10 00:00:00.000000000 Z
+date: 2016-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -158,7 +158,7 @@ files:
 - lib/mangdown/equality.rb
 - lib/mangdown/manga.rb
 - lib/mangdown/manga_list.rb
-- lib/mangdown/mangdown_hash.rb
+- lib/mangdown/md_hash.rb
 - lib/mangdown/page.rb
 - lib/mangdown/properties.rb
 - lib/mangdown/tools.rb
@@ -172,7 +172,6 @@ files:
 - spec/lib/mangdown/manga_spec.rb
 - spec/lib/mangdown/mangdown_hash_spec.rb
 - spec/lib/mangdown/page_spec.rb
-- spec/lib/mangdown/popular_spec.rb
 - spec/lib/mangdown/properties_spec.rb
 - spec/lib/mangdown/tools_spec.rb
 - spec/lib/mangdown/uri_spec.rb

data/spec/lib/mangdown/popular_spec.rb

@@ -1,21 +0,0 @@
-require_relative '../../spec_helper'
-
-describe Mangdown::PopularManga do
-  let(:mangareader) { 
-    Mangdown::PopularManga.new('http://www.mangareader.net/popular')
-  }
-
-  before do
-    VCR.insert_cassette 'events', record: :new_episodes
-  end
-
-  after do
-    VCR.eject_cassette
-  end
-
-  describe 'new' do
-    it 'must have a list of mangas'  do
-      mangareader.mangas.wont_be(:empty?)
-    end
-  end
-end