rakismet 0.4.0 → 0.4.1

data/CHANGELOG

@@ -1,3 +1,7 @@
+= 0.4.0
+* Rakismet is no longer injected into ActiveRecord or ActionController
+* API changes to support newly decoupled modules
+* Use Jeweler to manage gemspec
 = 0.3.6
 * Allow attributes to fall through to methods or AR attributes
 = 0.3.5

data/README.md

@@ -72,8 +72,8 @@ however. If yours differ, just tell Rakismet what to call them:
     class Comment
       include Rakismet::Model
       attr_accessor :commenter_name, :commenter_email
-      rakismet_attributes :author => :commenter_name,
-                          :author_email => :commenter_email
+      rakismet_attrs :author => :commenter_name,
+                     :author_email => :commenter_email
     end
 
 Or you can pass in a proc, to access associations:
@@ -81,8 +81,8 @@ Or you can pass in a proc, to access associations:
     class Comment < ActiveRecord::Base
       include Rakismet::Model
       belongs_to :author
-      rakismet_attributes :author => proc { author.name },
-                          :author_email => proc { author.email }
+      rakismet_attrs :author => proc { author.name },
+                     :author_email => proc { author.email }
     end
 
 Rakismet::Controller

data/VERSION.yml

@@ -1,4 +1,5 @@
----
-:major: 0
+--- 
 :minor: 4
-:patch: 0
+:build: 
+:patch: 1
+:major: 0

data/lib/rakismet.rb

@@ -2,6 +2,10 @@ require 'net/http'
 require 'uri'
 require 'yaml'
 
+require 'rakismet/model'
+require 'rakismet/filter'
+require 'rakismet/controller'
+
 module Rakismet
   def self.version
     @version ||= begin
@@ -11,7 +15,7 @@ module Rakismet
   end
 
   class Base
-    cattr_accessor :valid_key, :rakismet_binding
+    cattr_accessor :valid_key, :current_request
     
     class << self
       def validate_key
@@ -58,7 +62,6 @@ module Rakismet
   end
   
   Undefined = Class.new(NameError)
