mangdown 0.9.1 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8edc98ea1b22509ee5e3239963a8ca582470da6
-  data.tar.gz: 3448aa25bbe27b62e6adf625757057ba7442cda8
+  metadata.gz: 39eae36cb18260f996d55849997b0b28bd306985
+  data.tar.gz: 1b097d36b0d567f0464ec06ac0913a5f8efded53
 SHA512:
-  metadata.gz: 7da3513f4a5261d9abb41b489cad7f78fedeedc28d8b82f1d4fa62c9512eaf37147eccfd2076ff9b30b09383ba7080b01087598befd72f0ca8f09406f297d074
-  data.tar.gz: 3f1db8d04801ef1894d2d3ccef32767f5e63e9c4c761af4843be597e4b6727aa42b4471f50f57b339662a802fc3c202d2017695f003034d9be176fc8d927ddcf
+  metadata.gz: bd8cfb84002fed92ae7eb6ddba6a6d6e0fc73d7873f43afee0ed06324ee6975eb1988eca03c331f96322771b1d2df9a56351fb53bc85966e029bc5489fd32fc9
+  data.tar.gz: 89b574acbf8fa239f780307b9befbd73eb40481a7a44d637a50954c814f85cec2c14538a14254792ba392dfe7f3a2f2fa75cb670fc4e76ae1bdb75706669157f

data/doc/help.txt

@@ -3,7 +3,7 @@ Mangdown
 
 Commands
 
-    M#find(string) - Will return an array of Mangdown::MDHash given 
+    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.
 
@@ -37,12 +37,16 @@ Commands
     # naruto is the Mangdown::Manga object from the example above
     naruto.download_to(Dir.home + '/manga', 500, 549)
     
-    M#clean_up     - Will delete .manga_list.yml file from the home
+    M.cbz(path)    - Will validate names of subdirectories in the path
+                     and thier files and then Zip those subdirectories
+                     with a .cbz extention
+
+    M.clean_up     - Will delete .manga_list.yml file from the home
                      directory
 
     M.clean_up
 
 
-    M#help         - Will display help for commands
+    M.help         - Will display help for commands
 
 =======================================================================

data/lib/mangdown/cbz.rb

@@ -3,6 +3,16 @@ module Mangdown
     extend self
     extend ::Mangdown::Tools
 
+    def all(main_dir)
+			# Make sure all sub dirs are checked
+			validate_file_or_dir_names(main_dir)
+			# Make sure all sub dirs have files checked
+			check_dir(main_dir) { |dir| validate_file_or_dir_names(dir)}
+			# Create cbz files for all sub dirs
+			cbz_sub_dirs(main_dir)
+    end
+
+    private
     def cbz_dir(dir)
       zip_file_name = dir + '.cbz'
       dir += '/' unless dir[-1] == '/'
@@ -20,17 +30,6 @@ module Mangdown
       end
     end 
 
-    def all(main_dir)
-			# Make sure all sub dirs are checked
-			validate_file_or_dir_names(main_dir)
-			# Make sure all sub dirs have files checked
-			check_dir(main_dir) { |dir| validate_file_or_dir_names(dir)}
-			# Create cbz files for all sub dirs
-			cbz_sub_dirs(main_dir)
-			# new line
-			puts
-    end
-
     def check_dir(dir)
       Dir.glob(dir + '/*').each do |file_name| 
         #do block on each file name, but skip .cbz files
@@ -56,6 +55,5 @@ module Mangdown
       num = "0" * zeros_to_add + num
       name.sub(/(\d+)(\.jpg)*\Z/, num + '\2')
     end 
-
   end
 end

data/lib/mangdown/chapter.rb

@@ -5,19 +5,23 @@ module Mangdown
 		attr_reader :name, :uri, :pages, :manga, :chapter
 
 		def initialize(name, uri)
-      @manga = name.slice(/(^.+)\s/, 1) 
-      @chapter = name.slice(/\d+\z/) 
-			@name  = name
-			@uri   = Mangdown::Uri.new(uri)
-			@pages = []
+      # use a valid name
+			@name       = name.sub(/\s(\d+)$/) { |num| 
+        ' ' + num.to_i.to_s.rjust(3, '0')
+      }
+      @manga      = name.slice(/(^.+)\s/, 1) 
+      @chapter    = name.slice(/\d+\z/) 
+			@uri        = Mangdown::Uri.new(uri)
       @properties = Properties.new(@uri)
+			@pages      = []
 
 			get_pages
+      @pages.sort_by! {|page| page.name}
 		end
 
     # enumerates through pages
     def each
-      @pages.each {|page| yield(page) if block_given?}
+      block_given? ? @pages.each { |page| yield(page) } : @pages.each
     end
 
 		# explicit conversion to chapter
@@ -41,7 +45,6 @@ module Mangdown
 		end
 
 		private
-			
 			# get page objects for all pages in a chapter
 			def get_pages
         threads = []
@@ -74,7 +77,6 @@ module Mangdown
 	# mangareader chapter object
 	class MRChapter < Chapter
 		private
-	
       # get the doc for a given page number
       def get_page_doc(num)
         root     = @properties.root
@@ -103,7 +105,6 @@ module Mangdown
 	# mangafox chapter object
 	class MFChapter < Chapter
 		private
-
       # get the doc for a given page number
       def get_page_doc(num)
         Tools.get_doc(

data/lib/mangdown/commands.rb

@@ -4,59 +4,68 @@ module M
   include ::Mangdown
 
   DATA_FILE_PATH = Dir.home + '/.manga_list.yml'
-
-	# check if the search key contains letters or numbers
-  def valid_search?(search)
-    search =~ /\w/
-  end
-
-	# check if the data file is current
-	def file_current?(file)
-		File.exists?(file) ? File.mtime(file) > (Time.now - 604800) : false
-	end
+  HELP_FILE_PATH = File.expand_path(
+    '../../doc/help.txt', File.dirname(__FILE__)
+  )
 
   # return a list of hash with :uri and :name of mangas found in list
   def find(search)
-    unless valid_search?(search)
-      puts "Searches must contain letters and numbers.."
-      return []
-    end
-    
-		if file_current?(DATA_FILE_PATH)
-      list = YAML.load(File.open(DATA_FILE_PATH, 'r').read)
-    else
-      list = MangaList.new(
-        'http://www.mangareader.net/alphabetical',
-        'http://mangafox.me/manga/'                       
-      ) 
-
-      File.open(DATA_FILE_PATH, 'w+') do |file|
-        file.write( list.to_yaml )
-      end
-    end
-
-    search_result = list.mangas.select do |manga| 
-      manga[:name].downcase.include?(search.downcase)
-    end
-    
-    search_result
+    validate_search(search)
+    current_manga_list.mangas.select { |manga| 
+      manga[:name].downcase.include?(search.downcase) 
+    }
   end
 
 	# cbz all subdirectories in a directory
   def cbz(dir)
-		Dir.exist?(dir) ? CBZ.all(dir) : (puts "Cannot find directory")
+		Dir.exist?(dir) ? (CBZ.all(dir)) : (raise Errno::ENOENT, dir) 
   end
 
 	# display help file
   def help
-    help_file = File.expand_path(
-      '../../doc/help.txt', File.dirname(__FILE__)
-    )
-    puts File.open(help_file, 'r').read
+    puts File.open(HELP_FILE_PATH, 'r').read
   end
 
 	# delete data file
   def clean_up
     File.delete(DATA_FILE_PATH) if File.exist?(DATA_FILE_PATH)
   end
+
+  private
+    # convenience method to access the data file path
+    def path
+      DATA_FILE_PATH
+    end
+
+    # check if the data file is current
+    def file_current?(f)
+      File.exists?(f) && File.mtime(f) > (Time.now - 604800)
+    end
+
+    # attempt to get the list from the data file
+    def data_from_file
+      YAML.load(File.open(path, 'r').read) if file_current?(path)
+    rescue Psych::SyntaxError => error
+      error
+    end
+
+
+    # get saved current manga list, if data is less than a week old
+    # otherwise fetch new data and write it to the data file
+    def current_manga_list
+      data = data_from_file
+      return data if data.is_a? Mangdown::MangaList
+
+      MangaList.new(
+        'http://www.mangareader.net/alphabetical',
+        'http://mangafox.me/manga/'
+      ).tap { |list| File.open(path,'w+') {|f| f.write(list.to_yaml)} }
+    end
+
+    # check if the search key contains letters or numbers
+    def validate_search(search)
+      unless search =~ /\w/
+        raise ArgumentError, "Searches must contain letters and numbers"
+      end
+    end
 end

data/lib/mangdown/manga_list.rb

@@ -14,8 +14,12 @@ module Mangdown
 		# get a list of mangas from the uri
     def get_mangas(uri)
 			properties = Properties.new(uri)
-      doc        = Tools.get_doc(uri)
-      
+      if properties.empty?
+        raise ArgumentError, 
+          "Bad URI: No Properties Specified for URI <#{uri}>"
+      end
+
+      doc = Tools.get_doc(uri)
       # This should be put in a tool
 			doc.css(properties.manga_list_css_klass).each do |a|
 				@mangas << MDHash.new( 

data/lib/mangdown/mangdown_hash.rb

@@ -2,25 +2,34 @@ module Mangdown
   class MDHash < ::Hash
 
 		def initialize(options = {})
-			self[:uri]     = options[:uri]
-			self[:name]    = options[:name]
+			self[:uri]  = options[:uri]
+			self[:name] = options[:name]
 		end
 
 		# explicit conversion to manga 
     def to_manga
-      Manga.new(self[:name], self[:uri])
+      Manga.new(name, uri)
     end
 
 		# explicit conversion to chapter 
 		def to_chapter
-			klass = Properties.new(self[:uri]).chapter_klass
-		  klass.new(self[:name], self[:uri])
+			Properties.new(uri).chapter_klass.new(name, uri)
 		end
 
 		# explicit conversion to page 
  	  def to_page 
-		  Page.new(self[:name], self[:uri])
+		  Page.new(name, uri)
 		end	
+
+    # name reader
+    def name
+      self[:name]
+    end
+
+    # uri reader
+    def uri
+      self[:uri]
+    end
   end
 end
 

data/lib/mangdown/page.rb

@@ -1,33 +1,39 @@
-class Mangdown::Page
+module Mangdown
+  class Page
 
-	include Mangdown 
-  include Comparable
+    include Mangdown 
+    include Comparable
 
-	attr_reader :name, :uri
+    attr_reader :name, :uri
 
-	def initialize(name, uri)
-		@name = name
-		@uri  = Mangdown::Uri.new(uri) 
-	end
+    def initialize(name, uri)
+      @name = name.sub(/(\s)(\d+)(\.\w+)$/) { 
+        "#{Regexp.last_match[1]}" +
+        "#{Regexp.last_match[2].to_s.rjust(3, '0')}" +
+        "#{Regexp.last_match[3]}" 
+      }
+      @uri  = Mangdown::Uri.new(uri) 
+    end
 
-  # space ship operator for sorting
-  def <=>(other)
-    self.name <=> other.name
-  end
+    # space ship operator for sorting
+    def <=>(other)
+      self.name <=> other.name
+    end
 
-	# explicit conversion to page 
-	def to_page
-		self
-	end	
+    # explicit conversion to page 
+    def to_page
+      self
+    end	
 
-  # 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
-    File.open(path, 'wb') {|file| file.write(image)}
-  rescue SocketError => error
-    STDERR.puts( "#{error.message} | #{name} | #{uri}" )
+    # 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
+      File.open(path, 'wb') {|file| file.write(image)}
+    rescue SocketError => error
+      STDERR.puts( "#{error.message} | #{name} | #{uri}" )
+    end
   end
 end

data/lib/mangdown/properties.rb

@@ -9,7 +9,10 @@ module Mangdown
       case site 
       when /mangareader/
 				mangareader
-      when /mangapanda/
+      when /mangapanda/ 
+        #mangapanda is a mirror of mangareader
+        #that being said, I really don't think this works
+        #especially with @info[:root]
         mangareader
       when /mangafox/
 				mangafox
@@ -36,8 +39,14 @@ module Mangdown
 			@info[:reverse]              = true
 		end
 
+    def empty?
+      @info.empty?
+    end
+
 		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
 			end

data/spec/lib/mangdown/cbz_spec.rb

@@ -0,0 +1,40 @@
+require_relative '../../spec_helper'
+
+describe Mangdown::CBZ do
+  describe 'CBZ all' do
+
+    before do
+      @fixtures_dir = File.expand_path('../../../fixtures', __FILE__)
+      @tmp_dir      = File.expand_path('../../../../tmp', __FILE__)
+      @nisekoi_dir  = @tmp_dir + "/Nisekoi"
+      FileUtils.cp_r(@fixtures_dir + '/Nisekoi', @tmp_dir) 
+      Mangdown::CBZ.all(@nisekoi_dir)
+    end
+
+    after do
+      FileUtils.rm_r(@nisekoi_dir, force: true)
+    end
+
+    it 'must have equal numbers of cbz files and chapter directories' do
+      chapter_count = Dir["#{@nisekoi_dir}/*/"].length
+      cbz_count     = Dir["#{@nisekoi_dir}/*.cbz"].length
+      cbz_count.must_equal(chapter_count)
+    end
+
+    it 'cbz file names should be valid' do
+      filenames = Dir["#{@nisekoi_dir}/*.cbz"]
+      filenames.each do |name|
+        name.must_match /\d{3}\.cbz/
+      end
+    end
+
+    it 'cbz image file names should be valid' do
+      zips = Dir["#{@nisekoi_dir}/*.cbz"]
+      names = zips.flat_map {|f| Zip::File.new(f).glob('*').map(&:name)}
+      names.each do |name|
+        # Don't use #must_match, it causes an error with Zip::File
+        (name =~ /Page \d{3}/).wont_be_nil
+      end
+    end
+  end
+end

data/spec/lib/mangdown/chapter_spec.rb

@@ -0,0 +1,76 @@
+require_relative '../../spec_helper'
+
+describe Mangdown::Chapter do
+  let(:download_path) { File.expand_path('../../../../tmp', __FILE__) }
+  let(:chapter_name) { "Dragon Ball 1" }
+  let(:uri)  { 
+    "http://www.mangareader.net/105-2100-1/dragon-ball/chapter-1.html" 
+  }
+
+  before do
+    VCR.insert_cassette 'events', record: :new_episodes
+    @chapter =  Mangdown::MRChapter.new(chapter_name, uri)
+  end
+
+  after do
+    VCR.eject_cassette
+    FileUtils.rm_r("#{download_path}/#{chapter_name}", force: true)
+  end
+
+  describe 'new' do
+    it 'must return a kind of Chapter but not an instance of Chapter' do
+    end
+  end
+
+  describe 'to_chapter' do
+    it 'must return the same class of chapter' do
+      new_chapter = @chapter.to_chapter
+      new_chapter.must_be_instance_of @chapter.class
+    end
+  end
+
+  describe 'each' do
+    it 'must return an enumerator' do
+      @chapter.each.must_be_instance_of Enumerator
+    end
+
+    it 'must iterate through each page' do
+      count = 0
+      @chapter.each do |page|
+        page.must_be_instance_of Mangdown::Page
+        count += 1 
+      end
+      count.must_equal @chapter.pages.length
+    end
+  end
+
+  describe 'download_to' do
+    before do
+      # @times will start at 0 and end at N, where N is the number 
+      # of specs in this describe block 
+      @times ||= 0
+      @chapter.download_to(download_path) if @times == 0
+      @times += 1
+    end
+
+    after do
+      # @times will start at 0 and end at N, where N is the number 
+      # of specs in this describe block 
+      if @times == 2 && Dir.exist?("#{download_path}/#{chapter_name}")
+        FileUtils.rm_r(@nisekoi_dir, force: true)
+      end
+    end
+
+    it 'must create a subdirectory with the chapter name' do
+      Dir.exist?("#{download_path}/#{chapter_name}").must_equal true
+    end
+
+    it 'must have page files in the sub directory' do
+      files = Dir["#{download_path}/#{chapter_name}/*"]
+      files.each do |name|
+        @chapter.pages.any? { |page| name =~ /#{page.name}/ }
+          .must_equal true
+      end
+    end
+  end
+end

data/spec/lib/mangdown/commands_spec.rb

@@ -0,0 +1,67 @@
+require_relative '../../spec_helper'
+require 'stringio'
+
+describe M do
+  before do
+    VCR.insert_cassette 'events', record: :new_episodes
+  end
+
+  after do
+    VCR.eject_cassette
+  end
+
+  describe 'find' do
+    it 'must return an array of MDHash' do
+      results = M.find('Naruto')
+      results.each do |result|
+        result.must_be_instance_of Mangdown::MDHash
+      end
+    end
+
+    it 'must only accept good search terms' do
+      bad  = ['@#$$#', '........', '@#%@#$%^']
+      good = ["666 Bats", "1 2 3", "Go! For! IT!"]
+      bad.each  { |term| -> { M.find(term) }.must_raise ArgumentError }
+      good.each { |term| -> { M.find(term) }.must_be_silent }
+    end
+  end
+
+  describe 'cbz' do
+    # CBZ is tested in cbz_spec.rb
+    it 'must fail if given a bad path' do
+      path = "super_bad_path/that/cant/possibly/exist!!!"
+      -> { M.cbz(path) }.must_raise Errno::ENOENT
+    end
+
+    it 'must not fail if given a good path' do
+      # Before
+      fixtures_dir = File.expand_path('../../../fixtures', __FILE__)
+      tmp_dir      = File.expand_path('../../../../tmp', __FILE__)
+      nisekoi_dir  = tmp_dir + "/Nisekoi"
+      FileUtils.cp_r(fixtures_dir + '/Nisekoi', tmp_dir) 
+
+      -> { M.cbz(nisekoi_dir) }.must_be_silent
+
+      # After
+      FileUtils.rm_r(nisekoi_dir, force: true)
+    end
+  end
+
+  describe 'help' do
+    it "must output instructions for the command methods" do
+      output = SpecHelper.stdout_for { M.help }
+      output.length.wont_be :zero?
+      ["M.help", "M.cbz", "M.clean_up"].each do |command|
+        output.must_match /#{command}/ 
+      end
+    end
+  end
+
+  describe 'clean_up' do
+    it "must delete the data file" do
+      File.open(M::DATA_FILE_PATH, 'a') { |f| f.write("HELLO!") }
+      M.clean_up
+      File.exist?(M::DATA_FILE_PATH).must_equal false
+    end
+  end
+end

data/spec/lib/mangdown/manga_list_spec.rb

@@ -0,0 +1,42 @@
+require_relative '../../spec_helper.rb'
+
+describe Mangdown::MangaList do
+  before do
+    VCR.insert_cassette 'events', record: :new_episodes
+  end
+
+  after do
+    VCR.eject_cassette
+  end
+
+  describe 'new' do
+    let(:mangareader) {
+      Mangdown::MangaList.new('http://www.mangareader.net/alphabetical')
+    }
+    let(:mangafox) { 
+      Mangdown::MangaList.new('http://mangafox.me/manga/')
+    }
+    let(:multiple) { Mangdown::MangaList.new(
+      'http://www.mangareader.net/alphabetical',
+      'http://mangafox.me/manga/'
+    ) }
+
+    it 'must have a manga list with mangas (as md hashes)' do
+      [mangareader, mangafox].each do |type|
+        type.mangas.must_be_instance_of Array
+        type.mangas.each do |manga|
+          manga.must_be_instance_of Mangdown::MDHash
+        end
+      end
+    end
+
+    it 'must raise an ArgumentError if given a bad url' do
+      -> { Mangdown::MangaList.new('garbage-url.com/bogus') }
+        .must_raise ArgumentError
+    end
+
+    it 'must return a manga list with mangas from all input urls' do
+      multiple.mangas.length.must_be :>, (mangareader.mangas.length)
+    end
+  end
+end

data/spec/mangdown/chapter_spec.rb

@@ -6,9 +6,9 @@ module Mangdown
     name: 'Bleach 537',
     manga: 'Bleach',
     chapter: '537',
-	)
+  )
 
-	chapter = @@chapter_hash.to_chapter
+  chapter = @@chapter_hash.to_chapter
   chapter.download
   
   STUB_PATH = File.expand_path('../../objects/chapter.yml', __FILE__)
@@ -49,9 +49,9 @@ module Mangdown
             name: 'Kitsune no Yomeiri 1',
             manga: 'Kitsune no Yomeiri',
             chapter: 1,
-					)
+          )
 
