summaryrefslogtreecommitdiff
path: root/sample
diff options
context:
space:
mode:
authorkou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-07-22 06:14:48 +0000
committerkou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-07-22 06:14:48 +0000
commitb2270e553583533ac7a1ef28b733f3a1bf27184f (patch)
treee7da19fce8cc5fddac8e71601063266887e7f1de /sample
parentbe7999fd3dd2868ff382a7611e978aa2f8ac61c2 (diff)
* lib/rss/rss.rb: moved copyright description to lib/rss.rb.
* lib/rss.rb: added for convenience. * sample/rss/re_read.rb: added #to_s sample. * sample/rss/blend.rb: use 'require "rss"' instead of 'require "rss/*"'. * sample/rss/list_description.rb: ditto. * sample/rss/rss_recent.rb: ditto. * sample/rss/tdiary-plugin/rss-recent.rb: ditto. * sample/rss/tdiary-plugin/rss-recent.rb: 0.0.6 -> 0.0.7. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8820 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'sample')
-rwxr-xr-xsample/rss/blend.rb5
-rw-r--r--sample/rss/list_description.rb4
-rwxr-xr-xsample/rss/re_read.rb64
-rw-r--r--sample/rss/rss_recent.rb4
-rw-r--r--sample/rss/tdiary_plugin/rss-recent.rb18
5 files changed, 71 insertions, 24 deletions
diff --git a/sample/rss/blend.rb b/sample/rss/blend.rb
index 2aa30d7fc9..e578f26a86 100755
--- a/sample/rss/blend.rb
+++ b/sample/rss/blend.rb
@@ -1,9 +1,6 @@
#!/usr/bin/env ruby
-require "rss/1.0"
-require "rss/2.0"
-require "rss/dublincore"
-require "rss/maker"
+require "rss"
feeds = []
verbose = false
diff --git a/sample/rss/list_description.rb b/sample/rss/list_description.rb
index ac1db099ca..bb1f9636e2 100644
--- a/sample/rss/list_description.rb
+++ b/sample/rss/list_description.rb
@@ -10,9 +10,7 @@ class String
end
end
-require "rss/1.0"
-require "rss/2.0"
-require "rss/dublincore"
+require "rss"
channels = {}
verbose = false
diff --git a/sample/rss/re_read.rb b/sample/rss/re_read.rb
new file mode 100755
index 0000000000..c19a5099bb
--- /dev/null
+++ b/sample/rss/re_read.rb
@@ -0,0 +1,64 @@
+#!/usr/bin/env ruby
+
+require "rss"
+
+def error(exception)
+ mark = "=" * 20
+ mark = "#{mark} error #{mark}"
+ puts mark
+ puts exception.class
+ puts exception.message
+ puts exception.backtrace
+ puts mark
+end
+
+verbose = false
+before_time = Time.now
+
+ARGV.each do |fname|
+ if fname == '-v'
+ verbose = true
+ next
+ end
+ source = nil
+ File.open(fname) do |f|
+ source = f.read
+ end
+
+ rss = nil
+ read = false
+ begin
+ rss = RSS::Parser.parse(source)
+ puts "Re-read valid RSS: #{fname}"
+ RSS::Parser.parse(rss.to_s)
+ read = true
+ rescue RSS::InvalidRSSError
+ error($!) if verbose
+ ## do non validate parse for invalid RSS 1.0
+ begin
+ rss = RSS::Parser.parse(source, false)
+ rescue RSS::Error
+ ## invalid RSS.
+ error($!) if verbose
+ end
+ rescue RSS::Error
+ error($!) if verbose
+ end
+
+ if rss.nil?
+ puts "Invalid RSS: #{fname}"
+ elsif !read
+ puts "Re-read invalid RSS: #{fname}"
+ begin
+ RSS::Parser.parse(rss.to_s)
+ rescue RSS::Error
+ puts " Error occurred: #{fname}"
+ error($!) if verbose
+ end
+ end
+end
+
+processing_time = Time.now - before_time
+
+puts "Used XML parser: #{RSS::Parser.default_parser}"
+puts "Processing time: #{processing_time}s"
diff --git a/sample/rss/rss_recent.rb b/sample/rss/rss_recent.rb
index 70776c1e8a..7821df5c7b 100644
--- a/sample/rss/rss_recent.rb
+++ b/sample/rss/rss_recent.rb
@@ -10,9 +10,7 @@ class String
end
end
-require "rss/1.0"
-require "rss/2.0"
-require "rss/dublincore"
+require "rss"
items = []
verbose = false
diff --git a/sample/rss/tdiary_plugin/rss-recent.rb b/sample/rss/tdiary_plugin/rss-recent.rb
index 7e6aad55ea..867851f386 100644
--- a/sample/rss/tdiary_plugin/rss-recent.rb
+++ b/sample/rss/tdiary_plugin/rss-recent.rb
@@ -20,7 +20,7 @@ require "rss/rss"
RSS_RECENT_FIELD_SEPARATOR = "\0"
RSS_RECENT_ENTRY_SEPARATOR = "\1"
-RSS_RECENT_VERSION = "0.0.6"
+RSS_RECENT_VERSION = "0.0.7"
RSS_RECENT_HTTP_HEADER = {
"User-Agent" => "tDiary RSS recent plugin version #{RSS_RECENT_VERSION}. " <<
"Using RSS parser version is #{::RSS::VERSION}.",
@@ -49,12 +49,12 @@ def rss_recent(url, max=5, cache_time=3600)
have_entry = infos.size > 0 && max > 0
- rv << "<ul>\n" if have_entry
+ rv << "<ul class='rss-recent'>\n" if have_entry
i = 0
infos.each do |title, url, time, image|
break if i >= max
next if title.nil?
- rv << '<li>'
+ rv << "<li class='rss-recent-item'>"
rv << %Q[<span class="#{rss_recent_modified_class(time)}">]
rv << rss_recent_entry_to_html(title, url, time, image)
rv << %Q[</span>]
@@ -78,17 +78,7 @@ def rss_recent_cache_rss(url, cache_file, cache_time)
if cached_time.nil? or Time.now > cached_time + cache_time
require 'time'
- require 'open-uri'
- require 'net/http'
- require 'uri/generic'
- require 'rss/parser'
- require 'rss/1.0'
- require 'rss/2.0'
- require 'rss/dublincore'
- begin
- require 'rss/image'
- rescue LoadError
- end
+ require 'rss'
begin
uri = URI.parse(url)