mangdown 0.16.1 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 322812e01eff29a30192673634873fcd286770c3
-  data.tar.gz: 97d4cc14476ec3a43d0ba11af6e9c541b65f3d63
+  metadata.gz: 394d93835122c8b78b98f83c09908786c75831e9
+  data.tar.gz: 3d50677445c08b240f46a8be8e9fd95d94cd81ff
 SHA512:
-  metadata.gz: 8697dd6bd034b1634494ae62dae674271d8864cdefb2b905c3dd7ffc901a604bb3e5593c90a0a2a1ce4fcc5e2e2bb3c66f042a555d8a249c84bba5d6fdd927e4
-  data.tar.gz: bd1051ea8ea0e0974157b48d4f249fdc37fc34dfa9137ce0531be7d003ddd4dc0036bfa81683e25565e1427730c5b207c9c3de25f7a0ea1a20e3352d7c8f7191
+  metadata.gz: 69b858ea5267457078c49f113002013a660086abbf12f6d1ccf4b70ba2123659eb59e14f362f7fe74c190b3646b7eb771ff296e8334c606dc2fd1658a5eab6fd
+  data.tar.gz: c2d48bdec2d6e5e771e7979d39e214ad57c0240142591e7bdf6abf774ec97e6131d75ec67b298ab5cc0f00995f71579335218435ab57f68a9de434610a64d3ae

data/lib/mangdown.rb

@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
-require 'uri'
+require 'addressable/uri'
 require 'nokogiri'
 require 'yaml'
 require 'zip'
 require 'filemagic'
-require 'cgi'
 
 require_relative 'mangdown/error'
 

data/lib/mangdown/adapter/mangareader.rb

@@ -68,7 +68,7 @@ module Mangdown
       (1..last_page).map do |page|
         slug = manga_name.tr(' ', '-').gsub(/[:,!]/, '')
         uri = "#{root}/#{slug}/#{chapter_number}/#{page}"
-        uri = CGI.escape(uri).downcase
+        uri = Addressable::URI.escape(uri).downcase
         { uri: uri, name: page, site: site }
       end
     end

data/lib/mangdown/chapter.rb

@@ -13,7 +13,7 @@ module Mangdown
       @name = name
       @manga = manga
       @chapter = chapter
-      @uri = CGI.escape(uri)
+      @uri = Addressable::URI.escape(uri)
       @pages = []
     end
 

data/lib/mangdown/client.rb

@@ -4,15 +4,14 @@ require_relative '../mangdown'
 
 # Simple client for Mangdown
 module M
-  class << self
-
-    DATA_FILE_PATH = Dir.home + '/.manga_list.yml'
-    HELP_FILE_PATH = File.expand_path(
-      '../../README.md', File.dirname(__FILE__)
-    )
+  DATA_FILE_PATH = Dir.home + '/.manga_list.yml'
+  HELP_FILE_PATH = File.expand_path(
+    '../../README.md', File.dirname(__FILE__)
+  )
 
-    MANGA_PAGES = ['http://www.mangareader.net/alphabetical'].freeze
+  DEFAULT_MANGA_PAGES = ['http://www.mangareader.net/alphabetical'].freeze
 
+  class << self
     # return a list of hash with :uri and :name of mangas found in list
     def find(search)
       search = Regexp.new(/^#{search}$/) if search.respond_to?(:to_str)
@@ -37,6 +36,10 @@ module M
       File.delete(DATA_FILE_PATH) if File.exist?(DATA_FILE_PATH)
     end
 
+    def manga_pages
+      @manga_pages ||= DEFAULT_MANGA_PAGES.dup
+    end
+
     private
 
     # convenience method to access the data file path
@@ -51,7 +54,7 @@ module M
 
     # attempt to get the list from the data file
     def data_from_file
-      YAML.safe_load(File.read(path)) if file_current?(path)
+      YAML.load(File.read(path)) if file_current?(path)
     end
 
     # get saved current manga list, if data is less than a week old
@@ -60,7 +63,7 @@ module M
       data = data_from_file
       return Mangdown::MangaList.from_data(data) if data
 
-      list = MANGA_PAGES.inject([]) do |manga, uri|
+      list = manga_pages.inject([]) do |manga, uri|
         list = Mangdown::MDHash.new(uri: uri).to_manga_list
         list.merge(manga)
       end

data/lib/mangdown/manga.rb

@@ -12,7 +12,7 @@ module Mangdown
 
     def initialize(uri, name)
       @name = name
-      @uri = CGI.escape(uri)
+      @uri = Addressable::URI.escape(uri)
       @chapters = []
     end
 

data/lib/mangdown/md_hash.rb

@@ -20,7 +20,7 @@ module Mangdown
 
       @adapter = Mangdown.adapter!(uri, site, nil, name)
 
-      @uri = CGI.escape(uri)
+      @uri = Addressable::URI.escape(uri)
       @site = adapter.site
     end
 

data/lib/mangdown/page.rb

@@ -12,7 +12,7 @@ module Mangdown
       @name = Tools.valid_path_name(name)
       @chapter = chapter
       @manga = manga
-      @uri = CGI.escape(uri)
+      @uri = Addressable::URI.escape(uri)
     end
 
     # explicit conversion to page

data/lib/mangdown/support/tools.rb

@@ -19,7 +19,7 @@ module Mangdown
       end
 
       def get_root(uri)
-        uri = URI.parse(uri)
+        uri = Addressable::URI.parse(uri)
         @root = "#{uri.scheme}://#{uri.host}"
       end
 

data/lib/mangdown/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mangdown
-  VERSION = '0.16.1'
+  VERSION = '0.17.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mangdown
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.17.0
 platform: ruby
 authors:
 - jphager2
@@ -11,19 +11,19 @@ cert_chain: []
 date: 2017-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: typhoeus
+  name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
+- !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: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -53,33 +67,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: ruby-filemagic
+  name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -95,21 +109,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="