simple-rss 1.0.0 → 1.1

data/Rakefile

@@ -4,11 +4,17 @@ require 'rake/testtask'
 require 'rake/rdoctask'
 require 'rake/gempackagetask'
 require 'rake/contrib/rubyforgepublisher'
+require File.dirname(__FILE__) + '/lib/simple-rss'
 
-PKG_VERSION = "1.0.0"
+PKG_VERSION = SimpleRSS::VERSION
+PKG_NAME = "simple-rss"
+PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
+RUBY_FORGE_PROJECT = "simple-rss"
+RUBY_FORGE_USER = ENV['RUBY_FORGE_USER'] || "cardmagic"
+RELEASE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
 PKG_FILES = FileList[
-    "lib/*", "bin/*", "test/**/*", "[A-Z]*", "Rakefile", "doc/**/*"
+    "lib/*", "bin/*", "test/**/*", "[A-Z]*", "Rakefile", "html/**/*"
 ]
 
 desc "Default Task"
@@ -32,7 +38,7 @@ end
 desc "Create documentation"
 Rake::RDocTask.new("doc") { |rdoc|
   rdoc.title = "Simple RSS - A Flexible RSS and Atom reader for Ruby"
-  rdoc.rdoc_dir = 'doc'
+  rdoc.rdoc_dir = 'html'
   rdoc.rdoc_files.include('README')
   rdoc.rdoc_files.include('lib/*.rb')
 }
@@ -88,3 +94,120 @@ desc "Publish new documentation"
 task :publish do
     Rake::RubyForgePublisher.new('simple-rss', 'cardmagic').upload
 end
+
+
+desc "Publish the release files to RubyForge."
+task :upload => [:package] do
+  files = ["gem", "tar.gz", "zip"].map { |ext| "pkg/#{PKG_FILE_NAME}.#{ext}" }
+
+  if RUBY_FORGE_PROJECT then
+      require 'net/http'
+      require 'open-uri'
+
+      project_uri = "http://rubyforge.org/projects/#{RUBY_FORGE_PROJECT}/"
+      project_data = open(project_uri) { |data| data.read }
+      group_id = project_data[/[?&]group_id=(\d+)/, 1]
+      raise "Couldn't get group id" unless group_id
+
+      # This echos password to shell which is a bit sucky
+      if ENV["RUBY_FORGE_PASSWORD"]
+          password = ENV["RUBY_FORGE_PASSWORD"]
+      else
+          print "#{RUBY_FORGE_USER}@rubyforge.org's password: "
+          password = STDIN.gets.chomp
+      end
+
+      login_response = Net::HTTP.start("rubyforge.org", 80) do |http|
+          data = [
+              "login=1",
+              "form_loginname=#{RUBY_FORGE_USER}",
+              "form_pw=#{password}"
+          ].join("&")
+          http.post("/account/login.php", data)
+      end
+
+      cookie = login_response["set-cookie"]
+      puts login_response["set-cookie"]
+      raise "Login failed" unless cookie
+      headers = { "Cookie" => cookie }
+
+      release_uri = "http://rubyforge.org/frs/admin/?group_id=#{group_id}"
+      release_data = open(release_uri, headers) { |data| data.read }
+      package_id = release_data[/[?&]package_id=(\d+)/, 1]
+      raise "Couldn't get package id" unless package_id
+
+      first_file = true
+      release_id = ""
+
+      files.each do |filename|
+          basename  = File.basename(filename)
+          file_ext  = File.extname(filename)
+          file_data = File.open(filename, "rb") { |file| file.read }
+
+          puts "Releasing #{basename}..."
+
+          release_response = Net::HTTP.start("rubyforge.org", 80) do |http|
+              release_date = Time.now.strftime("%Y-%m-%d %H:%M")
+              type_map = {
+                  ".zip"    => "3000",
+                  ".tgz"    => "3110",
+                  ".gz"     => "3110",
+                  ".gem"    => "1400"
+              }; type_map.default = "9999"
+              type = type_map[file_ext]
+              boundary = "rubyqMY6QN9bp6e4kS21H4y0zxcvoor"
+
+              query_hash = if first_file then
+                {
+                  "group_id" => group_id,
+                  "package_id" => package_id,
+                  "release_name" => RELEASE_NAME,
+                  "release_date" => release_date,
+                  "type_id" => type,
+                  "processor_id" => "8000", # Any
+                  "release_notes" => "",
+                  "release_changes" => "",
+                  "preformatted" => "1",
+                  "submit" => "1"
+                }
+              else
+                {
+                  "group_id" => group_id,
+                  "release_id" => release_id,
+                  "package_id" => package_id,
+                  "step2" => "1",
+                  "type_id" => type,
+                  "processor_id" => "8000", # Any
+                  "submit" => "Add This File"
+                }
+              end
+
+              query = "?" + query_hash.map do |(name, value)|
+                  [name, URI.encode(value)].join("=")
+              end.join("&")
+
+              data = [
+                  "--" + boundary,
+                  "Content-Disposition: form-data; name=\"userfile\"; filename=\"#{basename}\"",
+                  "Content-Type: application/octet-stream",
+                  "Content-Transfer-Encoding: binary",
+                  "", file_data, ""
+                  ].join("\x0D\x0A")
+
+              release_headers = headers.merge(
+                  "Content-Type" => "multipart/form-data; boundary=#{boundary}"
+              )
+
+              target = first_file ? "/frs/admin/qrs.php" : "/frs/admin/editrelease.php"
+              http.post(target + query, data, release_headers)
+          end
+
+          if first_file then
+              release_id = release_response.body[/release_id=(\d+)/, 1]
+              raise("Couldn't get release id") unless release_id
+          end
+
+          first_file = false
+      end
+  end
+end

