0
@@ -16,10 +16,13 @@ module Rakismet
0
         [:comment_type, :author, :author_url, :author_email, :content].each do |field|
0
            # clunky, but throwing around +type+ will break your heart
0
            fieldname = field.to_s =~ %r(^comment_) ? field : "comment_#{field}".intern
0
-           self.akismet_attrs[fieldname] = args[field] || field
0
+           self.akismet_attrs[fieldname] = args.delete(field) || field
0
         end
0
         [:user_ip, :user_agent, :referrer].each do |field|
0
-          self.akismet_attrs[field] = (args[field] || field) if args.has_key?(field) or self.public_instance_methods.include?(field.to_s)
0
+          self.akismet_attrs[field] = (args.delete(field) || field) if args.has_key?(field) or self.public_instance_methods.include?(field.to_s)
0
+        end
0
+        args.each_pair do |f,v|
0
+          self.akismet_attrs[f] = v
0
         end
0
       end
0
     end

0
@@ -23,7 +23,7 @@ describe AkismetModel do
0
   mapped_params = { :comment_type => :type2, :author => :author2, :content => :content2,
0
                     :author_email => :author_email2, :author_url => :author_url2 }
0
     
0
-  describe override = AkismetModel.subclass('Override') { has_rakismet(mapped_params) } do
0
+  describe override = AkismetModel.subclass('Override') { has_rakismet(mapped_params.dup) } do
0
     it "should override default mappings" do
0
       [:comment_type, :author, :author_url, :author_email, :content].each do |field|
0
         fieldname = field.to_s =~ %r(^comment_) ? field : "comment_#{field}".intern
0
@@ -43,7 +43,7 @@ describe AkismetModel do
0
   extended_params = { :user_ip => :stored_ip, :user_agent => :stored_agent,
0
                       :referrer => :stored_referrer }
0
                       
0
-  describe extended = AkismetModel.subclass('Extended') { has_rakismet(extended_params) } do
0
+  describe extended = AkismetModel.subclass('Extended') { has_rakismet(extended_params.dup) } do
0
     
0
     before do
0
       @extended = extended.new
0
@@ -96,6 +96,16 @@ describe AkismetModel do
0
     end
0
   end
0
 
0
+  extra_params = { :extra => :extra, :another => lambda { } }
0
+
0
+  describe extra = AkismetModel.subclass('ExtraParams') { has_rakismet(extra_params.dup) } do
0
+    it "should map additional attributes" do
0
+      [:extra, :another].each do |field|
0
+        extra.akismet_attrs[field].should eql(extra_params[field])
0
+      end
0
+    end
0
+  end
0
+
0
   describe ".spam?" do
0
     
0
     before do