panchira 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5625692d52a2fa265db20d62c9311f877a27b4a8d099446bae7dda346b9fcb5
-  data.tar.gz: 0be90bf0354d5f87ca15e213722c7c44b4c522ec9ad048a611c8f0d307e8fb84
+  metadata.gz: 1809ad9bff82b513e43a58b5270cf67232ccec9bb440b549b0faacfa24d1c9b5
+  data.tar.gz: 7948df0b4ef085a2f37c6ae7c30801da7bc6f5a997dff74e108d51e4c5f4204e
 SHA512:
-  metadata.gz: 98c86bab322717af51f335a5c252dd465c3ec06fdb4bd54e3d3c166153e9571d3b6a94625ab708c286cf18ef8846114cc74cc6ec27f66e376bddbd4fbfcb8aae
-  data.tar.gz: 1efabc99a91e770e47a06ddb527cf72ac361f165a0e5f5a4fcfc4ab17eae99436a55bdb70f721da0826117e6febd10062736b47c02442ae8870a6604070bf2e2
+  metadata.gz: 0cac7d53c293e5426db620e2fe7eb358b00e4bd7a5e1d0d05a743933f90056c1416391139b193a967a1a675c3bf6863ae691a99f893d4956cd49fd5d0316773b
+  data.tar.gz: 013ea3d18b91410392a8d1727197746ad6b210dac2898c44f68e81f67b5361ebf034bb5f24f594cd78177b00f862478dc4ebdba7022875a60351f32fc3b5826c

data/CHANGELOG.md

@@ -4,6 +4,22 @@ 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.1.0 - 2020-08-06
+### Added
+- Added support for Fanza Books.
+- Added support for direct links to an image.
+- You can now set cookie by overriding Resolver#cookie in individual resolvers.
+
+### Changed
+- Resolver::USER_AGENT changed to Resolver#user_agent.
+
+## 1.0.0 - 2020-06-23
+### Added
+- Added support for tags.
+
+### Fixed
+- Fixed some outdated documents.
+
 ## 0.3.0 - 2020-06-04
 ### Added
 - You can now register and use your own Resolver with this gem. (see Panchira::Extensions#register)
@@ -27,6 +43,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 - Released Panchira gem. At this time we can parse only 5 websites.
 
+[1.1.0]: https://github.com/nuita/panchira/releases/tag/v1.1.0
+[1.0.0]: https://github.com/nuita/panchira/releases/tag/v1.0.0
 [0.3.0]: https://github.com/nuita/panchira/releases/tag/v0.3.0
 [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

data/Gemfile.lock

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

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 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 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.
 
@@ -16,7 +16,7 @@ This gem is derived from the [Nuita](https://github.com/nuita/nuita) project.
 
 **Please use this gem with appropriate censoring and age-restricting. Never violate local laws and copyrights.**
 
-If you are running one of the websites we cover and feel negative about it, please contact the community or the author([@kypkyp](https://github.com/kypkyp)). 
+If you are running one of the websites we cover and feel negative about this gem, please contact the community or the author([@kypkyp](https://github.com/kypkyp)). 
 
 ## Installation
 

data/lib/panchira.rb

@@ -13,6 +13,9 @@ 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 }
 
+# register fallback ImageResolver at the end. (resolver is selected by registration order)
+::Panchira::Extensions.register(Panchira::ImageResolver)
+
 # Main Panchira code goes here.
 # If you simply want to get data from your URL, then ::Panchira::fetch() will do.
 module Panchira

data/lib/panchira/resolvers/fanza_resolver.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'net/https'
+
+module Panchira
+  module Fanza
+    class FanzaBookResolver < Resolver
+      URL_REGEXP = %r{book\.dmm\.co\.jp\/}.freeze
+
+      private
+
+      def parse_image
+        @page.css('.m-imgDetailProductPack/@src').first.to_s
+      end
+
+      def cookie
+        'age_check_done=1;'
+      end
+    end
+  end
+
+  ::Panchira::Extensions.register(Panchira::Fanza::FanzaBookResolver)
+end

data/lib/panchira/resolvers/image_resolver.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Panchira
+  class ImageResolver < Resolver
+    URL_REGEXP = %r{\.(png|gif|jpg|jpeg|webp)$}.freeze
+
+    def fetch
+      result = PanchiraResult.new
+      result.canonical_url = @url
+      result.image = PanchiraImage.new
+      result.image.url = @url
+      result
+    end
+  end
+end

data/lib/panchira/resolvers/komiflo_resolver.rb

@@ -10,7 +10,7 @@ module Panchira
       @url = url
 
       @id = url.slice(URL_REGEXP, 1)
-      raw_json = URI.parse("https://api.komiflo.com/content/id/#{@id}").read('User-Agent' => USER_AGENT)
+      raw_json = URI.parse("https://api.komiflo.com/content/id/#{@id}").read('User-Agent' => user_agent)
       @json = JSON.parse(raw_json)
     end
 
@@ -39,7 +39,7 @@ module Panchira
     end
 
     def parse_tags
-      @json['content']['attributes']['tags']['children'].map{|content| content['data']['name']}
+      @json['content']['attributes']['tags']['children'].map { |content| content['data']['name'] }
     end
   end
 

data/lib/panchira/resolvers/pixiv_resolver.rb

@@ -8,7 +8,7 @@ module Panchira
       super(url)
       @illust_id = url.slice(URL_REGEXP, 2)
 
-      raw_json = URI.parse("https://www.pixiv.net/ajax/illust/#{@illust_id}").read('User-Agent' => USER_AGENT)
+      raw_json = URI.parse("https://www.pixiv.net/ajax/illust/#{@illust_id}").read('User-Agent' => user_agent)
       @json = JSON.parse(raw_json)
     end
 

data/lib/panchira/resolvers/resolver.rb

@@ -11,8 +11,6 @@ module Panchira
     # You must override this in subclasses to limit which urls to resolve.
     URL_REGEXP = URI::DEFAULT_PARSER.make_regexp
 
-    USER_AGENT = "Mozilla/5.0 (compatible; PanchiraBot/#{VERSION}; +https://github.com/nuita/panchira)"
-
     def initialize(url)
       @url = url
     end
@@ -46,7 +44,12 @@ module Panchira
     private
 
     def fetch_page(url)
-      raw_page = URI.parse(url).read('User-Agent' => self.class::USER_AGENT)
+      read_options = {
+        'User-Agent' => user_agent,
+        'Cookie' => cookie
+      }
+
+      raw_page = URI.parse(url).read(read_options)
       charset = raw_page.charset
       Nokogiri::HTML.parse(raw_page, url, charset)
     end
@@ -102,5 +105,13 @@ module Panchira
     def parse_tags
       []
     end
+
+    def cookie
+      ''
+    end
+
+    def user_agent
+      "Mozilla/5.0 (compatible; PanchiraBot/#{VERSION}; +https://github.com/nuita/panchira)"
+    end
   end
 end

data/lib/panchira/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panchira
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - kyp
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-23 00:00:00.000000000 Z
+date: 2020-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -103,6 +103,8 @@ files:
 - lib/panchira/extensions.rb
 - lib/panchira/panchira_result.rb
 - lib/panchira/resolvers/dlsite_resolver.rb
+- lib/panchira/resolvers/fanza_resolver.rb
+- lib/panchira/resolvers/image_resolver.rb
 - lib/panchira/resolvers/komiflo_resolver.rb
 - lib/panchira/resolvers/melonbooks_resolver.rb
 - lib/panchira/resolvers/narou_resolver.rb