mangdown 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0eeabd1173684b550b4cdf72608c175b4391510
-  data.tar.gz: 65dc5fd208fbea67661742c9783f52faaa12aaeb
+  metadata.gz: 3601e69092554b4994957c59e79fde24ed0b5014
+  data.tar.gz: eab931deff079ce8f0aa89636c3ba089733b6faa
 SHA512:
-  metadata.gz: ce29debf06fb2c5b16ff66f133c8cd0ef2bc8a2f6de9b234d7d37647a214f4e7011d9a0432965b12983381f219cc2d233e253a609fcc0ed7281c03aef7cbb854
-  data.tar.gz: f389ae7aaab05d16ac7669cf1a98f8b7ec358ee5c71a6871a5d5c0aadfe1e5022dd4615ca8061fa9ecf2efd0391fc824ca94832912c860386ec57b93d25c76d0
+  metadata.gz: 4489b2f82b82f1fcfe40462a28a900eca489bb09ffbf7e482f179d97c1b7e7c6a778c8f8255c5eabb163d10ad33d1aa5da484d759c01bd2aa4357bee3d08f4fc
+  data.tar.gz: 67923d472168c32a8271f428039e9e8aaf726790d17f0a788eaf91bbd7c98162388ab44235199eb7b9d026a98700e6dac1dc6c4347f5f82180e4f34720f7df79

data/LICENSE

@@ -1,20 +1,20 @@
-The MIT License (MIT)
-
-Copyright (c) 2013 John Hager
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+The MIT License (MIT)
+
+Copyright (c) 2013 John Hager
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/doc/help.txt

@@ -1,33 +1,33 @@
-==============================================================================
-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.
-
-    results = M.find('Naruto')
-
-
-
-    *** 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.
-
-    M.download(naruto, 500, 549)
-
-
-
-    M#help         - Will display help for commands
-
-==============================================================================
+==============================================================================
+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.
+
+    results = M.find('Naruto')
+
+
+
+    *** 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.
+
+    M.download(naruto, 500, 549)
+
+
+
+    M#help         - Will display help for commands
+
+==============================================================================

data/lib/mangdown.rb

@@ -1,19 +1,19 @@
-require 'uri'
-require 'open-uri'
-require 'nokogiri'
-require 'yaml'
-require 'timeout'
-require 'zip'
-
-require_relative 'mangdown/tools'
-require_relative 'mangdown/page'
-require_relative 'mangdown/chapter'
-require_relative 'mangdown/manga'
-require_relative 'mangdown/popular'
-require_relative 'mangdown/cbz'
-require_relative 'mangdown/commands'
-require_relative 'mangdown/mangdown_hash'
-
-unless $0 == __FILE__
-  puts '*** Use "M.help" for commands ***'
-end
+require 'uri'
+require 'open-uri'
+require 'nokogiri'
+require 'yaml'
+require 'timeout'
+require 'zip'
+
+require_relative 'mangdown/tools'
+require_relative 'mangdown/page'
+require_relative 'mangdown/chapter'
+require_relative 'mangdown/manga'
+require_relative 'mangdown/popular'
+require_relative 'mangdown/cbz'
+require_relative 'mangdown/commands'
+require_relative 'mangdown/mangdown_hash'
+
+unless $0 == __FILE__
+  puts '*** Use "M.help" for commands ***'
+end

data/lib/mangdown/cbz.rb

