rakismet 1.3.0 → 1.4.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NmQ3NDRlYjkxOTBkY2E4Zjk0YzUwMDlmYzI3NDI5NzQ4ZjlkM2NiZQ==
+  data.tar.gz: !binary |-
+    YTI5NTlkOGYxNTU4MGY5ZjZjYWZhMzg1NDU4NTJkNzJjMTRmZTQyZg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ZWY2Yzg3MTkzYzc5YWNjZjllYWE2NDg4ZTYyY2EyZGUyNTVhODY3OTA0ZDBj
+    Y2UzZDc0YzM0ZjQ4MzhiODdmNmRmMzQ5ZmNkODBmZWZmZWRhOThmNjQ4MjRj
+    OTg1YzdmZGY2ZGI1NmRmYjI0Y2UzYWMwMjY1YTU2OTk1YTIxNTk=
+  data.tar.gz: !binary |-
+    YjM2YTI3MGQwY2QwNWFmMDYxYWVjMGZhNWRkNjFkZDIwZGZiZjYwMWYxMDNm
+    MDhmZTlhNDNjNTY0YjM4ZDQ5NTUwMGY5MjNlODFmZTA0ZGE5MjQ5ZGFiMDBh
+    Mjc1ZjI5OTAwZTM0NjM2OWJjNDBlMTdmMzY3Yjk4MTFlNWY0OGQ=

data/CHANGELOG

@@ -1,3 +1,6 @@
+= 1.4.0
+* Allow endpoint to be specified with a proc for multitenant applications [Bradly Feeley]
+* Add Akistmet permalink attribute [Eric Hochberger]
 = 1.3.0
 * Clean up gemspec and load paths [Steven Harman]
 * Add Akismet is_test param [Steven Harman]

data/README.md

@@ -15,7 +15,13 @@ Compatibility
 Getting Started
 ===============
 
-Once you've installed the Rakismet gem and added it to your application's Gemfile,
+Add the Rakismet gem to your Gemfile
+
+```ruby
+gem 'rakismet'
+```
+
+Once you've added the Rakismet gem to your Gemfile and installed it with ``bundle install``,
 you'll need an API key. Head on over to http://akismet.com/signup/ and sign up
 for a new username.
 
@@ -46,6 +52,12 @@ config.rakismet.proxy_host = 'http://yourdomain.com/'
 config.rakismet.proxy_port = '8080'
 ```
 
+If your Rails app is a multitenant application, you can specify your Rakismet url as a proc:
+
+```ruby
+config.rakismet.url = Proc.new { ApplicationController.current_tenant.url }
+```
+
 Checking For Spam
 -----------------
 

data/lib/rakismet.rb

@@ -19,6 +19,10 @@ module Rakismet
       @request ||= Request.new
     end
 
+    def url
+      @url.is_a?(Proc) ? @url.call : @url
+    end
+
     def set_request_vars(env)
       request.user_ip, request.user_agent, request.referrer =
         env['REMOTE_ADDR'], env['HTTP_USER_AGENT'], env['HTTP_REFERER']

data/lib/rakismet/model.rb

@@ -14,7 +14,7 @@ module Rakismet
     module ClassMethods
       def rakismet_attrs(args={})
         self.akismet_attrs ||= {}
-        [:comment_type, :author, :author_url, :author_email, :content, :user_role].each do |field|
+        [:comment_type, :author, :author_url, :author_email, :content, :user_role, :permalink].each do |field|
           # clunky, but throwing around +type+ will break your heart
           fieldname = field.to_s =~ %r(^comment_) ? field : "comment_#{field}".intern
           self.akismet_attrs[fieldname] = args.delete(field) || field
@@ -64,7 +64,7 @@ module Rakismet
                                 elsif !mapped_field.nil? && respond_to?(mapped_field)
                                   send(mapped_field)
                                 elsif not [:comment_type, :author, :author_email,
-                                        :author_url, :content, :user_role,
+                                        :author_url, :content, :user_role, :permalink,
                                         :user_ip, :referrer,
                                         :user_agent].include?(mapped_field)
                                   # we've excluded any fields that appear to

data/lib/rakismet/version.rb

@@ -1,3 +1,3 @@
 module Rakismet
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

data/rakismet.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/joshfrench/rakismet"
   s.summary = "Akismet and TypePad AntiSpam integration for Rails."
   s.description = "Rakismet is the easiest way to integrate Akismet or TypePad's AntiSpam into your Rails app."
-  s.date = "2012-08-04"
+  s.date = "2013-09-22"
 
   s.rubyforge_project = "rakismet"
   s.add_development_dependency "rake"

data/spec/models/custom_params_spec.rb

@@ -2,7 +2,7 @@ require  'spec_helper'
 
 MAPPED_PARAMS = { :comment_type => :type2, :author => :author2, :content => :content2,
                   :author_email => :author_email2, :author_url => :author_url2,
-                  :user_role => :user_role2 }
+                  :user_role => :user_role2, :permalink => :permalink2 }
 
 class CustomAkismetModel
   include Rakismet::Model
@@ -12,7 +12,7 @@ end
 
 describe CustomAkismetModel do
   it "should override default mappings" do
-    [:comment_type, :author, :author_url, :author_email, :content, :user_role].each do |field|
+    [:comment_type, :author, :author_url, :author_email, :content, :user_role, :permalink].each do |field|
       fieldname = field.to_s =~ %r(^comment_) ? field : "comment_#{field}".intern
        CustomAkismetModel.akismet_attrs[fieldname].should eql(MAPPED_PARAMS[field])
      end

data/spec/models/rakismet_model_spec.rb

@@ -8,7 +8,7 @@ describe AkismetModel do
   end
 
   it "should have default mappings" do
-    [:comment_type, :author, :author_email, :author_url, :content, :user_role].each do |field|
+    [:comment_type, :author, :author_email, :author_url, :content, :user_role, :permalink].each do |field|
       fieldname = field.to_s =~ %r(^comment_) ? field : "comment_#{field}".intern
       AkismetModel.akismet_attrs[fieldname].should eql(field)
      end

data/spec/rakismet_spec.rb

@@ -20,6 +20,18 @@ describe Rakismet do
     end
   end
 
+  describe "url" do
+    it "should allow url to be a string" do
+      Rakismet.url = "string.example.com"
+      Rakismet.url.should eql("string.example.com")
+    end
+
+    it "should allow url to be a proc" do
+      Rakismet.url = Proc.new { "proc.example.com" }
+      Rakismet.url.should eql("proc.example.com")
+    end
+  end
+
   describe ".validate_config" do
     it "should raise an error if key is not found" do
       Rakismet.key = ''

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: rakismet
 version: !ruby/object:Gem::Version
-  version: 1.3.0
-  prerelease: 
+  version: 1.4.0
 platform: ruby
 authors:
 - Josh French
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-04 00:00:00.000000000 Z
+date: 2013-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -75,27 +70,26 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/joshfrench/rakismet
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: rakismet
-rubygems_version: 1.8.22
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Akismet and TypePad AntiSpam integration for Rails.
 test_files:
 - spec/models/block_params_spec.rb