rakismet 1.5.1 → 1.5.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzYyMjAxMmVhYThlM2IyNjg3YzhmN2IyNjI3NzFiNDQ4YzkzNzE0Mg==
+    NzdlODJkNzk5YjAxYTgyNjkxZmMzYjc1NjMxZGQ3ZGY4OTFlZTMwMQ==
   data.tar.gz: !binary |-
-    MjI1YzE2YWQwMzUxNTk3NzY3Y2IzYjFhYzE5YzE5YTBjMjdmMzIyYg==
+    Y2FhOTZjNzg5NDEyMWFmOGM2MTYwYzQ0NWJmM2ViNWM5OGVlZTA0YQ==
 SHA512:
   metadata.gz: !binary |-
-    NzI0MWU0YzBhZjYxN2FhNGIyZGI1M2QzNjFmMzVlMmFmNWVmYTNmZDVhOThl
-    NTc2OTA2Mjg1ZGE5YmE3ZjhiZDQwYzIwNzRkOGRkNzQ1MmYzMzA4NDE2ZDE2
-    NmIyNTMyZmU5ZjI4MWRkYjZmYThhZDFlZDM0NWU5ZWVmMzFhYjM=
+    MzY2YWU3N2E2NmNjNzU1MTBkNmYxNDAwNDdiM2ZhZmE4ODU2Y2ZkZTliNmFl
+    MGNjOWIwYmRhYWRhZGNmMDk5ZDdmYjQ0OTE3YjI3YWRjZTQzY2VhYzU2NTFl
+    N2EwNTFmNDRlZTY5ODE0ZDY2MTQ3M2JlNjA5MDQ0MGQyNTM1MDE=
   data.tar.gz: !binary |-
-    ZWJjNTAwZDMxNzU2ZWU3OTI2NGU2ZmQ5NjBhMzRmZWU2M2JiOGIyMWYwOTNm
-    NjViNjM0MjIyZGY5ZjBlM2M0MDZmNjczODIxMjY4YTJmY2I5OWMwOTMzOWFh
-    YWRjZTU2YjYxNTQxOWYwZjMzNWZhNjdhOGE0NGUwMThiZjdlNTM=
+    N2U0MmUzNTM0NTZmNjE3YjhjMDFjYmZmNmVhMmY2NjY4MjJiMmZhY2RlYmFi
+    ZjNmYzJlYzc5MzE2MDg1ZTgwMWE4NDg2NWNlOTBhY2Y1OTYzNjEwMGFhZmI5
+    NmE5ZDViZGMzZWFlMTBhZjhkY2NlYWVmMWY5YWQ0OWExM2Y2ZjE=

data/CHANGELOG

@@ -1,3 +1,5 @@
+= 1.5.2
+* Don't try to send Rails.version unless it's actually defined [Brett Bender]
 = 1.5.1
 * Send user_role attribute to Akismet without comment prefix [Hugo Bauer]
 = 1.5.0

data/lib/rakismet.rb

@@ -42,7 +42,11 @@ module Rakismet
     def headers
       @headers ||= begin
         user_agent = "Rakismet/#{Rakismet::VERSION}"
-        user_agent = "Rails/#{Rails.version} | " + user_agent if defined?(Rails)
+
+        if defined?(Rails) && Rails.respond_to?(:version)
+          user_agent = "Rails/#{Rails.version} | " + user_agent
+        end
+
         { 'User-Agent' => user_agent, 'Content-Type' => 'application/x-www-form-urlencoded' }
       end
     end

data/lib/rakismet/version.rb

@@ -1,3 +1,3 @@
 module Rakismet
-  VERSION = "1.5.1"
+  VERSION = "1.5.2"
 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 = "2013-09-22"
+  s.date = "2016-02-26"
 
   s.rubyforge_project = "rakismet"
   s.add_development_dependency "rake"

data/spec/models/block_params_spec.rb

@@ -11,7 +11,7 @@ describe BlockAkismetModel do
 
   before do
     @block = BlockAkismetModel.new
-    comment_attrs.each_pair { |k,v| @block.stub!(k).and_return(v) }
+    comment_attrs.each_pair { |k,v| @block.stub(k).and_return(v) }
   end
 
   it "should accept a block" do

data/spec/models/rakismet_model_spec.rb

@@ -4,7 +4,7 @@ describe AkismetModel do
 
   before do
     @model = AkismetModel.new
-    comment_attrs.each_pair { |k,v| @model.stub!(k).and_return(v) }
+    comment_attrs.each_pair { |k,v| @model.stub(k).and_return(v) }
   end
 
   it "should have default mappings" do
@@ -31,7 +31,7 @@ describe AkismetModel do
       [:user_ip, :user_agent, :referrer].each do |field|
         @model.should_not respond_to(:field)
       end