@@ -1,38 +1,38 @@
-module Mangdown
-  module CBZ
-    extend self
-    extend ::Mangdown::Tools
-
-    def cbz_dir(dir)
-      zip_file_name = dir + '.cbz'
-      dir += '/' unless dir[-1] == '/'
-
-      ::Zip::File.open(zip_file_name, ::Zip::File::CREATE) do |zp|
-        Dir[File.join(dir, '**', '**')].each do |file|
-          zp.add(file.sub(dir, ''), file)
-        end
-      end
-    end
-
-    def cbz_sub_dirs(dir)
-      check_dir(dir) do |d|
-        cbz_dir(d)
-      end
-    end 
-
-    def all(main_dir)
-      if Dir.exist?(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) { |d| validate_file_or_dir_names(d)}
-        # Create cbz files for all sub dirs
-        cbz_sub_dirs(main_dir)
-        # new line
-        puts
-      else
-	puts "Cannot find directory"
-      end
-    end
-  end
-end
+module Mangdown
+  module CBZ
+    extend self
+    extend ::Mangdown::Tools
+
+    def cbz_dir(dir)
+      zip_file_name = dir + '.cbz'
+      dir += '/' unless dir[-1] == '/'
+
+      ::Zip::File.open(zip_file_name, ::Zip::File::CREATE) do |zp|
+        Dir[File.join(dir, '**', '**')].each do |file|
+          zp.add(file.sub(dir, ''), file)
+        end
+      end
+    end
+
+    def cbz_sub_dirs(dir)
+      check_dir(dir) do |d|
+        cbz_dir(d)
+      end
+    end 
+
+    def all(main_dir)
+      if Dir.exist?(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) { |d| validate_file_or_dir_names(d)}
+        # Create cbz files for all sub dirs
+        cbz_sub_dirs(main_dir)
+        # new line
+        puts
+      else
+	puts "Cannot find directory"
+      end
+    end
+  end
+end

data/lib/mangdown/chapter.rb

@@ -1,131 +1,59 @@
-module Mangdown
-  class Chapter
-    include ::Mangdown::Tools
-
-    attr_reader :name, :pages, :uri, :num_pages
-    
-    def initialize( uri, name )
-      @uri = uri
-      @name = name
-      @pages = []
-      @root = get_root(@uri)
-
-      get_pages
-    end
-
-    def download
-      start_dir = Dir.pwd 
-      Dir.mkdir(@name) unless Dir.exists?(@name)
-      Dir.chdir(@name)
-      
-      @pages.each {|page| page.download}
-
-      Dir.chdir(start_dir)
-    end
-
-    def get_pages
-      uri = @uri
-      get_doc(uri)
-      @num_pages ||= get_num_pages
-      
-      @num_pages.times do
-        page_uri, page_name = get_page 
-        @pages << Page.new( page_uri, page_name )
-        uri = get_next_uri
-        get_doc(uri)
-      end
-
-      @doc = "Nokogiri::HTML::Document"
-    end
-
-    #def get_page # STAR
-    #  image = @doc.css('img')[0]
-    #  [image['src'], image['alt']]
-    #end
-
-    #def get_next_uri # STAR
-    #  get_root(@uri) 
-    #  @root + @doc.css('div#imgholder a')[0]['href']
-    #end
-  end
-
-  class MRChapter < Chapter
-    def get_page # STAR
-      image = @doc.css('img')[0]
-      [image['src'], image['alt']]
-    end
-
-    def get_next_uri # STAR
-      @root + @doc.css('div#imgholder a')[0]['href']
-    end
-
-    def get_num_pages
-      @doc.css('select')[1].children.length
-    end
-  end
-
-  class FKChapter < Chapter
-    attr_reader :num_pages
-
-    def initialize(uri, name, num_pages)
-      @num_pages = num_pages
-
-      super(uri, name)
-    end
-
-=begin
-    def get_pages
-      uri = @uri
-      get_doc(uri)
-
-      @num_pages.times do
-        page_uri, page_name = get_page 
-        @pages << Page.new( page_uri, page_name )
-        uri = get_next_uri
-        get_doc(uri)
-      end
-
-      @doc = "Nokogiri::HTML::Document"
-    end
-=end
-
-    def get_page # STAR
-      page = (@pages.length + 1).to_s
-      while page.length < 3
-        page = '0' + page
-      end
-
-      # puts "Doc: #{@doc.css('script').text.length}"
-      # 
-      # It seems that Nokogiri cuts out the spaces that were previously there
-      # before
-      #
-      # Watch this because I'm guessing this might revert back
-      # 
-      #s = /(http:\/\/t\.fakku\.net)(.+?)('\+x\+')(\.jpg)/
-      #image = @doc.css('script').text.slice(s)
-      #image.sub!(/'\+x\+'/, page)
-
-       script = @doc.css('script').text
-
-       if script.include?("' + x + '.jpg")
-	 # puts "With spaces"
-         ss = "'\s\\+\sx\s\\+\s'"
-       else
-	 # puts "No spaces"
-         ss = "'\\+x\\+'"
-       end
-
-       s = Regexp.new("(http:\/\/t\.fakku\.net)(.+?)(#{ss})(\.jpg)")
-       image = script.slice(s)
-       image.sub!(Regexp.new(ss), page)
-    
-      
-      [image, "Page - #{page}"]
-    end
-
-    def get_next_uri # STAR
-      "#{::URI.join( @uri, 'read#page=')}#{@pages.length + 2}" 
-    end
-  end
-end
+module Mangdown
+  class Chapter
+
+    attr_reader :name, :pages, :uri
+    
+    def initialize( uri, name )
+      @uri = uri
+      @name = name
+      @pages = []
+
+      get_pages
+    end
+
+    # download should be in its own module
+    def download
+      start_dir = Dir.pwd 
+
+      Dir.mkdir(@name) unless Dir.exists?(@name)
+      Dir.chdir(@name)
+      
+      @pages.each {|page| page.download}
+
+      Dir.chdir(start_dir)
+    end
+
+    private
+      def get_pages
+        uri = @uri
+        doc = ::Mangdown::Tools.get_doc(uri)
+        
+        get_num_pages(doc).times do
+          page_uri, page_name = get_page(doc) 
+          uri = get_next_uri(doc)
+
+          @pages << Page.new( page_uri, page_name )
+          doc = ::Mangdown::Tools.get_doc(uri)
+        end
+      end
+  end
+
+  class MRChapter < Chapter
+    private
+      def get_page(doc)
+        image = doc.css('img')[0]
+        [image['src'], image['alt']]
+      end
+
+      def get_next_uri(doc)
+        #root url + the href of the link to the next page
+        ::Mangdown::Tools.get_root(@uri) + 
+          doc.css('div#imgholder a')[0]['href']
+      end
+
+      def get_num_pages(doc)
+        # the select is a dropdown menu of chapter pages
+        doc.css('select')[1].children.length
+      end
+  end
+end