data/{doc → html}/classes/SimpleRSS.html

@@ -105,6 +105,19 @@
     <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>
@@ -222,7 +235,7 @@
         <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, strict=false)</span>
+          <span class="method-name">parse</span><span class="method-args">(source, do_validate=true, ignore_unknown_element=true, parser_class=false)</span>
           </a>
         </div>
       

data/{doc → html}/classes/SimpleRSS.src/M000001.html

@@ -10,7 +10,7 @@
   <link rel="stylesheet" href="../.././rdoc-style.css" type="text/css" media="screen" />
 </head>
 <body class="standalone-code">
-  <pre><span class="ruby-comment cmt"># File lib/simple-rss.rb, line 32</span>
+  <pre><span class="ruby-comment cmt"># File lib/simple-rss.rb, line 35</span>
         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">source</span>)
                 <span class="ruby-ivar">@source</span> = <span class="ruby-identifier">source</span>.<span class="ruby-identifier">respond_to?</span>(<span class="ruby-identifier">:read</span>) <span class="ruby-operator">?</span> <span class="ruby-identifier">source</span>.<span class="ruby-identifier">read</span> <span class="ruby-operator">:</span> <span class="ruby-identifier">source</span>.<span class="ruby-identifier">to_s</span>
                 <span class="ruby-ivar">@items</span> = <span class="ruby-constant">Array</span>.<span class="ruby-identifier">new</span>

data/{doc → html}/classes/SimpleRSS.src/M000002.html

@@ -10,7 +10,7 @@
   <link rel="stylesheet" href="../.././rdoc-style.css" type="text/css" media="screen" />
 </head>
 <body class="standalone-code">
-  <pre><span class="ruby-comment cmt"># File lib/simple-rss.rb, line 39</span>
+  <pre><span class="ruby-comment cmt"># File lib/simple-rss.rb, line 42</span>
         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">channel</span>() <span class="ruby-keyword kw">self</span> <span class="ruby-keyword kw">end</span></pre>
 </body>
 </html>

data/{doc → html}/classes/SimpleRSS.src/M000004.html

@@ -10,7 +10,7 @@
   <link rel="stylesheet" href="../.././rdoc-style.css" type="text/css" media="screen" />
 </head>
 <body class="standalone-code">
-  <pre><span class="ruby-comment cmt"># File lib/simple-rss.rb, line 43</span>
+  <pre><span class="ruby-comment cmt"># File lib/simple-rss.rb, line 46</span>
                 <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">feed_tags</span>
                         <span class="ruby-ivar">@@feed_tags</span>
                 <span class="ruby-keyword kw">end</span></pre>

data/{doc → html}/classes/SimpleRSS.src/M000005.html

@@ -10,7 +10,7 @@
   <link rel="stylesheet" href="../.././rdoc-style.css" type="text/css" media="screen" />
 </head>
 <body class="standalone-code">
-  <pre><span class="ruby-comment cmt"># File lib/simple-rss.rb, line 46</span>
+  <pre><span class="ruby-comment cmt"># File lib/simple-rss.rb, line 49</span>
                 <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">feed_tags=</span>(<span class="ruby-identifier">ft</span>)
                         <span class="ruby-ivar">@@feed_tags</span> = <span class="ruby-identifier">ft</span>
                 <span class="ruby-keyword kw">end</span></pre>

data/{doc → html}/classes/SimpleRSS.src/M000006.html

@@ -10,7 +10,7 @@
   <link rel="stylesheet" href="../.././rdoc-style.css" type="text/css" media="screen" />
 </head>
 <body class="standalone-code">