-      Rakismet.stub!(:request).and_return(request)
+      Rakismet.stub(:request).and_return(request)
       Rakismet.should_receive(:akismet_call).
                 with('comment-check', akismet_attrs.merge(:user_ip => '127.0.0.1',
                                                           :user_agent => 'RSpec',
@@ -40,7 +40,7 @@ describe AkismetModel do
     end
 
     it "should send http_headers from Rakismet.request if present" do
-      Rakismet.stub!(:request).and_return(request_with_headers)
+      Rakismet.stub(:request).and_return(request_with_headers)
       Rakismet.should_receive(:akismet_call).
                 with('comment-check', akismet_attrs.merge(:user_ip => '127.0.0.1',
                                                           :user_agent => 'RSpec',
@@ -57,24 +57,25 @@ describe AkismetModel do
     end
 
     it "should be true if comment is spam" do
-      Rakismet.stub!(:akismet_call).and_return('true')
+      Rakismet.stub(:akismet_call).and_return('true')
       @model.should be_spam
     end
 
     it "should be false if comment is not spam" do
-      Rakismet.stub!(:akismet_call).and_return('false')
+      Rakismet.stub(:akismet_call).and_return('false')
       @model.should_not be_spam
     end
 
     it "should set akismet_response" do
-      Rakismet.stub!(:akismet_call).and_return('response')
+      Rakismet.stub(:akismet_call).and_return('response')
       @model.spam?
       @model.akismet_response.should eql('response')
     end
 
     it "should not throw an error if request vars are missing" do
-      Rakismet.stub!(:request).and_return(empty_request)
-      lambda { @model.spam? }.should_not raise_error(NoMethodError)
+      Rakismet.stub(:request).and_return(empty_request)
+      Rakismet.stub(:akismet_call).and_return('false')
+      lambda { @model.spam? }.should_not raise_error
     end
   end
 
@@ -86,7 +87,7 @@ describe AkismetModel do
     end
 
     it "should mutate #spam?" do
-      Rakismet.stub!(:akismet_call)
+      Rakismet.stub(:akismet_call)
       @model.instance_variable_set(:@_spam, false)
       @model.spam!
       @model.should be_spam
@@ -100,7 +101,7 @@ describe AkismetModel do
     end
 
     it "should mutate #spam?" do
-      Rakismet.stub!(:akismet_call)
+      Rakismet.stub(:akismet_call)
       @model.instance_variable_set(:@_spam, true)
       @model.ham!
       @model.should_not be_spam

data/spec/models/request_params_spec.rb

@@ -9,7 +9,7 @@ describe RequestParams do
     before do
       @model = RequestParams.new
       attrs = comment_attrs(:user_ip => '192.168.0.1', :user_agent => 'Rakismet', :referrer => 'http://localhost/referrer')
-      attrs.each_pair { |k,v| @model.stub!(k).and_return(v) }
+      attrs.each_pair { |k,v| @model.stub(k).and_return(v) }
     end
 
   it "should use local values even if Rakismet.request is populated" do

data/spec/rakismet_spec.rb

@@ -35,44 +35,44 @@ 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(Rakismet::Undefined)
+      lambda { Rakismet.send(:validate_config) }.should raise_error
     end
 
     it "should raise an error if url is not found" do
       Rakismet.url = ''
-      lambda { Rakismet.send(:validate_config) }.should raise_error(Rakismet::Undefined)
+      lambda { Rakismet.send(:validate_config) }.should raise_error
     end
 
     it "should raise an error if host is not found" do
       Rakismet.host = ''
-      lambda { Rakismet.send(:validate_config) }.should raise_error(Rakismet::Undefined)
+      lambda { Rakismet.send(:validate_config) }.should raise_error
     end
   end
 
   describe ".validate_key" do
     before (:each) do
-      @proxy = mock(Net::HTTP)
-      Net::HTTP.stub!(:Proxy).and_return(@proxy)
+      @proxy = double(Net::HTTP)
+      Net::HTTP.stub(:Proxy).and_return(@proxy)
     end
 
     it "should use proxy host and port" do
       Rakismet.proxy_host = 'proxy_host'
       Rakismet.proxy_port = 'proxy_port'
-      @proxy.stub!(:start).and_return(mock_response('valid'))
+      @proxy.stub(:start).and_return(mock_response('valid'))
       Net::HTTP.should_receive(:Proxy).with('proxy_host', 'proxy_port').and_return(@proxy)
       Rakismet.validate_key
     end
 
     it "should set @@valid_key = true if key is valid" do
-      @proxy.stub!(:start).and_return(mock_response('valid'))
+      @proxy.stub(:start).and_return(mock_response('valid'))
       Rakismet.validate_key
-      Rakismet.valid_key?.should be_true
+      Rakismet.valid_key?.should be_truthy
     end
 
     it "should set @@valid_key = false if key is invalid" do
-      @proxy.stub!(:start).and_return(mock_response('invalid'))
+      @proxy.stub(:start).and_return(mock_response('invalid'))
       Rakismet.validate_key
-      Rakismet.valid_key?.should be_false
+      Rakismet.valid_key?.should be_falsey
     end
 
     it "should build url with host" do
@@ -82,7 +82,7 @@ describe Rakismet do
       Rakismet.validate_key
     end
   end
-  
+
   describe '.excluded_headers' do
     it "should default to ['HTTP_COOKIE']" do
       Rakismet.excluded_headers.should eq ['HTTP_COOKIE']
@@ -91,15 +91,15 @@ describe Rakismet do
 
   describe ".akismet_call" do
     before do
-      @proxy = mock(Net::HTTP)
-      Net::HTTP.stub!(:Proxy).and_return(@proxy)
+      @proxy = double(Net::HTTP)
+      Net::HTTP.stub(:Proxy).and_return(@proxy)
       @proxy.stub(:start).and_yield(http)
     end
 
     it "should use proxy host and port" do
       Rakismet.proxy_host = 'proxy_host'
       Rakismet.proxy_port = 'proxy_port'
-      @proxy.stub!(:start).and_return(mock_response('valid'))
+      @proxy.stub(:start).and_return(mock_response('valid'))
       Net::HTTP.should_receive(:Proxy).with('proxy_host', 'proxy_port').and_return(@proxy)
       Rakismet.send(:akismet_call, 'bogus-function')
     end
@@ -134,7 +134,7 @@ describe Rakismet do
     it "should build query string when params are nil" do
       lambda {
         Rakismet.send(:akismet_call, 'bogus-function', { :nil_param => nil })
-      }.should_not raise_error(NoMethodError)
+      }.should_not raise_error
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rakismet
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Josh French
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-22 00:00:00.000000000 Z
+date: 2016-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake