mangdown 0.10.0 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d79f8b057221a2a242c3f84e7e7676da88750b0
-  data.tar.gz: dc22aa9359778ffb500d40750718d876582477cf
+  metadata.gz: 0fcefd9f91de261d15fdb0c165ec5be1852c9507
+  data.tar.gz: 23b77f0de9dfd3b57bea6d7d23a2d63ed51165b6
 SHA512:
-  metadata.gz: 261ea5c3270de92ae280a901ba8ea3c47c9b239db690b174a88d6aa41a6955ad579195e6087e48dfd1ba312df7965abca4354f2dea3fcbd71bc42f23a9ea7693
-  data.tar.gz: 672b6ae539b57a2ac4cd3183ac4a0aa7a66c76f46b50558ca55c481a66a3c1a971ed0bf06f27ef5ad9a23101e11816d870559900697450cb0e35d731a4d1c94b
+  metadata.gz: fffa3aca22c07425b59007d0d50500a01f28d8292763494ee2518e07348d98f1f8a921e54914db654b297be3c38ce99dae0c7c7cd2d2d87e7b6d3e3aead7acff
+  data.tar.gz: 69c6e148cfefb9dd5906860ece93b5d8ead402b4ee71814cabcb33bbb991b6a81af747e4b3d74d2977561a467b3de5fee45c25181ec340891e02b23b1360c615

data/lib/mangdown/chapter.rb

@@ -20,6 +20,13 @@ module Mangdown
       @pages.sort_by! {|page| page.name}
 		end
 
+    def inspect
+      "#<#{self.class} @name=#{name} @uri=#{uri} " +
+      "@pages=[#{pages.first(10).join(',')}"       +
+      "#{",..." if pages.length > 10}]>"
+    end
+    alias_method :to_s, :inspect
+
     # enumerates through pages
     def each
       block_given? ? @pages.each { |page| yield(page) } : @pages.each
@@ -35,14 +42,16 @@ module Mangdown
       dir = File.expand_path(dir + '/' + @name)
       Dir.mkdir(dir) unless Dir.exists?(dir)
       
-      threads = []
-      each do |page| 
-        threads << Thread.new(page) do |this_page| 
-          Tools.no_time_out {this_page.to_page.download_to(dir)}
+      # Limit active threads to 20
+      each_slice(20) do |slice| 
+        threads = []
+        slice.each do |page|
+          threads << Thread.new(page) do |this_page| 
+            this_page.to_page.download_to(dir)
+          end
         end
+        threads.each {|thread| thread.join}
       end
-
-      threads.each {|thread| thread.join}
 		end
 
 		private

data/lib/mangdown/manga.rb

@@ -1,3 +1,5 @@
+require 'progress_bar'
+
 module Mangdown
 
   DOWNLOAD_DIR ||= Dir.home + '/manga'
@@ -16,8 +18,15 @@ module Mangdown
       @properties = Properties.new(@uri)
 
       get_chapters
-      #@chapters.select! { |chapter| @properties.is_chapter?(chapter) }
+      @chapters.select! { |chapter| @properties.is_chapter?(chapter) }
+    end
+
+    def inspect
+      "#<#{self.class} @name=#{name} @uri=#{uri} " +
+      "@chapters=[#{chapters.first(10).join(',')}" +
+      "#{",..." if chapters.length > 10}]>"
     end
+    alias_method :to_s, :inspect
 
     # download to current directory convenience method
     def download(*args)
@@ -26,11 +35,14 @@ module Mangdown
     
     # download using enumerable
     def download_to(dir, start = 0, stop = -1)
-      dir += "/#{name}"
+      start, stop = validate_indeces!(start, stop)
+      dir         = setup_download_dir!(dir)
+
+      bar = progress_bar(start, stop)
       reset(start, stop)
-      Dir.mkdir(dir) unless Dir.exist?(dir)
       loop do
         self.next.to_chapter.download_to(dir)
+        bar.increment!
       end
     end
 
@@ -72,5 +84,29 @@ module Mangdown
 
       @chapters.reverse! if @properties.reverse 
     end
+
+    def chapter_indeces(start, stop)
+      [chapters.index(chapters[start]), chapters.index(chapters[stop])]
+    end
+
+    def setup_download_dir!(dir)
+      dir += "/#{name}"
+      Dir.mkdir(dir) unless Dir.exist?(dir)
+      dir
+    end
+
+    def validate_indeces!(start, stop)
+      i_start, i_stop = chapter_indeces(start, stop)
+      if i_stop < i_stop
+        error = 'Last index must be greater than first index'
+        raise ArgumentError, error
+      end 
+      [i_start, i_stop]
+    end
+
+    # create a progress bar object for start and stop indexes
+    def progress_bar(start, stop)
+      ProgressBar.new(stop - start + 1)
+    end
   end
 end

data/lib/mangdown/mangdown.rb

@@ -5,7 +5,7 @@ module Mangdown
     end
 
     def ==(other)
-      puts "You may want to use :eql?"
+      # puts "You may want to use :eql?"
       super
     end
   end

data/lib/mangdown/mangdown_hash.rb

@@ -54,10 +54,14 @@ module Mangdown
       @hash[key]
     end
 
-    def inspect
+    def to_hash
       @hash
     end
-    alias_method :to_hash, :inspect
+
+    def inspect
+      to_hash.to_s
+    end
+    alias_method :to_s, :inspect
 
     def type
       @properties.type

data/lib/mangdown/page.rb

@@ -5,6 +5,7 @@ module Mangdown
     attr_reader :name, :uri
 
     def initialize(name, uri)
+      name.gsub!(/_/, ' ') && name.gsub!(/-/, '')
       @name = name.sub(/([^\d])(\d+)(\.\w+)$/) { 
         "#{Regexp.last_match[1]}" +
         "#{Regexp.last_match[2].to_s.rjust(3, '0')}" +
@@ -29,7 +30,7 @@ module Mangdown
       # don't download again
       return if File.exist?(path)
       image = open(uri).read
-      File.open(path, 'wb') {|file| file.write(image)}
+      Tools.no_time_out { File.open(path, 'wb') { |file| file.write(image) } }
     rescue SocketError => error
       STDERR.puts( "#{error.message} | #{name} | #{uri}" )
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mangdown
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.2
 platform: ruby
 authors:
 - jphager2
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-16 00:00:00.000000000 Z
+date: 2015-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -81,47 +81,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: progress_bar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
-  type: :development
+        version: 1.0.3
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  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'
-- !ruby/object:Gem::Dependency
-  name: reek
-  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'
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement