diff options
author | kou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-28 04:23:09 +0000 |
---|---|---|
committer | kou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-28 04:23:09 +0000 |
commit | 1f84e89cf45158c2ddca44b7823bbcadbca9d732 (patch) | |
tree | 74322fcc1cc7d03a01f24da5882c08ba02f6785d | |
parent | a3035403104c322b9326739bcc9c7ef7e3b45bcf (diff) |
* lib/rss/rss.rb, test/rss/test_version.rb, NEWS: 0.2.2 -> 0.2.3.
* lib/rss/parser.rb, test/rss/test_parser.rb: supported "-" in tag name.
Reported by Ray Chen. Thanks.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@14753 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | NEWS | 2 | ||||
-rw-r--r-- | lib/rss/parser.rb | 30 | ||||
-rw-r--r-- | lib/rss/rss.rb | 2 | ||||
-rw-r--r-- | test/rss/test_parser.rb | 12 | ||||
-rw-r--r-- | test/rss/test_version.rb | 2 |
6 files changed, 38 insertions, 17 deletions
@@ -1,3 +1,10 @@ +Fri Dec 28 13:21:32 2007 Kouhei Sutou <kou@cozmixng.org> + + * lib/rss/rss.rb, test/rss/test_version.rb, NEWS: 0.2.2 -> 0.2.3. + + * lib/rss/parser.rb, test/rss/test_parser.rb: supported "-" in tag name. + Reported by Ray Chen. Thanks. + Thu Dec 27 23:56:01 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> * mkconfig.rb: should not use the libraries under the source directory @@ -85,7 +85,7 @@ with all sufficient information, see the ChangeLog file. * rss - * 0.1.6 -> 0.2.2 + * 0.1.6 -> 0.2.3 * Fix image module URI diff --git a/lib/rss/parser.rb b/lib/rss/parser.rb index 0c76d8fdff..9e4919223c 100644 --- a/lib/rss/parser.rb +++ b/lib/rss/parser.rb @@ -194,11 +194,7 @@ module RSS # return the tag_names for setters associated with uri def available_tags(uri) - begin - @@accessor_bases[uri].keys - rescue NameError - [] - end + (@@accessor_bases[uri] || {}).keys end # register uri against this name. @@ -221,11 +217,13 @@ module RSS # retrieve class_name for the supplied uri and tag_name # If it doesn't exist, capitalize the tag_name def class_name(uri, tag_name) - begin - @@class_names[uri][tag_name] - rescue NameError - tag_name[0,1].upcase + tag_name[1..-1] + name = (@@class_names[uri] || {})[tag_name] + return name if name + + tag_name = tag_name.gsub(/[_\-]([a-z]?)/) do + $1.upcase end + tag_name[0, 1].upcase + tag_name[1..-1] end def install_get_text_element(uri, name, accessor_base) @@ -448,12 +446,14 @@ module RSS end def start_have_something_element(tag_name, prefix, attrs, ns, klass) - check_ns(tag_name, prefix, ns, klass.required_uri) + attributes = collect_attributes(tag_name, prefix, attrs, ns, klass) + @proc_stack.push(setup_next_element(tag_name, klass, attributes)) + end + def collect_attributes(tag_name, prefix, attrs, ns, klass) attributes = {} klass.get_attributes.each do |a_name, a_uri, required, element_name| - if a_uri.is_a?(String) or !a_uri.respond_to?(:include?) a_uri = [a_uri] end @@ -482,14 +482,18 @@ module RSS attributes[a_name] = val end + attributes + end + def setup_next_element(tag_name, klass, attributes) previous = @last_element next_element = klass.new(@do_validate, attributes) previous.set_next_element(tag_name, next_element) @last_element = next_element @last_element.parent = previous if klass.need_parent? @xml_child_mode = @last_element.have_xml_content? - pr = Proc.new do |text, tags| + + Proc.new do |text, tags| p(@last_element.class) if DEBUG if @xml_child_mode @last_element.content = @xml_element.to_s @@ -510,9 +514,7 @@ module RSS end @last_element = previous end - @proc_stack.push(pr) end - end unless const_defined? :AVAILABLE_PARSER_LIBRARIES diff --git a/lib/rss/rss.rb b/lib/rss/rss.rb index 2fe7ca9fb7..04dfdf8052 100644 --- a/lib/rss/rss.rb +++ b/lib/rss/rss.rb @@ -52,7 +52,7 @@ require "rss/xml-stylesheet" module RSS - VERSION = "0.2.2" + VERSION = "0.2.3" URI = "http://purl.org/rss/1.0/" diff --git a/test/rss/test_parser.rb b/test/rss/test_parser.rb index 59458ef51b..2e8c9be4d3 100644 --- a/test/rss/test_parser.rb +++ b/test/rss/test_parser.rb @@ -46,5 +46,17 @@ EOR assert_nil(RSS::Parser.parse(garbage_rss_file)) end end + + def test_parse_tag_includes_hyphen + assert_nothing_raised do + RSS::Parser.parse(make_RDF(<<-EOR)) +<xCal:x-calconnect-venue xmlns:xCal="urn:ietf:params:xml:ns:xcal" /> +#{make_channel} +#{make_item} +#{make_textinput} +#{make_image} +EOR + end + end end end diff --git a/test/rss/test_version.rb b/test/rss/test_version.rb index a602caf103..8f6771a4f3 100644 --- a/test/rss/test_version.rb +++ b/test/rss/test_version.rb @@ -3,7 +3,7 @@ require "rss-testcase" module RSS class TestVersion < TestCase def test_version - assert_equal("0.2.2", ::RSS::VERSION) + assert_equal("0.2.3", ::RSS::VERSION) end end end |