panchira 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd10641f0e69fa7afbe99d0793c420da27d11eab54189fed566b2a325b66bc89
-  data.tar.gz: 71ebb9c12171e06849e3a4e05c2724197e823634ae1199e2810654ac7e663b75
+  metadata.gz: f2715a3395e43d5ad43f35bedae84dbfe25a4cd533f964cbcc4cdaf953bc0c4b
+  data.tar.gz: '059e23e1ca4831bc58c62a4a7ccd4ed87010fee75b7e8997560fe49f43486f01'
 SHA512:
-  metadata.gz: c220c35ab007fc582a680fa8212d42e38c6796d6b7d4cac52504e137b172e775572d42dc283483b7687561d77df7f64860d476fbba375e5728365af4c1499acc
-  data.tar.gz: 98ece3d0b40b99a991e9d12a9e7abb011a4d83d31f852a3192c9800391839fc1972d3e426c46bba40c8f248617f5d71513eb25aafea054c98ec7561b373eef68
+  metadata.gz: e5ed936514fec2e05dfcaeb727189d1bcc6328e1a27559bd925acba7dc3037c26c57c99fece2c88bad95c7d0d7ae7ffd6840f9e33dde58aef81db81ae600d829
+  data.tar.gz: 8383db6bdc9c78e2e845651e7206d702f5a8566475b8161c9e464364da7b6aa9c5f9886125771c636e0465e8eec7f1ee1dda3c0865a1f0d478131510451c4a74

data/.github/workflows/ruby.yml

@@ -0,0 +1,33 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@ec106b438a1ff6ff109590de34ddc62c540232e0
+      with:
+        ruby-version: 2.6
+    - name: Install dependencies
+      run: bundle install
+    - name: Run tests
+      run: bundle exec rake test

data/CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 0.2.0 - 2020-05-18
+### Added
+- Added support for Shousetsuka Ni Narou (novel18.syosetu.com).
+- Added support for external resolvers.
+- Added method Panchira::Resolvers#applicable?.
+
 ## 0.1.1 - 2020-05-13
 ### Fixed
 - Fix serious requirement issue and make this gem at least executable.
@@ -12,4 +18,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 - Released Panchira gem. At this time we can parse only 5 websites.
 
+[0.2.0]: https://github.com/nuita/panchira/releases/tag/v0.2.0
+[0.1.1]: https://github.com/nuita/panchira/releases/tag/v0.1.1
 [0.1.0]: https://github.com/nuita/panchira/releases/tag/v0.1.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    panchira (0.1.1)
+    panchira (0.2.0)
       fastimage (~> 2.1.7)
       nokogiri (~> 1.10.9)
 

data/README.md

@@ -1,5 +1,5 @@
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
-[![Build Status](https://travis-ci.org/nuita/panchira.svg?branch=master)](https://travis-ci.org/nuita/panchira.svg?branch=master)
+![Ruby](https://github.com/nuita/panchira/workflows/Ruby/badge.svg)
 [![Gem Version](https://badge.fury.io/rb/panchira.svg)](https://badge.fury.io/rb/panchira)
 
 # Panchira

data/lib/panchira.rb

@@ -7,11 +7,10 @@ require 'json'
 
 require_relative 'panchira/version'
 require_relative 'panchira/resolvers/resolver'
-require_relative 'panchira/resolvers/dlsite_resolver'
-require_relative 'panchira/resolvers/komiflo_resolver'
-require_relative 'panchira/resolvers/melonbooks_resolver'
-require_relative 'panchira/resolvers/nijie_resolver'
-require_relative 'panchira/resolvers/pixiv_resolver'
+require_relative 'panchira/extensions'
+
+project_root = File.dirname(File.absolute_path(__FILE__))
+Dir.glob(project_root + '/panchira/resolvers/*_resolver.rb').sort.each { |file| require file }
 
 # Main Panchira code goes here.
 module Panchira
@@ -26,20 +25,11 @@ module Panchira
     private
 
     def select_resolver(url)
-      case url
-      when %r{komiflo\.com(?:/#!)?/comics/(\d+)}
-        Panchira::KomifloResolver
-      when %r{melonbooks.co.jp/detail/detail.php\?product_id=(\d+)}
-        Panchira::MelonbooksResolver
-      when %r{pixiv\.net/(member_illust.php?.*illust_id=|artworks/)(\d+)}
-        Panchira::PixivResolver
-      when /nijie.*view.*id=\d+/
-        Panchira::NijieResolver
-      when /dlsite/
-        Panchira::DlsiteResolver
-      else
-        Panchira::Resolver
+      Panchira::Extensions.resolvers.each do |resolver|
+        return resolver if resolver.applicable?(url)
       end
+
+      Panchira::Resolver
     end
   end
 end

data/lib/panchira/extensions.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Panchira
+  module Extensions
+    @resolvers = []
+
+    class << self
+      # Register a resolver class which extends Panchira::Resolver.
+      def register(resolver)
+        @resolvers.push(resolver) unless @resolvers.include?(resolver)
+      end
+
+      attr_reader :resolvers
+    end
+  end
+end

data/lib/panchira/resolvers/dlsite_resolver.rb

@@ -2,10 +2,14 @@
 
 module Panchira
   class DlsiteResolver < Resolver
+    URL_REGEXP = /dlsite/.freeze
+
     private
 
     def parse_image_url
       @page.css('//meta[property="og:image"]/@content').first.to_s.sub(/sam/, 'main')
     end
   end
+
+  ::Panchira::Extensions.register(Panchira::DlsiteResolver)
 end

data/lib/panchira/resolvers/komiflo_resolver.rb

@@ -4,12 +4,14 @@ module Panchira
   # KomifloResolver resolves Komiflo.
   # Komiflo has its API server, so we can utilize it.
   class KomifloResolver < Resolver
+    URL_REGEXP = %r{komiflo\.com(?:/#!)?/comics/(\d+)}.freeze
+
     def initialize(url)
       @url = url
 
-      @id = url.slice(%r{komiflo\.com(?:/#!)?/comics/(\d+)}, 1)
-      json_uri = URI.parse("https://api.komiflo.com/content/id/#{@id}")
-      @json = JSON.parse(Net::HTTP.get(json_uri))
+      @id = url.slice(URL_REGEXP, 1)
+      raw_json = URI.parse("https://api.komiflo.com/content/id/#{@id}").read('User-Agent' => USER_AGENT)
+      @json = JSON.parse(raw_json)
     end
 
     private
@@ -36,4 +38,6 @@ module Panchira
       'https://komiflo.com/comics/' + id
     end
   end
+
+  ::Panchira::Extensions.register(Panchira::KomifloResolver)
 end

data/lib/panchira/resolvers/melonbooks_resolver.rb

@@ -2,10 +2,12 @@
 
 module Panchira
   class MelonbooksResolver < Resolver
+    URL_REGEXP = %r{melonbooks.co.jp/detail/detail.php\?product_id=(\d+)}.freeze
+
     private
 
     def parse_canonical_url
-      product_id = @url.slice(%r{melonbooks.co.jp/detail/detail.php\?product_id=(\d+)}, 1)
+      product_id = @url.slice(URL_REGEXP, 1)
       'https://www.melonbooks.co.jp/detail/detail.php?product_id=' + product_id + '&adult_view=1'
     end
 
@@ -24,4 +26,6 @@ module Panchira
       @page.css('//meta[property="og:image"]/@content').first.to_s.sub(/&c=1/, '')
     end
   end
+
+  ::Panchira::Extensions.register(Panchira::MelonbooksResolver)
 end

data/lib/panchira/resolvers/narou_resolver.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'net/https'
+
+module Panchira
+  class NarouResolver < Resolver
+    URL_REGEXP = %r{novel18\.syosetu\.com/}.freeze
+
+    def fetch_page(uri)
+      u = URI.parse(uri)
+      http = Net::HTTP.new(u.host, u.port)
+      http.use_ssl = u.port == 443
+      res = http.get u.request_uri, { 'cookie' => 'over18=yes;' }
+
+      Nokogiri::HTML.parse(res.body, uri)
+    end
+  end
+
+  ::Panchira::Extensions.register(Panchira::NarouResolver)
+end

data/lib/panchira/resolvers/nijie_resolver.rb

@@ -2,6 +2,7 @@
 
 module Panchira
   class NijieResolver < Resolver
+    URL_REGEXP = /nijie.*view.*id=\d+/.freeze
 
     private
 
@@ -24,4 +25,6 @@ module Panchira
       end
     end
   end
+
+  ::Panchira::Extensions.register(Panchira::NijieResolver)
 end

data/lib/panchira/resolvers/pixiv_resolver.rb

@@ -2,21 +2,22 @@
 
 module Panchira
   class PixivResolver < Resolver
+    URL_REGEXP = %r{pixiv\.net/(member_illust.php?.*illust_id=|artworks/)(\d+)}.freeze
+
     def initialize(url)
       super(url)
-      @illust_id = url.slice(%r{pixiv\.net/(member_illust.php?.*illust_id=|artworks/)(\d+)}, 2)
+      @illust_id = url.slice(URL_REGEXP, 2)
     end
 
     private
 
     def parse_canonical_url
-      illust_id = @url.slice(%r{pixiv\.net/(member_illust.php?.*illust_id=|artworks/)(\d+)}, 2)
-      'https://pixiv.net/member_illust.php?mode=medium&illust_id=' + illust_id
+      'https://pixiv.net/member_illust.php?mode=medium&illust_id=' + @illust_id
     end
 
     def parse_image_url
       proxy_url = "https://pixiv.cat/#{@illust_id}.jpg"
-      
+
       case Net::HTTP.get_response(URI.parse(proxy_url))
       when Net::HTTPNotFound
         proxy_url = "https://pixiv.cat/#{@illust_id}-1.jpg"
@@ -27,4 +28,6 @@ module Panchira
       @page.css('//meta[property="og:image"]/@content').first.to_s
     end
   end
+
+  ::Panchira::Extensions.register(Panchira::PixivResolver)
 end

data/lib/panchira/resolvers/resolver.rb

@@ -5,6 +5,12 @@
 # and is inherited by the other resolvers.
 module Panchira
   class Resolver
+    # The URL pattern that this resolver tries to resolve.
+    # Should be redefined in subclasses.
+    URL_REGEXP = URI::DEFAULT_PARSER.make_regexp
+
+    USER_AGENT = "Mozilla/5.0 (compatible; Panchira/#{VERSION}; +https://github.com/nuita/panchira)"
+
     def initialize(url)
       @url = url
     end
@@ -26,10 +32,17 @@ module Panchira
       attributes
     end
 
+    class << self
+      # Tell whether the url is applicable for this resolver.
+      def applicable?(url)
+        url =~ self::URL_REGEXP
+      end
+    end
+
     private
 
     def fetch_page(url)
-      raw_page = URI.parse(url).read
+      raw_page = URI.parse(url).read('User-Agent' => USER_AGENT)
       charset = raw_page.charset
       Nokogiri::HTML.parse(raw_page, url, charset)
     end

data/lib/panchira/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Panchira
-  VERSION = "0.1.1"
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panchira
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - kyp
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-13 00:00:00.000000000 Z
+date: 2020-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -89,8 +89,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -100,9 +100,11 @@ files:
 - bin/console
 - bin/setup
 - lib/panchira.rb
+- lib/panchira/extensions.rb
 - lib/panchira/resolvers/dlsite_resolver.rb
 - lib/panchira/resolvers/komiflo_resolver.rb
 - lib/panchira/resolvers/melonbooks_resolver.rb
+- lib/panchira/resolvers/narou_resolver.rb
 - lib/panchira/resolvers/nijie_resolver.rb
 - lib/panchira/resolvers/pixiv_resolver.rb
 - lib/panchira/resolvers/resolver.rb

data/.travis.yml

@@ -1,9 +0,0 @@
----
-sudo: false
-language: ruby
-cache: bundler
-rvm:
-  - 2.6.2
-before_install: gem install bundler -v 2.0.2
-script:
- - bundle exec rake test