rakismet 1.5.2 → 1.5.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NzdlODJkNzk5YjAxYTgyNjkxZmMzYjc1NjMxZGQ3ZGY4OTFlZTMwMQ==
-  data.tar.gz: !binary |-
-    Y2FhOTZjNzg5NDEyMWFmOGM2MTYwYzQ0NWJmM2ViNWM5OGVlZTA0YQ==
+SHA1:
+  metadata.gz: cf228545419704714621f2ae6e6e1cc37e702eb6
+  data.tar.gz: 6f39f292c5ac67f57ddc6f499237ef7b339f1523
 SHA512:
-  metadata.gz: !binary |-
-    MzY2YWU3N2E2NmNjNzU1MTBkNmYxNDAwNDdiM2ZhZmE4ODU2Y2ZkZTliNmFl
-    MGNjOWIwYmRhYWRhZGNmMDk5ZDdmYjQ0OTE3YjI3YWRjZTQzY2VhYzU2NTFl
-    N2EwNTFmNDRlZTY5ODE0ZDY2MTQ3M2JlNjA5MDQ0MGQyNTM1MDE=
-  data.tar.gz: !binary |-
-    N2U0MmUzNTM0NTZmNjE3YjhjMDFjYmZmNmVhMmY2NjY4MjJiMmZhY2RlYmFi
-    ZjNmYzJlYzc5MzE2MDg1ZTgwMWE4NDg2NWNlOTBhY2Y1OTYzNjEwMGFhZmI5
-    NmE5ZDViZGMzZWFlMTBhZjhkY2NlYWVmMWY5YWQ0OWExM2Y2ZjE=
+  metadata.gz: 33a9d267a17332f49b7f0500841bd777bc741185c64ae37ba1f53d3e4f0229fb8eaa1a7606a1c8c76aa4704470ada00b5720e1117cf0bb6e82acc5dd28daafc3
+  data.tar.gz: 1a5ec9899dbebca1877cffb018e81302bccc928eef49dfa9cd8e3e4f1df56111e9aafd4b22ac6241b5a838321e699364c662687703510dd0fc35836f54e4398a

data/CHANGELOG

@@ -1,3 +1,5 @@
+= 1.5.3
+* Use HTTPS to connect to Akismet [Christian Wesselhoeft]
 = 1.5.2
 * Don't try to send Rails.version unless it's actually defined [Brett Bender]
 = 1.5.1

data/lib/rakismet.rb

@@ -54,7 +54,7 @@ module Rakismet
     def validate_key
       validate_config
       akismet = URI.parse(verify_url)
-      response = Net::HTTP::Proxy(proxy_host, proxy_port).start(akismet.host) do |http|
+      response = Net::HTTP.start(akismet.host, use_ssl: true, p_addr: proxy_host, p_port: proxy_port) do |http|
         data = "key=#{Rakismet.key}&blog=#{Rakismet.url}"
         http.post(akismet.path, data, Rakismet.headers)
       end
@@ -69,7 +69,7 @@ module Rakismet
       validate_config
       args.merge!(:blog => Rakismet.url, :is_test => Rakismet.test_mode)
       akismet = URI.parse(call_url(function))
-      response = Net::HTTP::Proxy(proxy_host, proxy_port).start(akismet.host) do |http|
+      response = Net::HTTP.start(akismet.host, use_ssl: true, p_addr: proxy_host, p_port: proxy_port) 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)}"
@@ -82,11 +82,11 @@ module Rakismet
     protected
 
     def verify_url
-      "http://#{Rakismet.host}/1.1/verify-key"
+      "https://#{Rakismet.host}/1.1/verify-key"
     end
 
     def call_url(function)
-      "http://#{Rakismet.key}.#{Rakismet.host}/1.1/#{function}"
+      "https://#{Rakismet.key}.#{Rakismet.host}/1.1/#{function}"
     end
 
     def validate_config

data/lib/rakismet/version.rb

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

data/spec/rakismet_spec.rb

@@ -11,6 +11,10 @@ describe Rakismet do
     Rakismet.key = 'dummy-key'
     Rakismet.url = 'test.localhost'
     Rakismet.host = 'endpoint.localhost'
+    Rakismet.proxy_host = nil
+    Rakismet.proxy_port = nil
+
+    @test_url = "#{Rakismet.key}.#{Rakismet.host}"
   end
 
   describe "proxy host" do
@@ -50,27 +54,24 @@ describe Rakismet do
   end
 
   describe ".validate_key" do
-    before (:each) do
-      @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'))
-      Net::HTTP.should_receive(:Proxy).with('proxy_host', 'proxy_port').and_return(@proxy)
+
+      Net::HTTP.should_receive(:start).with(Rakismet.host, use_ssl: true, p_addr: 'proxy_host', p_port: 'proxy_port')
+        .and_return(mock_response('valid'))
+
       Rakismet.validate_key
     end
 
     it "should set @@valid_key = true if key is valid" do
-      @proxy.stub(:start).and_return(mock_response('valid'))
+      Net::HTTP.stub(:start).and_return(mock_response('valid'))
       Rakismet.validate_key
       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'))
+      Net::HTTP.stub(:start).and_return(mock_response('invalid'))
       Rakismet.validate_key
       Rakismet.valid_key?.should be_falsey
     end
@@ -78,7 +79,7 @@ describe Rakismet do
     it "should build url with host" do
       host = "api.antispam.typepad.com"
       Rakismet.host = host
-      @proxy.should_receive(:start).with(host).and_yield(http)
+      Net::HTTP.should_receive(:start).with(host, use_ssl: true, p_addr: nil, p_port: nil).and_yield(http)
       Rakismet.validate_key
     end
   end
@@ -91,23 +92,23 @@ describe Rakismet do
 
   describe ".akismet_call" do
     before do
-      @proxy = double(Net::HTTP)
-      Net::HTTP.stub(:Proxy).and_return(@proxy)
-      @proxy.stub(:start).and_yield(http)
+      Net::HTTP.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'))
-      Net::HTTP.should_receive(:Proxy).with('proxy_host', 'proxy_port').and_return(@proxy)
+
+      Net::HTTP.should_receive(:start).with(@test_url, use_ssl: true, p_addr: 'proxy_host', p_port: 'proxy_port')
+        .and_return(mock_response('valid'))
+
       Rakismet.send(:akismet_call, 'bogus-function')
     end
 
     it "should build url with API key for the correct host" do
       host = 'api.antispam.typepad.com'
       Rakismet.host = host
-      @proxy.should_receive(:start).with("#{Rakismet.key}.#{host}")
+      Net::HTTP.should_receive(:start).with("#{Rakismet.key}.#{host}", use_ssl: true, p_addr: nil, p_port: nil)
       Rakismet.send(:akismet_call, 'bogus-function')
     end
 

data/spec/spec_helper.rb

@@ -2,7 +2,8 @@ require File.expand_path "lib/rakismet"
 require 'ostruct'
 
 RSpec.configure do |config|
-  config.mock_with :rspec
+  config.mock_with(:rspec)   { |c| c.syntax = :should }
+  config.expect_with(:rspec) { |c| c.syntax = :should }
 end
 
 class AkismetModel
@@ -39,4 +40,4 @@ def empty_request
                  :user_agent => nil,
                  :referrer => nil,
                  :http_headers => nil)
-end
+end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: rakismet
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Josh French
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-26 00:00:00.000000000 Z
+date: 2016-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.11'
 description: Rakismet is the easiest way to integrate Akismet or TypePad's AntiSpam
@@ -46,7 +46,7 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG
 - Gemfile
 - MIT-LICENSE
@@ -77,17 +77,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: rakismet
-rubygems_version: 2.4.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Akismet and TypePad AntiSpam integration for Rails.