* 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/trunk@6585 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

ChangeLog

@@ -1,3 +1,10 @@
+Mon Jul  5 23:56:42 2004  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/{trackback,syndication,dublincore,content}.rb: worked
+	  with ruby 1.6 again.
+
+	* test/rss/rss-assertions.rb: ditto.
+
 Mon Jul  5 22:54:39 2004  Tanaka Akira  <akr@m17n.org>
 
 	* lib/uri/common.rb (Kernel#URI): new global method for parsing URIs.

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

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|

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

lib/rss/trackback.rb

@@ -11,7 +11,6 @@ module RSS
 
 	module BaseTrackBackModel
 		def trackback_validate(tags)
-			raise unless @do_validate
 			counter = {}
 			%w(ping about).each do |x|
 				counter["#{TRACKBACK_PREFIX}_#{x}"] = 0
@@ -211,6 +210,7 @@ module RSS
 					EOC
 				end
 			end
+		end
 
 		private
 		def new_with_content(klass, content)
@@ -227,7 +227,6 @@ module RSS
 			end
 		end
 
-		end
 
 		class Ping < Element
 			include RSS09

test/rss/rss-assertions.rb

@@ -1,4 +1,16 @@
 # -*- tab-width: 2 -*- vim: ts=2
+module Test
+	module Unit
+		module Assertions
+			# For backward compatibility
+			unless instance_methods.include?("assert_raise")
+				def assert_raise(*args, &block)
+					assert_raises(*args, &block)
+				end
+			end
+		end
+	end
+end
 
 module RSS
 	module Assertions