tiegz-ruby-mtv 1.2 → 1.3

data/TODO

@@ -1,3 +1,4 @@
 - Fix edge cases where no string is passed to a #find, #browse, #search, etc. method
 - Add request cacheing
-- Allow fake or real requests during tests
+- Allow fake or real requests during tests
+- Try Nokogiri instead of Hpricot and benchmark results

data/lib/mtv.rb

@@ -1,4 +1,5 @@
 require 'activesupport'
+require 'hpricot'
 require 'open-uri'
 require 'benchmark'
 

data/lib/mtv/artist.rb

@@ -89,9 +89,9 @@ module MTV
       protected
       # Parses a response xml string for artists.
       def parse_many(body) # :nodoc:
-        entries = XmlSimple.xml_in(body)['entry']
-        raise Error, "That artist not found!" if entries.nil?
+        entries = (Hpricot.XML(body)/:entry)
         entries = [entries] unless entries.is_a? Array
+        raise Error, "That artist not found!" if entries.nil?
         entries.map { |entry|
           instantiate entry
         }.reject { |artist| MTV::Artist.name.nil? || MTV::Artist.name.empty? }
@@ -99,17 +99,17 @@ module MTV
     
       # Parses a response xml string for an artist.
       def parse_one(body) # :nodoc:
-        entry = XmlSimple.xml_in(body)
-        name = entry['author'].first['name'].first
+        entry = Hpricot.XML(body)
+        name = (entry/'author/name').inner_html
         raise Error, "That artist not found!" if name.nil? || name.empty?
         instantiate entry
       end
     
       def instantiate(entry={})
-        Artist.new(:name => entry['author'].first['name'].to_s,
-          :uri => entry['author'].first['uri'].to_s,
-          :links => entry['link'].map { |link| link['href'].to_s },
-          :updated => entry['updated'].to_s.to_datetime)
+        Artist.new(:name => (entry/'author/name').inner_html,
+          :uri => (entry/'author/uri').inner_html,
+          :links => (entry/'link').map { |l| l.attributes['href'] },
+          :updated => (entry/'updated').inner_html)
       end
     end
     

data/lib/mtv/video.rb

@@ -4,7 +4,7 @@ module MTV
     attr_accessor :artist, :artist_name, :artist_uri, :category, :content, :credit, 
                   :media_player_url, :media_thumbnails, :media_title, :media_description,
                   :media_keywords, :media_duration, :media_expression, :media_url, :media_type, 
-                  :media_credits, :media_category, :media_medium,
+                  :media_credits, :media_category, :media_medium, :published, :thumbnails,
                   :title, :published, :uid, :updated, :uri, :vid
 
     #-----------------
@@ -73,21 +73,19 @@ module MTV
       protected
       # Parses a response xml string for videos.
       def parse_many(body) # :nodoc:
-        body = hack_media_enclosures(body)
-        entries = XmlSimple.xml_in(body)['entry']
-        raise Error, "That video not found!" if entries.nil?
+        entries = (Hpricot.XML(body)/:entry)
         entries = [entries] unless entries.is_a? Array
+        raise Error, "That video not found!" if entries.nil?
         entries.reject! { |entry| entry.nil? }
         entries.map { |entry|
           instantiate entry
-        }
-      end
+        }.reject { |artist| MTV::Artist.name.nil? || MTV::Artist.name.empty? }
+     end
 
       # Parses a response xml string for a video.
       def parse_one(body) # :nodoc:
-        body = hack_media_enclosures(body)
-        entry = XmlSimple.xml_in(body)
-        artist_name = entry['author'].first['name'].first
+        entry = Hpricot.XML(body)
+        artist_name = (entry/'author/name').inner_html
         raise Error, "That video not found!" if artist_name.nil? || artist_name.empty?
         instantiate entry
       end
@@ -99,32 +97,28 @@ module MTV
         response.strip.gsub('<?xml version="1.0" encoding="iso-8859-1"?>', '').empty? ? "" : response
       end
 
-      # HACK because XmlSimple doesn't seem to handle enclosures, we'll replace colons with hyphens
-      # TODO write a better regexp for that hack :\
-      def hack_media_enclosures(body) # :nodoc:
-        body.gsub("<media:", "<media_").gsub("</media:", "</media_")
-      end
-
       def instantiate(entry={})
