mangdown 0.7.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3601e69092554b4994957c59e79fde24ed0b5014
-  data.tar.gz: eab931deff079ce8f0aa89636c3ba089733b6faa
+  metadata.gz: 2661378fbd595b26a9bf3287f4ac62998aa6839c
+  data.tar.gz: 020610efc7afb039d77415d18ac5f5a232541ca5
 SHA512:
-  metadata.gz: 4489b2f82b82f1fcfe40462a28a900eca489bb09ffbf7e482f179d97c1b7e7c6a778c8f8255c5eabb163d10ad33d1aa5da484d759c01bd2aa4357bee3d08f4fc
-  data.tar.gz: 67923d472168c32a8271f428039e9e8aaf726790d17f0a788eaf91bbd7c98162388ab44235199eb7b9d026a98700e6dac1dc6c4347f5f82180e4f34720f7df79
+  metadata.gz: 6ce635544cdd44bdfa0c6b8bb39cd296ecac6e356130440ceceeb5c86a0b617496ac5b66cc0a027e64f20934515dbc6b7da37e7dc314b7e56ef950c5f0be4c27
+  data.tar.gz: d96dbacc58a1388b8b3a57bf89538af380b2920100dc5453d61fc8402b3653f005f2fab566f506a2a24a78b531737e36983cbb97d4b0826e1bf74c488742c001

data/doc/help.txt

@@ -1,33 +1,39 @@
-==============================================================================
+========================================================================
 Mangdown
 
 Commands
 
-    M#find(string) - Will return an array of Mangdown::MDHash given a string 
-                     which is matched to manga names of the 3000 most popular 
-                     mangas on Mangareader.
+    M#find(string) - Will return an array of Mangdown::MDHash given 
+                     a string which is matched to manga names of the 
+                     3000 most popular mangas on Mangareader.
 
     results = M.find('Naruto')
 
 
 
-    *** Use Mangdown::MDHash#get_manga to get a Mangdown::Manga object ***
+    **Use Mangdown::MDHash#get_manga to get a Mangdown::Manga object**
 
     naruto = results[0].get_manga
 
 
 
     M#download(manga, int = 0, int = -1) 
-                  - Will download a manga (Mangdown::Manga object) from the 
-                    first int (index of the first chapter) to the last int 
-                    (index of the last chapter) to a subdirectory named 
-                    #{manga.name}".  If no indexes are given, all chapters 
-                    are downloaded.
+                  - Will download a manga (Mangdown::Manga object) 
+                    from the first int (index of the first chapter) 
+                    to the last int  (index of the last chapter) to 
+                    a subdirectory named  #{manga.name}".  If no 
+                    indexes are given, all chapters are downloaded.
 
     M.download(naruto, 500, 549)
 
+    
+
+    M#clean_up     - Will delete .manga_list.yml file from the home
+                     directory
+
+    M.clean_up
 
 
     M#help         - Will display help for commands
 
-==============================================================================
+=======================================================================

data/lib/mangdown.rb

@@ -10,6 +10,7 @@ require_relative 'mangdown/page'
 require_relative 'mangdown/chapter'
 require_relative 'mangdown/manga'
 require_relative 'mangdown/popular'
+require_relative 'mangdown/manga_list.rb'
 require_relative 'mangdown/cbz'
 require_relative 'mangdown/commands'
 require_relative 'mangdown/mangdown_hash'

data/lib/mangdown/chapter.rb

@@ -1,22 +1,34 @@
 module Mangdown
   class Chapter
 
-    attr_reader :name, :pages, :uri
-    
-    def initialize( uri, name )
-      @uri = uri
-      @name = name
+    attr_reader :pages
+
+    # initialize with MDHash and only have @info[:key]
+    def initialize(info)
+      @info = info
       @pages = []
 
       get_pages
     end
 
+    # reader method for uri
+    def uri
+      @info[:uri]
+    end
+
+    # reader method for name
+    def name
+      @info[:name]
+    end
+
     # download should be in its own module
