aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--lib/rss/dublincore.rb5
-rw-r--r--lib/rss/maker/dublincore.rb5
-rw-r--r--test/rss/test_maker_dc.rb9
-rw-r--r--version.h6
5 files changed, 26 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index e1154b81a4..e4bb496e26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Feb 12 11:48:52 2007 Kouhei Sutou <kou@cozmixng.org>
+
+ * lib/rss/dublincore.rb, lib/rss/maker/dublincore.rb: dc_rightses
+ -> dc_rights_list. dc_rightses still exists for backward
+ compatibility. [ruby-core:8350]
+ * test/rss/test_maker_dc.rb: added tests for dc_rights_list.
+
Sun Feb 11 22:40:17 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole/win32ole.c (ole_ptrtype2val): ole_type, ole_type_detail
diff --git a/lib/rss/dublincore.rb b/lib/rss/dublincore.rb
index af64d19183..79d2ca561c 100644
--- a/lib/rss/dublincore.rb
+++ b/lib/rss/dublincore.rb
@@ -38,6 +38,9 @@ module RSS
klass.module_eval(<<-EOC, *get_file_and_line_from_caller(0))
alias date #{DC_PREFIX}_date
alias date= #{DC_PREFIX}_date=
+
+ # For backward compatibility
+ alias #{DC_PREFIX}_rightses #{DC_PREFIX}_rights_list
EOC
end
end
@@ -61,7 +64,7 @@ module RSS
"language" => nil,
"relation" => nil,
"coverage" => nil,
- "rights" => "rightses" # FIXME
+ "rights" => "rights_list"
}
DATE_ELEMENTS = {
diff --git a/lib/rss/maker/dublincore.rb b/lib/rss/maker/dublincore.rb
index e038378329..b208d5fcb2 100644
--- a/lib/rss/maker/dublincore.rb
+++ b/lib/rss/maker/dublincore.rb
@@ -38,6 +38,11 @@ module RSS
end
EOC
end
+
+ klass.module_eval(<<-EOC, __FILE__, __LINE__ + 1)
+ # For backward compatibility
+ alias #{DC_PREFIX}_rightses #{DC_PREFIX}_rights_list
+EOC
end
::RSS::DublinCoreModel::ELEMENT_NAME_INFOS.each do |name, plural_name|
diff --git a/test/rss/test_maker_dc.rb b/test/rss/test_maker_dc.rb
index 9f568ed441..37a7f2bb1d 100644
--- a/test/rss/test_maker_dc.rb
+++ b/test/rss/test_maker_dc.rb
@@ -57,9 +57,14 @@ module RSS
end
def test_rss10_multiple
+ assert_multiple_dublin_core_rss10("_list")
+ assert_multiple_dublin_core_rss10("es")
+ end
+
+ def assert_multiple_dublin_core_rss10(multiple_rights_suffix)
elems = []
@elements.each do |name, value|
- plural = name.to_s + (name == :rights ? "es" : "s")
+ plural = name.to_s + (name == :rights ? multiple_rights_suffix : "s")
values = [value]
if name == :date
values << value + 60
@@ -68,7 +73,7 @@ module RSS
end
elems << [name, values, plural]
end
-
+
rss = RSS::Maker.make("1.0") do |maker|
setup_dummy_channel(maker)
set_multiple_elements(maker.channel, elems)
diff --git a/version.h b/version.h
index 286c176a27..8e08136857 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2007-02-11"
+#define RUBY_RELEASE_DATE "2007-02-12"
#define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20070211
+#define RUBY_RELEASE_CODE 20070212
#define RUBY_PATCHLEVEL 0
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_YEAR 2007
#define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 11
+#define RUBY_RELEASE_DAY 12
RUBY_EXTERN const char ruby_version[];
RUBY_EXTERN const char ruby_release_date[];