-  NoBinding = Class.new(NameError)
   
   HEADERS = {
     'User-Agent' => "Rails/#{Rails::VERSION::STRING} | Rakismet/#{Rakismet.version}",

data/lib/rakismet/controller.rb

@@ -4,22 +4,15 @@ module Rakismet
     def self.included(base)
       base.class_eval do
         extend ClassMethods
-        around_filter :rakismet
+        around_filter Rakismet::Filter
       end
     end
-    
-    def rakismet(&block)
-      Rakismet::Base.rakismet_binding = binding
-      yield
-      Rakismet::Base.rakismet_binding = nil
-    end
-    private :rakismet
 
     module ClassMethods
       def rakismet_filter(opts={})
-        skip_filter :rakismet # in case we're inheriting from another Rakismeted controller
+        skip_filter Rakismet::Filter # in case we're inheriting/overriding an existing Rakismet filter
         opts.assert_valid_keys(:only, :except)
-        self.around_filter :rakismet, opts
+        self.around_filter Rakismet::Filter, opts
       end
     end
     

data/lib/rakismet/filter.rb

@@ -0,0 +1,10 @@
+class Rakismet::Filter
+  def self.filter(controller)
+    begin
+      Rakismet::Base.current_request = controller.request
+      yield
+    ensure
+      Rakismet::Base.current_request = nil
+    end
+  end
+end

data/lib/rakismet/model.rb

@@ -30,25 +30,31 @@ module Rakismet
     
     module InstanceMethods
       def spam?
-        data = akismet_data
+        if instance_variable_defined? :@_spam
+          @_spam
+        else
+          data = akismet_data
 
-        unless Rakismet::Base.rakismet_binding.nil?
-          { :referrer => 'request.referer', :user_ip => 'request.remote_ip',
-            :user_agent => 'request.user_agent' }.each_pair do |k,v|
-              data[k] = eval(v, Rakismet::Base.rakismet_binding) || ''
+          unless Rakismet::Base.current_request.nil?
+            { :referrer => :referer, :user_ip => :remote_ip,
+              :user_agent => :user_agent }.each_pair do |k,v|
+                data[k] = Rakismet::Base.current_request.send(v) || ''
+            end
           end
-        end
 
-        self.akismet_response = Rakismet::Base.akismet_call('comment-check', data)
-        self.akismet_response == 'true'
+          self.akismet_response = Rakismet::Base.akismet_call('comment-check', data)
+          @_spam = self.akismet_response == 'true'
+        end
       end
 
       def spam!
         Rakismet::Base.akismet_call('submit-spam', akismet_data)
+        @_spam = true
       end
 
       def ham!
         Rakismet::Base.akismet_call('submit-ham', akismet_data)
+        @_spam = false
       end
 
       private

data/spec/controllers/rakismet_controller_spec.rb

@@ -11,31 +11,20 @@ class StubController < ActionController::Base
 end
 
 describe StubController do
-
-  it "should set Rakismet::Base.rakismet_binding" do
-    Rakismet::Base.should_receive(:rakismet_binding=).twice
-    get :one
-  end
-
-  it "should return Rakismet::Base.rakismet_binding to nil after request" do
-    get :one
-    Rakismet::Base.rakismet_binding.should be_nil
-  end
-
   it "should add around_filter" do
-    StubController.filter_chain.map(&:class).should include(ActionController::Filters::AroundFilter)
+    StubController.filter_chain.map(&:method).should include(Rakismet::Filter)
   end
 end
 
 describe StubController.subclass('OnlyActions') { rakismet_filter(:only => :one) } do
 
   it "should add around filter to specified actions" do
-    Rakismet::Base.should_receive(:rakismet_binding=).twice
+    Rakismet::Base.should_receive(:current_request=).twice
     get :one
   end
 
   it "should not add around filter to unspecified actions" do
-    Rakismet::Base.should_not_receive(:rakismet_binding=)
+    Rakismet::Base.should_not_receive(:current_request=)
     get :two
   end
 end
@@ -43,12 +32,12 @@ end
 describe StubController.subclass('ExceptActions') { rakismet_filter(:except => :one) } do
 
   it "should not add around filter to specified actions" do
-    Rakismet::Base.should_not_receive(:rakismet_binding=)
+    Rakismet::Base.should_not_receive(:current_request=)
     get :one
   end
   
   it "should add around filter to other actions" do
-    Rakismet::Base.should_receive(:rakismet_binding=).twice
+    Rakismet::Base.should_receive(:current_request=).twice
     get :two
   end
 end

data/spec/models/base_spec.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Rakismet::Base do
 
-  before do
+  before :all do
     load File.join(RAILS_ROOT, 'config', 'initializers', 'rakismet.rb')
   end
 

data/spec/models/rakismet_filter_spec.rb

@@ -0,0 +1,24 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+Rakismet::TestingError = Class.new(StandardError)
+
+describe Rakismet::Base do
+  before do
+    @request = mock('request')
+    @controller = mock('controller', :request => @request)
+  end
+
+  it "should set Rakismet::Base.current_request" do
+    Rakismet::Base.should_receive(:current_request=).with(@request).ordered
+    Rakismet::Base.should_receive(:current_request=).with(nil).ordered
+    Rakismet::Filter.filter(@controller, &lambda{})
+  end
+
+  it "should not retain the request object in case of error" do
+    begin
+      Rakismet::Filter.filter(@controller, &lambda{ raise Rakismet::TestingError })
+    rescue Rakismet::TestingError
+      Rakismet::Base.current_request.should be_nil
+    end
+  end
+end

data/spec/models/rakismet_model_spec.rb

@@ -11,7 +11,7 @@ class StoredParams
 end
 
 describe AkismetModel do
-  
+
   before do
     @model = AkismetModel.new
     comment_attrs.each_pair { |k,v| @model.stub!(k).and_return(v) }
@@ -125,7 +125,7 @@ describe AkismetModel do
   describe ".spam?" do
     
     before do
-      Rakismet::Base.rakismet_binding = request_binding
+      Rakismet::Base.current_request = request
     end
     
     it "should eval request variables in context of Base.rakismet_binding" do
@@ -136,6 +136,12 @@ describe AkismetModel do
       @model.spam?
     end
     
+    it "should cache result of #spam?" do
+      Rakismet::Base.should_receive(:akismet_call).once
+      @model.spam?
+      @model.spam?
+    end
+
     it "should be true if comment is spam" do
       Rakismet::Base.stub!(:akismet_call).and_return('true')
       @model.should be_spam
@@ -153,14 +159,14 @@ describe AkismetModel do
     end
 
     it "should not throw an error if request vars are missing" do
-      Rakismet::Base.rakismet_binding = nil_binding
+      Rakismet::Base.current_request = empty_request
       lambda { @model.spam? }.should_not raise_error(NoMethodError)
     end
   end
   
   describe StoredParams do
       before do
-        Rakismet::Base.rakismet_binding = nil
+        Rakismet::Base.current_request = nil
         @model = StoredParams.new
         comment_attrs.each_pair { |k,v| @model.stub!(k).and_return(v) }
       end
@@ -183,6 +189,13 @@ describe AkismetModel do
       Rakismet::Base.should_receive(:akismet_call).with('submit-spam', akismet_attrs)
       @model.spam!
     end
+
+    it "should mutate #spam?" do
+      Rakismet::Base.stub!(:akismet_call)
+      @model.instance_variable_set(:@_spam, false)
+      @model.spam!
+      @model.should be_spam
+    end
   end
 
   describe ".ham!" do
@@ -190,6 +203,13 @@ describe AkismetModel do
       Rakismet::Base.should_receive(:akismet_call).with('submit-ham', akismet_attrs)
       @model.ham!
     end
+
+    it "should mutate #spam?" do
+      Rakismet::Base.stub!(:akismet_call)
+      @model.instance_variable_set(:@_spam, true)
+      @model.ham!
+      @model.should_not be_spam
+    end
   end
   
   private
@@ -206,18 +226,16 @@ describe AkismetModel do
         :comment_content => 'comment content' }.merge(attrs)
     end
     
