mangdown 0.13.4 → 0.14.0

data/lib/mangdown/md_hash.rb

@@ -1,25 +1,54 @@
 module Mangdown
   class MDHash
     include Equality
+    include Properties
+
+    properties :name, :uri, :manga, :chapter, :site
 
     def initialize(options = {})
       uri = options.fetch(:uri)
       name = options[:name]
       site = options[:site]
-      @properties = Properties.new(uri, site, nil, name)
+      @adapter = Mangdown.adapter!(uri, site, nil, name)
 
-      @hash = {}
-      @hash[:name] = name
-      @hash[:uri] = Mangdown::Uri.new(uri)
-      @hash[:site] = @properties.type
-      @hash[:manga] = options[:manga]
-      @hash[:chapter] = options[:chapter]
+      self.name = name
+      self.uri = Mangdown::Uri.new(uri)
+      self.site = @adapter.site
+      self.manga = options[:manga]
+      self.chapter = options[:chapter]
+    end
+
+    # explicit conversion to manga list
+    def to_manga_list
+      # Seems weird to do it this way, but this is to intentially make it 
+      # more tedious to create a Mangadown::Manga object 
+      # (outsite of this method)
+      #
+      if @adapter.is_manga_list?
+        list = MangaList.new
+        list.load_manga(uri)
+        list
+      else
+        raise NoMethodError, 'This is not a known manga list type'
+      end
     end
 
     # explicit conversion to manga 
     def to_manga
-      if @properties.is_manga?
-        Manga.new(uri, name)
+      # Seems weird to do it this way, but this is to intentially make it 
+      # more tedious to create a Mangadown::Manga object 
+      # (outsite of this method)
+      #
+      if @adapter.is_manga?
+        if name.to_s.empty?
+          properties.merge!(@adapter.manga) { |_, before, after| 
+            before || after }
+        end
+
+        manga = Manga.new(uri, name)
+        manga.adapter = @adapter
+        manga.load_chapters
+        manga
       else
         raise NoMethodError, 'This is not a known manga type'
       end
@@ -27,8 +56,22 @@ module Mangdown
 
     # explicit conversion to chapter 
     def to_chapter
-      if @properties.is_chapter?
-        Chapter.new(uri, name, manga)
+      # Seems weird to do it this way, but this is to intentially make it 
+      # more tedious to create a Mangadown::Chapter object 
+      # (outsite of this method)
+      #
+      if @adapter.is_chapter?
+        if name.to_s.empty? || manga.to_s.empty? || chapter.to_s.empty?
+          properties.merge!(@adapter.chapter) { |_, before, after| 
+            before || after }
+        end
+        # Get a local binding
+        number = chapter
+
+        chapter = Chapter.new(uri, name, manga, number)
+        chapter.adapter = @adapter
+        chapter.load_pages
+        chapter
       else
         raise NoMethodError, 'This is not a known chapter type'
       end
@@ -36,64 +79,11 @@ module Mangdown
 
     # explicit conversion to page 
     def to_page 
-      if @properties.is_page?
+      if @adapter.is_page?
         Page.new(uri, name, manga, chapter)
       else
         raise NoMethodError, 'This is not a known page type'
       end
     end 
-
-    # name reader
-    def name
-      @hash[:name]
-    end
-
-    # uri reader
-    def uri
-      @hash[:uri]
-    end
-
-    def manga
-      @hash[:manga]
-    end
-
-    def chapter
-      @hash[:chapter ]
-    end
-
-    # name writer
-    def name=(other)
-      @hash[:name] = other
-    end
-
-    # uri writer
-    def uri=(other)
-      @hash[:uri] = other
-    end
-
-    def manga=(other)
-      @hash[:manga] = other
-    end
-    
-    def chapter=(other)
-      @hash[:chapter] = other
-    end
-
-    def [](key)
-      @hash[key]
-    end
-
-    def to_hash
-      @hash
-    end
-
-    def inspect
-      to_hash.to_s
-    end
-    alias_method :to_s, :inspect
-
-    def type
-      @properties.type
-    end
   end
 end

