cine-passion 0.9.0 → 0.10.0

data/History.txt

@@ -39,3 +39,8 @@
 === 0.9.0 / 2010-09-06
 
 * Can search with MovieID MovieSearch("1234", "ID")
+
+=== 0.10.0 / 2010-09-06
+
+* version() return library version
+* Better MovieGetInfo() (Work now)

data/lib/cine_passion.rb

@@ -20,7 +20,11 @@ include REXML
 class CinePassion
   attr_reader :xml_data, :movies_info, :result_nb, :status, :quota, :apikey, :siteurl, :proxyinfo, :lang
   
-  VERSION = '0.9.0'
+  VERSION = '0.10.0'
+
+  def version()
+     return VERSION
+  end
   
   # This class does not require parameters
   # First action is reset object
@@ -95,18 +99,18 @@ class CinePassion
   end
   
   # Generate URL For Movie.GetInfo
-  def GenerateURLMovieGetInfo(search, query="Title", format="XML")
+  def GenerateURLMovieGetInfo(search, query="ID", format="XML")
     "#{@siteurl}/scraper/API/1/Movie.GetInfo/#{query}/#{@lang}/#{format}/#{@apikey}/#{search}"
   end
   
   # Execute a MovieSearch on scraper
-  def MovieSearch(search)
+  def MovieSearch(search, query="Title", format="XML")
     DataLoadFromSite(GenerateURLMovieSearch(search, query="Title", format="XML"))
     @xml_data
   end
   
   # Execute a MovieGetInfo on scraper
-  def MovieGetInfo(search)
+  def MovieGetInfo(search, query="ID", format="XML")
     DataLoadFromSite(GenerateURLMovieSearch(search, query="Title", format="XML"))
     @xml_data
   end
@@ -136,7 +140,12 @@ class CinePassion
     @movies_info = []
     
     doc = Document.new(@xml_data)
-    root = doc.root
+    begin
+       doc.root.elements["movie"].has_elements?
+       root = doc.root
+    rescue
+       root = doc
+    end
     
     @movies_info = []
     root.each_element('movie') do |movie|
@@ -195,6 +204,71 @@ class CinePassion
     movie_info['year'] = oneMovieXML.elements['year'].text
     movie_info['runtime'] = oneMovieXML.elements['runtime'].text
     movie_info['plot'] = oneMovieXML.elements['plot'].text
+    movie_info['tagline'] = oneMovieXML.elements['tagline'].text if not oneMovieXML.elements['tagline'].nil?
+    movie_info['information'] = oneMovieXML.elements['information'].text if not oneMovieXML.elements['information'].nil?
+    
+    movie_info['ratings'] = {}
+    movie_info['ratings']['cinepassion'] = {}
+    movie_info['ratings']['allocine'] = {}
+    movie_info['ratings']['imdb'] = {}
+    ratings = oneMovieXML.elements["ratings"]
+    ratings_cinepassion = ratings.elements["rating[@type='cinepassion']"]
+    movie_info['ratings']['cinepassion']['votes'] = ratings_cinepassion.attributes['votes']
+    movie_info['ratings']['cinepassion']['value'] = ratings_cinepassion.text
+    ratings_allocine = ratings.elements["rating[@type='allocine']"]
+    movie_info['ratings']['allocine']['votes'] = ratings_allocine.attributes['votes']
+    movie_info['ratings']['allocine']['value'] = ratings_allocine.text
+    ratings_imdb = ratings.elements["rating[@type='imdb']"]
+    movie_info['ratings']['imdb']['votes'] = ratings_imdb.attributes['votes']
+    movie_info['ratings']['imdb']['value'] = ratings_imdb.text
+    
+    movie_info['directors'] = []
+    directors = oneMovieXML.elements["directors"]
+    if not directors.nil?
+      directors.each_element("director") do |director|
+        movie_info['directors'].push(director.text)
+      end
+    end
+    
+    movie_info['trailers'] = []
+    trailers = oneMovieXML.elements["trailers"]
+    if not trailers.nil?
+      trailers.each_element("trailer") do |trailer|
+        movie_info['trailers'].push(trailer.text)
+      end
+    end
+    
+    movie_info['countries'] = []
+    countries = oneMovieXML.elements["countries"]
+    if not countries.nil?
+      countries.each_element("country") do |country|
+        movie_info['countries'].push(country.text)
+      end
+    end
+    
+    movie_info['genres'] = []
+    genres = oneMovieXML.elements["genres"]
+    if not genres.nil?
+      genres.each_element("genre") do |genre|
+        movie_info['genres'].push(genre.text)
+      end
+    end
+    
+    movie_info['studios'] = []
+    studios = oneMovieXML.elements["studios"]
+    if not studios.nil?
+      studios.each_element("studio") do |studio|
+        movie_info['studios'].push(studio.text)
+      end
+    end
+    
+    movie_info['credits'] = []
+    credits = oneMovieXML.elements["credits"]
+    if not credits.nil?
+      credits.each_element("credit") do |credit|
+        movie_info['credits'].push(credit.text)
+      end
+    end
     
     movie_info['images'] = {}
     images = oneMovieXML.elements["images"]