-					chapter = hash.to_chapter
+          chapter = hash.to_chapter
           
           expect(chapter.pages).not_to be_empty
         end

data/spec/mangdown/commands_spec.rb

@@ -3,32 +3,32 @@ require 'spec_helper.rb'
 module M
 
   describe "commands" do
-		before(:all) do
+    before(:all) do
       hash = MDHash.new(
-				uri:  'http://www.mangareader.net/6-no-trigger',
-				name: '6 no Trigger'
-			)
+        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'
-			)
+        uri:  'http://mangafox.me/manga/naruto/',
+        name: 'Naruto'
+      )
       @mf_manga = hash.to_manga
 
-	   	M.download(@manga, 1, 3)
-			M.cbz("./#{@manga.name}")
-	  end
+      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 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 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')
@@ -48,19 +48,19 @@ module M
 
     it "should download a manga from MF" do 
       dir = Dir.pwd
-			#@mf_manga.remove_chapters
+      #@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 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
+    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_spec.rb

@@ -4,9 +4,9 @@ module Mangdown
   @@manga_hash = MDHash.new(
     uri:  'http://www.mangareader.net/94/bleach.html',
     name: 'Bleach'
-	)
+  )
 
-	manga = @@manga_hash.to_manga
+  manga = @@manga_hash.to_manga
   
   MANGA_STUB_PATH = File.expand_path('../../objects/manga.yml', 
                                      __FILE__)