-        Video.new(:title => entry['title'].to_s,
-          :artist_uri => entry['author'].first['uri'].to_s,
-          :artist_name => entry['author'].first['name'].to_s,
-          :published => entry['published'].first.to_s,
-          :content => entry['content'], # Artist Name, Video Title, and Record Label
-          :uri => entry['link'].select { |link| link['rel'].to_s == 'self' }.first['href'].to_s,
-          :updated => (entry['updated'].to_s.to_datetime rescue nil),
-          :media_category => entry['media_category'].to_s, # governing agreement
-          :media_credits => entry['media_credit'].map { |credit| "#{credit['content'] || 'N/A'} (#{credit['role']})}" }.join(', '),
-          :media_description => entry['media_description'].to_s,
-          :media_duration => entry['media_content'].first['duration'].to_s,
-          :media_expression => entry['media_content'].first['expression'].to_s,
-          :media_keywords => entry['media_keywords'].to_s,
-          :media_medium => entry['media_content'].first['medium'].to_s,
-          :media_player_url => entry['media_player'].first['url'].to_s,
-          :thumbnails => entry['media_thumbnail'],
-          :media_title => entry['media_title'].to_s,
-          :media_type => entry['media_content'].first['type'].to_s,
-          :media_url => entry['media_content'].first['url'].to_s)
+        # TODO I did encounter a bug with a search for 'creep' on the first result... it
+        # has a media:credit node that is self-closing, and it appears to break hpricot. 
+        Video.new(:title => (entry/'title').inner_html, # entry['title'].to_s,
+          :artist_uri => (entry/'author/uri').inner_html, # entry['author'].first['uri'].to_s,
+          :artist_name => (entry/'author/name').inner_html, # entry['author'].first['name'].to_s,
+          :published => (entry/'published').inner_html, # entry['published'].first.to_s,
+          :content => (entry/'content').inner_html, # Artist Name, Video Title, and Record Label
+          :uri => (entry/'link').select { |link| link.attributes['rel'] == 'self' }.first.attributes['href'],
+          :updated => ((entry/'updated').inner_html.to_datetime rescue nil), #  (entry['updated'].to_s.to_datetime rescue nil),
+          :media_category => (entry/'media:category').inner_html, # entry['media_category'].to_s, # governing agreement
+          :media_credits => (entry/'media:credit').map { |credit| "#{credit.inner_html || 'N/A'} (#{credit.attributes['role']})" }.join(', '), # entry['media_credit'],
+          :media_description => (entry/'media:description').inner_html, # entry['media_description'].to_s,
+          :media_duration => ((entry/'media:content').first.attributes['duration'] rescue nil), # entry['media_content'].first['duration'].to_s,
+          :media_expression => ((entry/'media:content').first.attributes['expression'] rescue nil), #entry['media_content'].first['expression'].to_s,
+          :media_keywords => (entry/'media:keywords').inner_html, #entry['media_keywords'].to_s,
+          :media_medium => ((entry/'media:content').first.attributes['medium'] rescue nil), #entry['media_content'].first['medium'].to_s,
+          :media_player_url => ((entry/'media:player').first.attributes['url'] rescue nil), #entry['media_player'].first['url'].to_s,
+          :thumbnails => (entry/'media:thumbnail').map { |t| Thumbnail.new(t.attributes['url'], t.attributes['width'], t.attributes['height']) }, #entry['media_thumbnail'],
+          :media_title => (entry/'media:title').inner_html, #entry['media_title'].to_s,
+          :media_type => ((entry/'media:content').first.attributes['type'] rescue nil), # entry['media_content'].first['type'].to_s,
+          :media_url => ((entry/'media:content').first.attributes['url'] rescue nil)) #entry['media_content'].first['url'].to_s)
       end
     end
 
@@ -144,7 +138,7 @@ module MTV
     def initialize(values={})
       super(values)
       self.uid = uri.gsub(self.class.base_url + "/video", '').delete '/' unless @uid
-      self.vid = media_url.split(':').last
+      self.vid = media_url.split(':').last if media_url
     end
 
     # Returns the artist object for the video.
@@ -183,20 +177,5 @@ module MTV
       attrs = [:title, :artist_uri].map { |name| "#{name}: #{attribute_for_inspect(name)}" }.compact.join(", ")
       "#<#{self.class} #{attrs}>"
     end
-
-    # Returns an array of thumbnails for this video.
-    #
-    # ==== Examples
-    #
-    #   MTV::Video.search('mellow gold').first.thumbnails
-    #   > [#<MTV::Thumbnail:0x184e274 @width="70", @height="53", @url="http://www.mtv.com/shared/promoimages/bands/b/beck/video_stills/loser/loser_70x53.jpg"> ... ]
-    def thumbnails
-      @thumbnails
-    end
-
-    # Parses the video thumbnails and sets them into an array.
-    def thumbnails=(val) # :nodoc:
-      @thumbnails = (val.is_a?(Array) ? val : [val]).map { |t| Thumbnail.new(t['url'], t['width'], t['height']) unless t.nil? }
-    end
   end
 end

data/ruby-mtv.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = "ruby-mtv"
-  s.version  = "1.2"
+  s.version  = "1.3"
   s.date     = "2008-10-27"
   s.summary  = "Ruby wrapper library for MTV api"
   s.email    = "tieg.zaharia+github@gmail.com"
@@ -36,4 +36,5 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--main", "README"]
   s.extra_rdoc_files = ["README"]
   s.add_dependency("active-support", ["> 2.0.2"])
+  s.add_dependency("hpricot", ["> 0.6"])
 end

data/test/unit/artist_test.rb

@@ -40,7 +40,7 @@ class TestArtist < Test::Unit::TestCase
   end
   
   def test_search_fails
-    assert_raises(MTV::Error) { MTV::Artist.search('alexanderthegreat') }
+    assert MTV::Artist.search('alexanderthegreat').empty?
   end
 
   def test_videos

data/test/unit/video_test.rb

@@ -12,7 +12,7 @@ class TestVideo < Test::Unit::TestCase
   end
   
   def test_search_fails
-    assert_raises(MTV::Error) { MTV::Video.search('somelongcrazynameforavideo') }
+    assert MTV::Video.search('somelongcrazynameforavideo').empty?
   end
 
   def test_find_succeeds

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tiegz-ruby-mtv
 version: !ruby/object:Gem::Version 
-  version: "1.2"
+  version: "1.3"
 platform: ruby
 authors: 
 - Tieg Zaharia
@@ -21,6 +21,15 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.0.2
     version: 
+- !ruby/object:Gem::Dependency 
+  name: hpricot
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: "0.6"
+    version: 
 description: ruby-mtv is a Ruby library for accessing Artist and Video objects through the MTVN api.
 email: tieg.zaharia+github@gmail.com
 executables: []