data/lib/mangdown/page.rb

@@ -9,7 +9,7 @@ module Mangdown
       @name = Tools.valid_path_name(name)
       @chapter = chapter
       @manga = manga
-      @uri  = Mangdown::Uri.new(uri) 
+      @uri = Mangdown::Uri.new(uri) 
     end
 
     # explicit conversion to page 
@@ -36,10 +36,10 @@ module Mangdown
 
     # downloads to specified directory
     def download_to(dir = Dir.pwd, opts = { force_download: false })
-      return if file_exist?(dir) && !opts[:force_download]
-
       # cleanup existing file (all extensions)
       delete_files!(dir) if opts[:force_download]
+
+      return if file_exist?(dir)
       
       image = Tools.get(uri)
 

data/lib/mangdown/properties.rb

@@ -1,26 +1,37 @@
 module Mangdown
-  class Properties
+  module Properties
 
-    def initialize(uri, site = nil, doc = nil, name = nil)
-      adapter_class = adapter_for_site(uri || site)
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
 
-      if adapter_class
-        @adapter = adapter_class.new(uri, doc, name)
-      else
-        raise Adapter::NoAdapterError.new(uri || site)
-      end
+    def properties
+      @_properties ||= {}
+    end
+
+    def [](key)
+      properties[key]
+    end
+      
+    def inspect
+      properties.inspect
     end
 
-    private
-    def adapter_for_site(site)
-      ADAPTERS.find { |adapter| site.to_s[adapter.site] }
+    def to_s
+      properties.to_s
     end
 
-    def method_missing(method, *args, &block)
-      if @adapter.respond_to?(method)
-        @adapter.__send__(method, *args, &block)
-      else
-        super
+    module ClassMethods
+      def properties(*names)
+        names.each do |name|
+          define_method(name) do
+            properties[name]
+          end
+
+          define_method("#{name}=") do |other|
+            properties[name] = other
+          end
+        end
       end
     end
   end

data/lib/mangdown/version.rb

@@ -1,3 +1,3 @@
 module Mangdown
-  VERSION = "0.13.4"
+  VERSION = "0.14.0"
 end

data/lib/mangdown.rb

@@ -4,28 +4,44 @@ require 'yaml'
 require 'zip'
 require 'filemagic'
 
-module Mangdown
-  ADAPTERS = []
-
-  DOWNLOAD_DIR ||= Dir.home + '/manga'
-end
-
-require_relative 'mangdown/adapter'
-adapters = "#{File.expand_path('../mangdown/adapter', __FILE__)}/*.rb"
-Dir[adapters].each do |f|
-  require_relative f 
-end
-
 require_relative 'mangdown/equality'
-require_relative 'mangdown/tools'
 require_relative 'mangdown/properties'
+require_relative 'mangdown/tools'
 require_relative 'mangdown/uri'
 require_relative 'mangdown/page'
 require_relative 'mangdown/chapter'
 require_relative 'mangdown/manga'
 require_relative 'mangdown/manga_list.rb'
 require_relative 'mangdown/cbz'
-require_relative 'mangdown/commands'
 require_relative 'mangdown/md_hash'
 
+require_relative 'mangdown/adapter'
+require_relative 'mangdown/adapter/no_adapter_error'
+require_relative 'mangdown/adapter/mangareader.rb'
+
+module Mangdown
+  ADAPTERS = {}
+
+  DOWNLOAD_DIR ||= Dir.home + '/manga'
+
+  def self.register_adapter(name, adapter)
+    ADAPTERS[name] = adapter
+  end
+
+  def self.adapter(name)
+    ADAPTERS[name]
+  end
+
+  def self.adapter!(uri, site = nil, doc = nil, name = nil)
+    adapter_name = (uri || site).to_s
+    klass = ADAPTERS.values.find { |adapter| adapter.for?(adapter_name) }
+
+    if klass
+      klass.new(uri, doc, name)
+    else
+      raise Adapter::NoAdapterError.new(adapter_name)
+    end
+  end
+end
 
