summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--lib/rss/content/1.0.rb1
-rw-r--r--lib/rss/content/2.0.rb1
-rw-r--r--lib/rss/dublincore/1.0.rb1
-rw-r--r--lib/rss/dublincore/2.0.rb1
-rw-r--r--lib/rss/dublincore/atom.rb1
-rw-r--r--test/rss/test_maker_atom_entry.rb2
7 files changed, 7 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 0812418826..8012b7f1a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 e7c0c19685..e5dc857930 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 8671b5b1a6..8491a99937 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 e193c6d2c2..efe2f5dad4 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 82ed1888c5..a79c1e84a4 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 e78df4821b..8db9066bb8 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 c9b9f89537..94e4255e9e 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