diff options
author | kou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-06-19 13:37:18 +0000 |
---|---|---|
committer | kou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-06-19 13:37:18 +0000 |
commit | 74a0bc896bef6dd84b93efef87c3d0e8ebadd909 (patch) | |
tree | 3532dcafb72f429b8d178cc307147f9ec131b675 /lib/rss/1.0.rb | |
parent | 0976e9e32f2b92038da4c7b11bb94bbae6284362 (diff) |
* lib/rss/rss.rb:
- provided default #to_s as RSS::Element#to_s.
- removed RSS::Element#other_element.
- RSS::Element#tag requires attributes as Hash instead of Array.
* lib/rss/0.9.rb: removed #to_s to use RSS::Element#to_s.
* lib/rss/1.0.rb: ditto.
* lib/rss/image.rb: ditto.
* lib/rss/taxonomy.rb: ditto.
* lib/rss/trackback.rb: ditto.
* lib/rss/2.0.rb: removed #other_element.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10327 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rss/1.0.rb')
-rw-r--r-- | lib/rss/1.0.rb | 126 |
1 files changed, 5 insertions, 121 deletions
diff --git a/lib/rss/1.0.rb b/lib/rss/1.0.rb index 9410fceb6a..060de8ff30 100644 --- a/lib/rss/1.0.rb +++ b/lib/rss/1.0.rb @@ -42,14 +42,13 @@ module RSS ["textinput", "?"], ].each do |tag, occurs| install_model(tag, occurs) + if occurs == "+" + install_have_children_element(tag) + else + install_have_child_element(tag) + end end - %w(channel image textinput).each do |name| - install_have_child_element(name) - end - - install_have_children_element("item") - attr_accessor :rss_version, :version, :encoding, :standalone def initialize(version=nil, encoding=nil, standalone=nil) @@ -59,20 +58,6 @@ module RSS def full_name tag_name_with_prefix(PREFIX) end - - def to_s(need_convert=true, indent='') - rv = tag(indent, ns_declarations) do |next_indent| - [ - channel_element(false, next_indent), - image_element(false, next_indent), - item_elements(false, next_indent), - textinput_element(false, next_indent), - other_element(false, next_indent), - ] - end - rv = convert(rv) if need_convert - rv - end private def children @@ -119,12 +104,6 @@ module RSS def full_name tag_name_with_prefix(PREFIX) end - - def to_s(need_convert=true, indent='') - rv = tag(indent) - rv = convert(rv) if need_convert - rv - end end class Seq < Element @@ -153,15 +132,6 @@ module RSS @li = args[0] if args[0] end end - - def to_s(need_convert=true, indent='') - tag(indent) do |next_indent| - [ - li_elements(need_convert, next_indent), - other_element(need_convert, next_indent), - ] - end - end def full_name tag_name_with_prefix(PREFIX) @@ -217,15 +187,6 @@ module RSS @li = args[0] if args[0] end end - - def to_s(need_convert=true, indent='') - tag(indent) do |next_indent| - [ - li_elements(need_convert, next_indent), - other_element(need_convert, next_indent), - ] - end - end def full_name tag_name_with_prefix(PREFIX) @@ -302,22 +263,6 @@ module RSS end end - def to_s(need_convert=true, indent='') - rv = tag(indent) do |next_indent| - [ - title_element(false, next_indent), - link_element(false, next_indent), - description_element(false, next_indent), - image_element(false, next_indent), - items_element(false, next_indent), - textinput_element(false, next_indent), - other_element(false, next_indent), - ] - end - rv = convert(rv) if need_convert - rv - end - private def children [@image, @items, @textinput] @@ -371,12 +316,6 @@ module RSS self.resource = args[0] end end - - def to_s(need_convert=true, indent='') - rv = tag(indent) - rv = convert(rv) if need_convert - rv - end end class Textinput < Element @@ -406,12 +345,6 @@ module RSS self.resource = args[0] end end - - def to_s(need_convert=true, indent='') - rv = tag(indent) - rv = convert(rv) if need_convert - rv - end end class Items < Element @@ -441,15 +374,6 @@ module RSS end self.Seq ||= Seq.new end - - def to_s(need_convert=true, indent='') - rv = tag(indent) do |next_indent| - [ - Seq_element(need_convert, next_indent), - other_element(need_convert, next_indent), - ] - end - end def resources if @Seq @@ -518,19 +442,6 @@ module RSS end end - def to_s(need_convert=true, indent='') - rv = tag(indent) do |next_indent| - [ - title_element(false, next_indent), - url_element(false, next_indent), - link_element(false, next_indent), - other_element(false, next_indent), - ] - end - rv = convert(rv) if need_convert - rv - end - private def _tags [ @@ -588,19 +499,6 @@ module RSS end end - def to_s(need_convert=true, indent='') - rv = tag(indent) do |next_indent| - [ - title_element(false, next_indent), - link_element(false, next_indent), - description_element(false, next_indent), - other_element(false, next_indent), - ] - end - rv = convert(rv) if need_convert - rv - end - private def _tags [ @@ -662,20 +560,6 @@ module RSS end end - def to_s(need_convert=true, indent='') - rv = tag(indent) do |next_indent| - [ - title_element(false, next_indent), - description_element(false, next_indent), - name_element(false, next_indent), - link_element(false, next_indent), - other_element(false, next_indent), - ] - end - rv = convert(rv) if need_convert - rv - end - private def _tags [ |