diff options
| author | kou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-16 09:12:31 +0000 |
|---|---|---|
| committer | kou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-16 09:12:31 +0000 |
| commit | 1582e33aef02c48241807425781bda62152ee06a (patch) | |
| tree | 43c3d0e9db93a60e145f9a03d71605fa5dc93356 | |
| parent | c1e91fea345d296309a8c0cf243f0e5c25201fee (diff) | |
| download | ruby-1582e33aef02c48241807425781bda62152ee06a.tar.gz ruby-1582e33aef02c48241807425781bda62152ee06a.tar.xz ruby-1582e33aef02c48241807425781bda62152ee06a.zip | |
* lib/rss/content/*, lib/rss/dublincore/*: fix circular require.
* test/test_maker_atom_feed.rb, test/test_maker_atom_entry.rb:
suppress warnings.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@23449 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/rss/content/1.0.rb | 1 | ||||
| -rw-r--r-- | lib/rss/content/2.0.rb | 1 | ||||
| -rw-r--r-- | lib/rss/dublincore/1.0.rb | 1 | ||||
| -rw-r--r-- | lib/rss/dublincore/2.0.rb | 1 | ||||
| -rw-r--r-- | lib/rss/dublincore/atom.rb | 1 | ||||
| -rw-r--r-- | test/rss/test_maker_atom_entry.rb | 2 |
7 files changed, 7 insertions, 6 deletions
@@ -1,3 +1,9 @@ +Sat May 16 18:12:39 2009 Kouhei Sutou <kou@cozmixng.org> + + * lib/rss/content/*, lib/rss/dublincore/*: fix circular require. + * test/test_maker_atom_feed.rb, + test/test_maker_atom_entry.rb: suppress warnings. + Sat May 16 18:07:17 2009 Kouhei Sutou <kou@cozmixng.org> * lib/rss/maker/feed.rb, test/test_maker_atom_feed.rb: diff --git a/lib/rss/content/1.0.rb b/lib/rss/content/1.0.rb index e7c0c1968..e5dc85793 100644 --- a/lib/rss/content/1.0.rb +++ b/lib/rss/content/1.0.rb @@ -1,5 +1,4 @@ require 'rss/1.0' -require 'rss/content' module RSS RDF.install_ns(CONTENT_PREFIX, CONTENT_URI) diff --git a/lib/rss/content/2.0.rb b/lib/rss/content/2.0.rb index 8671b5b1a..8491a9993 100644 --- a/lib/rss/content/2.0.rb +++ b/lib/rss/content/2.0.rb @@ -1,5 +1,4 @@ require "rss/2.0" -require "rss/content" module RSS Rss.install_ns(CONTENT_PREFIX, CONTENT_URI) diff --git a/lib/rss/dublincore/1.0.rb b/lib/rss/dublincore/1.0.rb index e193c6d2c..efe2f5dad 100644 --- a/lib/rss/dublincore/1.0.rb +++ b/lib/rss/dublincore/1.0.rb @@ -1,5 +1,4 @@ require "rss/1.0" -require "rss/dublincore" module RSS RDF.install_ns(DC_PREFIX, DC_URI) diff --git a/lib/rss/dublincore/2.0.rb b/lib/rss/dublincore/2.0.rb index 82ed1888c..a79c1e84a 100644 --- a/lib/rss/dublincore/2.0.rb +++ b/lib/rss/dublincore/2.0.rb @@ -1,5 +1,4 @@ require "rss/2.0" -require "rss/dublincore" module RSS Rss.install_ns(DC_PREFIX, DC_URI) diff --git a/lib/rss/dublincore/atom.rb b/lib/rss/dublincore/atom.rb index e78df4821..8db9066bb 100644 --- a/lib/rss/dublincore/atom.rb +++ b/lib/rss/dublincore/atom.rb @@ -1,5 +1,4 @@ require "rss/atom" -require "rss/dublincore" module RSS module Atom diff --git a/test/rss/test_maker_atom_entry.rb b/test/rss/test_maker_atom_entry.rb index c9b9f8953..94e4255e9 100644 --- a/test/rss/test_maker_atom_entry.rb +++ b/test/rss/test_maker_atom_entry.rb @@ -381,7 +381,7 @@ module RSS end end assert_equal(date, feed.items[0].updated.content) - assert_equal([date], feed.items[0].dc_dates.collect {|date| date.value}) + assert_equal([date], feed.items[0].dc_dates.collect {|_date| _date.value}) end end end |