panchira 1.3.1 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf1b6f4f73236bda86a93f4ae24c377a2ef4dc8dad1f721d87cc78b0659ca413
-  data.tar.gz: 5e75576bc2bd8c8d4147f12537750646e88d464e81800d6847c9210b9bf66831
+  metadata.gz: 45b393a405624e26e8d6555c1833e0f65e5e93deef13518197ec4b15fc3bff61
+  data.tar.gz: b770975cbbba8d66cf6acde417ae9d32e78d310f145726ff16b60824a49f99e3
 SHA512:
-  metadata.gz: 911a1e50dc8d0d443bb323f2e260a88bc3c353c9c3e6cca1dc7d1f592b50c51d0ac92a8ce2a5bd0619f04a5a8cfc3db4d441e739908be861e522d8b555d36128
-  data.tar.gz: ce917b7a4a905dc6364a39764262b9f4777e074c57f7962439cc8a3b1181feb2f995b1f756eaae431185e5a4a58d82c219a028582038fd1c0bcb771294b137a9
+  metadata.gz: 9c4ca217b6bd3fa782fa92d36ed1a1974880e2ff1746319cbd4f3e652d947807f74490b937a7f84cd4b1c8c46b0a95bd91a8374c28d575aa224c3c9ce6817385
+  data.tar.gz: b050fcb7586b81209e0d2f0ac521ab34c4db0ad05362655b3b25ae16c2d226a31b57da50019a195bb092080cfddf5eb1bdf44c80757f3943b1075860182b3add

data/.github/workflows/ruby.yml

@@ -16,7 +16,7 @@ on:
 jobs:
   test:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     steps:
     - uses: actions/checkout@v2

data/CHANGELOG.md

@@ -4,6 +4,32 @@ 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/).
 
+## 1.3.5 - 2021-09-01
+### Added
+- Added support for Pixiv Novel.
+
+### Fixed
+- Fixed an issue where Image Resolver missed image scales.
+
+## 1.3.4 - 2021-07-26
+### Fixed
+- Fixed an issue where Iwara Resolver failed when a description was present.
+
+## 1.3.3 - 2021-07-25
+### Added
+- Added support for Iwara.
+
+### Fixed
+- Fixed an issue where DLsite Resolver was retrieving wrong tags.
+
+## 1.3.2 - 2021-05-23
+### Fixed
+- Fixed an issue where Fanza Resolver was retrieving incorrect canonical URLs.
+- Fixed an issue where Narou Resolver was retrieving wrong descriptions.
+
+### Changed
+- Updated dependencies.
+
 ## 1.3.1 - 2021-02-17
 ### Added
 - Added support for Fanza Video.
@@ -71,6 +97,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 - Released Panchira gem. At this time we can parse only 5 websites.
 
+[1.3.5]: https://github.com/nuita/panchira/releases/tag/v1.3.5
+[1.3.4]: https://github.com/nuita/panchira/releases/tag/v1.3.4
+[1.3.3]: https://github.com/nuita/panchira/releases/tag/v1.3.3
+[1.3.2]: https://github.com/nuita/panchira/releases/tag/v1.3.2
 [1.3.1]: https://github.com/nuita/panchira/releases/tag/v1.3.1
 [1.3.0]: https://github.com/nuita/panchira/releases/tag/v1.3.0
 [1.2.0]: https://github.com/nuita/panchira/releases/tag/v1.2.0

data/Gemfile.lock

@@ -1,41 +1,41 @@
 PATH
   remote: .
   specs:
-    panchira (1.3.1)
+    panchira (1.3.5)
       fastimage (~> 2.1.7)
       nokogiri (>= 1.10.9, < 1.12.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.1)
+    ast (2.4.2)
     fastimage (2.1.7)
-    minitest (5.14.2)
-    nokogiri (1.11.1-x86_64-darwin)
+    minitest (5.14.4)
+    nokogiri (1.11.7-x86_64-darwin)
       racc (~> 1.4)
     parallel (1.20.1)
-    parser (3.0.0.0)
+    parser (3.0.1.1)
       ast (~> 2.4.1)
     racc (1.5.2)
     rainbow (3.0.0)
     rake (12.3.3)
