kinopoisk_parser 1.0.2 → 1.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTMzMDliZjMxMmM0M2UzOTM4MDlmM2IwZDI0Yzg3NTY4MTYxZTlmMw==
+    NDFiMTk5NjRlZjk2Mjk1NjIyMzhkYWFmYzI2NWQyODgzNTkwOGUxNA==
   data.tar.gz: !binary |-
-    YWJmY2Y0YjU0NjdkZTEwZjVlMjI0ODM2NWM4OTAzNDM1NzBhMWQ5NQ==
+    NzRmYzQxNjRhODRlNTFlNWQ0ZDE1ZTNiMDA2MzA0NjZhZGM1MGUwZg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NmYzMzAwMjM0YTNiMjgxZDhkOGMzYWVjNjU2MTU5ZTFlOWExODA3M2NlNjg3
-    YmRkOWU4OWYwNDc4NGZjNjYzNDc0NWM5NTZiMDg2NmZlNmZjYTg5YWY1Y2E5
-    NmVkMDdjYWM1ZTlhMjUwZDMyYjU2MjVkN2Y1YmUwMmQ1NDU4NGY=
+    ZTFhZDJlMDY5MTdlMjY3NDE2YjIxMGE0MDc5NDkzYjlhN2NkOTNlYWQxNjBj
+    MWJjMDA3MDdhMjFlZjMwZmU1ODk5MzdjMzUwNzgyNTAxZDM1MTU0YzM4MmNi
+    MTExZDdmMjFlZTdiYjRlMDViMWNkYTQ3M2Q5YWEyZDQzYzE1NzQ=
   data.tar.gz: !binary |-
-    NTBmMzFhZGUxYjk0ZjNkNGIxZjJlNDgxNGZmNWZhNDEwMmFmZTdiOWU3YTA2
-    YmI1NjYzZDU3NjE1NGFhYTdkYzhlYjhiZmJmMTdkNDJiNmI2ZDcxMTQ1NzJl
-    NmI4NjU3ZmZiMmRjY2RhY2JlYzNkMjg3ZjFiZDcwYTViYmI0ZTg=
+    MjBhNWFiZGQ2MjRiZDE5MGUwYTk5ZjFlMDZlMThkYTJjMjcyNWZjNTRjZDY3
+    MTc0NDhmNzkwNjAzYTFhNGJhMzA5ZDllMWE3YjhiMTk1NTY2MWIxM2NhNDhj
+    NDljZDZhYjBjOTM0NzU0OTVhNzJmYzk5ODZkNThlYWUzYmU1NjQ=

data/README.md