-  <pre><span class="ruby-comment cmt"># File lib/simple-rss.rb, line 50</span>
+  <pre><span class="ruby-comment cmt"># File lib/simple-rss.rb, line 53</span>
                 <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">item_tags</span>
                         <span class="ruby-ivar">@@item_tags</span>
                 <span class="ruby-keyword kw">end</span></pre>

data/{doc → html}/classes/SimpleRSS.src/M000007.html

@@ -10,7 +10,7 @@
   <link rel="stylesheet" href="../.././rdoc-style.css" type="text/css" media="screen" />
 </head>
 <body class="standalone-code">
-  <pre><span class="ruby-comment cmt"># File lib/simple-rss.rb, line 53</span>
+  <pre><span class="ruby-comment cmt"># File lib/simple-rss.rb, line 56</span>
                 <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">item_tags=</span>(<span class="ruby-identifier">it</span>)
                         <span class="ruby-ivar">@@item_tags</span> = <span class="ruby-identifier">it</span>
                 <span class="ruby-keyword kw">end</span></pre>

data/{doc → html}/classes/SimpleRSS.src/M000008.html

@@ -10,8 +10,8 @@
   <link rel="stylesheet" href="../.././rdoc-style.css" type="text/css" media="screen" />
 </head>
 <body class="standalone-code">
-  <pre><span class="ruby-comment cmt"># File lib/simple-rss.rb, line 58</span>
-                <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">parse</span>(<span class="ruby-identifier">source</span>, <span class="ruby-identifier">strict</span>=<span class="ruby-keyword kw">false</span>)
+  <pre><span class="ruby-comment cmt"># File lib/simple-rss.rb, line 61</span>
+                <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">parse</span>(<span class="ruby-identifier">source</span>, <span class="ruby-identifier">do_validate</span>=<span class="ruby-keyword kw">true</span>, <span class="ruby-identifier">ignore_unknown_element</span>=<span class="ruby-keyword kw">true</span>, <span class="ruby-identifier">parser_class</span>=<span class="ruby-keyword kw">false</span>)
                         <span class="ruby-identifier">new</span> <span class="ruby-identifier">source</span>
                 <span class="ruby-keyword kw">end</span></pre>
 </body>

data/html/created.rid

@@ -0,0 +1 @@
+Wed Feb 01 18:08:07 PST 2006

data/{doc → html}/files/lib/simple-rss_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Mon Aug 29 18:10:35 PDT 2005</td>
+      <td>Wed Feb 01 17:57:26 PST 2006</td>
     </tr>
     </table>
   </div>

data/lib/simple-rss.rb

@@ -2,6 +2,8 @@ require 'cgi'
 require 'time'
 
 class SimpleRSS
+  VERSION = "1.1"
+  
 	attr_reader :items, :source
 	alias :entries :items
 
@@ -10,12 +12,13 @@ class SimpleRSS
 		:title, :subtitle, :link,
 		:description, 
 		:author, :webMaster, :managingEditor, :contributor,
-		:pubDate, :lastBuildDate, :updated,
+		:pubDate, :lastBuildDate, :updated, :'dc:date',
 		:generator, :language, :docs, :cloud,
 		:ttl, :skipHours, :skipDays,
 		:image, :logo, :icon, :rating,
 		:rights, :copyright,
