rakismet 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf228545419704714621f2ae6e6e1cc37e702eb6
-  data.tar.gz: 6f39f292c5ac67f57ddc6f499237ef7b339f1523
+  metadata.gz: c8bc157e4813efa686db0b46304c70f757c60dd7
+  data.tar.gz: dd04179466c530a7c3dc2a633ee27e95f842ee8d
 SHA512:
-  metadata.gz: 33a9d267a17332f49b7f0500841bd777bc741185c64ae37ba1f53d3e4f0229fb8eaa1a7606a1c8c76aa4704470ada00b5720e1117cf0bb6e82acc5dd28daafc3
-  data.tar.gz: 1a5ec9899dbebca1877cffb018e81302bccc928eef49dfa9cd8e3e4f1df56111e9aafd4b22ac6241b5a838321e699364c662687703510dd0fc35836f54e4398a
+  metadata.gz: 7321aaccaa49a51f68218b9a851db5dd6ebfe69ffef9822c136e2f8092517515634bc4dac07f1d020e4a4f660eaca5826ecadfe14e4ad9a5fcc184dafb42beeb
+  data.tar.gz: d014957d99a0822a481e65aa35ef0f41672c6a731816d03aef5e2f387566558745dd95f109cd3507553970623f4c477a108d211446678c88e3803bd0b215bb36

data/CHANGELOG

@@ -1,3 +1,5 @@
+= 1.5.4
+* Don't prefix permalink param with comment_
 = 1.5.3
 * Use HTTPS to connect to Akismet [Christian Wesselhoeft]
 = 1.5.2

data/lib/rakismet/model.rb

@@ -14,12 +14,11 @@ module Rakismet
     module ClassMethods
       def rakismet_attrs(args={})
         self.akismet_attrs ||= {}
-        [:comment_type, :author, :author_url, :author_email, :content, :permalink].each do |field|
-          # clunky, but throwing around +type+ will break your heart
-          fieldname = field.to_s =~ %r(^comment_) ? field : "comment_#{field}".intern
+        [:author, :author_url, :author_email, :content].each do |field|
+          fieldname = "comment_#{field}".intern
           self.akismet_attrs[fieldname] = args.delete(field) || field
         end
-        [:user_ip, :user_agent, :referrer, :user_role].each do |field|
+        [:comment_type, :user_ip, :user_agent, :referrer, :user_role, :permalink].each do |field|
           self.akismet_attrs[field] = args.delete(field) || field
         end
         args.each_pair do |f,v|

data/lib/rakismet/version.rb

@@ -1,3 +1,3 @@
 module Rakismet
-  VERSION = "1.5.3"
+  VERSION = "1.5.4"
 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 = "2016-06-12"
+  s.date = "2017-07-14"
 
   s.rubyforge_project = "rakismet"
   s.add_development_dependency "rake"

data/spec/models/custom_params_spec.rb

@@ -12,9 +12,11 @@ end
 
 describe CustomAkismetModel do
   it "should override default mappings" do
-    [: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
+    CustomAkismetModel.akismet_attrs[:comment_type].should eql(:type2)
+    CustomAkismetModel.akismet_attrs[:comment_author].should eql(:author2)
+    CustomAkismetModel.akismet_attrs[:comment_content].should eql(:content2)
+    CustomAkismetModel.akismet_attrs[:comment_author_email].should eql(:author_email2)
+    CustomAkismetModel.akismet_attrs[:comment_author_url].should eql(:author_url2)
+    CustomAkismetModel.akismet_attrs[:permalink].should eql(:permalink2)
   end
 end

data/spec/models/rakismet_model_spec.rb

@@ -7,11 +7,13 @@ describe AkismetModel do
     comment_attrs.each_pair { |k,v| @model.stub(k).and_return(v) }
   end
 
-  it "should have default mappings" do
-    [:comment_type, :author, :author_email, :author_url, :content, :permalink].each do |field|
-      fieldname = field.to_s =~ %r(^comment_) ? field : "comment_#{field}".intern
-      AkismetModel.akismet_attrs[fieldname].should eql(field)
-     end
+  it "should map internal params to Akismet params" do
+    AkismetModel::akismet_attrs[:comment_author].should eql(:author)
+    AkismetModel::akismet_attrs[:comment_author_email].should eql(:author_email)
+    AkismetModel::akismet_attrs[:comment_author_url].should eql(:author_url)
+    AkismetModel::akismet_attrs[:comment_content].should eql(:content)
+    AkismetModel::akismet_attrs[:comment_type].should eql(:comment_type)
+    AkismetModel::akismet_attrs[:permalink].should eql(:permalink)
     AkismetModel::akismet_attrs[:user_role].should eql(:user_role)
   end
 

data/spec/rakismet_spec.rb

@@ -39,17 +39,17 @@ describe Rakismet do
   describe ".validate_config" do
     it "should raise an error if key is not found" do
       Rakismet.key = ''
-      lambda { Rakismet.send(:validate_config) }.should raise_error
+      lambda { Rakismet.send(:validate_config) }.should raise_error(Rakismet::Undefined)
     end
 
     it "should raise an error if url is not found" do
       Rakismet.url = ''
-      lambda { Rakismet.send(:validate_config) }.should raise_error
+      lambda { Rakismet.send(:validate_config) }.should raise_error(Rakismet::Undefined)
     end
 
     it "should raise an error if host is not found" do
       Rakismet.host = ''
-      lambda { Rakismet.send(:validate_config) }.should raise_error
+      lambda { Rakismet.send(:validate_config) }.should raise_error(Rakismet::Undefined)
     end
   end
 

data/spec/spec_helper.rb

@@ -40,4 +40,4 @@ def empty_request
                  :user_agent => nil,
                  :referrer => nil,
                  :http_headers => nil)
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rakismet
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors:
 - Josh French
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-12 00:00:00.000000000 Z
+date: 2017-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -87,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rakismet
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Akismet and TypePad AntiSpam integration for Rails.