simple-rss 1.1 → 1.2

data/README

@@ -30,6 +30,9 @@ But since the parser can read Atom feeds as easily as RSS feeds, there are optio
 The parser does not care about the correctness of the XML as it does not use an XML library to read the information. Thus it is flexible and allows for easy extending via:
 
    SimpleRSS.feed_tags << :some_new_tag
+   SimpleRSS.item_tags << :"item+myrel" # this will extend SimpleRSS to be able to parse RSS items or ATOM entries that have a rel specified, common in many blogger feeds
+   SimpleRSS.item_tags << :"feedburner:origLink" # this will extend SimpleRSS to be able to parse RSS items or ATOM entries that have a specific pre-tag specified, common in many feedburner feeds
+
 
 == Authors
 * Lucas Carlson  (mailto:lucas@rufy.com)

data/Rakefile

@@ -127,7 +127,6 @@ task :upload => [:package] do
       end
 
       cookie = login_response["set-cookie"]
-      puts login_response["set-cookie"]
       raise "Login failed" unless cookie
       headers = { "Cookie" => cookie }
 

data/lib/simple-rss.rb

@@ -2,7 +2,7 @@ require 'cgi'
 require 'time'
 
 class SimpleRSS
-  VERSION = "1.1"
+  VERSION = "1.2"
   
 	attr_reader :items, :source
 	alias :entries :items
@@ -23,13 +23,14 @@ class SimpleRSS
 
 	@@item_tags = [
 		:id,
-		:title, :link,
+		: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'
+		:'dc:creator', :'dc:title', :'dc:subject', :'dc:rights', :'dc:publisher',
+		:'feedburner:origLink'
 	]
 
 	def initialize(source)
@@ -93,12 +94,25 @@ class SimpleRSS
 		@source.scan( %r{<(rss:|atom:)?(item|entry)([\s][^>]*)?>(.*?)</(rss:|atom:)?(item|entry)>}mi ) do |match|
 			item = Hash.new
 			@@item_tags.each do |tag|