+Mangdown.register_adapter(:mangareader, Mangdown::Mangareader)

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: mangdown
 version: !ruby/object:Gem::Version
-  version: 0.13.4
+  version: 0.14.0
 platform: ruby
 authors:
 - jphager2
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-06 00:00:00.000000000 Z
+date: 2016-06-14 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
@@ -146,15 +132,11 @@ files:
 - README.md
 - 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/no_adapter_error.rb
-- lib/mangdown/adapter/wiemanga.rb
 - lib/mangdown/cbz.rb
 - lib/mangdown/chapter.rb
-- lib/mangdown/commands.rb
+- lib/mangdown/client.rb
 - lib/mangdown/equality.rb
 - lib/mangdown/manga.rb
 - lib/mangdown/manga_list.rb
@@ -164,18 +146,6 @@ files:
 - lib/mangdown/tools.rb
 - lib/mangdown/uri.rb
 - lib/mangdown/version.rb
-- spec/lib/mangdown/cbz_spec.rb
-- spec/lib/mangdown/chapter_spec.rb
-- spec/lib/mangdown/commands_spec.rb
-- spec/lib/mangdown/equality_spec.rb
-- spec/lib/mangdown/manga_list_spec.rb
-- spec/lib/mangdown/manga_spec.rb
-- spec/lib/mangdown/mangdown_hash_spec.rb
-- spec/lib/mangdown/page_spec.rb
-- spec/lib/mangdown/properties_spec.rb
-- spec/lib/mangdown/tools_spec.rb
-- spec/lib/mangdown/uri_spec.rb
-- spec/spec_helper.rb
 homepage: https://github.com/jphager2/mangdown
 licenses:
 - MIT

data/lib/mangdown/adapter/mangafox.rb

@@ -1,47 +0,0 @@
-module Mangdown
-  class Mangafox < Adapter::Base
-    Mangdown::ADAPTERS << self
-
-    def initialize(uri, doc, name)
-      super
-      @manga_list_css        = 'div.manga_list li a'
-      @chapter_list_css      = 'a.tips'
-      @root                  = 'http://mangafox.me'
-      @manga_list_uri        = "#{@root}/manga"
-      @manga_name_css        = "#title h1"
-      @manga_link_prefix     = ''
-      @reverse_chapters      = true
-      @manga_uri_regex       = 
-        /#{@root}\/manga\/[^\/]+?\//i
-      @chapter_uri_regex     = 
-        /#{@manga_uri_regex}(v\d+\/)?(c\d+\/)(1\.html)/i
-      @page_uri_regex        = /.+\.(png|jpg|jpeg)$/i
-    end
-
-    def manga_name
-      CGI.unescapeHTML(super.sub(/ Manga/, '').downcase).upcase
-    end
-
-    def build_page_uri(uri, manga, chapter, page_num)
-      uri.sub(/\d+\.html/, "#{page_num}.html")
-    end
-
-    def num_pages
-      doc.css('select')[1].css('option').length - 1
-    end
-
-    def page_image_src
-      page_image[:src]
-    end
-
-    def page_image_name
-      doc.css('select')[1].css('option[selected]').first().text
-        .rjust(3,'0')
-    end
-
-    private
-    def page_image
-      doc.css('img')[0]
-    end
-  end
-end

data/lib/mangdown/adapter/mangahere.rb

@@ -1,51 +0,0 @@
-module Mangdown
-  class Mangahere < Adapter::Base
-    Mangdown::ADAPTERS << self
-
-    def initialize(uri, doc, name)
-      super
-      @root                  = 'http://www.mangahere.co'
-      @manga_list_css        = 'a.manga_info'
-      @manga_name_css        = 'h1.title'
-      @chapter_list_css      = '.detail_list ul a'
-      @manga_list_uri        = "#{@root}/mangalist/"
-      @manga_link_prefix     = ''
-      @reverse_chapters      = true
-      @manga_uri_regex       = 
-        /#{@root}\/manga\/([^\/]+\/)?/i
-      @chapter_uri_regex     = 
-        /#{@manga_uri_regex}(v\d+\/)?(c\d+\/)(1\.html)?/i
-      @page_uri_regex        = /.+\.(png|jpg|jpeg)$/i
-    end
-
-    def manga_name
-      CGI.unescapeHTML(super.downcase).upcase
-    end
-
-    def build_page_uri(uri, manga, chapter, page_num)
-      if page_num == 1
-        uri
-      else
-        uri.sub(/\/[^\/]*$/, "/#{page_num}.html")
-      end
-    end
-
-    def num_pages
-      doc.css('.go_page span.right select')[0].css('option').length
-    end
-
-    def page_image_src
-      page_image[:src].sub(/\?.*$/, '')
-    end
-
-    def page_image_name
-      doc.css('.go_page span.right select')[0].css('option[selected]')
-        .text.rjust(3, '0')
-    end
-
-    private
-    def page_image
-      doc.css('.read_img img')[0]
-    end
-  end
-end

data/lib/mangdown/adapter/mangapanda.rb

@@ -1,13 +0,0 @@
-require_relative 'mangareader'
-
-module Mangdown
-  class Mangapanda < Mangareader
-    Mangdown::ADAPTERS << self
-
-    def initialize(uri, doc, name)
-      @root = 'http://www.mangapanda.com'
-      super
-    end
-  end
-end
-

data/lib/mangdown/adapter/wiemanga.rb

@@ -1,49 +0,0 @@
-module Mangdown
-  class Wiemanga < Adapter::Base
-    Mangdown::ADAPTERS << self
-
-    def initialize(uri, doc, name)
-      super
-      @root                  = 'http://www.wiemanga.com'
-      @manga_list_uri        = 
-        "#{@root}/search/?name_sel=contain&author_sel=contain" +
-        "&completed_series=either"
-      @manga_name_css        = '.bookmessagebox h1'
-      @manga_list_css        = 'a.resultbookname'
-      @chapter_list_css      = 
-        '.chapterlist tr:not(:first-child) .col1 a'
-      @manga_link_prefix     = '' 
-      @reverse_chapters      = true
-      @manga_uri_regex       = /#{@root}\/manga\/([^\/]+)(\.html)?/i
-      @chapter_uri_regex     = 
-        /#{@root}\/chapter\/([^\/]+)\/(\d+)(\/|\.html)?/i
-      @page_uri_regex        = /.+\.(png|jpg|jpeg)$/i
-    end
-
-    def manga_name
-      super.sub(/ Manga$/, "")
-    end
-
-    def build_page_uri(uri, manga, chapter, page_num)
-      "#{uri.sub(/\/+$/, '')}-#{page_num}.html"
-    end
-
-    def num_pages
-      doc.css('select#page')[0].css('option').length
-    end
-
-    def page_image_src
-      page_image[:src]
-    end
-
-    def page_image_name
-      doc.css('select#page')[0].css('option[selected]')[0]
-        .text.rjust(3, '0')
-    end
-
-    private
-    def page_image
-      doc.css('img#comicpic')[0]
-    end
-  end
-end

data/spec/lib/mangdown/cbz_spec.rb

@@ -1,40 +0,0 @@
-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

@@ -1,79 +0,0 @@
-require_relative '../../spec_helper'
-
-describe Mangdown::Chapter do
-  let(:download_path) { File.expand_path('../../../../tmp', __FILE__) }
-  let(:chapter_name) { "Dragon Ball 1" }
-  let(:download_chapter_name) { "Dragon Ball 001" }
-  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::Chapter.new(uri, chapter_name)
-  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.to_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
-      skip
-      Dir.exist?("#{download_path}/#{download_chapter_name}").must_equal true
-    end
-
-    it 'must have page files in the sub directory' do
-      skip
-      files = Dir["#{download_path}/#{chapter_name}/*"]
-      files.each do |name|
-        @chapter.pages.any? { |page| name =~ /#{page.name}/ }
-          .must_equal true
-      end
-    end
-  end
-end