rakismet 1.2.0 → 1.2.1

data/CHANGELOG

@@ -1,3 +1,5 @@
+= 1.2.1
+* Fix deprecated usage of HTTPResponse for Ruby 1.9.3 [Leonid Shevtsov]
 = 1.2.0
 * Rakismet attribute mappings are now inheritable
 = 1.1.2

data/lib/rakismet.rb

@@ -39,11 +39,11 @@ module Rakismet
     def validate_key
       validate_config
       akismet = URI.parse(verify_url)
-      _, valid = Net::HTTP::Proxy(proxy_host, proxy_port).start(akismet.host) do |http|
+      response = Net::HTTP::Proxy(proxy_host, proxy_port).start(akismet.host) do |http|
         data = "key=#{Rakismet.key}&blog=#{Rakismet.url}"
         http.post(akismet.path, data, Rakismet.headers)
       end
-      @valid_key = (valid == 'valid')
+      @valid_key = (response.body == 'valid')
     end
 
     def valid_key?
@@ -54,14 +54,14 @@ module Rakismet
       validate_config
       args.merge!(:blog => Rakismet.url)
       akismet = URI.parse(call_url(function))
-      _, response = Net::HTTP::Proxy(proxy_host, proxy_port).start(akismet.host) do |http|
+      response = Net::HTTP::Proxy(proxy_host, proxy_port).start(akismet.host) do |http|
         params = args.map do |k,v|
           param = v.class < String ? v.to_str : v.to_s # for ActiveSupport::SafeBuffer and Nil, respectively
           "#{k}=#{CGI.escape(param)}"
         end
         http.post(akismet.path, params.join('&'), Rakismet.headers)
       end
-      response
+      response.body
     end
 
     protected

data/lib/rakismet/version.rb

@@ -1,3 +1,3 @@
 module Rakismet
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/rakismet.gemspec

@@ -11,7 +11,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-04-19"
+  s.date = "2012-04-22"
 
   s.rubyforge_project = "rakismet"
 

data/spec/models/block_params_spec.rb

@@ -15,7 +15,6 @@ describe BlockAkismetModel do
   end
 
   it "should accept a block" do
-    puts BlockAkismetModel.akismet_attrs.inspect
     BlockAkismetModel.akismet_attrs[:comment_author].should eql(PROC)
   end
 

data/spec/rakismet_spec.rb

@@ -2,7 +2,10 @@ require File.dirname(__FILE__) + '/spec_helper'
 
 describe Rakismet do
 
-  let(:http) { double(:http, :to_ary => [nil, 'akismet response']).as_null_object }
+  def mock_response(body)
+    double(:response, :body => body)
+  end
+  let(:http) { double(:http, :post => mock_response('akismet response')) }
 
   after do
     Rakismet.key = 'dummy-key'
@@ -43,19 +46,19 @@ describe Rakismet do
     it "should use proxy host and port" do
       Rakismet.proxy_host = 'proxy_host'
       Rakismet.proxy_port = 'proxy_port'
-      @proxy.stub!(:start).and_return([nil, '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([nil, 'valid'])
+      @proxy.stub!(:start).and_return(mock_response('valid'))
       Rakismet.validate_key
       Rakismet.valid_key?.should be_true
     end
 
     it "should set @@valid_key = false if key is invalid" do
-      @proxy.stub!(:start).and_return([nil, 'invalid'])
+      @proxy.stub!(:start).and_return(mock_response('invalid'))
       Rakismet.validate_key
       Rakismet.valid_key?.should be_false
     end
@@ -78,7 +81,7 @@ describe Rakismet do
     it "should use proxy host and port" do
       Rakismet.proxy_host = 'proxy_host'
       Rakismet.proxy_port = 'proxy_port'
-      @proxy.stub!(:start).and_return([nil, '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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rakismet
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-19 00:00:00.000000000 Z
+date: 2012-04-22 00:00:00.000000000 Z
 dependencies: []
 description: Rakismet is the easiest way to integrate Akismet or TypePad's AntiSpam
   into your Rails app.