panchira 1.3.3 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6efe3f2eddf6984db580aebed3d142e7ba8cab9df8b5f69742b9692d62b83dc5
-  data.tar.gz: d86faa63aeb5cf4b963a420575f8522dbd4f079f91af23b03e0ff8e79dc026fc
+  metadata.gz: 87af8a25ccd6d841b133aaa28ce7853c0111ae0ce4768f287a1f9a8a09eec148
+  data.tar.gz: 93233eca9a9fd019fb82aafbd1e97630aa242d1645d2e2306fee52d1812aa144
 SHA512:
-  metadata.gz: 0ab350c44ea6e8374926f4cea197320bdfb65b5f243c70f3943a775e32b8bc75c26910380326face1fc1a157d03b78f8d81fe5f5eda26b7516d55d13edda3ec9
-  data.tar.gz: 272f6e3deea2b6e0e1f678c32e1e3e00dddb10d2fa74626ff6e5fe5787864ec76f054d1679448e0b174ba34aba600d1c923606336690f2a7f7b7d60353054668
+  metadata.gz: 42e8539356b8c73b8cced17cdaec2452960f17175736a004702c37e7370f407ea995504a07e2b060c53f52629f42cb247e34080d9e54c52a07158fddb5e427c1
+  data.tar.gz: 4b1746f991ba2353304c96e3297efca0a45ba0e3d9c908f653e72aa6920de3654f2714235d24037de591699287bf0c027b0720d6e2741cf3ef6a6e5ae1add95a

data/.github/workflows/ruby.yml

@@ -9,22 +9,25 @@ name: Ruby
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
-    branches: [ master ]
+    branches: [master]
 
 jobs:
   test:
-
     runs-on: ubuntu-18.04
-
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ["2.7", "3.0"]
+    name: Ruby ${{ matrix.ruby }}
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: 2.6
-    - name: Install dependencies
-      run: bundle install
-    - name: Run tests
-      run: bundle exec rake test
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - name: Install dependencies
+        run: bundle install
+      - name: Run tests
+        run: bundle exec rake test

data/.rubocop.yml

