kinopoisk_parser 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a512062e75b11a59968e53d182e4348e2065243e
-  data.tar.gz: 9a6e745858ac1ebaa2898bd5eee752ccfd2f106f
+  metadata.gz: 7efdb357ef8aa519896bf12cbfc14a1d6fcfd4d8
+  data.tar.gz: 98f354d07b2872ff351200e0d84610c2344e0f59
 SHA512:
-  metadata.gz: 6f85074b1cb0cd4273f06b1ce66748bf4c5c13d9ddacbfafbee37b1d250e7c085371192ccffe6e0ca65616b28b41e6a52c2cf8b4d817a3d83f449bdc369c1831
-  data.tar.gz: 526a04d09ee9e39a1828ea6dcde5cad3afbb4bbdcf5ab5c8e6b635d75f9bb8c5e0505d17a9b858eec93588a21b28e6cfc446b2a05a2c46869e4a423438057729
+  metadata.gz: caf299d7f7acd611513debfeff6cd01c00014ee2daf5598f43c88f55c9010cf7476570eeceefbac4f6ac7e18b71c0c4587fab26bdd814c9aa44e8e6d3aa771f9
+  data.tar.gz: da0584635f218d625d386522532b0317eaf6b4fcf3bf8a303eb1c9a09c7711d608da4b2a2bfebf8c46c2e12cbc7fbc5c363b589c3de1d421261a2a8e872ca915

data/kinopoisk_parser.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = 'kinopoisk_parser'
-  gem.version       = '2.2.2'
+  gem.version       = '2.2.3'
   gem.authors       = ['RavWar']
   gem.email         = ['rav_war@mail.ru']
   gem.homepage      = 'https://github.com/RavWar/kinopoisk_parser'

data/lib/kinopoisk/movie.rb

@@ -14,7 +14,7 @@ module Kinopoisk
     # Movie page request is made once and on the first access to a remote data.
     #
     def initialize(input, title=nil)
-      @id    = input.is_a?(String) ? find_by_title(input) : input
+      @id    = input.is_a?(String) ? find_id_by_title(input) : input
       @url   = "https://www.kinopoisk.ru/film/#{id}/"
       @title = title
     end
@@ -176,18 +176,8 @@ module Kinopoisk
       @doc ||= Kinopoisk.parse url
     end
 
-    # Kinopoisk has defined first=yes param to redirect to first result
-    # Return its id from location header
-    def find_by_title(title)
-      url = SEARCH_URL + "#{URI.escape(title)}&first=yes"
-      location = Kinopoisk.fetch(url).headers['Location'].to_s
-
-      if location =~ /error\.kinopoisk\.ru|showcaptcha/
-        raise Denied, 'Request denied'
-      else
-        id_match = location.match(/\/(\d*)\/$/)
-        id_match[1] if id_match
-      end
+    def find_id_by_title(title)
+      Search.new(title).movies.first&.id || raise(NotFound)
     end
 
     def search_by_itemprop(name)

data/lib/kinopoisk_parser.rb

@@ -8,20 +8,26 @@ module Kinopoisk
   SEARCH_URL = 'https://www.kinopoisk.ru/index.php?kp_query='
 
   NotFound = Class.new StandardError
-  Denied   = Class.new StandardError
+  Denied   = Class.new StandardError do
+    def initialize(msg = 'Request denied')
+      super
+    end
+  end
 
   # Headers are needed to mimic proper request so kinopoisk won't block it
   def self.fetch(url)
-    HTTPClient.new.get url, nil, { follow_redirect: true, 'User-Agent'=>'a', 'Accept-Encoding'=>'a' }
+    HTTPClient.new.get url, follow_redirect: true, header: { 'User-Agent'=>'a', 'Accept-Encoding'=>'a' }
   end
 
-  # Returns a nokogiri document or an error if fetch response status is not 200
+  # Returns a nokogiri document or throws an error
   def self.parse(url)
     page = fetch url
-    if page.status == 200
-      Nokogiri::HTML(page.body.encode('utf-8'))
-    else
-      raise NotFound, 'Page not found'
-    end
+
+    raise NotFound, 'Page not found' if page.status != 200
+    raise Denied if page.header.request_uri.to_s =~ /error\.kinopoisk\.ru|\/showcaptcha/
+
+    Nokogiri::HTML page.body.encode('utf-8')
+  rescue HTTPClient::BadResponseError
+    raise Denied
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kinopoisk_parser
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - RavWar