-    regexp_parser (2.0.3)
-    rexml (3.2.4)
-    rubocop (1.7.0)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
+    rubocop (1.15.0)
       parallel (~> 1.10)
-      parser (>= 2.7.1.5)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.2.0, < 2.0)
+      rubocop-ast (>= 1.5.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.4.0)
-      parser (>= 2.7.1.5)
-    rubocop-minitest (0.10.2)
-      rubocop (>= 0.87, < 2.0)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.5.0)
+      parser (>= 3.0.1.1)
+    rubocop-minitest (0.12.1)
+      rubocop (>= 0.90, < 2.0)
     ruby-progressbar (1.11.0)
-    unicode-display_width (1.7.0)
+    unicode-display_width (2.0.0)
 
 PLATFORMS
   ruby

data/README.md

@@ -6,7 +6,7 @@
 
 Due to some legal or ethical issues, most hentai and NSFW platforms don't clarify their content on meta tags. As a result, most hentai platforms are rendered poorly on the card previews on social media.
 
-To solve this issue, Panchira is made to parse correct and uncensored metadata from such web platforms (at this time we cover **DLSite, Komiflo, Melonbooks, Nijie, Pixiv, Shousetsuka ni narou, Fanza and Twitter**).
+To solve this issue, Panchira is made to parse correct and uncensored metadata from such web platforms (at this time we cover **DLSite, Komiflo, Melonbooks, Nijie, Pixiv, Shousetsuka ni narou, Fanza, Iwara and Twitter**).
 
 If you need card previews of hentai on your web application, but can't get them with simply parsing metatags, then it is time for Panchira.
 

data/lib/panchira/resolvers/dlsite_resolver.rb

@@ -39,7 +39,13 @@ module Panchira
       end
 
       def parse_tags
-        @page.css('.main_genre').children.children.map(&:text)
+        @page.css('table[id*="work_"] tr').each do |tr|
+          next unless tr.css('th').text =~ /ジャンル/
+
+          return tr.css('td a').map do |node|
+            node.text.strip
+          end
+        end
       end
   end
 

data/lib/panchira/resolvers/fanza_resolver.rb

@@ -41,6 +41,12 @@ module Panchira
 
       private
 
+        # canonical urlに別サービス(FANZA GAMES)のURLが設定されていることがあるため、
+        # 別サービスの場合はとりあえず元URLを設定する
+        def parse_canonical_url
+          @url
+        end
+
         def parse_circle
           @page.css('a.circleName__txt').first.text
         end

data/lib/panchira/resolvers/image_resolver.rb

@@ -9,6 +9,8 @@ module Panchira
       result.canonical_url = @url
       result.image = PanchiraImage.new
       result.image.url = @url
+      result.image.width, result.image.height = FastImage.size(result.image.url)
+
       result.resolver = parse_resolver
       result
     end

data/lib/panchira/resolvers/iwara_resolver.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Panchira
+  class IwaraResolver < Resolver
+    URL_REGEXP = /(www|ecchi)\.iwara\.tv\//.freeze
+
+    private
+      def parse_title
+        super.split(' | ')[0]
+      end
+
+      def parse_image_url
+        url = @page.at_css('#video-player')&.attributes['poster']&.value
+        'https:' + url if url
+      end
+
+      def parse_author
+        @page.at_css('.node-info .username')&.children&.[](0)&.text
+      end
+
+      def parse_tags
+        @page.css('.field-name-field-categories .field-item').map { |e| e.children&.text }
+      end
+
+      def parse_description
+        @page.at_css('.field-name-body')&.text
+      end
+
+      def cookie
+        'show_adult=1'
+      end
+
+      def parse_canonical_url
+        @url # canonical has relative path. ignore it
+      end
+  end
+
+  ::Panchira::Extensions.register(Panchira::IwaraResolver)
+end

data/lib/panchira/resolvers/narou_resolver.rb

@@ -25,6 +25,10 @@ module Panchira
         Nokogiri::HTML.parse(res.body, uri)
       end
 