@@ -4,7 +4,7 @@ require:
   - rubocop-minitest
 
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.7
   NewCops: enable
   Exclude:
     - bin/*
@@ -27,7 +27,7 @@ Lint/AssignmentInCondition:
   Enabled: false
 
 Lint/MissingSuper:
-  Exclude: 
+  Exclude:
     - lib/panchira/resolvers/*
 
 Style/AsciiComments:

data/CHANGELOG.md

@@ -4,9 +4,37 @@ 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.4.0 - 2022-01-10
+### Added
+- Added support for non-Japanese pixiv URLs.
+
+### Fixed
+- Fixed an issue where Nijie Resolver failed to fetch image.
+
+### Changed
+- Dropped support for Ruby 2.6.
+
+## 1.3.6 - 2021-10-19
+### Added
+- Added support for Twitter.
+
+### Changed
+- Melonbooks Resolver now returns image URI without resizing queries.
+
+## 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.
+- Added support for Iwara.
 
 ### Fixed
 - Fixed an issue where DLsite Resolver was retrieving wrong tags.
@@ -86,6 +114,9 @@ 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

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    panchira (1.3.3)
+    panchira (1.4.0)
       fastimage (~> 2.1.7)
-      nokogiri (>= 1.10.9, < 1.12.0)
+      nokogiri (>= 1.10.9, < 1.13.0)
 
 GEM
   remote: https://rubygems.org/
@@ -11,12 +11,12 @@ GEM
     ast (2.4.2)
     fastimage (2.1.7)
     minitest (5.14.4)
-    nokogiri (1.11.5-x86_64-darwin)
+    nokogiri (1.12.5-x86_64-darwin)
       racc (~> 1.4)
     parallel (1.20.1)
     parser (3.0.1.1)
       ast (~> 2.4.1)
-    racc (1.5.2)
+    racc (1.6.0)
     rainbow (3.0.0)
     rake (12.3.3)
     regexp_parser (2.1.1)

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

@@ -19,7 +19,11 @@ module Panchira
       end
 
       def parse_tags
-        @page.css('.node-info .field-item').map { |e| e.children&.text }
+        @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

data/lib/panchira/resolvers/melonbooks_resolver.rb

@@ -57,7 +57,10 @@ module Panchira
       end
 
       def parse_image_url
-        @page.css('//meta[property="og:image"]/@content').first.to_s.sub(/&c=1/, '')
+        url = @page.css('//meta[property="og:image"]/@content').first.to_s
+        image = url.match(/resize_image.php\?image=([^&]+)/)[1]
+
+        "https://melonbooks.akamaized.net/user_data/packages/resize_image.php?image=#{image}"
       end
 
       def parse_tags

data/lib/panchira/resolvers/nijie_resolver.rb

@@ -26,17 +26,17 @@ module Panchira
       end
 
       def parse_image_url
-        str = @page.css('//script[@type="application/ld+json"]/text()').first.to_s
-
-        if s = str.match(%r{https://pic.nijie.(net|info)/(?<servername>\d+)/[^/]+/nijie_picture/(?<imagename>[^"]+)})
-          # 動画は容量大きすぎるし取らない
-          if s[:imagename] =~ /(jpg|png)/
-            "https://pic.nijie.net/#{s[:servername]}/nijie_picture/#{s[:imagename]}"
-          else
-            s[0]
-          end
+        str = @page.css('//script[@type="application/ld+json"]/text()').first.to_s.split.join(' ')
+        thumbnail_url = JSON.parse(str)['thumbnailUrl']
+
+        unless thumbnail_url
+          return @page.css('//meta[property="og:image"]/@content').first.to_s
+        end
+
+        if md = thumbnail_url.match(%r{pic.nijie.net/\w+(?<resolution>/\w+/)nijie.+\.(?<format>png|jpg|jpeg)})
+          thumbnail_url.sub(md[:resolution], '/')
         else
-          @page.css('//meta[property="og:image"]/@content').first.to_s
+          thumbnail_url
         end
       end
 

data/lib/panchira/resolvers/pixiv_resolver.rb

@@ -2,7 +2,7 @@
 
 module Panchira
   class PixivResolver < Resolver
-    URL_REGEXP = %r{pixiv\.net/(member_illust.php?.*illust_id=|artworks/)(\d+)}.freeze
+    URL_REGEXP = %r{pixiv\.net/.*(member_illust.php?.*illust_id=|artworks/)(\d+)}.freeze
 
     def initialize(url)
       super(url)
@@ -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/twitter_resolver.rb

@@ -0,0 +1,24 @@
+module Panchira
+  class TwitterResolver < Resolver
+    URL_REGEXP = /twitter.com\/\w+\/status\/\d+/.freeze
+
+    private
+      def parse_title
+        @title = super
+      end
+
+      def parse_author
+        @title.match(/\A(.+) on Twitter\z/)[1]
+      end
+
+      def parse_description
+        @description = super.gsub(/\A“|”\z/, '')
+      end
+
+      def parse_tags
+        @description.scan(/[#＃]([^#＃\s]+)/).map(&:first)
+      end
+  end
+
+  ::Panchira::Extensions.register(Panchira::TwitterResolver)
+end

data/lib/panchira/version.rb

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

data/panchira.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.6'
+  spec.required_ruby_version = '>= 2.7'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'minitest', '~> 5.0'
@@ -40,5 +40,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop-minitest', '~> 0.10'
 
   spec.add_dependency 'fastimage', '~> 2.1.7'
-  spec.add_dependency 'nokogiri', '>= 1.10.9', '< 1.12.0'
+  spec.add_dependency 'nokogiri', '>= 1.10.9', '< 1.13.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panchira
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.4.0
 platform: ruby
 authors:
 - kyp
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-25 00:00:00.000000000 Z
+date: 2022-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -103,7 +103,7 @@ dependencies:
         version: 1.10.9
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -113,7 +113,7 @@ dependencies:
         version: 1.10.9
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.13.0
 description: |2
       Panchira allows you to parse attributes of hentais on some web platforms, such as Pixiv and DLSite.
       If you need card previews on hentai but can't get it with simply parsing metatags, then it is time for Panchira.
@@ -148,6 +148,7 @@ files:
 - lib/panchira/resolvers/nijie_resolver.rb
 - lib/panchira/resolvers/pixiv_resolver.rb
 - lib/panchira/resolvers/resolver.rb
+- lib/panchira/resolvers/twitter_resolver.rb
 - lib/panchira/version.rb
 - panchira.gemspec
 homepage: https://github.com/nuita/panchira
@@ -165,14 +166,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.4
 signing_key:
 specification_version: 4
 summary: A parser for hentai websites