-    def request_binding
-      request = OpenStruct.new(:remote_ip => '127.0.0.1',
-                               :user_agent => 'RSpec',
-                               :referer => 'http://test.host/referrer')
-      binding
-    end
-
-    def nil_binding
-      request = OpenStruct.new(:remote_ip => nil,
-                               :user_agent => nil,
-                               :referer => nil)
-      binding
+    def request
+      OpenStruct.new(:remote_ip => '127.0.0.1',
+                     :user_agent => 'RSpec',
+                     :referer => 'http://test.host/referrer')
+    end
+
+    def empty_request
+      OpenStruct.new(:remote_ip => nil,
+                     :user_agent => nil,
+                     :referer => nil)
     end
 
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rakismet
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  hash: 13
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Josh French
@@ -9,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-25 00:00:00 -05:00
+date: 2010-05-27 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -33,9 +39,11 @@ files:
 - install.rb
 - lib/rakismet.rb
 - lib/rakismet/controller.rb
+- lib/rakismet/filter.rb
 - lib/rakismet/model.rb
 - spec/controllers/rakismet_controller_spec.rb
 - spec/models/base_spec.rb
+- spec/models/rakismet_filter_spec.rb
 - spec/models/rakismet_model_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -50,26 +58,33 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: rakismet
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Akismet and TypePad AntiSpam integration for Rails.
 test_files: 
 - spec/controllers/rakismet_controller_spec.rb
 - spec/models/base_spec.rb
+- spec/models/rakismet_filter_spec.rb
 - spec/models/rakismet_model_spec.rb
 - spec/spec_helper.rb