ruby-changes:2592
From: ko1@a...
Date: 2 Dec 2007 15:51:18 +0900
Subject: [ruby-changes:2592] kou - Ruby:r14083 (ruby_1_8): * lib/rss/rss.rb, test/rss/test_version.rb, NEWS: 0.2.1 -> 0.2.2.
kou 2007-12-02 15:51:07 +0900 (Sun, 02 Dec 2007)
New Revision: 14083
Modified files:
branches/ruby_1_8/ChangeLog
branches/ruby_1_8/NEWS
branches/ruby_1_8/lib/rss/maker/itunes.rb
branches/ruby_1_8/lib/rss/maker/taxonomy.rb
branches/ruby_1_8/lib/rss/parser.rb
branches/ruby_1_8/lib/rss/rss.rb
branches/ruby_1_8/test/rss/test_itunes.rb
branches/ruby_1_8/test/rss/test_version.rb
branches/ruby_1_8/version.h
Log:
* lib/rss/rss.rb, test/rss/test_version.rb, NEWS: 0.2.1 -> 0.2.2.
* lib/rss/maker/itunes.rb: fixed new_itunes_category.
* lib/rss/maker/taxonomy.rb: new_taxo_topic -> new_topic because
of consistency.
* test/rss/test_maker_itunes.rb, test/rss/test_itunes.rb: removed
needless UTF-8 characters.
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/lib/rss/parser.rb?r1=14083&r2=14082
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=14083&r2=14082
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/test/rss/test_itunes.rb?r1=14083&r2=14082
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/test/rss/test_version.rb?r1=14083&r2=14082
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/version.h?r1=14083&r2=14082
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/lib/rss/rss.rb?r1=14083&r2=14082
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/lib/rss/maker/itunes.rb?r1=14083&r2=14082
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/NEWS?r1=14083&r2=14082
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/lib/rss/maker/taxonomy.rb?r1=14083&r2=14082
Index: ruby_1_8/NEWS
===================================================================
--- ruby_1_8/NEWS (revision 14082)
+++ ruby_1_8/NEWS (revision 14083)
@@ -82,7 +82,7 @@
* rss
- * 0.1.6 -> 0.2.1
+ * 0.1.6 -> 0.2.2
* Fix image module URI
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog (revision 14082)
+++ ruby_1_8/ChangeLog (revision 14083)
@@ -1,7 +1,18 @@
-Wed Dec 2 01:12:15 2007 James Edward Gray II <jeg2@r...>
+Sun Dec 2 15:49:20 2007 Kouhei Sutou <kou@c...>
+ * lib/rss/rss.rb, test/rss/test_version.rb, NEWS: 0.2.1 -> 0.2.2.
+
+ * lib/rss/maker/itunes.rb: fixed new_itunes_category.
+ * lib/rss/maker/taxonomy.rb: new_taxo_topic -> new_topic because
+ of consistency.
+
+ * test/rss/test_maker_itunes.rb, test/rss/test_itunes.rb: removed
+ needless UTF-8 characters.
+
+Sun Dec 2 01:12:15 2007 James Edward Gray II <jeg2@r...>
+
Merged 14070 from trunk.
-
+
* lib/xmlrpc/server.rb (XMLRPC::Server#server): Improve signal handling so
pressing control-c in the controlling terminal or sending SIGTERM stops
the XML-RPC server.
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h (revision 14082)
+++ ruby_1_8/version.h (revision 14083)
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2007-12-01"
+#define RUBY_RELEASE_DATE "2007-12-02"
#define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20071201
+#define RUBY_RELEASE_CODE 20071202
#define RUBY_PATCHLEVEL 5000
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 6
#define RUBY_RELEASE_YEAR 2007
#define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 1
+#define RUBY_RELEASE_DAY 2
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8/lib/rss/parser.rb
===================================================================
--- ruby_1_8/lib/rss/parser.rb (revision 14082)
+++ ruby_1_8/lib/rss/parser.rb (revision 14083)
@@ -391,8 +391,9 @@
def start_else_element(local, prefix, attrs, ns)
class_name = self.class.class_name(_ns(ns, prefix), local)
current_class = @last_element.class
- if current_class.const_defined?(class_name) or
- current_class.constants.include?(class_name)
+ if class_name and
+ (current_class.const_defined?(class_name) or
+ current_class.constants.include?(class_name))
next_class = current_class.const_get(class_name)
start_have_something_element(local, prefix, attrs, ns, next_class)
else
Index: ruby_1_8/lib/rss/maker/taxonomy.rb
===================================================================
--- ruby_1_8/lib/rss/maker/taxonomy.rb (revision 14082)
+++ ruby_1_8/lib/rss/maker/taxonomy.rb (revision 14083)
@@ -66,7 +66,8 @@
end
class TaxonomyTopicsBase < Base
- def_array_element("taxo_topic", nil, "TaxonomyTopic")
+ def_array_element("topic", nil, "TaxonomyTopic")
+ alias_method(:new_taxo_topic, :new_topic) # For backward compatibility
class TaxonomyTopicBase < Base
include DublinCoreModel
Index: ruby_1_8/lib/rss/maker/itunes.rb
===================================================================
--- ruby_1_8/lib/rss/maker/itunes.rb (revision 14082)
+++ ruby_1_8/lib/rss/maker/itunes.rb (revision 14083)
@@ -27,7 +27,7 @@
full_plural_name = "#{RSS::ITUNES_PREFIX}_#{plural_name}"
klass_name = "ITunes#{Utils.to_class_name(name)}"
plural_klass_name = "ITunes#{Utils.to_class_name(plural_name)}"
- def_elements_class_accessor(klass, full_name, full_plural_name,
+ def_elements_class_accessor(klass, name, full_name, full_plural_name,
klass_name, plural_klass_name,
recommended_attribute_name)
end
@@ -55,7 +55,7 @@
klass.def_csv_element(full_name)
end
- def def_elements_class_accessor(klass, full_name, full_plural_name,
+ def def_elements_class_accessor(klass, name, full_name, full_plural_name,
klass_name, plural_klass_name,
recommended_attribute_name=nil)
if recommended_attribute_name
@@ -66,7 +66,7 @@
end
klass.module_eval(<<-EOC, __FILE__, __LINE__ + 1)
def new_#{full_name}(text=nil)
- #{full_name} = @#{full_plural_name}.new_#{full_name}
+ #{full_name} = @#{full_plural_name}.new_#{name}
#{full_name}.text = text
if block_given?
yield #{full_name}
Index: ruby_1_8/lib/rss/rss.rb
===================================================================
--- ruby_1_8/lib/rss/rss.rb (revision 14082)
+++ ruby_1_8/lib/rss/rss.rb (revision 14083)
@@ -52,7 +52,7 @@
module RSS
- VERSION = "0.2.1"
+ VERSION = "0.2.2"
URI = "http://purl.org/rss/1.0/"
Index: ruby_1_8/test/rss/test_itunes.rb
===================================================================
--- ruby_1_8/test/rss/test_itunes.rb (revision 14082)
+++ ruby_1_8/test/rss/test_itunes.rb (revision 14083)
@@ -338,7 +338,7 @@
"of your answers here.",
readers, &rss20_maker)
_assert_itunes_summary("This week we talk about surviving in a " +
- "Red state if youe a Blue person. Or " +
+ "Red state if you're a Blue person. Or " +
"vice versa.",
readers, &rss20_maker)
end
Index: ruby_1_8/test/rss/test_version.rb
===================================================================
--- ruby_1_8/test/rss/test_version.rb (revision 14082)
+++ ruby_1_8/test/rss/test_version.rb (revision 14083)
@@ -3,7 +3,7 @@
module RSS
class TestVersion < TestCase
def test_version
- assert_equal("0.2.1", ::RSS::VERSION)
+ assert_equal("0.2.2", ::RSS::VERSION)
end
end
end
--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml