panchira 1.5.0 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9119f6e4ad4e4a3b551642f7d19a7853805d2c82b65c5fc868b472f265e7169c
-  data.tar.gz: 03cbbf38e009cd326b4f40f467de1dcc1d0fb852de362b3dde05ed56eb65c2c2
+  metadata.gz: b0a6e502368c14a15073925a7c717646a8e59ff1fbb17240aba4abdedd93fec7
+  data.tar.gz: 42557986e00b95619e845c79b20a15f17370fbf72b8bf163f98e0a1660d2d244
 SHA512:
-  metadata.gz: 6ff2fab3b4489ade9e7accb6f10dc2d391aa5ba5ebbbb08f130926df81acd31eeae36d2208b915848e5e1337e71ab2a7cbe300eeeb728ed8669593fc139573f8
-  data.tar.gz: df76a29e1af2515d4eee99568426295e02fbcf8b1b6b835932633458f3f287d4ca2460ec1a497a73f2f8a5e66a100acf71aa37e35be3dd778c95ac83f2f808e7
+  metadata.gz: 7f500d879e81fda3ac9c3869b16293b1591da1ac60b149e679fa35be797524a63e01696995f9e4d46f3e0854f213dc276dc84427cbb4bd0086504b931e9ac3f0
+  data.tar.gz: 120c8d8c4d86b3a6dda82d14b9cc63a9e9854d930b835fb46681c2392cabce0807ee67332fe2aaafea4f7afd4f626001842a53a8aa8cdb853bb2c7ff6c1773c2

data/CHANGELOG.md

@@ -4,10 +4,25 @@ 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.5.3 - 2022-06-04
+### Fixed
+- Fixed an issue where Pixiv resolver can't retrieve image urls for manga.
+
+### Changed
+- DLsite resolver now returns descriptions without platform PR sentences.
+
+## 1.5.2 - 2022-03-20
+### Fixed
+- Fixed an issue where Pixiv resolver can't retrieve not-proxied image scales.
+
+## 1.5.1 - 2022-03-20
+### Added
+- Pixiv resolver can now fetch image URIs that are not proxied.
+
 ## 1.5.0 - 2022-03-01
 ### Changed
 - You can now set options in Panchira::fetch and Resolver's constructors.
-- Twitter resolvers can now fetch datas from API (requires bearer token).
+- Twitter resolver can now fetch datas from API (requires bearer token).
 - Max execution time is now set to 10 seconds.
 
 ## 1.4.0 - 2022-01-10

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    panchira (1.5.0)
+    panchira (1.5.3)
       fastimage (~> 2.1.7)
       nokogiri (>= 1.10.9, < 1.14.0)
 
@@ -12,35 +12,36 @@ GEM
     fastimage (2.1.7)
     mini_portile2 (2.8.0)
     minitest (5.15.0)
-    nokogiri (1.13.3)
+    nokogiri (1.13.6)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    parallel (1.21.0)
-    parser (3.1.1.0)
+    parallel (1.22.1)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
     racc (1.6.0)
     rainbow (3.1.1)
     rake (12.3.3)
-    regexp_parser (2.2.1)
+    regexp_parser (2.5.0)
     rexml (3.2.5)
-    rubocop (1.25.1)
+    rubocop (1.30.0)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.15.1, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.18.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.16.0)
+    rubocop-ast (1.18.0)
       parser (>= 3.1.1.0)
-    rubocop-minitest (0.17.2)
+    rubocop-minitest (0.20.0)
       rubocop (>= 0.90, < 2.0)
     ruby-progressbar (1.11.0)
     unicode-display_width (2.1.0)
 
 PLATFORMS
   ruby
+  x86_64-linux
 
 DEPENDENCIES
   bundler (~> 2.0)

data/README.md

@@ -56,6 +56,14 @@ To use Twitter API instead of normal scraping, please set Twitter's bearer token
 > Panchira.fetch("https://twitter.com/example/status/1234567890", options: {twitter: {bearer_token: 'ABC...123'}})
 ```
 
+### About Pixiv proxy
+
+By default, Panchira returns a link to [Pixiv.cat](https://pixiv.cat/) as a image URI, but you can change this behavior by setting `fetch_raw_image_url` as an option. To access not-proxied URI, pximg.net, you have to set Referer as `https://app-api.pixiv.net/` in HTTP request header.
+
+```
+> Panchira.fetch("https://pixiv.net/artworks/12345678", options: {pixiv: {fetch_raw_image_url: true}})
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/panchira/resolvers/dlsite_resolver.rb

@@ -18,6 +18,10 @@ module Panchira
         @title_md[1]
       end
 
+      def parse_description
+        super.split('「DLsite').first
+      end
+
       def parse_authors
         @page.css('table[id*="work_"] tr').each do |tr|
           next unless tr.css('th').text =~ /(作|著)者/

data/lib/panchira/resolvers/pixiv_resolver.rb

@@ -10,6 +10,8 @@ module Panchira
 
       raw_json = URI.parse("https://www.pixiv.net/ajax/illust/#{@illust_id}").read('User-Agent' => user_agent)
       @json = JSON.parse(raw_json)
+
+      @fetch_raw_image_url = options&.dig(:pixiv, :fetch_raw_image_url)
     end
 
     private
@@ -26,11 +28,24 @@ module Panchira
         "https://pixiv.net/member_illust.php?mode=medium&illust_id=#{@illust_id}"
       end
 
+      def parse_image
+        image = PanchiraImage.new
+        image.url = parse_image_url
+        image.width, image.height = FastImage.size(image.url, http_header: {'Referer' => 'https://app-api.pixiv.net/'})
+
+        image
+      end
+
       def parse_image_url
+        if @fetch_raw_image_url
+          return @json['body']['urls']['original']
+        end
+
         proxy_url = "https://pixiv.cat/#{@illust_id}.jpg"
 
-        case Net::HTTP.get_response(URI.parse(proxy_url))
-        when Net::HTTPNotFound
+        case res = Net::HTTP.get_response(URI.parse(proxy_url))
+        when Net::HTTPMovedPermanently
+          # 301が返された場合、locationで渡されたURIにホストが含まれず扱いづらいため決め打ちする
           proxy_url = "https://pixiv.cat/#{@illust_id}-1.jpg"
         end
 

data/lib/panchira/resolvers/twitter_resolver.rb

@@ -10,6 +10,9 @@ module Panchira
       @id = @url.slice(URL_REGEXP, 2)
 
       @bearer_token = options&.dig(:twitter, :bearer_token)
+
+      @author = nil
+      @response = nil
     end
 
     def fetch

data/lib/panchira/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panchira
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.3
 platform: ruby
 authors:
 - kyp
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-01 00:00:00.000000000 Z
+date: 2022-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler