rakismet 1.0.1 → 1.1.0

data/CHANGELOG

@@ -1,3 +1,5 @@
+= 1.1.0
+* Add HTTP Proxy support [Francisco Trindade]
 = 1.0.1
 * Fix hash access for Ruby 1.9 [Alex Crichton]
 = 1.0.0

data/README.md

@@ -23,11 +23,17 @@ in an initializer or application.rb:
 
     config.rakismet.key = 'your wordpress key'
     config.rakismet.url = 'http://yourdomain.com/'
-
+    
 If you wish to use another Akismet-compatible API provider such as TypePad's
 antispam service, you'll also need to set `config.rakismet.host` to your service
 provider's endpoint.
 
+If you want to use a proxy to access akismet (i.e your application is behind a firewall),
+set the proxy_host and proxy_port option.
+
+    config.rakismet.proxy_host = 'http://yourdomain.com/'
+    config.rakismet.proxy_port = '8080'
+
 Checking For Spam
 -----------------
 

data/Rakefile

@@ -17,10 +17,9 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new do |spec|
+  spec.rspec_opts = ["--color", "--format progress"]
 end
 
 task :default => :spec

data/VERSION.yml

@@ -1,6 +1,6 @@
 --- 
-:minor: 0
+:minor: 1
 :build: 
-:patch: 1
+:patch: 0
 :major: 1
 

data/lib/rakismet.rb

@@ -13,7 +13,7 @@ module Rakismet
   Undefined = Class.new(NameError)
 
   class << self
-    attr_accessor :key, :url, :host
+    attr_accessor :key, :url, :host, :proxy_host, :proxy_port
 
     def request
       @request ||= Request.new
@@ -46,7 +46,7 @@ module Rakismet
     def validate_key
       validate_config
       akismet = URI.parse(verify_url)
-      _, valid = Net::HTTP.start(akismet.host) do |http|
+      _, valid = 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
@@ -61,7 +61,7 @@ module Rakismet
       validate_config
       args.merge!(:blog => Rakismet.url)
       akismet = URI.parse(call_url(function))
-      _, response = Net::HTTP.start(akismet.host) do |http|
+      _, response = Net::HTTP::Proxy(proxy_host, proxy_port).start(akismet.host) do |http|
         data = args.map { |k,v| "#{k}=#{CGI.escape(v.to_s)}" }.join('&')
         http.post(akismet.path, data, Rakismet.headers)
       end

data/lib/rakismet/railtie.rb

@@ -12,6 +12,8 @@ module Rakismet
         Rakismet.key = app.config.rakismet[:key]
         Rakismet.url = app.config.rakismet[:url]
         Rakismet.host = app.config.rakismet[:host]
+        Rakismet.proxy_host = app.config.rakismet[:proxy_host]
+        Rakismet.proxy_port = app.config.rakismet[:proxy_port]
         app.middleware.use Rakismet::Middleware if app.config.rakismet.use_middleware
       end
 

data/rakismet.gemspec