+    # and the start_dir is sandwich code and should be moved and
+    # passed a block 
     def download
       start_dir = Dir.pwd 
 
-      Dir.mkdir(@name) unless Dir.exists?(@name)
-      Dir.chdir(@name)
+      Dir.mkdir(@info[:name]) unless Dir.exists?(@info[:name])
+      Dir.chdir(@info[:name])
       
       @pages.each {|page| page.download}
 
@@ -25,14 +37,14 @@ module Mangdown
 
     private
       def get_pages
-        uri = @uri
+        uri = @info[:uri]
         doc = ::Mangdown::Tools.get_doc(uri)
         
         get_num_pages(doc).times do
-          page_uri, page_name = get_page(doc) 
+          page = get_page(doc) 
           uri = get_next_uri(doc)
 
-          @pages << Page.new( page_uri, page_name )
+          @pages << Page.new(page)
           doc = ::Mangdown::Tools.get_doc(uri)
         end
       end
@@ -42,12 +54,15 @@ module Mangdown
     private
       def get_page(doc)
         image = doc.css('img')[0]
-        [image['src'], image['alt']]
+
+        hash = MDHash.new
+        hash[:uri], hash[:name] = image['src'], (image['alt'] + ".jpg")
+        hash
       end
 
       def get_next_uri(doc)
         #root url + the href of the link to the next page
-        ::Mangdown::Tools.get_root(@uri) + 
+        ::Mangdown::Tools.get_root(@info[:uri]) + 
           doc.css('div#imgholder a')[0]['href']
       end
 
@@ -56,4 +71,26 @@ module Mangdown
         doc.css('select')[1].children.length
       end
   end
