diff options
author | kou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-07-05 15:15:04 +0000 |
---|---|---|
committer | kou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-07-05 15:15:04 +0000 |
commit | d9034d23ce8dcb88f310a9e33b79379123c1f7fd (patch) | |
tree | bdc7a1d43a6679033d42ecaf4370123068533435 /lib/rss | |
parent | 74f6b8e7c9ca570b7663554f7ce2b76f3eb78497 (diff) |
* lib/rss/{trackback,syndication,dublincore,content}.rb: worked
with ruby 1.6 again.
* test/rss/rss-assertions.rb: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@6585 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rss')
-rw-r--r-- | lib/rss/content.rb | 6 | ||||
-rw-r--r-- | lib/rss/dublincore.rb | 6 | ||||
-rw-r--r-- | lib/rss/syndication.rb | 6 | ||||
-rw-r--r-- | lib/rss/trackback.rb | 59 |
4 files changed, 41 insertions, 36 deletions
diff --git a/lib/rss/content.rb b/lib/rss/content.rb index fae0b687be..a8ed962644 100644 --- a/lib/rss/content.rb +++ b/lib/rss/content.rb @@ -13,8 +13,10 @@ module RSS ELEMENTS = [] - def self.included(mod) - mod.module_eval(<<-EOC) + def self.append_features(klass) + super + + klass.module_eval(<<-EOC) %w(encoded).each do |x| install_text_element("\#{CONTENT_PREFIX}_\#{x}") end diff --git a/lib/rss/dublincore.rb b/lib/rss/dublincore.rb index dcf8e46c65..c757b6279b 100644 --- a/lib/rss/dublincore.rb +++ b/lib/rss/dublincore.rb @@ -13,8 +13,10 @@ module RSS ELEMENTS = [] - def self.included(mod) - mod.module_eval(<<-EOC) + def self.append_features(klass) + super + + klass.module_eval(<<-EOC) %w(title description creator subject publisher contributor type format identifier source language relation coverage rights).each do |x| diff --git a/lib/rss/syndication.rb b/lib/rss/syndication.rb index 8c10688b57..aca39bb374 100644 --- a/lib/rss/syndication.rb +++ b/lib/rss/syndication.rb @@ -13,8 +13,10 @@ module RSS ELEMENTS = [] - def self.included(mod) - mod.module_eval(<<-EOC) + def self.append_features(klass) + super + + klass.module_eval(<<-EOC) %w(updatePeriod updateFrequency).each do |x| install_text_element("\#{SY_PREFIX}_\#{x}") end diff --git a/lib/rss/trackback.rb b/lib/rss/trackback.rb index 493e742453..ae33ff8854 100644 --- a/lib/rss/trackback.rb +++ b/lib/rss/trackback.rb @@ -3,24 +3,23 @@ require 'rss/2.0' module RSS - TRACKBACK_PREFIX = 'trackback' - TRACKBACK_URI = 'http://madskills.com/public/xml/rss/module/trackback/' + TRACKBACK_PREFIX = 'trackback' + TRACKBACK_URI = 'http://madskills.com/public/xml/rss/module/trackback/' - RDF.install_ns(TRACKBACK_PREFIX, TRACKBACK_URI) - Rss.install_ns(TRACKBACK_PREFIX, TRACKBACK_URI) + RDF.install_ns(TRACKBACK_PREFIX, TRACKBACK_URI) + Rss.install_ns(TRACKBACK_PREFIX, TRACKBACK_URI) module BaseTrackBackModel - def trackback_validate(tags) - raise unless @do_validate - counter = {} - %w(ping about).each do |x| + def trackback_validate(tags) + counter = {} + %w(ping about).each do |x| counter["#{TRACKBACK_PREFIX}_#{x}"] = 0 end - tags.each do |tag| - key = "#{TRACKBACK_PREFIX}_#{tag}" - raise UnknownTagError.new(tag, TRACKBACK_URI) unless counter.has_key?(key) - counter[key] += 1 + tags.each do |tag| + key = "#{TRACKBACK_PREFIX}_#{tag}" + raise UnknownTagError.new(tag, TRACKBACK_URI) unless counter.has_key?(key) + counter[key] += 1 if tag != "about" and counter[key] > 1 raise TooMuchTagError.new(tag, tag_name) end @@ -33,8 +32,8 @@ module RSS end end - module TrackBackModel10 - extend BaseModel + module TrackBackModel10 + extend BaseModel include BaseTrackBackModel def self.append_features(klass) @@ -211,24 +210,24 @@ module RSS EOC end end + end - private - def new_with_content(klass, content) - obj = klass.new - obj.content = content - obj - end + private + def new_with_content(klass, content) + obj = klass.new + obj.content = content + obj + end - def new_with_content_if_need(klass, content) - if content.is_a?(klass) - content - else - new_with_content(klass, content) - end + def new_with_content_if_need(klass, content) + if content.is_a?(klass) + content + else + new_with_content(klass, content) end - end + class Ping < Element include RSS09 @@ -288,9 +287,9 @@ module RSS end end - class RDF - class Item; include TrackBackModel10; end - end + class RDF + class Item; include TrackBackModel10; end + end class Rss class Channel |