simple-rss 1.3.3 → 2.0.0

data/lib/simple-rss.rb

@@ -1,160 +1,279 @@
-require 'cgi'
-require 'time'
+# rbs_inline: enabled
+
+require "cgi"
+require "time"
 
 class SimpleRSS
-  VERSION = "1.3.3"
-  
-	attr_reader :items, :source
-	alias :entries :items
-
-	@@feed_tags = [
-		:id,
-		:title, :subtitle, :link,
-		:description, 
-		:author, :webMaster, :managingEditor, :contributor,
-		:pubDate, :lastBuildDate, :updated, :'dc:date',
-		:generator, :language, :docs, :cloud,
-		:ttl, :skipHours, :skipDays,
-		:image, :logo, :icon, :rating,
-		:rights, :copyright,
-		:textInput, :'feedburner:browserFriendly',
-		:'itunes:author', :'itunes:category'
-	]
-
-	@@item_tags = [
-		:id,
-		:title, :link, :'link+alternate', :'link+self', :'link+edit', :'link+replies',
-		:author, :contributor,
-		:description, :summary, :content, :'content:encoded', :comments,
-		:pubDate, :published, :updated, :expirationDate, :modified, :'dc:date',
-		:category, :guid,
-		:'trackback:ping', :'trackback:about',
-		:'dc:creator', :'dc:title', :'dc:subject', :'dc:rights', :'dc:publisher',
-		:'feedburner:origLink',
-		:'media:content#url', :'media:content#type', :'media:content#height', :'media:content#width', :'media:content#duration',
-		:'media:title', :'media:thumbnail#url', :'media:thumbnail#height', :'media:thumbnail#width',
-		:'media:credit', :'media:credit#role',
-		:'media:category', :'media:category#scheme'
-	]
-
-	def initialize(source, options={})
-		@source = source.respond_to?(:read) ? source.read : source.to_s
-		@items = Array.new
-		@options = Hash.new.update(options)
-    
-		parse
-	end
-
-	def channel() self end
-	alias :feed :channel
-
-	class << self
-		def feed_tags
-			@@feed_tags
-		end
-		def feed_tags=(ft)
-			@@feed_tags = ft
-		end
-
-		def item_tags
-			@@item_tags
-		end
-		def item_tags=(it)
-			@@item_tags = it
-		end
-
-		# The strict attribute is for compatibility with Ruby's standard RSS parser
-		def parse(source, options={})
-			new source, options
-		end
-	end
-
-	private
-
-	def parse
-	  raise SimpleRSSError, "Poorly formatted feed" unless @source =~ %r{<(channel|feed).*?>.*?</(channel|feed)>}mi
-	  
-		# Feed's title and link
-		feed_content = $1 if @source =~ %r{(.*?)<(rss:|atom:)?(item|entry).*?>.*?</(rss:|atom:)?(item|entry)>}mi
-		
-		@@feed_tags.each do |tag|
-			if feed_content && feed_content =~ %r{<(rss:|atom:)?#{tag}(.*?)>(.*?)</(rss:|atom:)?#{tag}>}mi
-				nil
-			elsif feed_content && feed_content =~ %r{<(rss:|atom:)?#{tag}(.*?)\/\s*>}mi
-				nil
-			elsif @source =~ %r{<(rss:|atom:)?#{tag}(.*?)>(.*?)</(rss:|atom:)?#{tag}>}mi
-				nil
-			elsif @source =~ %r{<(rss:|atom:)?#{tag}(.*?)\/\s*>}mi
-				nil
-			end
-			
-			if $2 || $3
-        			tag_cleaned = clean_tag(tag)
-        			instance_variable_set("@#{ tag_cleaned }", clean_content(tag, $2, $3))
-        			self.class.class_eval("attr_reader :#{ tag_cleaned }")
-			end
-		end
-
-		# RSS items' title, link, and description
-		@source.scan( %r{<(rss:|atom:)?(item|entry)([\s][^>]*)?>(.*?)</(rss:|atom:)?(item|entry)>}mi ) do |match|
-			item = Hash.new
-			@@item_tags.each do |tag|
-				if tag.to_s.include?("+")
-					tag_data = tag.to_s.split("+")
-					tag = tag_data[0]
-					rel = tag_data[1]
-  					if match[3] =~ %r{<(rss:|atom:)?#{tag}(.*?)rel=['"]#{rel}['"](.*?)>(.*?)</(rss:|atom:)?#{tag}>}mi
-            					nil
-  					elsif match[3] =~ %r{<(rss:|atom:)?#{tag}(.*?)rel=['"]#{rel}['"](.*?)/\s*>}mi
-  				  		nil
-  					end
-  					item[clean_tag("#{tag}+#{rel}")] = clean_content(tag, $3, $4) if $3 || $4
-  				elsif tag.to_s.include?("#")
-			    		tag_data = tag.to_s.split("#")
-			    		tag = tag_data[0]
-			    		attrib = tag_data[1]
-  					if match[3] =~ %r{<(rss:|atom:)?#{tag}(.*?)#{attrib}=['"](.*?)['"](.*?)>(.*?)</(rss:|atom:)?#{tag}>}mi
-            					nil
-  					elsif match[3] =~ %r{<(rss:|atom:)?#{tag}(.*?)#{attrib}=['"](.*?)['"](.*?)/\s*>}mi
-  				  		nil
-  					end
-  					item[clean_tag("#{tag}_#{attrib}")] = clean_content(tag, attrib, $3) if $3
-		    		else
-                                        if match[3] =~ %r{<(rss:|atom:)?#{tag}(.*?)>(.*?)</(rss:|atom:)?#{tag}>}mi
-  						nil
-	  				elsif match[3] =~ %r{<(rss:|atom:)?#{tag}(.*?)/\s*>}mi
-  						nil
-  					end
-  					item[clean_tag(tag)] = clean_content(tag, $2, $3) if $2 || $3
-				end
-			end
-			def item.method_missing(name, *args) self[name] end
-			@items << item
-		end
-	end
-
-	def clean_content(tag, attrs, content)
-		content = content.to_s
-		case tag
-			when :pubDate, :lastBuildDate, :published, :updated, :expirationDate, :modified, :'dc:date'
-				Time.parse(content) rescue unescape(content)
-			when :author, :contributor, :skipHours, :skipDays
-				unescape(content.gsub(/<.*?>/,''))
-			else
-				content.empty? && "#{attrs} " =~ /href=['"]?([^'"]*)['" ]/mi ? $1.strip : unescape(content)
-		end
-	end
-
-	def clean_tag(tag)
-		tag.to_s.gsub(':','_').intern
-	end
-	
+  VERSION = "2.0.0".freeze
+
+  # @rbs @items: Array[Hash[Symbol, untyped]]
+  # @rbs @source: String
+  # @rbs @options: Hash[Symbol, untyped]
+
+  attr_reader :items #: Array[Hash[Symbol, untyped]]
+  attr_reader :source #: String
+  alias entries items #: Array[Hash[Symbol, untyped]]
+
+  @@feed_tags = %i[
+    id
+    title subtitle link
+    description
+    author webMaster managingEditor contributor
+    pubDate lastBuildDate updated dc:date
+    generator language docs cloud
+    ttl skipHours skipDays
+    image logo icon rating
+    rights copyright
+    textInput feedburner:browserFriendly
+    itunes:author itunes:category
+  ]
+
+  @@item_tags = %i[
+    id
+    title link link+alternate link+self link+edit link+replies
+    author contributor
+    description summary content content:encoded comments
+    pubDate published updated expirationDate modified dc:date
+    category guid
+    trackback:ping trackback:about
+    dc:creator dc:title dc:subject dc:rights dc:publisher
+    feedburner:origLink
+    media:content#url media:content#type media:content#height media:content#width media:content#duration
+    media:title media:thumbnail#url media:thumbnail#height media:thumbnail#width
+    media:credit media:credit#role
+    media:category media:category#scheme
+  ]
+
+  # @rbs (untyped, ?Hash[Symbol, untyped]) -> void
+  def initialize(source, options = {})
+    @source = source.respond_to?(:read) ? source.read.to_s : source.to_s
+    @items = [] #: Array[Hash[Symbol, untyped]]
+    @options = {} #: Hash[Symbol, untyped]
+    @options.update(options)
+
+    parse
+  end
+
+  # @rbs () -> SimpleRSS
+  def channel
+    self
+  end
+  alias feed channel
+
+  class << self
+    # @rbs () -> Array[Symbol]
+    def feed_tags
+      @@feed_tags
+    end
+
+    # @rbs (Array[Symbol]) -> Array[Symbol]
+    def feed_tags=(ft)
+      @@feed_tags = ft
+    end
+
+    # @rbs () -> Array[Symbol]
+    def item_tags
+      @@item_tags
+    end
+
+    # @rbs (Array[Symbol]) -> Array[Symbol]
+    def item_tags=(it)
+      @@item_tags = it
+    end
+
+    # The strict attribute is for compatibility with Ruby's standard RSS parser
+    #
+    # @rbs (untyped, ?Hash[Symbol, untyped]) -> SimpleRSS
+    def parse(source, options = {})
+      new source, options
+    end
+  end
+
+  DATE_TAGS = %i[pubDate lastBuildDate published updated expirationDate modified dc:date].freeze
+  STRIP_HTML_TAGS = %i[author contributor skipHours skipDays].freeze
+
+  private
+
+  # @rbs () -> void
+  def parse
+    raise SimpleRSSError, "Poorly formatted feed" unless @source =~ %r{<(channel|feed).*?>.*?</(channel|feed)>}mi
+
+    # Feed's title and link
+    feed_content = Regexp.last_match(1) if @source =~ %r{(.*?)<(rss:|atom:)?(item|entry).*?>.*?</(rss:|atom:)?(item|entry)>}mi
+
+    # Capture channel/feed tag attributes
+    feed_attrs = nil
+    if @source =~ /<(channel|feed)([\s][^>]*)?>/mi
+      feed_attrs = Regexp.last_match(2)
+    end
+
+    @@feed_tags.each do |tag|
+      next if tag.to_s.strip.empty?
+
+      tag_str = tag.to_s
+
+      # Handle channel#attr or feed#attr syntax
+      if tag_str.include?("#")
+        parse_feed_attr_tag(tag_str, feed_attrs)
+        next
+      end
+
+      if feed_content && feed_content =~ %r{<(rss:|atom:)?#{tag}(.*?)>(.*?)</(rss:|atom:)?#{tag}>}mi
+        nil
+      elsif feed_content && feed_content =~ %r{<(rss:|atom:)?#{tag}(.*?)\/\s*>}mi
+        nil
+      elsif @source =~ %r{<(rss:|atom:)?#{tag}(.*?)>(.*?)</(rss:|atom:)?#{tag}>}mi
+        nil
+      elsif @source =~ %r{<(rss:|atom:)?#{tag}(.*?)\/\s*>}mi
+        nil
+      end
+
+      next unless Regexp.last_match(2) || Regexp.last_match(3)
+
+      tag_cleaned = clean_tag(tag)
+      instance_variable_set("@#{tag_cleaned}", clean_content(tag, Regexp.last_match(2), Regexp.last_match(3)))
+      self.class.class_eval("attr_reader :#{tag_cleaned}")
+    end
+
+    # RSS items' title, link, and description
+    @source.scan(%r{<(rss:|atom:)?(item|entry)([\s][^>]*)?>(.*?)</(rss:|atom:)?(item|entry)>}mi) do |match|
+      item = {} #: Hash[Symbol, untyped]
+      @@item_tags.each do |tag|
+        next if tag.to_s.strip.empty?
+
+        parse_item_tag(item, tag, match[3], match[2])
+      end
+      item.define_singleton_method(:method_missing) { |name, *| self[name] }
+      @items << item
+    end
+  end
+
+  # @rbs (Hash[Symbol, untyped], Symbol, String?, String?) -> void
+  def parse_item_tag(item, tag, content, item_attrs = nil)
+    return if content.nil?
+
+    tag_str = tag.to_s
+
+    return parse_rel_tag(item, tag_str, content) if tag_str.include?("+")
+    return parse_attr_tag(item, tag_str, content, item_attrs) if tag_str.include?("#")
+
+    parse_simple_tag(item, tag, content)
+  end
+
+  # @rbs (Hash[Symbol, untyped], String, String) -> void
+  def parse_rel_tag(item, tag_str, content)
+    tag, rel = tag_str.split("+")
+    return unless tag && rel
+
+    content =~ %r{<(rss:|atom:)?#{tag}(.*?)rel=['"]#{rel}['"](.*?)>(.*?)</(rss:|atom:)?#{tag}>}mi ||
+      content =~ %r{<(rss:|atom:)?#{tag}(.*?)rel=['"]#{rel}['"](.*?)/\s*>}mi
+
+    return unless Regexp.last_match(3) || Regexp.last_match(4)
+
+    item[clean_tag("#{tag}+#{rel}")] = clean_content(tag.to_sym, Regexp.last_match(3), Regexp.last_match(4))
+  end
+
+  # @rbs (String, String?) -> void
+  def parse_feed_attr_tag(tag_str, feed_attrs)
+    tag, attrib = tag_str.split("#")
+    return unless tag && attrib && feed_attrs
+
+    # Only handle channel or feed tags
+    return unless %w[channel feed].include?(tag)
+    return unless feed_attrs =~ /#{attrib}=['"](.*?)['"]/mi
+
+    tag_cleaned = clean_tag("#{tag}_#{attrib}")
+    instance_variable_set("@#{tag_cleaned}", clean_content(tag.to_sym, attrib, Regexp.last_match(1)))
+    self.class.class_eval("attr_reader :#{tag_cleaned}")
+  end
+
+  # @rbs (Hash[Symbol, untyped], String, String, String?) -> void
+  def parse_attr_tag(item, tag_str, content, item_attrs = nil)
+    tag, attrib = tag_str.split("#")
+    return unless tag && attrib
+
+    # Handle attributes on the item/entry tag itself
+    if %w[item entry].include?(tag) && item_attrs
+      return unless item_attrs =~ /#{attrib}=['"](.*?)['"]/mi
+
+      item[clean_tag("#{tag}_#{attrib}")] = clean_content(tag.to_sym, attrib, Regexp.last_match(1))
+      return
+    end
+
+    content =~ %r{<(rss:|atom:)?#{tag}(.*?)#{attrib}=['"](.*?)['"](.*?)>(.*?)</(rss:|atom:)?#{tag}>}mi ||
+      content =~ %r{<(rss:|atom:)?#{tag}(.*?)#{attrib}=['"](.*?)['"](.*?)/\s*>}mi
+
+    return unless Regexp.last_match(3)
+
+    item[clean_tag("#{tag}_#{attrib}")] = clean_content(tag.to_sym, attrib, Regexp.last_match(3))
+  end
+
+  # @rbs (Hash[Symbol, untyped], Symbol, String) -> void
+  def parse_simple_tag(item, tag, content)
+    # Handle array_tags option - collect all values for this tag
+    if array_tag?(tag)
+      values = content.scan(%r{<(rss:|atom:)?#{tag}(?:[^>]*)>(.*?)</(rss:|atom:)?#{tag}>}mi).map do |match|
+        clean_content(tag, nil, match[1])
+      end
+      item[clean_tag(tag)] = values unless values.empty?
+      return
+    end
+
+    content =~ %r{<(rss:|atom:)?#{tag}(.*?)>(.*?)</(rss:|atom:)?#{tag}>}mi ||
+      content =~ %r{<(rss:|atom:)?#{tag}(.*?)/\s*>}mi
+
+    return unless Regexp.last_match(2) || Regexp.last_match(3)
+
+    item[clean_tag(tag)] = clean_content(tag, Regexp.last_match(2), Regexp.last_match(3))
+  end
+
+  # @rbs (Symbol) -> bool
+  def array_tag?(tag)
+    array_tags = @options[:array_tags]
+    return false unless array_tags.is_a?(Array)
+
+    array_tags.include?(tag) || array_tags.include?(tag.to_sym)
+  end
+
+  # @rbs (Symbol, String?, String?) -> (Time | String)
+  def clean_content(tag, attrs, content)
+    content = content.to_s
+
+    return parse_date(content) if DATE_TAGS.include?(tag)
+    return unescape(content.gsub(/<.*?>/, "")) if STRIP_HTML_TAGS.include?(tag)
+    return extract_href(attrs) if content.empty? && attrs
+
+    unescape(content)
+  end
+
+  # @rbs (String) -> (Time | String)
+  def parse_date(content)
+    Time.parse(content)
+  rescue StandardError
+    unescape(content)
+  end
+
+  # @rbs (String?) -> String
+  def extract_href(attrs)
+    return "" unless "#{attrs} " =~ /href=['"]?([^'"]*)['" ]/mi
+
+    Regexp.last_match(1)&.strip || ""
+  end
+
+  # @rbs (Symbol | String) -> Symbol
+  def clean_tag(tag)
+    tag.to_s.tr(":", "_").intern
+  end
+
+  # @rbs (String) -> String
   def unescape(content)
-  	if content =~ /([^-_.!~*'()a-zA-Z\d;\/?:@&=+$,\[\]]%)/ then
-  		CGI.unescape(content)
-  	else
-  		content
-  	end.gsub(/(<!\[CDATA\[|\]\]>)/,'').strip
+    result = if content =~ %r{([^-_.!~*'()a-zA-Z\d;/?:@&=+$,\[\]]%)}
+               CGI.unescape(content)
+             else
+               content
+             end.gsub(/(<!\[CDATA\[|\]\]>)/, "").strip
+
+    result.encode(Encoding::UTF_8)
   end
 end
 

data/simple-rss.gemspec

@@ -1,15 +1,14 @@
 Gem::Specification.new do |s|
   s.name = "simple-rss"
-  s.version = "1.3.3"
-  s.version = "#{s.version}-alpha-#{ENV['TRAVIS_BUILD_NUMBER']}" if ENV['TRAVIS']
-  s.date = "2015-08-17"
+  s.version = "2.0.0"
+  s.date = "2025-12-28"
   s.summary = "A simple, flexible, extensible, and liberal RSS and Atom reader for Ruby. It is designed to be backwards compatible with the standard RSS parser, but will never do RSS generation."
   s.email = "lucas@rufy.com"
   s.homepage = "http://github.com/cardmagic/simple-rss"
   s.description = "A simple, flexible, extensible, and liberal RSS and Atom reader for Ruby. It is designed to be backwards compatible with the standard RSS parser, but will never do RSS generation."
   s.authors = ["Lucas Carlson"]
-  s.files = ["install.rb", "lib", "lib/simple-rss.rb", "LICENSE", "Rakefile", "README.markdown", "simple-rss.gemspec", "test", "test/base", "test/base/base_test.rb", "test/data", "test/data/atom.xml", "test/data/not-rss.xml", "test/data/rss09.rdf", "test/data/rss20.xml", "test/test_helper.rb"]
-  s.rubyforge_project = 'simple-rss'
+  s.files = Dir["lib/**/*", "test/**/*", "LICENSE", "README.markdown", "Rakefile", "simple-rss.gemspec"]
+  s.rubyforge_project = "simple-rss"
   s.add_development_dependency "rake"
   s.add_development_dependency "rdoc"
   s.add_development_dependency "test-unit"

data/test/base/array_tags_test.rb

@@ -0,0 +1,37 @@
+require "test_helper"
+
+class ArrayTagsTest < Test::Unit::TestCase
+  def setup
+    @rss20 = SimpleRSS.parse(
+      open(File.dirname(__FILE__) + "/../data/rss20.xml"),
+      array_tags: [:category]
+    )
+    @rss20_no_array = SimpleRSS.parse(
+      open(File.dirname(__FILE__) + "/../data/rss20.xml")
+    )
+  end
+
+  def test_array_tag_returns_array
+    assert_kind_of Array, @rss20.items.first.category
+  end
+
+  def test_array_tag_contains_all_values
+    categories = @rss20.items.first.category
+    assert_equal 2, categories.size
+    assert_includes categories, "Programming"
+    assert_includes categories, "Ruby"
+  end
+
+  def test_single_value_still_returns_array
+    # Item with only one category should still return an array
+    categories = @rss20.items[2].category
+    assert_kind_of Array, categories
+    assert_equal 1, categories.size
+    assert_equal ["General"], categories
+  end
+
+  def test_without_array_tags_returns_string
+    # Default behavior should return just the first/last match as a string
+    assert_kind_of String, @rss20_no_array.items.first.category
+  end
+end

data/test/base/base_test.rb

@@ -1,83 +1,82 @@
-# -*- coding: utf-8 -*-
-require 'test_helper'
+require "test_helper"
 class BaseTest < Test::Unit::TestCase
-	def setup
-		@rss09 = SimpleRSS.parse open(File.dirname(__FILE__) + '/../data/rss09.rdf')
-		@rss20 = SimpleRSS.parse open(File.dirname(__FILE__) + '/../data/rss20.xml')
-                @rss20_utf8 = SimpleRSS.parse open(File.dirname(__FILE__) + '/../data/rss20_utf8.xml')
-		@media_rss = SimpleRSS.parse open(File.dirname(__FILE__) + '/../data/media_rss.xml')
-		@atom = SimpleRSS.parse open(File.dirname(__FILE__) + '/../data/atom.xml')
-	end
-	
-	def test_channel
-		assert_equal @rss09, @rss09.channel
-		assert_equal @rss20, @rss20.channel
-		assert_equal @atom, @atom.feed
-	end
-	
-	def test_items
-		assert_kind_of Array, @rss09.items
-		assert_kind_of Array, @rss20.items
-		assert_kind_of Array, @atom.entries
-	end
-	
-	def test_rss09
-		assert_equal 10, @rss09.items.size
-		assert_equal "Slashdot", @rss09.title
-		assert_equal "http://slashdot.org/", @rss09.channel.link
-		assert_equal "http://books.slashdot.org/article.pl?sid=05/08/29/1319236&amp;from=rss", @rss09.items.first.link
-		assert_equal "http://books.slashdot.org/article.pl?sid=05/08/29/1319236&amp;from=rss", @rss09.items.first[:link]
+  def setup
+    @rss09 = SimpleRSS.parse open(File.dirname(__FILE__) + "/../data/rss09.rdf")
+    @rss20 = SimpleRSS.parse open(File.dirname(__FILE__) + "/../data/rss20.xml")
+    @rss20_utf8 = SimpleRSS.parse open(File.dirname(__FILE__) + "/../data/rss20_utf8.xml")
+    @media_rss = SimpleRSS.parse open(File.dirname(__FILE__) + "/../data/media_rss.xml")
+    @atom = SimpleRSS.parse open(File.dirname(__FILE__) + "/../data/atom.xml")
+  end
+
+  def test_channel
+    assert_equal @rss09, @rss09.channel
+    assert_equal @rss20, @rss20.channel
+    assert_equal @atom, @atom.feed
+  end
+
+  def test_items
+    assert_kind_of Array, @rss09.items
+    assert_kind_of Array, @rss20.items
+    assert_kind_of Array, @atom.entries
+  end
+
+  def test_rss09
+    assert_equal 10, @rss09.items.size
+    assert_equal "Slashdot", @rss09.title
+    assert_equal "http://slashdot.org/", @rss09.channel.link
+    assert_equal "http://books.slashdot.org/article.pl?sid=05/08/29/1319236&amp;from=rss", @rss09.items.first.link
+    assert_equal "http://books.slashdot.org/article.pl?sid=05/08/29/1319236&amp;from=rss", @rss09.items.first[:link]
     assert_equal Time.parse("Wed Aug 24 13:33:34 UTC 2005"), @rss20.items.first.pubDate
     assert_equal Time.parse("Fri Sep 09 02:52:31 PDT 2005"), @rss09.channel.dc_date
-	end
+  end
+
+  def test_media_rss
+    assert_equal 20, @media_rss.items.size
+    assert_equal "Uploads from herval", @media_rss.title
+    assert_equal "http://www.flickr.com/photos/herval/", @media_rss.channel.link
+    assert_equal "http://www.flickr.com/photos/herval/4671960608/", @media_rss.items.first.link
+    assert_equal "http://www.flickr.com/photos/herval/4671960608/", @media_rss.items.first[:link]
+    assert_equal "http://farm5.static.flickr.com/4040/4671960608_10cb945d5c_o.jpg", @media_rss.items.first.media_content_url
+    assert_equal "image/jpeg", @media_rss.items.first.media_content_type
+    assert_equal "3168", @media_rss.items.first.media_content_height
+    assert_equal "4752", @media_rss.items.first.media_content_width
+    assert_equal "Woof?", @media_rss.items.first.media_title
+    assert_equal "http://farm5.static.flickr.com/4040/4671960608_954d2297bc_s.jpg", @media_rss.items.first.media_thumbnail_url
+    assert_equal "75", @media_rss.items.first.media_thumbnail_height
+    assert_equal "75", @media_rss.items.first.media_thumbnail_width
+    assert_equal "herval", @media_rss.items.first.media_credit
+    assert_equal "photographer", @media_rss.items.first.media_credit_role
+    assert_equal "pets frodo", @media_rss.items.first.media_category
+    assert_equal "urn:flickr:tags", @media_rss.items.first.media_category_scheme
+  end
+
+  def test_rss20
+    assert_equal 10, @rss20.items.size
+    assert_equal "Technoblog", @rss20.title
+    assert_equal "http://tech.rufy.com", @rss20.channel.link
+    assert_equal "http://feeds.feedburner.com/rufytech?m=68", @rss20.items.first.link
+    assert_equal "http://feeds.feedburner.com/rufytech?m=68", @rss20.items.first[:link]
+    assert_equal "This is an XML content feed. It is intended to be viewed in a newsreader or syndicated to another site.", @rss20.channel.feedburner_browserFriendly
+  end
+
+  def test_atom
+    assert_equal 1, @atom.entries.size
+    assert_equal "dive into mark", @atom.title
+    assert_equal "http://example.org/", @atom.feed.link
+    assert_equal "http://example.org/2005/04/02/atom", @atom.entries.first.link
+    assert_equal "http://example.org/2005/04/02/atom", @atom.entries.first[:link]
+  end
 
-	def test_media_rss
-		assert_equal 20, @media_rss.items.size
-		assert_equal "Uploads from herval", @media_rss.title
-		assert_equal "http://www.flickr.com/photos/herval/", @media_rss.channel.link
-		assert_equal "http://www.flickr.com/photos/herval/4671960608/", @media_rss.items.first.link
-		assert_equal "http://www.flickr.com/photos/herval/4671960608/", @media_rss.items.first[:link]
-		assert_equal "http://farm5.static.flickr.com/4040/4671960608_10cb945d5c_o.jpg", @media_rss.items.first.media_content_url
-		assert_equal "image/jpeg", @media_rss.items.first.media_content_type
-		assert_equal "3168", @media_rss.items.first.media_content_height
-		assert_equal "4752", @media_rss.items.first.media_content_width
-		assert_equal "Woof?", @media_rss.items.first.media_title
-		assert_equal "http://farm5.static.flickr.com/4040/4671960608_954d2297bc_s.jpg", @media_rss.items.first.media_thumbnail_url
-		assert_equal "75", @media_rss.items.first.media_thumbnail_height
-		assert_equal "75", @media_rss.items.first.media_thumbnail_width
-		assert_equal "herval", @media_rss.items.first.media_credit
-		assert_equal "photographer", @media_rss.items.first.media_credit_role
-		assert_equal "pets frodo", @media_rss.items.first.media_category
-		assert_equal "urn:flickr:tags", @media_rss.items.first.media_category_scheme
-	end
-	
-	def test_rss20
-		assert_equal 10, @rss20.items.size
-		assert_equal "Technoblog", @rss20.title
-		assert_equal "http://tech.rufy.com", @rss20.channel.link
-		assert_equal "http://feeds.feedburner.com/rufytech?m=68", @rss20.items.first.link
-		assert_equal "http://feeds.feedburner.com/rufytech?m=68", @rss20.items.first[:link]
-		assert_equal "This is an XML content feed. It is intended to be viewed in a newsreader or syndicated to another site.", @rss20.channel.feedburner_browserFriendly
-	end
-	
-	def test_atom
-		assert_equal 1, @atom.entries.size
-		assert_equal "dive into mark", @atom.title
-		assert_equal "http://example.org/", @atom.feed.link
-		assert_equal "http://example.org/2005/04/02/atom", @atom.entries.first.link
-		assert_equal "http://example.org/2005/04/02/atom", @atom.entries.first[:link]
-	end
-	
-	def test_bad_feed
-	  assert_raise(SimpleRSSError) { SimpleRSS.parse(open(File.dirname(__FILE__) + '/../data/not-rss.xml')) }
-	end
+  def test_bad_feed
+    assert_raise(SimpleRSSError) { SimpleRSS.parse(open(File.dirname(__FILE__) + "/../data/not-rss.xml")) }
+  end
 
-        def test_rss_utf8
-		assert_equal 2, @rss20_utf8.items.size
-		assert_equal "SC5 Blog", @rss20_utf8.title
-		assert_equal Encoding::UTF_8, @rss20_utf8.title.encoding
-		item = @rss20_utf8.items.first
-		assert_equal "Mitä asiakkaamme ajattelevat meistä?", item.title
-		assert_equal Encoding::UTF_8, item.title.encoding
-	end
+  def test_rss_utf8
+    assert_equal 2, @rss20_utf8.items.size
+    assert_equal "SC5 Blog", @rss20_utf8.title
+    assert_equal Encoding::UTF_8, @rss20_utf8.title.encoding
+    item = @rss20_utf8.items.first
+    assert_equal "Mitä asiakkaamme ajattelevat meistä?", item.title
+    assert_equal Encoding::UTF_8, item.title.encoding
+  end
 end