data/lib/mangdown/commands.rb

@@ -1,45 +1,57 @@
-module M
-  extend self
-
-  include ::Mangdown
-  extend ::Mangdown::Tools
-
-  #returns a list of hash with :uri and :name of mangas found in @@list
-  def find(manga_name)
-    unless manga_name =~ /\w/
-      puts 'Bad search term'
-      return []
-    end
-
-    @@list ||= PopularManga.new('http://www.mangareader.net/popular', 3000)
-
-    fnd = @@list.mangas_list.select do |m| 
-      m[1].downcase.include?(manga_name.downcase)
-    end
-    
-    fnd.collect! do |m| 
-      h = MDHash.new
-      h[:uri], h[:name] = m[0], m[1]
-      h
-    end
-
-    puts "Could not find manga" if fnd.empty?     
-    
-    fnd
-  end
-  
-  def download(manga, bgn = 0, nd = -1)
-    m = slow_get_chapters(manga, bgn, nd)
-    slow_dl_chapters(m)
-  end
-
-  def cbz(dir)
-    CBZ.all(dir)
-  end
-
-  def help
-    help_file = File.expand_path('../../doc/help.txt', File.dirname(__FILE__))
-    puts help_file
-    puts File.open(help_file, 'r').read
-  end
-end
+module M
+  extend self
+
+  include ::Mangdown
+  extend ::Mangdown::Tools
+
+  def valid_search?(search)
+    search =~ /\w/
+  end
+  
+  #returns 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
+    
+    # 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
+    
+=begin
+    search_result.collect! do |manga| 
+      h = MDHash.new
+      h[:uri], h[:name] = manga[:uri], manga[:name]
+      h
+    end
+=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)
+  end
+
+  def cbz(dir)
+    CBZ.all(dir)
+  end
+
+  def help
+    help_file = File.expand_path('../../doc/help.txt', 
+                                 File.dirname(__FILE__))
+    puts File.open(help_file, 'r').read
+  end
+end