mangdown 0.10.2 → 0.11.0

data/lib/mangdown/page.rb

@@ -5,20 +5,10 @@ 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')}" +
-        "#{Regexp.last_match[3]}" 
-      }
+      @name = name
       @uri  = Mangdown::Uri.new(uri) 
     end
 
-    # space ship operator for sorting
-    def <=>(other)
-      self.name <=> other.name
-    end
-
     # explicit conversion to page 
     def to_page
       self
@@ -26,13 +16,15 @@ module Mangdown
 
     # downloads to specified directory
     def download_to(dir = Dir.pwd)
-      path = dir + '/' + name
-      # don't download again
-      return if File.exist?(path)
-      image = open(uri).read
-      Tools.no_time_out { File.open(path, 'wb') { |file| file.write(image) } }
+      return if File.exist?(path = file_path(dir))
+      File.open(path, 'wb') { |file| file.write(Tools.get(uri)) }
+      FileUtils.mv(path, "#{path}.#{Tools.file_type(path)}")
     rescue SocketError => error
       STDERR.puts( "#{error.message} | #{name} | #{uri}" )
     end
+
+    def file_path(dir)
+      Tools.relative_or_absolute_path(dir, name)
+    end
   end
 end

data/lib/mangdown/properties.rb

@@ -1,87 +1,25 @@
 module Mangdown
 	class Properties
 
-		attr_reader :info, :type
-
-		def initialize(site)
-			@info = Hash.new
-
-      case site.to_s 
-      when /mangareader/
-        @type = :mangareader
-				mangareader
-      when /mangapanda/ 
-        #mangapanda is a mirror of mangareader
-        #that being said, I really don't think this works
-        #especially with @info[:root]
-        @type = :mangapanda
-        mangapanda
-      when /mangafox/
-        @type = :mangafox
-				mangafox
+		def initialize(uri, site = nil, doc = nil)
+      adapter_class = ADAPTERS.find { |adapter| 
+        (site||uri).to_s =~ /#{adapter.to_s.split('::').last.downcase}/
+      }
+      if adapter_class
+        @adapter = adapter_class.new(uri, doc)
       else
-        nil
+        raise ArgumentError, 
+          "Bad Site: No Properties Specified for Site <#{uri}>"
       end
 		end
 
-		def mangareader
-			@info[:manga_list_css_klass] = 'ul.series_alpha li a'
-			@info[:manga_css_klass]      = 'div#chapterlist td a'
-			@info[:chapter_klass]        = MRChapter
-			@info[:root]                 ||= 'http://www.mangareader.net'
-			@info[:manga_link_prefix]    ||= @info[:root] 
-			@info[:reverse]              = false
-      @info[:manga_uri_regex]      = 
-        /#{@info[:root]}(\/\d+)?(\/[^\/]+)(\.html)?/i
-      @info[:chapter_uri_regex]    = 
-        /#{@info[:root]}(\/[^\/]+){1,2}\/(\d+|chapter-\d+\.html)/i
-      @info[:page_uri_regex]       = /.+\.(png|jpg|jpeg)$/i
-		end
-
-    def mangapanda
-      @info[:root]                 = 'http://www.mangapanda.com'
-			@info[:manga_link_prefix]    = @info[:root] 
-      mangareader
-    end
-
-		def mangafox
-			@info[:manga_list_css_klass] = 'div.manga_list li a'
-			@info[:manga_css_klass]      = 'a.tips'
-			@info[:chapter_klass]        = MFChapter
-			@info[:root]                 = 'http://mangafox.me'
-			@info[:manga_link_prefix]    = ''
-			@info[:reverse]              = true
-      @info[:manga_uri_regex]      = 
-        /#{@info[:root]}\/manga\/[^\/]+?\//i
-      @info[:chapter_uri_regex]    = /
-        #{@info[:manga_uri_regex]}
-        (v\d+\/)?(c\d+\/)(1\.html)
-      /xi
-      @info[:page_uri_regex]       = /.+\.(png|jpg|jpeg)$/i
-		end
-
-    def is_manga?(obj)
-      obj.uri.slice(@info[:manga_uri_regex]) == obj.uri
-    end
-
-    def is_chapter?(obj)
-      obj.uri.slice(@info[:chapter_uri_regex]) == obj.uri
-    end
-
-    def is_page?(obj)
-      obj.uri.slice(@info[:page_uri_regex]) == obj.uri
-    end
-
-    def empty?
-      @info.empty?
-    end
-
-		private
+    private
     def method_missing(method, *args, &block)