@@ -217,20 +291,22 @@ class CinePassion
       end
     end
     
-    movie_info['ratings'] = {}
-    movie_info['ratings']['cinepassion'] = {}
-    movie_info['ratings']['allocine'] = {}
-    movie_info['ratings']['imdb'] = {}
-    ratings = oneMovieXML.elements["ratings"]
-    ratings_cinepassion = ratings.elements["rating[@type='cinepassion']"]
-    movie_info['ratings']['cinepassion']['votes'] = ratings_cinepassion.attributes['votes']
-    movie_info['ratings']['cinepassion']['value'] = ratings_cinepassion.text
-    ratings_allocine = ratings.elements["rating[@type='allocine']"]
-    movie_info['ratings']['allocine']['votes'] = ratings_allocine.attributes['votes']
-    movie_info['ratings']['allocine']['value'] = ratings_allocine.text
-    ratings_imdb = ratings.elements["rating[@type='imdb']"]
-    movie_info['ratings']['imdb']['votes'] = ratings_imdb.attributes['votes']
-    movie_info['ratings']['imdb']['value'] = ratings_imdb.text
+    movie_info['casting'] = {}
+    casting = oneMovieXML.elements["casting"]
+    if not casting.nil?
+      casting.each_element("person") do |person|
+         person_id = person.attributes['id']
+         
+         if not movie_info['casting'].has_key? person_id
+            movie_info['casting'][person_id] = {}
+         end
+         
+         movie_info['casting'][person_id]['name'] = person.attributes['name']
+         movie_info['casting'][person_id]['character'] = person.attributes['character']
+         movie_info['casting'][person_id]['idthumb'] = person.attributes['idthumb']
+         movie_info['casting'][person_id]['thumb'] = person.attributes['thumb']
+      end
+    end
     
     nfo_base = "#{@siteurl}/scraper/index.php?id=#{movie_info['id']}&Download=1"
     movie_info['nfo'] = {}

data/test/test_cine_passion.rb

@@ -11,6 +11,7 @@ class TestCinePassion < Test::Unit::TestCase
     @test = CinePassion.new
     assert_not_nil(@test)
     assert_instance_of(CinePassion, @test)
+    assert_not_nil(@test.version)
   end
   
   # Test ability to define a apikey
@@ -37,7 +38,7 @@ class TestCinePassion < Test::Unit::TestCase
   def test_generate_url
     @test1 = CinePassion.new()
     assert_equal(@test1.GenerateURLMovieSearch("toto"), "http://scraper-cine-passion-demo.ledez.net/scraper/API/1/Movie.Search/Title/en/XML/fake-7945cb-fake/toto")
-    assert_equal(@test1.GenerateURLMovieGetInfo("toto"), "http://scraper-cine-passion-demo.ledez.net/scraper/API/1/Movie.GetInfo/Title/en/XML/fake-7945cb-fake/toto")
+    assert_equal(@test1.GenerateURLMovieGetInfo("toto"), "http://scraper-cine-passion-demo.ledez.net/scraper/API/1/Movie.GetInfo/ID/en/XML/fake-7945cb-fake/toto")
   end
   
   # Test ability to define a language for requests
@@ -213,6 +214,86 @@ class TestCinePassion < Test::Unit::TestCase
     assert_equal(@test.quota['authorize'], "300")
     assert_equal(@test.quota['use'], "2")
     assert_equal(@test.quota['reset_date'], "2010-08-04 12:45:26")
