kinopoisk_parser 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b39e141d40b1a6647bf706635e2bc87aca7e5049
-  data.tar.gz: a5635ba2a8075bbcf424542f1d842270a9e83c75
+  metadata.gz: 24653cc8767111eb4cd54ceede08d3ab8dd9a5b4
+  data.tar.gz: 2f85849f90e4befe2b30f3580de2c68cba14f732
 SHA512:
-  metadata.gz: f2861d2833565b793f7ee059a3d49557aff949269bcbfe4e7100222ec0c13186235ecbfc79871b6df8cb10af930c388d0173693441e764bb8ae4c31c79a77842
-  data.tar.gz: fbf86669444bebbcc1fba9d56a2a1cdf821b4b70f6974c4434cd7dd5eff58f5e330dec6dc8910b7fdf344bf36e1391f03ff34bd7f2db067c96def8460ed253c8
+  metadata.gz: c3f3c5adc813675d9cea5a87f26c7f70dbb6e4546c31bd62832d39135463ca777a54e7864435e51cba1dae460f606868014ffebb6fc6b6d986e3cde6cd9310fc
+  data.tar.gz: fa98e16ff3b6d4960f6d92d43950abe799640d9ba324173410f4d51fa85d78b1755c8625e3576b2728f738917523765146a8b9c98bb7fe8f10868dba53b561a0

data/kinopoisk_parser.gemspec

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

data/lib/kinopoisk/movie.rb

@@ -112,7 +112,7 @@ module Kinopoisk
 
     # Returns an integer kinopoisk rating vote count
     def rating_count
-      search_by_itemprop('ratingCount').to_i
+      search_by_itemprop('ratingCount').gsub(' ', '').to_i
     end
 
     # Returns an array of strings containing director names
@@ -179,8 +179,14 @@ module Kinopoisk
     # 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"
-      Kinopoisk.fetch(url).headers['Location'].to_s.match(/\/(\d*)\/$/)[1]
+      url = SEARCH_URL + "#{URI.escape(title)}&first=yes"
+      location = Kinopoisk.fetch(url).headers['Location'].to_s
+
+      if location.include?('error.kinopoisk.ru')
+        raise Denied, 'Request denied'
+      else
+        location.match(/\/(\d*)\/$/)[1]
+      end
     end
 
     def search_by_itemprop(name)

data/lib/kinopoisk_parser.rb

@@ -5,8 +5,10 @@ require 'kinopoisk/search'
 require 'kinopoisk/person'
 
 module Kinopoisk
-  SEARCH_URL = "http://www.kinopoisk.ru/index.php?kp_query="
-  NotFound   = Class.new StandardError
+  SEARCH_URL = 'http://www.kinopoisk.ru/index.php?kp_query='
+
+  NotFound = Class.new StandardError
+  Denied   = Class.new StandardError
 
   # Headers are needed to mimic proper request so kinopoisk won't block it
   def self.fetch(url)
@@ -15,7 +17,11 @@ module Kinopoisk
 
   # Returns a nokogiri document or an error if fetch response status is not 200
   def self.parse(url)
-    p = fetch url
-    p.status==200 ? Nokogiri::HTML(p.body.encode('utf-8')) : raise(NotFound)
+    page = fetch url
+    if page.status == 200
+      Nokogiri::HTML(page.body.encode('utf-8'))
+    else
+      raise NotFound, 'Page not found'
+    end
   end
 end

data/spec/kinopoisk/movie_spec.rb

@@ -6,7 +6,7 @@ describe Kinopoisk::Movie, vcr: { cassette_name: 'movies' } do
   let(:avatar) { Kinopoisk::Movie.new 251733 }
 
   it { dexter.url.should eq('http://www.kinopoisk.ru/film/277537/') }
-  it { dexter.title.should eq('Правосудие Декстера') }
+  it { dexter.title.should eq('Декстер') }
   it { dexter.title_en.should eq('Dexter') }
 
   it { dexter.poster.should eq('http://st.kp.yandex.net/images/film_iphone/iphone360_277537.jpg') }
@@ -21,7 +21,7 @@ describe Kinopoisk::Movie, vcr: { cassette_name: 'movies' } do
   it { dexter.operators.should eq(['Ромео Тироне','Джеф Джёр','Мартин Дж. Лэйтон']) }
   it { dexter.composers.should eq(['Дэниэл Лихт']) }
   it { dexter.art_directors.should eq(['Джессика Кендер','Энтони Коули','Эрик Уейлер']) }
-  it { dexter.editors.should eq(['Луис Ф. Циоффи','Стюарт Шилл','Кит Хендерсон']) }
+  it { dexter.editors.should eq(['Луис Циоффи', 'Стюарт Шилл', 'Кит Хендерсон']) }
   it { dexter.genres.should eq(['триллер','драма','криминал', 'детектив']) }
   it { dexter.actors.should include('Майкл С. Холл', 'Дженнифер Карпентер') }
   it { dexter.description.should match('Декстер Морган.') }

data/spec/kinopoisk/person_spec.rb

@@ -17,8 +17,8 @@ describe Kinopoisk::Person, vcr: { cassette_name: 'people' } do
   it { person.name.should eq('Декстер Флетчер') }
   it { person.birthplace.should eq('Лондон') }
   it { person.first_movie.should eq('1976') }
-  it { person.last_movie.should eq('2014') }
+  it { person.last_movie.should be_a(String) }
   it { person.birthdate.should be_a(Date) }
-  it { person.total_movies.should eq(93) }
+  it { person.total_movies.should be_a(Integer) }
   it { person.height.should eq('1.68 м') }
 end

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: kinopoisk_parser
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - RavWar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-10 00:00:00.000000000 Z
+date: 2015-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: |2
@@ -103,8 +103,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -127,17 +127,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Easily search and access information on kinopoisk.ru