@@ -1,53 +1,44 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{rakismet}
-  s.version = "1.0.1"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Josh French"]
-  s.date = %q{2010-10-25}
+  s.date = %q{2011-07-05}
   s.description = %q{Rakismet is the easiest way to integrate Akismet or TypePad's AntiSpam into your Rails app.}
   s.email = %q{josh@digitalpulp.com}
   s.extra_rdoc_files = [
     "README.md"
   ]
   s.files = [
-    ".gitignore",
-     "CHANGELOG",
-     "MIT-LICENSE",
-     "README.md",
-     "Rakefile",
-     "VERSION.yml",
-     "lib/rakismet.rb",
-     "lib/rakismet/middleware.rb",
-     "lib/rakismet/model.rb",
-     "lib/rakismet/railtie.rb",
-     "rakismet.gemspec",
-     "spec/.rspec",
-     "spec/rakismet_middleware_spec.rb",
-     "spec/rakismet_model_spec.rb",
-     "spec/rakismet_spec.rb",
-     "spec/spec_helper.rb"
+    "CHANGELOG",
+    "MIT-LICENSE",
+    "README.md",
+    "Rakefile",
+    "VERSION.yml",
+    "lib/rakismet.rb",
+    "lib/rakismet/middleware.rb",
+    "lib/rakismet/model.rb",
+    "lib/rakismet/railtie.rb",
+    "rakismet.gemspec",
+    "spec/.rspec",
+    "spec/rakismet_middleware_spec.rb",
+    "spec/rakismet_model_spec.rb",
+    "spec/rakismet_spec.rb",
+    "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/joshfrench/rakismet}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rakismet}
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Akismet and TypePad AntiSpam integration for Rails.}
-  s.test_files = [
-    "spec/rakismet_middleware_spec.rb",
-     "spec/rakismet_model_spec.rb",
-     "spec/rakismet_spec.rb",
-     "spec/spec_helper.rb"
-  ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/spec/rakismet_spec.rb

@@ -9,6 +9,13 @@ describe Rakismet do
     Rakismet.url = 'test.localhost'
     Rakismet.host = 'endpoint.localhost'
   end
+  
+  describe "proxy host" do
+    it "should have proxy host and port as nil by default" do
+      Rakismet.proxy_host.should be_nil
+      Rakismet.proxy_port.should be_nil
+    end
+  end
 
   describe ".validate_config" do
     it "should raise an error if key is not found" do
@@ -28,14 +35,27 @@ describe Rakismet do
   end
   
   describe ".validate_key" do
+    before (:each) do
+      @proxy = mock(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([nil, '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
-      Net::HTTP.stub!(:start).and_return([nil, 'valid'])
+      @proxy.stub!(:start).and_return([nil, 'valid'])
       Rakismet.validate_key
       Rakismet.valid_key?.should be_true
     end
 
     it "should set @@valid_key = false if key is invalid" do
-      Net::HTTP.stub!(:start).and_return([nil, 'invalid'])
+      @proxy.stub!(:start).and_return([nil, 'invalid'])
       Rakismet.validate_key
       Rakismet.valid_key?.should be_false
     end
@@ -43,20 +63,30 @@ describe Rakismet do
     it "should build url with host" do
       host = "api.antispam.typepad.com"
       Rakismet.host = host
-      Net::HTTP.should_receive(:start).with(host).and_yield(http)
+      @proxy.should_receive(:start).with(host).and_yield(http)
       Rakismet.validate_key
     end
   end
   
   describe ".akismet_call" do
     before do
-      Net::HTTP.stub(:start).and_yield(http)
+      @proxy = mock(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([nil, 'valid'])
+      Net::HTTP.should_receive(:Proxy).with('proxy_host', 'proxy_port').and_return(@proxy)
+      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
-      Net::HTTP.should_receive(:start).with("#{Rakismet.key}.#{host}")
+      @proxy.should_receive(:start).with("#{Rakismet.key}.#{host}")
       Rakismet.send(:akismet_call, 'bogus-function')
     end
     
@@ -66,7 +96,6 @@ describe Rakismet do
     end
     
     it "should return response.body" do
-      #Net::HTTP.stub!(:start).and_return([nil, 'akismet response'])
       Rakismet.send(:akismet_call, 'bogus-function').should eql('akismet response')
     end
 

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-require File.expand_path "../lib/rakismet"
+require File.expand_path "lib/rakismet"
 
 RSpec.configure do |config|
   config.mock_with :rspec

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: rakismet
 version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 1
-  version: 1.0.1
+  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors: 
 - Josh French
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-25 00:00:00 -04:00
+date: 2011-07-05 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -28,7 +23,6 @@ extensions: []
 extra_rdoc_files: 
 - README.md
 files: 
-- .gitignore
 - CHANGELOG
 - MIT-LICENSE
 - README.md
@@ -49,8 +43,8 @@ homepage: http://github.com/joshfrench/rakismet
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -58,28 +52,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: rakismet
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Akismet and TypePad AntiSpam integration for Rails.
-test_files: 
-- spec/rakismet_middleware_spec.rb
-- spec/rakismet_model_spec.rb
-- spec/rakismet_spec.rb
-- spec/spec_helper.rb
+test_files: []
+

data/.gitignore

@@ -1,9 +0,0 @@
-.DS_Store
-*.tmproj
-tmtags
-*.swp
-*.swo
-*.un~
-coverage
-rdoc
-pkg