@@ -34,9 +34,9 @@ module Mangdown
       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'
-					)
+            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
@@ -65,10 +65,10 @@ module Mangdown
 
     context "when a chapter is retrieved" do
       before(:all) do
-				@manga2 = YAML.load(File.open(
+        @manga2 = YAML.load(File.open(
                             Mangdown::MANGA_STUB_PATH, 'r').read)
         @manga2.get_chapter(0)
-				@mchapter = @manga2.chapters_list[0]
+        @mchapter = @manga2.chapters_list[0]
       end
 
       it "should have a chapter in chapters" do
@@ -79,14 +79,14 @@ module Mangdown
         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
+      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

@@ -5,9 +5,9 @@ module Mangdown
   describe MDHash do
     before(:all) do
       @hash = MDHash.new(
-				uri:  'http://www.mangareader.net/103/one-piece.html',
-				name: 'One Piece'
-			)
+        uri:  'http://www.mangareader.net/103/one-piece.html',
+        name: 'One Piece'
+      )
     end
 
     it "should get a manga object from get_manga" do

data/spec/mangdown/page_spec.rb

@@ -2,22 +2,22 @@ require 'spec_helper'
 
 module Mangdown
   describe Page do
-   	before(:all) do
-		  @dir = Dir.pwd
+    before(:all) do
+      @dir = Dir.pwd
       @page_hash = MDHash.new(
-	      uri: 'http://i25.mangareader.net/bleach/537/bleach-4149721.jpg',
-	      name: "Bleach 537 - Page 1" 
-			)
+        uri: 'http://i25.mangareader.net/bleach/537/bleach-4149721.jpg',
+        name: "Bleach 537 - Page 1" 
+      )
 
