@@ -19,7 +19,7 @@ module Rakismet self.akismet_attrs[fieldname] = args.delete(field) || field end [:user_ip, :user_agent, :referrer].each do |field| - self.akismet_attrs[field] = (args.delete(field) || field) if args.has_key?(field) or self.public_instance_methods.include?(field.to_s) + self.akismet_attrs[field] = args.delete(field) end args.each_pair do |f,v| self.akismet_attrs[f] = v @@ -56,12 +56,14 @@ module Rakismet self.class.akismet_attrs.keys.inject({}) do |data,attr| data.merge attr => if self.class.akismet_attrs[attr].is_a?(Proc) instance_eval(&self.class.akismet_attrs[attr]) - elsif respond_to?(self.class.akismet_attrs[attr]) + elsif !self.class.akismet_attrs[attr].nil? && respond_to?(self.class.akismet_attrs[attr]) send(self.class.akismet_attrs[attr]) - else + elsif !self.class.akismet_attrs[attr].nil? self.class.akismet_attrs[attr] + elsif respond_to?(attr) + send(attr) end - end + end.delete_if { |k,v| v.blank? } end end lib/rakismet/model_extensions.rb @@ -26,6 +26,12 @@ describe AkismetModel do end end + it "should have nil placeholders for optional binding variables" do + [:user_ip, :user_agent, :referrer].each do |field| + AkismetModel.akismet_attrs.should have_key(field) + end + end + mapped_params = { :comment_type => :type2, :author => :author2, :content => :content2, :author_email => :author_email2, :author_url => :author_url2 } @@ -37,18 +43,10 @@ describe AkismetModel do end end end - - describe implicit = AkismetModel.subclass('Implicit') { attr_accessor(:user_ip, :user_agent, :referrer); has_rakismet } do - it "should map optional fields if they are present in the model" do - [:user_ip, :user_agent, :referrer].each do |field| - implicit.akismet_attrs[field].should eql(field) - end - end - end - + extended_params = { :user_ip => :stored_ip, :user_agent => :stored_agent, :referrer => :stored_referrer } - + describe extended = AkismetModel.subclass('Extended') { has_rakismet(extended_params.dup) } do before do spec/models/model_extension_spec.rb 2138021cccd074a8e0eb1da86a2d5894700e8fe4 Josh French josh@digitalpulp.com http://github.com/jfrench/rakismet/commit/b2d7ac4e49707523c1a8f36b9d6835ed75fd3dc2 b2d7ac4e49707523c1a8f36b9d6835ed75fd3dc2 2009-11-05T14:03:56-08:00 2009-11-05T14:03:56-08:00 Allow custom attributes to fall through to instance methods *or* attributes e87e7ddaedc7fff77cb03f750a65c3ec686127a7 Josh French josh@digitalpulp.com