-      # this should probably be if @info.has_key?(method)
-      # or more consisely @info.fetch(method) { super }
-      return @info[method] unless @info[method].nil?
-      super
+      if @adapter.respond_to?(method)
+        @adapter.__send__(method, *args, &block)
+      else
+        super
+      end
     end
 	end
 end

data/lib/mangdown/tools.rb

@@ -1,21 +1,83 @@
-require 'timeout'
+require 'pathname'
+require 'typhoeus'
 
 module Mangdown
   module Tools
     extend self
   
 		def get_doc(uri)
-			@doc = ::Nokogiri::HTML(open(uri))
+			@doc = ::Nokogiri::HTML(get(uri))
+    end
+
+    def get(uri)
+      Typhoeus.get(uri).body
     end
 
     def get_root(uri)
       @root = ::URI::join(uri, "/").to_s[0..-2] 
     end
-    
-    def no_time_out(tries = 3, &block)
-      timeout(30) { yield } 
-    rescue Timeout::Error
-      retry if (tries -= 1) >= 0  
+
+    def relative_or_absolute_path(*sub_paths)
+      root = (sub_paths.first.to_s =~ /^\// ? sub_paths.shift : Dir.pwd)
+      Pathname.new(root).join(*sub_paths)
+    end
+
+    def file_type(path)
+      FileMagic.new.file(path.to_s).slice(/^\w+/).downcase
+    end
+
+    def hydra_streaming(objects)
+      hydra = Typhoeus::Hydra.hydra
+
+      requests = objects.map {|obj| 
+        next unless yield(:before, obj)
+
+        request = Typhoeus::Request.new(obj.uri)
+        request.on_headers do |response|
+          yield((response.success? ? :succeeded : :failed), obj)
+        end
+        request.on_body do |chunk|
+          yield(:body, obj, chunk) 
+        end
+        request.on_complete do |response|
+          yield(:complete, obj)
+        end
+
+        hydra.queue(request)
+        request
+      }.compact
+
+      hydra.run
+      requests
+    end
+
+    def hydra(objects)
+      hydra = Typhoeus::Hydra.hydra
+
+      requests = objects.map {|obj| 
+        request = Typhoeus::Request.new(obj.uri)
+        request.on_complete do |response|
+          if response.success?
+            yield(obj, response.body) if block_given?
+          elsif response.timed_out?
+            STDERR.puts "#{obj.uri}: got a time out"
+          elsif response.code == 0
+            STDERR.puts "#{obj.uri}: #{response.return_message}"
+          else
+            STDERR.puts "#{obj.uri}: " +
+              "HTTP request failed: #{response.code.to_s} \n" +
+              "But maybe it succeeded..."
+            if response.body
+              yield(obj, response.body) if block_given?
+            end
+          end
+        end
+        hydra.queue(request)
+        request
+      }
+
+      hydra.run
+      requests
     end
   end
 end

data/lib/mangdown.rb

@@ -1,12 +1,17 @@
 require 'uri'
-require 'open-uri'
 require 'nokogiri'
 require 'yaml'
-require 'timeout'
 require 'zip'
+require 'filemagic'
 
 require_relative 'mangdown/mangdown'
 
+require_relative 'mangdown/adapter'
+adapters = "#{File.expand_path('../mangdown/adapter', __FILE__)}/*.rb"
+Dir[adapters].each do |f|
+  require_relative f 
+end
+
 require_relative 'mangdown/tools'
 require_relative 'mangdown/properties'
 require_relative 'mangdown/uri'

data/spec/lib/mangdown/chapter_spec.rb

@@ -10,7 +10,7 @@ describe Mangdown::Chapter do
 
   before do
     VCR.insert_cassette 'events', record: :new_episodes
-    @chapter =  Mangdown::MRChapter.new(chapter_name, uri)
+    @chapter =  Mangdown::Chapter.new(chapter_name, uri)
   end
 
   after do

data/spec/lib/mangdown/mangdown_hash_spec.rb

@@ -47,13 +47,8 @@ describe Mangdown::Manga do
   end
 
   describe 'to_chapter' do
-    it 'must give a manga read chapter for a manga reader chapter' do
-      @md_chapter.to_chapter.must_be_instance_of Mangdown::MRChapter
-    end
-
-    it 'must give a manga fox chapter for a manga fox chapter' do
-      md = Mangdown::MDHash.new(uri: c2_uri, name: c2_name)
-      md.to_chapter.must_be_instance_of Mangdown::MFChapter
+    it 'must give a chapter' do
+      @md_chapter.to_chapter.must_be_instance_of Mangdown::Chapter
     end
 
     it 'must raise an exception if not a chapter' do

data/spec/lib/mangdown/page_spec.rb

@@ -10,6 +10,7 @@ describe Mangdown::Page do
   end
 
   describe 'new' do
+    let(:download_path) {File.expand_path('../../../../tmp', __FILE__)}
     let(:mangareader) {
       Mangdown::Page.new(
         "Naruto 1 - Page 1.jpg",
@@ -29,10 +30,30 @@ describe Mangdown::Page do
       )
     }
 
-    it 'have a valid name' do
+=begin
+    it 'must have a valid name' do
       [mangareader, mangafox, mangafox2].each do |type|
-        type.name.must_match(/\d{3}\.jpg$/)
+        type.name.must_match(/\d{3}$/)
       end
     end
+=end
+
+    it 'must download image to dir' do
+      [mangareader, mangafox, mangafox2].each do |type|
+        type.download_to(download_path)
+        path   = "#{download_path}/#{type.name}.jpeg"
+        exists = File.exist?(path)
+        exists.must_equal true
+        File.delete(path) if exists
+      end
+    end
+
+    it 'must sort pages by name' do
+      pages        = [mangareader, mangafox, mangafox2] * 20
+      sorted       = pages.shuffle.sort
+      sort_by_name = pages.shuffle.sort_by(&:name)
+
+      sorted.must_equal sort_by_name
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mangdown
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.11.0
 platform: ruby
 authors:
 - jphager2
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-02 00:00:00.000000000 Z
+date: 2015-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -94,6 +94,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.3
+- !ruby/object:Gem::Dependency
+  name: typhoeus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+- !ruby/object:Gem::Dependency
+  name: ruby-filemagic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -136,7 +164,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A gem to download Manga, (pg integration in dev)
+description: A gem to download Manga, (now using hydra)
 email: jphager2@gmail.com
 executables: []
 extensions: []
@@ -150,6 +178,12 @@ files:
 - db/pages_script.rb
 - doc/help.txt
 - lib/mangdown.rb
+- lib/mangdown/adapter.rb
+- lib/mangdown/adapter/mangafox.rb
+- lib/mangdown/adapter/mangahere.rb
+- lib/mangdown/adapter/mangapanda.rb
+- lib/mangdown/adapter/mangareader.rb
+- lib/mangdown/adapter/wiemanga.rb
 - lib/mangdown/cbz.rb
 - lib/mangdown/chapter.rb
 - lib/mangdown/commands.rb
@@ -178,14 +212,6 @@ files:
 - spec/lib/mangdown/properties_spec.rb
 - spec/lib/mangdown/tools_spec.rb
 - spec/lib/mangdown/uri_spec.rb
-- spec/mangdown/chapter_spec.rb
-- spec/mangdown/commands_spec.rb
-- spec/mangdown/manga_list_spec.rb
-- spec/mangdown/manga_spec.rb
-- spec/mangdown/mangdown_hash_spec.rb
-- spec/mangdown/page_spec.rb
-- spec/mangdown/popular_spec.rb
-- spec/mangdown/tools_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/jphager2/mangdown
 licenses:
@@ -210,5 +236,5 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Downloads Manga, 0.10.0 has some big API changes
+summary: Downloads Manga (no longer MRChapter nor MFChapter)
 test_files: []

data/spec/mangdown/chapter_spec.rb

@@ -1,80 +0,0 @@
-require 'spec_helper'
-
-module Mangdown
-  @@chapter_hash = MDHash.new(
-    uri: 'http://www.mangareader.net/bleach/537',
-    name: 'Bleach 537',
-    manga: 'Bleach',
-    chapter: '537',
-  )
-
-  chapter = @@chapter_hash.to_chapter
-  chapter.download
-  
-  STUB_PATH = File.expand_path('../../objects/chapter.yml', __FILE__)
-  File.open(STUB_PATH, 'w+') do |file| 
-    file.write(chapter.to_yaml)
-  end
-
-  describe MRChapter do
-    before(:each) do
-      print 'o'
-      @chapter = YAML.load(File.open(Mangdown::STUB_PATH, 'r').read)
-    end
-
-    context "when chapter is initialized" do
-      # sanity check, not necessary
-      it "should have the right chapter uri" do
-        expect(@chapter.uri).to eq(@@chapter_hash[:uri])
-      end
-
-      it "should get pages when initialized" do
-        expect(@chapter.pages.size).to be > 0
-      end
-
-      it "should have the right first page at the 0 index" do
-        expect(@chapter.pages.first.name).to eq(
-               'Bleach 537 - Page 1.jpg')  
-      end
-
-      it "should have the right last page at the -1 index" do
-        expect(@chapter.pages.last.name).to eq(
-               'Bleach 537 - Page 21.jpg')
-      end
-
-      context "as a MFChapter" do
-        it "should have pages" do
-          hash = MDHash.new(
-            uri:  'http://mangafox.me/manga/kitsune_no_yomeiri/v01/c001/1.html',
-            name: 'Kitsune no Yomeiri 1',
-            manga: 'Kitsune no Yomeiri',
-            chapter: 1,
-          )
-
-          chapter = hash.to_chapter
-          
-          expect(chapter.pages).not_to be_empty
-        end
-      end
-    end
-    
-  context "when chapter is downloaded" do
-    it "should have a sub directory in the current directory" do
-      dir = Dir.pwd
-      chapter_path = dir + '/' +  @chapter.name
-
-      expect(Dir.glob(dir + '/*' )).to include(chapter_path)
-    end
-
-    it "should download all it's pages" do
-      dir = Dir.pwd + '/' + @chapter.name
-
-      pages_in_dir = Dir.glob(dir + '/*.jpg').length
-      expect(pages_in_dir).to eq(@chapter.pages.length)
-      end
-    end
-  end
-end
-
-
-

data/spec/mangdown/commands_spec.rb

@@ -1,66 +0,0 @@
-require 'spec_helper.rb'
-
-module M
-
-  describe "commands" do
-    before(:all) do
-      hash = MDHash.new(
-        uri:  'http://www.mangareader.net/6-no-trigger',
-        name: '6 no Trigger'
-      )
-      @manga = hash.to_manga
-      
-      hash = MDHash.new(
-        uri:  'http://mangafox.me/manga/naruto/',
-        name: 'Naruto'
-      )
-      @mf_manga = hash.to_manga
-
-      M.download(@manga, 1, 3)
-      M.cbz("./#{@manga.name}")
-    end
-
-    it "should find a manga with the find command" do
-      m = M.find('Naruto')
-      expect(m.first[:name]).to eq('Naruto')
-    end
-
-    it "should find a list of manga with the find command" do
-      m = M.find('Trigger')
-      expect(m.length).to be > 1
-    end
-
-    it "should find a manga from MF" do
-      m = M.find('naruto')
-      mangafox_hash_found = m.find {|hash| hash[:uri] =~ /mangafox/}
-      expect(mangafox_hash_found).not_to be_nil
-    end
-
-    #for sanity
-    it "should create a list of MDHash" do 
-      expect(@mf_manga.chapters_list[10]).to be_kind_of(MDHash)
-    end
-
-    it "should create MFChapter for mf manga" do
-      @mf_manga.get_chapter(10)
-      expect(@mf_manga.chapters.first).to be_kind_of(MFChapter)
-    end
-
-    it "should download a manga from MF" do 
-      dir = Dir.pwd
-      #@mf_manga.remove_chapters
-      M.download(@mf_manga, 500, 501)
-      expect(Dir.glob(dir + "/#{@mf_manga.name}/*").length).to eq(2)
-    end
-
-    it "should download a manga with the download command" do
-      chps = Dir.glob("#{Dir.pwd}/#{@manga.name}/*/") 
-      expect(chps.length).to eq(3)
-    end
-
-    it "should cbz a manga with the cbz command" do
-      cbz_s = Dir.glob("#{Dir.pwd}/#{@manga.name}/*.cbz")   
-      expect(cbz_s.length).to eq(3)
-    end
-  end
-end

data/spec/mangdown/manga_list_spec.rb

@@ -1,17 +0,0 @@
-require 'spec_helper.rb'
-
-module Mangdown 
-  describe MangaList do
-    before do
-      @manga_list = MangaList.new(
-                    'http://www.mangareader.net/alphabetical')
-    end
-
-    subject {@manga_list}
-
-    it "should not have an empty manga list" do
-      expect(subject.mangas).to_not be_empty 
-    end
-  end
-end
-    

data/spec/mangdown/manga_spec.rb

@@ -1,92 +0,0 @@
-require_relative '../spec_helper'
-
-module Mangdown
-  @@manga_hash = MDHash.new(
-    uri:  'http://www.mangareader.net/94/bleach.html',
-    name: 'Bleach'
-  )
-
-  manga = @@manga_hash.to_manga
-  
-  MANGA_STUB_PATH = File.expand_path('../../objects/manga.yml', 
-                                     __FILE__)
-
-  File.open(MANGA_STUB_PATH, 'w+') do |file| 
-    file.write(manga.to_yaml)
-  end
-
-
-  describe Manga do
-    before(:each) do
-      print '@'
-      @manga = YAML.load(File.open(Mangdown::MANGA_STUB_PATH, 'r').read)
-    end
-
-    context "When a manga is initialized" do
-      it "should not have chapters" do
-        expect(@manga.chapters).to be_empty
-      end
-
-      it "should have chapters listed in chapters_list" do
-        expect(@manga.chapters_list).not_to be_empty
-      end
-
-      context "as a MangaFox manga" do
-        it "should have chapters" do
-          hash = MDHash.new(
-            uri:  'http://mangafox.me/manga/masca_the_beginning/', 
-            name: 'Masca: The Beginning'
-          )
-          manga = hash.to_manga
-          expect(manga.chapters_list).not_to be_empty
-        end
-      end
-    end
-
-    context "with Bleach manga" do
-      it "should have more that 500 chapters" do
-        expect(@manga.chapters_list.length).to be > 500
-      end
-
-      it "should have the right first chapter" do
-        expect(@manga.chapters_list.first).to eq({
-          uri:'http://www.mangareader.net/94-8-1/bleach/chapter-1.html',
-          name: 'Bleach 1',
-        })
-      end
-
-      it "should have the right 465th chapter" do
-        expect(@manga.chapters_list[464]).to eq({
-          uri: 'http://www.mangareader.net/bleach/465',
-          name: 'Bleach 465',
-        })
-      end
-    end
-
-    context "when a chapter is retrieved" do
-      before(:all) do
-        @manga2 = YAML.load(File.open(
-                            Mangdown::MANGA_STUB_PATH, 'r').read)
-        @manga2.get_chapter(0)
-        @mchapter = @manga2.chapters_list[0]
-      end
-
-      it "should have a chapter in chapters" do
-        expect(@manga2.chapters.length).to eq(1)
-      end
-
-      it "should have chapter 1 in chapters" do
-        expect(@manga2.chapters[0].name).to eq(@mchapter[:name])
-      end
-
-      it "should have the right chapter sub class" do
-        klass = Chapter
-        if @mchapter[:uri].include?('mangareader')
-          klass = MRChapter
-        end
-        
-        expect(@manga2.chapters[0].class).to eq(klass)
-      end
-    end
-  end
-end

data/spec/mangdown/mangdown_hash_spec.rb

@@ -1,17 +0,0 @@
-require 'spec_helper'
-
-module Mangdown
-
-  describe MDHash do
-    before(:all) do
-      @hash = MDHash.new(
-        uri:  'http://www.mangareader.net/103/one-piece.html',
-        name: 'One Piece'
-      )
-    end
-
-    it "should get a manga object from get_manga" do
-      expect(@hash.to_manga).to be_kind_of(Manga)
-    end
-  end
-end