-			@page = @page_hash.to_page
-	    @page.download
+      @page = @page_hash.to_page
+      @page.download
       PAGE_STUB_PATH = File.expand_path('../../objects/page.yml', 
                                         __FILE__)
 
       File.open(PAGE_STUB_PATH, 'w+') do |file| 
         file.write(@page.to_yaml)
       end
-		  @page2 = YAML.load(File.open(PAGE_STUB_PATH, 'r').read)
+      @page2 = YAML.load(File.open(PAGE_STUB_PATH, 'r').read)
     end
 
     context "when page is downloaded" do
@@ -26,14 +26,14 @@ module Mangdown
       end
     end
 
-		context "when a page is compared with a page loaded from a .yml file" do
+    context "when a page is compared with a page loaded from a .yml file" do
       it "should compare with #eql?" do
-	  		expect(@page.eql?(@page2))
-			end 
+        expect(@page.eql?(@page2))
+      end 
 
-			it "should not compare with ==" do
-				expect(!@page == @page2)
-			end
-		end
+      it "should not compare with ==" do
+        expect(!@page == @page2)
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,39 +1,22 @@
-require 'rspec'
-require 'yaml'
 require_relative '../lib/mangdown'
 
-M.clean_up
+require 'minitest/autorun'
+require 'webmock/minitest'
+require 'vcr'
+require 'fileutils'
 
-dirs = ['../../Bleach 537', '../../6 no Trigger', '../../Naruto']
-
-dirs.each do |d|
-  dir = File.expand_path(d, __FILE__)
-  if Dir.exist?(dir)
-    print '*'
-    FileUtils.rm_rf(dir)
-  end
+VCR.configure do |c|
+  c.cassette_library_dir = 'spec/fixtures/cpo_cassettes'
+  c.hook_into :webmock
 end
 
-path = File.expand_path('../../Bleach 537 - Page 1.jpg', __FILE__) 
-if File.exist?(path)
-  print '*'
-  FileUtils.rm(path)
-end
-
-# This file was generated by the `rspec --init` command. Conventionally, all
-# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
-# Require this file using `require "spec_helper"` to ensure that it is only
-# loaded once.
-#
-# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
-RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
-  config.run_all_when_everything_filtered = true
-  config.filter_run :focus
-  
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
-  config.order = 'random'
+module SpecHelper
+  extend self
+  def stdout_for
+    out, temp = StringIO.new, $stdout  
+    $stdout = out
+    yield
+    out, $stdout = $stdout, temp
+    out.rewind and out.read
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mangdown
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.3
 platform: ruby
 authors:
 - jphager2
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-11 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -122,6 +122,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  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: vcr
+  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: rake
+  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'
 description: A gem to download Manga, (pg integration in dev)
 email: jphager2@gmail.com
 executables: []
@@ -152,6 +194,10 @@ files:
 - models/manga.rb
 - models/page.rb
 - models/site.rb
+- spec/lib/mangdown/cbz_spec.rb
+- spec/lib/mangdown/chapter_spec.rb
+- spec/lib/mangdown/commands_spec.rb
+- spec/lib/mangdown/manga_list_spec.rb
 - spec/mangdown/chapter_spec.rb
 - spec/mangdown/commands_spec.rb
 - spec/mangdown/manga_list_spec.rb
@@ -160,7 +206,6 @@ files:
 - spec/mangdown/page_spec.rb
 - spec/mangdown/popular_spec.rb
 - spec/mangdown/tools_spec.rb
-- spec/objects/make_chapter.rb
 - spec/spec_helper.rb
 homepage: https://github.com/jphager2/mangdown
 licenses:

data/spec/objects/make_chapter.rb

@@ -1,5 +0,0 @@
-require_relative '../../lib/mandown'
-
-include Mandown
-
-$chapter = Chapter.new('http://www.mangareader.net/bleach/537', 'Bleach 537')