-		:textInput
+		:textInput, :'feedburner:browserFriendly',
+		:'itunes:author', :'itunes:category'
 	]
 
 	@@item_tags = [
@@ -23,7 +26,7 @@ class SimpleRSS
 		:title, :link,
 		:author, :contributor,
 		:description, :summary, :content, :'content:encoded', :comments,
-		:pubDate, :published, :updated, :expirationDate,
+		:pubDate, :published, :updated, :expirationDate, :modified, :'dc:date',
 		:category, :guid,
 		:'trackback:ping', :'trackback:about',
 		:'dc:creator', :'dc:title', :'dc:subject', :'dc:rights', :'dc:publisher'
@@ -55,7 +58,7 @@ class SimpleRSS
 		end
 
 		# The strict attribute is for compatibility with Ruby's standard RSS parser
-		def parse(source, strict=false)
+		def parse(source, do_validate=true, ignore_unknown_element=true, parser_class=false)
 			new source
 		end
 	end
@@ -80,18 +83,19 @@ class SimpleRSS
 			end
 			
 			if $2 || $3
-				eval %{ @#{ clean_tag tag } = clean_content(tag, $2, $3) }
-				self.class.class_eval %{ attr_reader tag }
+        tag_cleaned = clean_tag(tag)
+        eval %{ @#{ 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).*?>(.*?)</(rss:|atom:)?(item|entry)>}mi ) do |match|
+		@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[2] =~ %r{<(rss:|atom:)?#{tag}(.*?)>(.*?)</(rss:|atom:)?#{tag}>}mi
+				if match[3] =~ %r{<(rss:|atom:)?#{tag}(.*?)>(.*?)</(rss:|atom:)?#{tag}>}mi
 					nil
-				elsif match[2] =~ %r{<(rss:|atom:)?#{tag}(.*?)/\s*>}mi
+				elsif match[3] =~ %r{<(rss:|atom:)?#{tag}(.*?)/\s*>}mi
 					nil
 				end
 				item[clean_tag(tag)] = clean_content(tag, $2, $3) if $2 || $3
@@ -105,8 +109,8 @@ class SimpleRSS
 	def clean_content(tag, attrs, content)
 		content = content.to_s
 		case tag
-			when :pubDate, :lastBuildDate, :published, :updated, :expirationDate
-				Time.parse(content)
+			when :pubDate, :lastBuildDate, :published, :updated, :expirationDate, :modified, :'dc:date'
+				Time.parse(content) rescue unescape(content)
 			when :author, :contributor, :skipHours, :skipDays
 				unescape(content.gsub(/<.*?>/,''))
 			else

data/test/base/base_test.rb

@@ -24,6 +24,8 @@ class BaseTest < Test::Unit::TestCase
 		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
 
 	def test_rss20
@@ -32,6 +34,7 @@ class BaseTest < Test::Unit::TestCase
 		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

data/test/data/rss09.rdf

@@ -2,12 +2,14 @@
 
 <rdf:RDF
 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+xmlns:dc="http://purl.org/dc/elements/1.1/"
 xmlns="http://my.netscape.com/rdf/simple/0.9/">
 
 <channel>
 <title>Slashdot</title>
 <link>http://slashdot.org/</link>
 <description>News for nerds, stuff that matters</description>
+<dc:date>2005-09-09T02:52:31-07:00</dc:date>
 </channel>
 
 <image>
@@ -19,6 +21,7 @@ xmlns="http://my.netscape.com/rdf/simple/0.9/">
 <item>
 <title>JBoss - A Developer's Notebook</title>
 <link>http://books.slashdot.org/article.pl?sid=05/08/29/1319236&amp;from=rss</link>
+<dc:date>2005-09-09T02:52:31-07:00</dc:date>
 </item>
 
 <item>

metadata

@@ -1,73 +1,77 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.10
+rubygems_version: 0.8.11
 specification_version: 1
 name: simple-rss
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
-date: 2005-08-29
-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."
+  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
+- 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."
+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
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 0.0.0
   version: 
 platform: ruby
+signing_key: 
+cert_chain: 
 authors: 
-  - Lucas Carlson
+- Lucas Carlson
 files: 
-  - lib/simple-rss.rb
-  - test/base
-  - test/data
-  - test/test_helper.rb
-  - test/base/base_test.rb
-  - test/data/atom.xml
-  - test/data/not-rss.xml
-  - test/data/rss09.rdf
-  - test/data/rss20.xml
-  - LICENSE
-  - Rakefile
-  - README
-  - doc/classes
-  - doc/created.rid
-  - doc/files
-  - doc/fr_class_index.html
-  - doc/fr_file_index.html
-  - doc/fr_method_index.html
-  - doc/index.html
-  - doc/rdoc-style.css
-  - doc/classes/SimpleRSS.html
-  - doc/classes/SimpleRSS.src
-  - doc/classes/SimpleRSSError.html
-  - doc/classes/SimpleRSS.src/M000001.html
-  - doc/classes/SimpleRSS.src/M000002.html
-  - doc/classes/SimpleRSS.src/M000004.html
-  - doc/classes/SimpleRSS.src/M000005.html
-  - doc/classes/SimpleRSS.src/M000006.html
-  - doc/classes/SimpleRSS.src/M000007.html
-  - doc/classes/SimpleRSS.src/M000008.html
-  - doc/files/lib
-  - doc/files/README.html
-  - doc/files/lib/simple-rss_rb.html
+- lib/simple-rss.rb
+- test/base
+- test/data
+- test/test_helper.rb
+- test/base/base_test.rb
+- test/data/atom.xml
+- test/data/not-rss.xml
+- test/data/rss09.rdf
+- test/data/rss20.xml
+- 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: []
+
 rdoc_options: []
+
 extra_rdoc_files: []
+
 executables: []
+
 extensions: []
+
 requirements: []
-dependencies: []
+
+dependencies: []
+

data/doc/created.rid

@@ -1 +0,0 @@
-Mon Aug 29 22:18:48 PDT 2005