+      def parse_description
+        @desc&.xpath('//*[@id="noveltable1"]/tr/td')&.first&.text&.strip
+      end
+
       def parse_author
         @desc&.xpath('//*[@id="noveltable1"]/tr[2]/td')&.text&.strip
       end
@@ -33,6 +37,11 @@ module Panchira
         # つらい。
         @desc&.xpath('//*[@id="noveltable1"]/tr[3]')&.text&.split("\n\n\n")&.dig(1)&.split(' ')
       end
+
+      # og:urlで指定されたncode.syosetu.com/~~~にアクセスすると301で戻されるので何もしない
+      def parse_canonical_url
+        @url
+      end
     end
 
     class NcodeResolver < Resolver
@@ -47,6 +56,10 @@ module Panchira
         end
       end
 
+      def parse_description
+        @desc&.xpath('//*[@id="noveltable1"]/tr/td')&.first&.text&.strip
+      end
+
       def parse_author
         @desc&.xpath('//*[@id="noveltable1"]/tr[2]/td')&.text&.strip
       end
@@ -55,6 +68,11 @@ module Panchira
         # めっちゃつらい。
         @desc&.xpath('//*[@id="noveltable1"]/tr[3]')&.text&.split("\n\n\n")&.dig(1)&.delete("\u00A0")&.split(' ')&.grep_v('')
       end
+
+      # og:urlで指定されたncode.syosetu.com/~~~にアクセスすると301で戻されるので何もしない
+      def parse_canonical_url
+        @url
+      end
     end
   end
 

data/lib/panchira/resolvers/pixiv_resolver.rb

@@ -44,5 +44,32 @@ module Panchira
       end
   end
 
+  class PixivNovelResolver < Resolver
+    URL_REGEXP = %r{pixiv\.net/novel/show.php\?id=(\d+)}.freeze
+
+    def initialize(url)
+      super(url)
+      @novel_id = url.slice(URL_REGEXP, 1)
+
+      raw_json = URI.parse("https://www.pixiv.net/ajax/novel/#{@novel_id}").read('User-Agent' => user_agent)
+      @json = JSON.parse(raw_json)
+    end
+
+    private
+
+      def parse_title
+        @json['body']['title']
+      end
+
+      def parse_author
+        @json['body']['userName']
+      end
+
+      def parse_tags
+        @json['body']['tags']['tags'].map { |content| content['tag'] }
+      end
+  end
+
   ::Panchira::Extensions.register(Panchira::PixivResolver)
+  ::Panchira::Extensions.register(Panchira::PixivNovelResolver)
 end

data/lib/panchira/resolvers/resolver.rb

@@ -67,17 +67,20 @@ module Panchira
         # fetch page and refresh canonical_url until canonical_url converges.
         loop do
           url_in_res = @page.css('//link[rel="canonical"]/@href').to_s
+          if url_in_res.empty?
+            url_in_res = @page.css('//meta[property="og:url"]/@content').to_s
+          end
 
           if url_in_res.empty?
             return history.last || @url
-          else
-            if history.include?(url_in_res) || history.length > 5
-              return url_in_res
-            else
-              history.push(url_in_res)
-              @page = fetch_page(url_in_res)
-            end
           end
+
+          if history.include?(url_in_res) || history.length > 5
+            return url_in_res
+          end
+
+          history.push(url_in_res)
+          @page = fetch_page(url_in_res)
         end
       end
 

data/lib/panchira/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Panchira
-  VERSION = '1.3.1'
+  VERSION = '1.3.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panchira
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.5
 platform: ruby
 authors:
 - kyp
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-17 00:00:00.000000000 Z
+date: 2021-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -141,6 +141,7 @@ files:
 - lib/panchira/resolvers/dlsite_resolver.rb
 - lib/panchira/resolvers/fanza_resolver.rb
 - lib/panchira/resolvers/image_resolver.rb
+- lib/panchira/resolvers/iwara_resolver.rb
 - lib/panchira/resolvers/komiflo_resolver.rb
 - lib/panchira/resolvers/melonbooks_resolver.rb
 - lib/panchira/resolvers/narou_resolver.rb