+    
+    # Extract all data from getInfo(id)
+    @test.DataLoadFromFile("test/data/cinepassion-scraper-test-03-by-id.xml")
+    assert_not_equal(@test.xml_data, "")
+    assert_equal(@test.result_nb, 1)
+    assert_equal(@test.movies_info[0]['id'], "136356")
+    assert_equal(@test.movies_info[0]['id_allocine'], "136356")
+    assert_equal(@test.movies_info[0]['id_imdb'], "1234548")
+    assert_equal(@test.movies_info[0]['last_change'], "1279466676")
+    assert_equal(@test.movies_info[0]['url'], "http://passion-xbmc.org/scraper/index2.php?Page=ViewMovie&ID=136356")
+    assert_equal(@test.movies_info[0]['title'], "Les Chèvres du Pentagone")
+    assert_equal(@test.movies_info[0]['originaltitle'], "The Men Who Stare at Goats")
+    assert_equal(@test.movies_info[0]['year'], "2009")
+    assert_equal(@test.movies_info[0]['directors'][0], "Grant Heslov")
+    assert_equal(@test.movies_info[0]['plot'], "Bob Wilton, un journaliste désespéré fait l'heureuse rencontre de Lyn Cassady, un soldat aux pouvoirs paranormaux combattant le terrorisme. Ils se rendent ensemble en Irak ou ils rencontrent Bill Django, le fondateur de l'unité, et Larry Hooper, soldat de l'unité qui dirige une prison.")
+    assert_equal(@test.movies_info[0]['tagline'], "(...) un casting de rêve pour une comédie dont l'insolence revigorante et l'absurdité assumée rappellent le récent Burn after reading des frères Coen. Jubilatoire!")
+    assert_equal(@test.movies_info[0]['runtime'], "90")
+    assert_equal(@test.movies_info[0]['information'], "Couleur  / Format de projection : 2.35 : 1 Cinemascope / Format de production : 35 mm")
+    assert_equal(@test.movies_info[0]['trailers'][0], "http://hd.fr.mediaplayer.allocine.fr/nmedia/18/73/11/43/18937641_fa2_vost_hd.flv")
+    assert_equal(@test.movies_info[0]['countries'][0], "américain")
+    assert_equal(@test.movies_info[0]['genres'][0], "Comédie")
+    assert_equal(@test.movies_info[0]['studios'][0], "Sony Pictures Releasing")
+    assert_equal(@test.movies_info[0]['credits'][0], "Peter Straughan")
+    
+    assert_equal(@test.movies_info[0]['images']['311335']['type'], "Poster")
+    assert_equal(@test.movies_info[0]['images']['311335']['original']['height'], "2716")
+    assert_equal(@test.movies_info[0]['images']['311335']['original']['width'], "2000")
+    assert_equal(@test.movies_info[0]['images']['311335']['original']['url'], "http://passion-xbmc.org/scraper/Gallery/main/Poster_LesChvresduPentagone-311335.jpg")
+    assert_equal(@test.movies_info[0]['images']['311335']['preview']['url'], "http://passion-xbmc.org/scraper/Gallery/preview/Poster_LesChvresduPentagone-311335.jpg")
+    assert_equal(@test.movies_info[0]['images']['311335']['thumb']['url'], "http://passion-xbmc.org/scraper/Gallery/thumb/Poster_LesChvresduPentagone-311335.jpg")
+    
+    assert_equal(@test.movies_info[0]['images']['316672']['type'], "Fanart")
+    assert_equal(@test.movies_info[0]['images']['316672']['original']['height'], "1080")
+    assert_equal(@test.movies_info[0]['images']['316672']['original']['width'], "1920")
+    assert_equal(@test.movies_info[0]['images']['316672']['original']['url'], "http://passion-xbmc.org/scraper/Gallery/main/Fanart_LesChvresduPentagone-316672.jpg")
+    assert_equal(@test.movies_info[0]['images']['316672']['preview']['url'], "http://passion-xbmc.org/scraper/Gallery/preview/Fanart_LesChvresduPentagone-316672.jpg")
+    assert_equal(@test.movies_info[0]['images']['316672']['thumb']['url'], "http://passion-xbmc.org/scraper/Gallery/thumb/Fanart_LesChvresduPentagone-316672.jpg")
+    
+    assert_equal(@test.movies_info[0]['ratings']['cinepassion']['votes'], "1")
+    assert_equal(@test.movies_info[0]['ratings']['cinepassion']['value'], "7")
+    assert_equal(@test.movies_info[0]['ratings']['allocine']['votes'], "1603")
+    assert_equal(@test.movies_info[0]['ratings']['allocine']['value'], "2,5")
+    assert_equal(@test.movies_info[0]['ratings']['imdb']['votes'], "33172")
+    assert_equal(@test.movies_info[0]['ratings']['imdb']['value'], "6,4")
+    
+    assert_equal(@test.movies_info[0]['casting']['10551']['name'], "Stephen Root")
+    assert_equal(@test.movies_info[0]['casting']['10551']['character'], "Gus Lacey")
+    assert_equal(@test.movies_info[0]['casting']['10551']['idthumb'], "0")
+    assert_equal(@test.movies_info[0]['casting']['10551']['thumb'], "http://passion-xbmc.org/scraper/Images/Actor_Unknow.png")
+    assert_equal(@test.movies_info[0]['casting']['103366']['name'], "Nick Offerman")
+    assert_equal(@test.movies_info[0]['casting']['103366']['character'], "Scotty Mercer")
+    assert_equal(@test.movies_info[0]['casting']['103366']['idthumb'], "0")
+    assert_equal(@test.movies_info[0]['casting']['103366']['thumb'], "http://passion-xbmc.org/scraper/Images/Actor_Unknow.png")
+    assert_equal(@test.movies_info[0]['casting']['32799']['name'], "J.K. Simmons")
+    assert_equal(@test.movies_info[0]['casting']['32799']['character'], "le général Putkin")
+    assert_equal(@test.movies_info[0]['casting']['32799']['idthumb'], "32423")
+    assert_equal(@test.movies_info[0]['casting']['32799']['thumb'], "http://passion-xbmc.org/scraper/Gallery/main/JKSimmons-32423.jpg")
+    assert_equal(@test.movies_info[0]['casting']['12399']['name'], "Kevin Spacey")
+    assert_equal(@test.movies_info[0]['casting']['12399']['character'], "Larry Hooper")
+    assert_equal(@test.movies_info[0]['casting']['12399']['idthumb'], "32271")
+    assert_equal(@test.movies_info[0]['casting']['12399']['thumb'], "http://passion-xbmc.org/scraper/Gallery/main/KevinSpacey-32271.jpg")
+    assert_equal(@test.movies_info[0]['casting']['111326']['name'], "Tim Griffin")
+    assert_equal(@test.movies_info[0]['casting']['111326']['character'], "Tim Kootz")
+    assert_equal(@test.movies_info[0]['casting']['111326']['idthumb'], "0")
+    assert_equal(@test.movies_info[0]['casting']['111326']['thumb'], "http://passion-xbmc.org/scraper/Images/Actor_Unknow.png")
+    assert_equal(@test.movies_info[0]['casting']['6298']['name'], "Robert Patrick")
+    assert_equal(@test.movies_info[0]['casting']['6298']['character'], "Todd Nixon")
+    assert_equal(@test.movies_info[0]['casting']['6298']['idthumb'], "31401")
+    assert_equal(@test.movies_info[0]['casting']['6298']['thumb'], "http://passion-xbmc.org/scraper/Gallery/main/RobertPatrick-31401.jpg")
+    assert_equal(@test.movies_info[0]['casting']['17043']['name'], "Ewan McGregor")
+    assert_equal(@test.movies_info[0]['casting']['17043']['character'], "Bob Wilton")
+    assert_equal(@test.movies_info[0]['casting']['17043']['idthumb'], "31599")
+    assert_equal(@test.movies_info[0]['casting']['17043']['thumb'], "http://passion-xbmc.org/scraper/Gallery/main/EwanMcGregor-31599.jpg")
+    assert_equal(@test.movies_info[0]['casting']['6407']['name'], "Stephen Lang")
+    assert_equal(@test.movies_info[0]['casting']['6407']['character'], "le général Hopgood")
+    assert_equal(@test.movies_info[0]['casting']['6407']['idthumb'], "50691")
+    assert_equal(@test.movies_info[0]['casting']['6407']['thumb'], "http://passion-xbmc.org/scraper/Gallery/main/StephenLang-50691.jpg")
+    assert_equal(@test.movies_info[0]['casting']['1052']['name'], "Jeff Bridges")
+    assert_equal(@test.movies_info[0]['casting']['1052']['character'], "Bill Django")
+    assert_equal(@test.movies_info[0]['casting']['1052']['idthumb'], "31026")
+    assert_equal(@test.movies_info[0]['casting']['1052']['thumb'], "http://passion-xbmc.org/scraper/Gallery/main/JeffBridges-31026.jpg")
   end
-
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cine-passion
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 55
   prerelease: false
   segments: 
   - 0
-  - 9
+  - 10
   - 0
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors: 
 - Nicolas Ledez
@@ -80,7 +80,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing cine-passion-0.9.0
+    Thank you for installing cine-passion-0.10.0
   
     Please request a APIKEY to make real requests.