1 files changed, 14 insertions, 52 deletions

diff --git a/lib/rss/1.0.rb b/lib/rss/1.0.rb
index 4438c40d33..9410fceb6a 100644
--- a/lib/rss/1.0.rb
+++ b/lib/rss/1.0.rb
@@ -125,13 +125,6 @@ module RSS
         rv = convert(rv) if need_convert
         rv
       end
-
-      private
-      def _attrs
-        [
-          ["resource", true]
-        ]
-      end
     end
 
     class Seq < Element
@@ -277,7 +270,8 @@ module RSS
       [
         ["about", URI, true]
       ].each do |name, uri, required|
-        install_get_attribute(name, uri, required)
+        install_get_attribute(name, uri, required, nil, nil,
+                              "#{PREFIX}:#{name}")
       end
 
       %w(title link description).each do |name|
@@ -342,12 +336,6 @@ module RSS
         end
       end
 
-      def _attrs
-        [
-          ["#{PREFIX}:about", true, "about"]
-        ]
-      end
-      
       def maker_target(maker)
         maker.channel
       end
@@ -371,7 +359,8 @@ module RSS
         [
           ["resource", URI, true]
         ].each do |name, uri, required|
-          install_get_attribute(name, uri, required)
+          install_get_attribute(name, uri, required, nil, nil,
+                                "#{PREFIX}:#{name}")
         end
       
         def initialize(*args)
@@ -388,13 +377,6 @@ module RSS
           rv = convert(rv) if need_convert
           rv
         end
-
-        private
-        def _attrs
-          [
-            ["#{PREFIX}:resource", true, "resource"]
-          ]
-        end
       end
 
       class Textinput < Element
@@ -412,7 +394,8 @@ module RSS
         [
           ["resource", URI, true]
         ].each do |name, uri, required|
-          install_get_attribute(name, uri, required)
+          install_get_attribute(name, uri, required, nil, nil,
+                                "#{PREFIX}:#{name}")
         end
       
         def initialize(*args)
@@ -429,13 +412,6 @@ module RSS
           rv = convert(rv) if need_convert
           rv
         end
-        
-        private
-        def _attrs
-          [
-            ["#{PREFIX}:resource", true, "resource"]
-          ]
-        end
       end
       
       class Items < Element
@@ -513,11 +489,12 @@ module RSS
         end
 
       end
-      
+
       [
         ["about", URI, true]
       ].each do |name, uri, required|
-        install_get_attribute(name, uri, required)
+        install_get_attribute(name, uri, required, nil, nil,
+                              "#{PREFIX}:#{name}")
       end
 
       %w(title url link).each do |name|
@@ -565,12 +542,6 @@ module RSS
         end
       end
 
-      def _attrs
-        [
-          ["#{PREFIX}:about", true, "about"]
-        ]
-      end
-
       def maker_target(maker)
         maker.image
       end
@@ -588,10 +559,12 @@ module RSS
         
       end
 
+
       [
         ["about", URI, true]
       ].each do |name, uri, required|
-        install_get_attribute(name, uri, required)
+        install_get_attribute(name, uri, required, nil, nil,
+                              "#{PREFIX}:#{name}")
       end
 
       %w(title link description).each do |name|
@@ -639,12 +612,6 @@ module RSS
         end
       end
 
-      def _attrs
-        [
-          ["#{PREFIX}:about", true, "about"]
-        ]
-      end
-
       def maker_target(items)
         if items.respond_to?("items")
           # For backward compatibility
@@ -669,7 +636,8 @@ module RSS
       [
         ["about", URI, true]
       ].each do |name, uri, required|
-        install_get_attribute(name, uri, required)
+        install_get_attribute(name, uri, required, nil, nil,
+                              "#{PREFIX}:#{name}")
       end
 
       %w(title description name link).each do |name|
@@ -719,12 +687,6 @@ module RSS
           __send__(name).nil?
         end
       end
-      
-      def _attrs
-        [
-          ["#{PREFIX}:about", true, "about"]
-        ]
-      end
 
       def maker_target(maker)
         maker.textinput