-				if match[3] =~ %r{<(rss:|atom:)?#{tag}(.*?)>(.*?)</(rss:|atom:)?#{tag}>}mi
-					nil
-				elsif match[3] =~ %r{<(rss:|atom:)?#{tag}(.*?)/\s*>}mi
-					nil
+			  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
+		    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
-				item[clean_tag(tag)] = clean_content(tag, $2, $3) if $2 || $3
 			end
 			def item.method_missing(name, *args) self[name] end
 			@items << item
@@ -122,9 +136,13 @@ class SimpleRSS
 		tag.to_s.gsub(':','_').intern
 	end
 	
-	def unescape(content)
-		CGI.unescape(content).gsub(/(<!\[CDATA\[|\]\]>)/,'').strip
-	end
+  def unescape(content)
+  	if content =~ /([^-_.!~*'()a-zA-Z\d;\/?:@&=+$,\[\]]%)/n then
+  		CGI.unescape(content).gsub(/(<!\[CDATA\[|\]\]>)/,'').strip
+  	else
+  		content.gsub(/(<!\[CDATA\[|\]\]>)/,'').strip
+  	end
+  end
 end
 
 class SimpleRSSError < StandardError

metadata

@@ -1,77 +1,64 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
-specification_version: 1
 name: simple-rss
 version: !ruby/object:Gem::Version 
-  version: "1.1"
-date: 2006-02-01 00:00:00 -08:00
-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.
-require_paths: 
-- lib
-email: lucas@rufy.com
-homepage: http://simple-rss.rubyforge.org/
-rubyforge_project: 
-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.
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: "1.2"
 platform: ruby
-signing_key: 
-cert_chain: 
 authors: 
 - Lucas Carlson
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2009-02-25 00:00:00 -08:00
+default_executable: 
+dependencies: []
+
+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.
+email: lucas@rufy.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: []
+
 files: 
 - lib/simple-rss.rb
 - test/base
-- test/data
-- test/test_helper.rb
 - 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
 - LICENSE
 - Rakefile
 - README
-- html/classes
-- html/created.rid
-- html/files
-- html/fr_class_index.html
-- html/fr_file_index.html
-- html/fr_method_index.html
-- html/index.html
-- html/rdoc-style.css
-- html/classes/SimpleRSS.html
-- html/classes/SimpleRSS.src
-- html/classes/SimpleRSSError.html
-- html/classes/SimpleRSS.src/M000001.html
-- html/classes/SimpleRSS.src/M000002.html
-- html/classes/SimpleRSS.src/M000004.html
-- html/classes/SimpleRSS.src/M000005.html
-- html/classes/SimpleRSS.src/M000006.html
-- html/classes/SimpleRSS.src/M000007.html
-- html/classes/SimpleRSS.src/M000008.html
-- html/files/lib
-- html/files/README.html
-- html/files/lib/simple-rss_rb.html
-test_files: []
-
+has_rdoc: true
+homepage: http://simple-rss.rubyforge.org/
+post_install_message: 
 rdoc_options: []
 
-extra_rdoc_files: []
-
-executables: []
-
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
+rubyforge_project: 
+rubygems_version: 1.3.1
+signing_key: 
+specification_version: 2
+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.
+test_files: []
 

data/html/classes/SimpleRSS.html

@@ -1,292 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html 
-     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <title>Class: SimpleRSS</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-  <meta http-equiv="Content-Script-Type" content="text/javascript" />
-  <link rel="stylesheet" href=".././rdoc-style.css" type="text/css" media="screen" />
-  <script type="text/javascript">
-  // <![CDATA[
-
-  function popupCode( url ) {
-    window.open(url, "Code", "resizable=yes,scrollbars=yes,toolbar=no,status=no,height=150,width=400")
-  }
-
-  function toggleCode( id ) {
-    if ( document.getElementById )
-      elem = document.getElementById( id );
-    else if ( document.all )
-      elem = eval( "document.all." + id );
-    else
-      return false;
-
-    elemStyle = elem.style;
-    
-    if ( elemStyle.display != "block" ) {
-      elemStyle.display = "block"
-    } else {
-      elemStyle.display = "none"
-    }
-
-    return true;
-  }
-  
-  // Make codeblocks hidden by default
-  document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" )
-  
-  // ]]>
-  </script>
-
-</head>
-<body>
-
-
-
-    <div id="classHeader">
-        <table class="header-table">
-        <tr class="top-aligned-row">
-          <td><strong>Class</strong></td>
-          <td class="class-name-in-header">SimpleRSS</td>
-        </tr>
-        <tr class="top-aligned-row">
-            <td><strong>In:</strong></td>
-            <td>
-                <a href="../files/lib/simple-rss_rb.html">
-                lib/simple-rss.rb
-                </a>
-        <br />
-            </td>
-        </tr>
-
-        <tr class="top-aligned-row">
-            <td><strong>Parent:</strong></td>
-            <td>
-                Object
-            </td>
-        </tr>
-        </table>
-    </div>
-  <!-- banner header -->
-
-  <div id="bodyContent">
-
-
-
-  <div id="contextContent">
-
-
-
-   </div>
-
-    <div id="method-list">
-      <h3 class="section-bar">Methods</h3>
-
-      <div class="name-list">
-      <a href="#M000002">channel</a>&nbsp;&nbsp;
-      <a href="#M000003">feed</a>&nbsp;&nbsp;
-      <a href="#M000004">feed_tags</a>&nbsp;&nbsp;
-      <a href="#M000005">feed_tags=</a>&nbsp;&nbsp;
-      <a href="#M000006">item_tags</a>&nbsp;&nbsp;
-      <a href="#M000007">item_tags=</a>&nbsp;&nbsp;
-      <a href="#M000001">new</a>&nbsp;&nbsp;
-      <a href="#M000008">parse</a>&nbsp;&nbsp;
-      </div>
-    </div>
-
-  </div>
-
-
-    <!-- if includes -->
-
-    <div id="section">
-
-
-    <div id="constants-list">
-      <h3 class="section-bar">Constants</h3>
-
-      <div class="name-list">
-        <table summary="Constants">
-        <tr class="top-aligned-row context-row">
-          <td class="context-item-name">VERSION</td>
-          <td>=</td>
-          <td class="context-item-value">&quot;1.1&quot;</td>
-        </tr>
-        </table>
-      </div>
-    </div>
-
-    <div id="aliases-list">
-      <h3 class="section-bar">External Aliases</h3>
-
-      <div class="name-list">
-                        <table summary="aliases">
-        <tr class="top-aligned-row context-row">
-          <td class="context-item-name">items</td>
-          <td>-></td>
-          <td class="context-item-value">entries</td>
-        </tr>
-                        </table>
-      </div>
-    </div>
-
-
-    <div id="attribute-list">
-      <h3 class="section-bar">Attributes</h3>
-
-      <div class="name-list">
-        <table>
-        <tr class="top-aligned-row context-row">
-          <td class="context-item-name">items</td>
-          <td class="context-item-value">&nbsp;[R]&nbsp;</td>
-          <td class="context-item-desc"></td>
-        </tr>
-        <tr class="top-aligned-row context-row">
-          <td class="context-item-name">source</td>
-          <td class="context-item-value">&nbsp;[R]&nbsp;</td>
-          <td class="context-item-desc"></td>
-        </tr>
-        </table>
-      </div>
-    </div>
-      
-
-
-    <!-- if method_list -->
-    <div id="methods">
-      <h3 class="section-bar">Public Class methods</h3>
-
-      <div id="method-M000004" class="method-detail">
-        <a name="M000004"></a>
-
-        <div class="method-heading">
-          <a href="SimpleRSS.src/M000004.html" target="Code" class="method-signature"
-            onclick="popupCode('SimpleRSS.src/M000004.html');return false;">
-          <span class="method-name">feed_tags</span><span class="method-args">()</span>
-          </a>
-        </div>
-      
-        <div class="method-description">
-        </div>
-      </div>
-
-      <div id="method-M000005" class="method-detail">
-        <a name="M000005"></a>
-
-        <div class="method-heading">
-          <a href="SimpleRSS.src/M000005.html" target="Code" class="method-signature"
-            onclick="popupCode('SimpleRSS.src/M000005.html');return false;">
-          <span class="method-name">feed_tags=</span><span class="method-args">(ft)</span>
-          </a>
-        </div>
-      
-        <div class="method-description">
-        </div>
-      </div>
-
-      <div id="method-M000006" class="method-detail">
-        <a name="M000006"></a>
-
-        <div class="method-heading">
-          <a href="SimpleRSS.src/M000006.html" target="Code" class="method-signature"
-            onclick="popupCode('SimpleRSS.src/M000006.html');return false;">
-          <span class="method-name">item_tags</span><span class="method-args">()</span>
-          </a>
-        </div>
-      
-        <div class="method-description">
-        </div>
-      </div>
-
-      <div id="method-M000007" class="method-detail">
-        <a name="M000007"></a>
-
-        <div class="method-heading">
-          <a href="SimpleRSS.src/M000007.html" target="Code" class="method-signature"
-            onclick="popupCode('SimpleRSS.src/M000007.html');return false;">
-          <span class="method-name">item_tags=</span><span class="method-args">(it)</span>
-          </a>
-        </div>
-      
-        <div class="method-description">
-        </div>
-      </div>
-
-      <div id="method-M000001" class="method-detail">
-        <a name="M000001"></a>
-
-        <div class="method-heading">
-          <a href="SimpleRSS.src/M000001.html" target="Code" class="method-signature"
-            onclick="popupCode('SimpleRSS.src/M000001.html');return false;">
-          <span class="method-name">new</span><span class="method-args">(source)</span>
-          </a>
-        </div>
-      
-        <div class="method-description">
-        </div>
-      </div>
-
-      <div id="method-M000008" class="method-detail">
-        <a name="M000008"></a>
-
-        <div class="method-heading">
-          <a href="SimpleRSS.src/M000008.html" target="Code" class="method-signature"
-            onclick="popupCode('SimpleRSS.src/M000008.html');return false;">
-          <span class="method-name">parse</span><span class="method-args">(source, do_validate=true, ignore_unknown_element=true, parser_class=false)</span>
-          </a>
-        </div>
-      
-        <div class="method-description">
-          <p>
-The strict attribute is for compatibility with Ruby&#8217;s standard RSS
-parser
-</p>
-        </div>
-      </div>
-
-      <h3 class="section-bar">Public Instance methods</h3>
-
-      <div id="method-M000002" class="method-detail">
-        <a name="M000002"></a>
-
-        <div class="method-heading">
-          <a href="SimpleRSS.src/M000002.html" target="Code" class="method-signature"
-            onclick="popupCode('SimpleRSS.src/M000002.html');return false;">
-          <span class="method-name">channel</span><span class="method-args">()</span>
-          </a>
-        </div>
-      
-        <div class="method-description">
-        </div>
-      </div>
-
-      <div id="method-M000003" class="method-detail">
-        <a name="M000003"></a>
-
-        <div class="method-heading">
-          <span class="method-name">feed</span><span class="method-args">()</span>
-        </div>
-      
-        <div class="method-description">
-          <p>
-Alias for <a href="SimpleRSS.html#M000002">channel</a>
-</p>
-        </div>
-      </div>
-
-
-    </div>
-
-
-  </div>
-
-
-<div id="validator-badges">
-  <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
-</div>
-
-</body>
-</html>