@@ -3,8 +3,9 @@
 Easily search and access information on kinopoisk.ru
 
 [![Build Status](https://secure.travis-ci.org/RavWar/kinopoisk_parser.png)](http://travis-ci.org/RavWar/kinopoisk_parser)
-[![Code Climate](https://codeclimate.com/github/RavWar/kinopoisk_parser.png)](https://codeclimate.com/github/RavWar/kinopoisk_parser)
 [![Dependency Status](https://gemnasium.com/RavWar/kinopoisk_parser.png)](https://gemnasium.com/RavWar/kinopoisk_parser)
+[![Gem Version](https://badge.fury.io/rb/kinopoisk_parser.png)](http://badge.fury.io/rb/kinopoisk_parser)
+[![Code Climate](https://codeclimate.com/github/RavWar/kinopoisk_parser.png)](https://codeclimate.com/github/RavWar/kinopoisk_parser)
 
 ## Installation
 

data/kinopoisk_parser.gemspec

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

data/lib/kinopoisk/movie.rb

@@ -42,15 +42,31 @@ module Kinopoisk
       doc.search("table.info a[href*='/m_act%5Bcountry%5D/']").map(&:text)
     end
 
+    def budget
+      doc.search("//td[text()='бюджет']/following-sibling::*//a").text
+    end
+
+    def gross_ru
+      doc.search("td#div_rus_box_td2 a").text
+    end
+
+    def gross_us
+      doc.search("td#div_usa_box_td2 a").text
+    end
+
+    def gross_world
+      doc.search("td#div_world_box_td2 a").text
+    end
+
     def poster
       doc.search("img[itemprop='image']").first.attr 'src'
     end
 
-    def world_premiere
+    def premiere_world
       doc.search('td#div_world_prem_td2 a:first').text
     end
 
-    def ru_premiere
+    def premiere_ru
       doc.search('td#div_rus_prem_td2 a:first').text
     end
 
@@ -63,7 +79,7 @@ module Kinopoisk
     end
 
     def length
-      doc.search('td#runtime').text
+      doc.search('td#runtime').text.to_i
     end
 
     def directors
@@ -132,7 +148,7 @@ module Kinopoisk
     end
 
     def search_by_text(name)
-      doc.search("//td[text()='#{name}']").first.next.text
+      doc.search("//td[text()='#{name}']/following-sibling::*").text
     end
 
     def to_array(string)

data/lib/kinopoisk/person.rb

@@ -22,7 +22,7 @@ module Kinopoisk
     end
 
     def partner
-      doc.search("//td[@class='type'][contains(text(),'супруг')]").first.next.text
+      doc.search("//td[@class='type'][contains(text(),'супруг')]/following-sibling::*").text
     end
 
     def birthdate
@@ -68,7 +68,7 @@ module Kinopoisk
     end
 
     def search_by_text(name)
-      doc.search("//td[@class='type'][text()='#{name}']").first.next.text
+      doc.search("//td[@class='type'][text()='#{name}']/following-sibling::*").text
     end
   end
 end

data/lib/kinopoisk_parser.rb

@@ -6,6 +6,7 @@ require 'kinopoisk/person'
 
 module Kinopoisk
   SEARCH_URL = "http://www.kinopoisk.ru/index.php?kp_query="
+  NotFound   = Class.new StandardError
 
   # Headers are needed to mimic proper request so kinopoisk won't block it
   def self.fetch(url)
@@ -13,7 +14,7 @@ module Kinopoisk
   end
 
   def self.parse(url)
-    page = fetch url
-    page.status == 200 ? Nokogiri::HTML(page.body.encode('utf-8')) : raise
+    p = fetch url
+    p.status==200 ? Nokogiri::HTML(p.body.encode('utf-8')) : raise(NotFound)
   end
 end

data/spec/kinopoisk/movie_spec.rb

@@ -1,39 +1,46 @@
 #coding: UTF-8
 require 'spec_helper'
 
-describe Kinopoisk::Movie, vcr: { cassette_name: 'movie' } do
-  let(:movie) { Kinopoisk::Movie.new 277537 }
-
-  it { movie.url.should eq('http://www.kinopoisk.ru/film/277537/') }
-  it { movie.title.should eq('Правосудие Декстера') }
-  it { movie.title_en.should eq('Dexter') }
-  it { movie.countries.should eq(['США']) }
-  it { movie.year.should eq(2006) }
-  it { movie.poster.should eq('http://st.kinopoisk.ru/images/film/277537.jpg') }
-  it { movie.poster_big.should eq('http://st.kinopoisk.ru/images/film_big/277537.jpg') }
-  it { movie.producers.should eq(['Сара Коллетон','Джон Голдвин','Роберт Ллойд Льюис']) }
-  it { movie.art_directors.should eq(['Джессика Кендер','Энтони Коули','Эрик Уейлер']) }
-  it { movie.operators.should eq(['Ромео Тироне','Джеф Джёр','Мартин Дж. Лэйтон']) }
-  it { movie.editors.should eq(['Луис Ф. Циоффи','Стюарт Шилл','Мэттью Колонна']) }
-  it { movie.writers.should eq(['Джефф Линдсэй','Джеймс Манос мл.','Скотт Бак']) }
-  it { movie.actors.should include('Майкл С. Холл', 'Дженнифер Карпентер') }
-  it { movie.genres.should eq(['триллер','драма','криминал', 'детектив']) }
-  it { movie.directors.should eq(['Джон Дал','Стив Шилл','Кит Гордон']) }
-  it { movie.slogan.should eq('«Takes life. Seriously.»') }
-  it { movie.description.should match('Декстер Морган.') }
-  it { movie.world_premiere.should eq('1 октября 2006') }
-  it { movie.ru_premiere.should eq('3 ноября 2008') }
-  it { movie.composers.should eq(['Дэниэл Лихт']) }
-  it { movie.imdb_rating_count.should be_a(Integer) }
-  it { movie.imdb_rating.should be_a(Float) }
-  it { movie.rating_count.should be_a(Integer) }
-  it { movie.rating.should be_a(Float) }
-  it { movie.length.should eq('55 мин.') }
+describe Kinopoisk::Movie, vcr: { cassette_name: 'movies' } do
+  let(:dexter) { Kinopoisk::Movie.new 277537 }
+  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_en.should eq('Dexter') }
+  it { dexter.countries.should eq(['США']) }
+  it { dexter.year.should eq(2006) }
+  it { dexter.poster.should eq('http://st.kinopoisk.ru/images/film/277537.jpg') }
+  it { dexter.poster_big.should eq('http://st.kinopoisk.ru/images/film_big/277537.jpg') }
+  it { dexter.producers.should eq(['Сара Коллетон','Джон Голдвин','Роберт Ллойд Льюис']) }
+  it { dexter.art_directors.should eq(['Джессика Кендер','Энтони Коули','Эрик Уейлер']) }
+  it { dexter.operators.should eq(['Ромео Тироне','Джеф Джёр','Мартин Дж. Лэйтон']) }
+  it { dexter.editors.should eq(['Луис Ф. Циоффи','Стюарт Шилл','Мэттью Колонна']) }
+  it { dexter.writers.should eq(['Джефф Линдсэй','Джеймс Манос мл.','Скотт Бак']) }
+  it { dexter.actors.should include('Майкл С. Холл', 'Дженнифер Карпентер') }
+  it { dexter.genres.should eq(['триллер','драма','криминал', 'детектив']) }
+  it { dexter.directors.should eq(['Джон Дал','Стив Шилл','Кит Гордон']) }
+  it { dexter.slogan.should eq('«Takes life. Seriously.»') }
+  it { dexter.description.should match('Декстер Морган.') }
+  it { dexter.premiere_world.should eq('1 октября 2006') }
+  it { dexter.premiere_ru.should eq('3 ноября 2008') }
+  it { dexter.composers.should eq(['Дэниэл Лихт']) }
+  it { dexter.imdb_rating_count.should be_a(Integer) }
+  it { dexter.imdb_rating.should be_a(Float) }
+  it { dexter.rating_count.should be_a(Integer) }
+  it { dexter.rating.should be_a(Float) }
+  it { dexter.gross_ru.should eq('') }
+
+  it { avatar.gross_world.should match('[$\d]') }
+  it { avatar.gross_ru.should match('[$\d]') }
+  it { avatar.gross_us.should match('[$\d]') }
+  it { avatar.budget.should eq("$237 000 000") }
+  it { avatar.length.should eq(162) }
 
   it 'should make only one request' do
-    movie.title
-    movie.countries
-    a_request(:get, movie.url).should have_been_made.once
+    dexter.title
+    dexter.countries
+    a_request(:get, dexter.url).should have_been_made.once
   end
 
   it 'should raise error if nothing found' do
@@ -41,18 +48,18 @@ describe Kinopoisk::Movie, vcr: { cassette_name: 'movie' } do
   end
 
   context 'by title' do
-    let(:movie_by_title) { Kinopoisk::Movie.new 'Dexter' }
+    let(:dexter_by_title) { Kinopoisk::Movie.new 'Dexter' }
 
-    it { movie.url.should eq(movie_by_title.url) }
+    it { dexter.url.should eq(dexter_by_title.url) }
 
     it 'should make only one request to initialize' do
-      movie_by_title
+      dexter_by_title
       a_request(:get, /.*/).should have_been_made.once
     end
 
     it 'should make max two requests' do
-      movie_by_title.title
-      movie_by_title.countries
+      dexter_by_title.title
+      dexter_by_title.countries
       a_request(:get, /.*/).should have_been_made.twice
     end
   end

data/spec/kinopoisk/person_spec.rb

@@ -1,7 +1,7 @@
 #coding: UTF-8
 require 'spec_helper'
 
-describe Kinopoisk::Person, vcr: { cassette_name: 'person' } do
+describe Kinopoisk::Person, vcr: { cassette_name: 'people' } do
   let(:person) { Kinopoisk::Person.new 13180 }
 
   it 'should return right url' do

metadata

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