+
+  class MFChapter < Chapter
+    private
+      def get_page(doc)
+        image = doc.css('img')[0]
+
+        hash        = MDHash.new
+        hash[:uri]  = image[:src]
+        hash[:name] = image[:src].sub(/.+\//, '')
+        hash
+      end
+
+
+      def get_next_uri(doc)
+        root = @info[:uri].slice(/.+\//)
+        root + doc.css('div#viewer a')[0][:href]
+      end
+
+      def get_num_pages(doc)
+        doc.css('select')[1].children.length - 1
+      end
+  end
 end

data/lib/mangdown/commands.rb

@@ -8,6 +8,10 @@ module M
     search =~ /\w/
   end
   
+  def file_path
+    Dir.home + '/.manga_list.yml'
+  end
+
   #returns a list of hash with :uri and :name of mangas found in @@list
   def find(search)
     unless valid_search?(search)
@@ -15,34 +19,44 @@ module M
       return []
     end
     
-    # change this: Check for yml file with popular list
-    # if it exists, then check if it was created this week
-    # if it wasn't get a new list
-    # if the yaml file doesn't exist get a new list
-    # write the new list to the yaml file
-    @@list ||= PopularManga.new(
-                 'http://www.mangareader.net/popular', 3000)
-
-    search_result = @@list.mangas_list.select do |manga| 
-      manga[:name].downcase.include?(search.downcase)
-    end
+    # Previously, popular manga was used for find, but there is a 
+    # much better way to do it
+    # PopularManga.new('http://www.mangareader.net/popular', 3000)
     
-=begin
-    search_result.collect! do |manga| 
-      h = MDHash.new
-      h[:uri], h[:name] = manga[:uri], manga[:name]
-      h
+    if File.exist?(file_path) 
+      file_current = File.mtime(file_path) > (Time.now - 60*60*24*7)
+    end
+
+    if file_current
+      @@list = YAML.load(File.open(file_path, 'r').read)
+    else
+      @@list = MangaList.new(
+        'http://www.mangareader.net/alphabetical',
+        'http://mangafox.me/manga/'                       
+      ) 
+
+      File.open(file_path, 'w+') do |f|
+        f.write( @@list.to_yaml )
+      end
     end
-=end
 
+    search_result = @@list.mangas.select do |manga| 
+      manga[:name].downcase.include?(search.downcase)
+    end
+    
     puts "Could not find manga" if search_result.empty?     
     
     search_result
   end
   
   def download(manga, first_chapter = 0, last_chapter = -1)
-    chapters = slow_get_chapters(manga, first_chapter, last_chapter)
-    slow_dl_chapters(chapters)
+    if manga.class == MDHash
+      manga = Manga.new(manga)
+    end
+
+    chapters = ::Mangdown::Tools.slow_get_chapters(
+                manga, first_chapter, last_chapter)
+    ::Mangdown::Tools.slow_dl_chapters(chapters)
   end
 
   def cbz(dir)
@@ -54,4 +68,8 @@ module M
                                  File.dirname(__FILE__))
     puts File.open(help_file, 'r').read
   end
+
+  def clean_up
+    File.delete(file_path) if File.exist?(file_path)
+  end
 end

data/lib/mangdown/manga.rb

@@ -2,11 +2,11 @@ module Mangdown
   class Manga
     include ::Mangdown::Tools
 
-    attr_reader :chapters, :chapters_list, :name, :uri
+    attr_reader :chapters, :chapters_list 
 
-    def initialize(uri, name)
-      @uri = uri
-      @name = name
+    #initialize only use @info[:key]
+    def initialize(info)
+      @info = info
 
       #Keeping these chapter objects in memory could be expensive
       @chapters = []
@@ -15,30 +15,69 @@ module Mangdown
       get_chapters_list
     end
 
+    # reader method for uri
+    def uri
+      @info[:uri]
+    end
+
+    # reader method for name
+    def name
+      @info[:name]
+    end
+
     def get_chapters_list
-      doc = ::Mangdown::Tools.get_doc(@uri)
-      root = ::Mangdown::Tools.get_root(@uri)
+      doc = ::Mangdown::Tools.get_doc(@info[:uri])
+      root = ::Mangdown::Tools.get_root(@info[:uri])
 
       #get the link with chapter name and uri
-      doc.css('div#chapterlist td a').each do |chapter|
-        @chapters_list << ([root + chapter['href'], chapter.text])
+      doc.css(css_klass(root)).each do |chapter|
+        hash = MDHash.new
+        hash[:uri]  = (root + chapter[:href].sub(root, '')) 
+        hash[:name] = chapter.text
+        @chapters_list << hash 
+      end
+
+      if root =~ /mangafox/
+        @chapters_list.reverse!
       end
     end
  
+    def css_klass(site)
+      case site
+      when /mangareader/
+        'div#chapterlist td a'
+      when /mangafox/
+        'a.tips'
+      else
+        nil
+      end
+    end
+
+    # chapter is an MDHash
+    def chapter_found(chapter)
+      @chapters.find do |chp| 
+        (chp.name == chapter[:name]) or (chp.uri == chapter[:uri])
+      end
+    end
+
     def get_chapter(index) 
       
-      root = ::Mangdown::Tools.get_root(@uri)
-      uri, name = @chapters_list[index]
-    
-      unless @chapters.find {|chp| (chp.name == name) or (chp.uri == uri)}
-        # this is far from ideal
-        chapter_klass = if root.include?('mangareader')
-          MRChapter
+      root = ::Mangdown::Tools.get_root(@info[:uri])
+      chapter  = @chapters_list[index] 
+
+      unless chapter_found(chapter) 
+        # this should be put in a module the case is used in 
+        # almost every class
+        chapter_klass = case root 
+        when /mangareader/
+          ::Mangdown::MRChapter
+        when /mangafox/
+          ::Mangdown::MFChapter
         else
-          NO_Chapter
+          return :no_chapter 
         end
      
-        @chapters << chapter_klass.new(uri, name)
+        @chapters << chapter_klass.new(chapter)
       else
         puts "This chapter has already been added" 
       end

data/lib/mangdown/manga_list.rb

@@ -0,0 +1,47 @@
+module Mangdown
+  class MangaList
+
+    attr_reader :mangas
+
+    def initialize(*uri)
+      @uri = uri
+      @mangas = []
+
+      @uri.each {|uri| get_mangas(uri)}
+    end
+
+    def get_mangas(uri)
+      doc = ::Mangdown::Tools.get_doc(uri)
+      root = ::Mangdown::Tools.get_root(uri)
+
+      
+      # This should be put in a tool
+      doc.css(css_klass(root)).each do |a|
+        hash = MDHash.new
+        #hot fix
+        url = case root 
+        when /mangareader/
+          root + a[:href]
+        when /mangafox/
+          a[:href]
+        else
+          nil
+        end
+
+        hash[:uri], hash[:name] = url, a.text
+        @mangas << hash
+      end
+    end
+
+    def css_klass(site)
+      case site
+      when /mangareader/
+        'ul.series_alpha li a'
+      when /mangafox/
+        'div.manga_list li a'
+      else
+        nil
+      end
+    end
+  end
+end

data/lib/mangdown/mangdown_hash.rb

@@ -1,7 +1,7 @@
 module Mangdown
   class MDHash < ::Hash
     def get_manga
-      Manga.new(self[:uri], self[:name])
+      Manga.new(self)
     end
   end
 end

data/lib/mangdown/page.rb

@@ -1,20 +1,29 @@
 module Mangdown
   class Page
-    attr_reader :filename, :uri
 
-    def initialize( uri, filename )
+    attr_reader :info
 
-      # this will probably become a problem when adding different
-      # Manga sites which may use different file types than .jpg
-      @filename = filename + '.jpg'
-      @uri = uri
+    # like chapter and manga, should initialize with MDHash, and use
+    # @info[:key]
+    def initialize(info)
+      @info = info
+    end
+
+    def filename
+      @info[:name]
+    end
+
+    def uri 
+      @info[:uri]
     end
 
     # this method should probably be moved somewhere else because
     # pages, chapters and mangas can all be "downloaded"
     def download
-      File.open(@filename, 'wb') do |file|
-        file.write(open(URI.encode(@uri, '[]')).read)
+      unless File.exist?(@info[:name])
+        File.open(@info[:name], 'wb') do |file|
+          file.write(open(URI.encode(@info[:uri], '[]')).read)
+        end
       end
     end
   end

data/lib/mangdown/popular.rb

@@ -16,15 +16,14 @@ module Mangdown
       get_mangas_list
     end
 
-    #Depreciated
+    #Depreciated use MDHash.get_manga
     def get_manga(number)
       puts "This has been depreciated, don't use PopularManga @mangas!"
-      uri  = @mangas_list[number - 1][:uri]
-      name = @mangas_list[number - 1][:name]
+      manga  = @mangas_list[number - 1]
 
-      unless @mangas.find {|manga| (manga.name == name) or 
-                                   (manga.uri == uri)}
-        @mangas << Manga.new( uri, name )
+      unless @mangas.find {|mnga| (mnga.name == manga[:name]) or 
+                                   (mnga.uri == manga[:uri])}
+        @mangas << Manga.new(manga)
       else
         puts "This manga has already been added.."
       end

data/lib/mangdown/tools.rb

@@ -2,6 +2,16 @@ module Mangdown
   module Tools
     extend self
   
+    def special?(klass)
+      klasses = [Manga, Chapter, Page, MRChapter, MFChapter]
+
+      if klasses.find(self.class)
+        true
+      else
+        false
+      end
+    end
+
     def get_doc(uri)
       @doc = ::Nokogiri::HTML(open(uri))
     end
@@ -11,30 +21,41 @@ module Mangdown
     end
 
     def to_s
-      "<#{self.class}::#{self.object_id} : #{@name} : #{@uri}>"
+      if special?(self.class)
+        "<#{self.class}::#{self.object_id} : #{@name} : #{@uri}>"
+      else
+        super
+      end
     end
 
     def eql?(other)
-      (@name == other.name) and (@uri == other.uri)
+      if special?(self.class)
+        (self.name == other.name) and (self.uri == other.uri)
+      else
+        super
+      end
     end
 
     def ==(other)
-      puts 'You may want to use :eql?'
+      if special?(self.class)
+        puts 'You may want to use eql?'
+      end
+
       super
     end
 
-    def no_time_out(tries = 3)
+    def no_time_out(tries = 3, &block)
+      tries -= 1
       begin 
         timeout(120) do
           yield 
         end
-            rescue
-        if tries > 0
-                tries -= 1
+      rescue
+        if tries >= 0
           puts "Tries left: #{tries}"
-          no_time_out(tries)
+          no_time_out(tries, &block)
         else
-          return
+          return :timed_out
         end
       end
     end
@@ -42,17 +63,17 @@ module Mangdown
     def slow_get_chapters(manga, bgn, nd)
       @@file_name = File.expand_path("#{manga.name}_temp.yml")
 
-      exists = File.exist?(@@file_name)
-
-      if exists
+      # get Manga object from file if it exists
+      if File.exist?(@@file_name)
         manga_from_file = YAML.load(File.open(@@file_name, 'r').read) 
       end
 
       if manga_from_file and (manga_from_file.chapters.length > 0)
-        frst = (manga.chapters_list[bgn][1] == 
+        frst = (manga.chapters_list[bgn][:name] == 
                manga_from_file.chapters.first.name) 
-        lst = (manga.chapters_list[nd][1] == 
+        lst = (manga.chapters_list[nd][:name] == 
                manga_from_file.chapters.last.name)
+        # check if this is the right temp file
         manga = manga_from_file if (frst and lst)
       else
         manga.chapters_list[bgn..nd].each_index do |i|
@@ -70,9 +91,12 @@ module Mangdown
       Dir.mkdir(manga.name) unless Dir.exist?(manga.name)
       Dir.chdir(manga.name)
 
+      manga_start_dir = Dir.pwd
       manga.chapters.each do |chap|
-        # puts "DL - #{chap.name}.."
-        no_time_out {chap.download}
+        no_time_out do 
+          Dir.chdir(manga_start_dir)
+          chap.download
+        end
       end
 
       File.delete(@@file_name)
@@ -80,6 +104,9 @@ module Mangdown
     end
 
     def check_file_or_dir_name(name)
+
+      # slice the last number in the file or directory name,
+      # which will be either the page number or the chapter number
       num = name.slice(/(\d+)(\.jpg)*\Z/, 1)
     
       if num
@@ -94,18 +121,19 @@ module Mangdown
     end 
 
     def check_dir(dir)
-      Dir.glob(dir + '/*').each do |d| 
-        next if d.include?('.cbz')
-        yield(d)
+      Dir.glob(dir + '/*').each do |file_name| 
+        #do block on each file name, but skip .cbz files
+        next if file_name.include?('.cbz')
+        yield(file_name)
       end
     end 
 
     def validate_file_or_dir_names(dir)
-      check_dir(dir) do |e|
-        f = check_file_or_dir_name(e)
+      check_dir(dir) do |file_name|
+        checked_name = check_file_or_dir_name(file_name)
 
-        unless f == e
-          File.rename(e, f)
+        unless file_name == checked_name
+          File.rename(file_name, checked_name)
         end
       end
     end

data/spec/mangdown/chapter_spec.rb

@@ -1,10 +1,11 @@
 require 'spec_helper'
 
 module Mangdown
-  @@uri = 'http://www.mangareader.net/bleach/537'
-  @@chapter_name = 'Bleach 537'
+  @@chapter_hash = MDHash.new
+  @@chapter_hash[:uri] = 'http://www.mangareader.net/bleach/537'
+  @@chapter_hash[:name] = 'Bleach 537'
 
-  chapter = MRChapter.new( @@uri, @@chapter_name )
+  chapter = MRChapter.new(@@chapter_hash)
   chapter.download
   
   STUB_PATH = File.expand_path('../../objects/chapter.yml', __FILE__)
@@ -21,7 +22,7 @@ module Mangdown
     context "when chapter is initialized" do
       # sanity check, not necessary
       it "should have the right chapter uri" do
-        expect(@chapter.uri).to eq(@@uri)
+        expect(@chapter.uri).to eq(@@chapter_hash[:uri])
       end
 
       it "should get pages when initialized" do
@@ -37,6 +38,19 @@ module Mangdown
         expect(@chapter.pages.last.filename).to eq(
                'Bleach 537 - Page 21.jpg')
       end
+
+      context "as a MFChapter" do
+        it "should have pages" do
+          hash = MDHash.new
+          hash[:uri]  = 
+          'http://mangafox.me/manga/kitsune_no_yomeiri/v01/c001/1.html'
+          hash[:name] = 'Kitsune no Yomeiri 1'
+
+          chapter = MFChapter.new(hash)
+          
+          expect(chapter.pages).not_to be_empty
+        end
+      end
     end
     
    # Move these to Tools spec 
@@ -61,13 +75,15 @@ module Mangdown
   context "when chapter is downloaded" do
     it "should have a sub directory in the current directory" do
       dir = Dir.pwd
-      expect(Dir.glob(dir + '/*' )).to include(dir + '/' + 
-                                               @chapter.name)
+      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
       # expect(dir).to include("mangdown/#{@chapter.name}")
+
       pages_in_dir = Dir.glob(dir + '/*.jpg').length
       expect(pages_in_dir).to eq(@chapter.pages.length)
       #@chapter.pages.each do |page|

data/spec/mangdown/commands_spec.rb

@@ -4,10 +4,17 @@ module M
 
   describe "commands" do
 		before(:all) do
-	   	@manga = Mangdown::Manga.new('http://www.mangareader.net/6-no-trigger',
-												 '6 NO TRIGGER')
-			
-		  M.download(@manga, 1, 3)
+      hash = MDHash.new
+      hash[:uri]  = 'http://www.mangareader.net/6-no-trigger'
+      hash[:name] = '6 no Trigger'
+      @manga = Manga.new(hash)
+      
+      hash = MDHash.new
+      hash[:uri]  = 'http://mangafox.me/manga/naruto/'
+      hash[:name] = 'Naruto'
+      @mf_manga = Manga.new(hash)
+
+	   	M.download(@manga, 1, 3)
 			M.cbz("./#{@manga.name}")
 	  end
 
@@ -21,8 +28,29 @@ module M
 			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
+      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
-			puts Dir.pwd
 		  chps = Dir.glob("#{Dir.pwd}/#{@manga.name}/*/")	
 			expect(chps.length).to eq(3)
 		end

data/spec/mangdown/manga_list_spec.rb

@@ -0,0 +1,17 @@
+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,12 +1,15 @@
 require_relative '../spec_helper'
 
 module Mangdown
-  @@m_uri = 'http://www.mangareader.net/94/bleach.html'
-  @@manga_name = 'Bleach'
+  @@manga_hash        = MDHash.new
+  @@manga_hash[:uri]  = 'http://www.mangareader.net/94/bleach.html'
+  @@manga_hash[:name] = 'Bleach'
 
-  manga = Manga.new( @@m_uri, @@manga_name )
+  manga = Manga.new(@@manga_hash)
   
-  MANGA_STUB_PATH = File.expand_path('../../objects/manga.yml', __FILE__)
+  MANGA_STUB_PATH = File.expand_path('../../objects/manga.yml', 
+                                     __FILE__)
+
   File.open(MANGA_STUB_PATH, 'w+') do |file| 
     file.write(manga.to_yaml)
   end
@@ -16,17 +19,27 @@ module Mangdown
     before(:each) do
       print '@'
       @manga = YAML.load(File.open(Mangdown::MANGA_STUB_PATH, 'r').read)
-      @manga.get_doc(@@m_uri)
+      #@manga.get_doc(@@manga_hash[:uri])
     end
 
     context "When a manga is initialized" do
-      it "should have chapters" 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
+          hash[:uri] = 'http://mangafox.me/manga/masca_the_beginning/' 
+          hash[:name] = 'Masca: The Beginning'
+          manga = Manga.new(hash)
+          expect(manga.chapters_list).not_to be_empty
+        end
+      end
     end
 
     context "with Bleach manga" do
@@ -35,21 +48,22 @@ module Mangdown
       end
 
       it "should have the right first chapter" do
-        expect(@manga.chapters_list.first).to eq([
-                'http://www.mangareader.net/94-8-1/bleach/chapter-1.html',
-                'Bleach 1'])
+        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([
-                'http://www.mangareader.net/bleach/465',
-                'Bleach 465'])
+        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 = YAML.load(File.open(
+                            Mangdown::MANGA_STUB_PATH, 'r').read)
         @manga2.get_chapter(0)
 				@mchapter = @manga2.chapters_list[0]
       end
@@ -59,12 +73,12 @@ module Mangdown
       end
 
       it "should have chapter 1 in chapters" do
-        expect(@manga2.chapters[0].name).to eq(@mchapter[1])
+        expect(@manga2.chapters[0].name).to eq(@mchapter[:name])
       end
 
 			it "should have the right chapter sub class" do
 				klass = Chapter
-				if @mchapter[0].include?('mangareader')
+				if @mchapter[:uri].include?('mangareader')
 					klass = MRChapter
 				end
 				

data/spec/mangdown/mangdown_hash_spec.rb

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

data/spec/mangdown/page_spec.rb

@@ -4,11 +4,16 @@ module Mangdown
   describe Page do
    	before(:all) do
 		  @dir = Dir.pwd
-	    @uri = 'http://i25.mangareader.net/bleach/537/bleach-4149721.jpg'
-	    @filename = "Bleach 537 - Page 1" 
-	    @page = Page.new( @uri, @filename )
+      @page_hash = MDHash.new
+	    @page_hash[:uri] = 
+        'http://i25.mangareader.net/bleach/537/bleach-4149721.jpg'
+	    @page_hash[:name] = "Bleach 537 - Page 1" 
+
+	    @page = Page.new(@page_hash)
 	    @page.download
-      PAGE_STUB_PATH = File.expand_path('../../objects/page.yml', __FILE__)
+      PAGE_STUB_PATH = File.expand_path('../../objects/page.yml', 
+                                        __FILE__)
+
       File.open(PAGE_STUB_PATH, 'w+') do |file| 
         file.write(@page.to_yaml)
       end

data/spec/spec_helper.rb

@@ -2,7 +2,9 @@ require 'rspec'
 require 'yaml'
 require_relative '../lib/mangdown'
 
-dirs = ['../../Bleach 537', '../../6 NO TRIGGER']
+M.clean_up
+
+dirs = ['../../Bleach 537', '../../6 no Trigger', '../../Naruto']
 
 dirs.each do |d|
   dir = File.expand_path(d, __FILE__)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mangdown
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.3
 platform: ruby
 authors:
 - jphager2
@@ -23,13 +23,16 @@ files:
 - lib/mangdown/chapter.rb
 - lib/mangdown/commands.rb
 - lib/mangdown/manga.rb
+- lib/mangdown/manga_list.rb
 - lib/mangdown/mangdown_hash.rb
 - lib/mangdown/page.rb
 - lib/mangdown/popular.rb
 - lib/mangdown/tools.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/objects/make_chapter.rb