mollom 0.1.2 → 0.1.3

data/lib/mollom.rb

@@ -10,7 +10,7 @@ class Mollom
   module Errors
     Standard = 1000
     Refresh = 1100
-    Redirect = 1200
+    TooBusy = 1200
   end
 
   attr_accessor :private_key, :public_key
@@ -85,6 +85,8 @@ class Mollom
   # Standard check to see if your public/private keypair are recognized. Takes no options
   def key_ok?
     return send_command('mollom.verifyKey')
+  rescue XMLRPC::FaultException
+    return false
   end
 
   # Gets some statistics from Mollom about your site.
@@ -140,10 +142,10 @@ class Mollom
         case error.faultCode
         when Errors::Standard
           raise Error.new(error.faultString)
-        when Errors::Refresh
+        when Errors::Refresh # Refresh server list please!
           # we take this one out of our loop
           raise
-        when Errors::Redirect
+        when Errors::TooBusy # Server is too busy, take the next one
           next
         else
           next

data/test/mollom_test.rb

@@ -24,7 +24,7 @@ class TestMollom < Test::Unit::TestCase
   def test_authentication_hash
     time = mock
     time.expects(:strftime).with('%Y-%m-%dT%H:%M:%S.000+0000').returns('2008-04-01T13:54:26.000+0000')
-    Time.stubs(:now).returns(stub(:gmtime => time))
+    Time.expects(:now).returns(stub(:gmtime => time))
     Kernel.expects(:rand).with(2**31).returns(42)
     hash = @mollom.authentication_hash
     assert_equal("oWN15TqrbLVdTAgcuDmofskaNyM=", hash[:hash])
@@ -36,7 +36,7 @@ class TestMollom < Test::Unit::TestCase
   def test_server_list
     xml_rpc = mock
     xml_rpc.expects(:call).with('mollom.getServerList', is_a(Hash)).returns(['http://172.16.0.1', 'http://172.16.0.2', 'https://172.16.0.2'])
-    XMLRPC::Client.stubs(:new).with('xmlrpc.mollom.com', '/1.0').returns(xml_rpc)
+    XMLRPC::Client.expects(:new).with('xmlrpc.mollom.com', '/1.0').returns(xml_rpc)
     
     assert_equal [{:ip => '172.16.0.1', :proto => 'http'}, {:ip => '172.16.0.2', :proto => 'http'}, {:ip => '172.16.0.2', :proto => 'https'}], @mollom.server_list
   end
@@ -52,47 +52,54 @@ class TestMollom < Test::Unit::TestCase
   end
   
   def test_send_command_with_good_server
-    Mollom.any_instance.stubs(:server_list).returns([{:ip => '172.16.0.1', :proto => 'http'}])
+    Mollom.any_instance.expects(:server_list).returns([{:ip => '172.16.0.1', :proto => 'http'}])
     xml_rpc = mock
     xml_rpc.expects(:call).with('mollom.testMessage', has_entry(:options => 'foo'))
-    XMLRPC::Client.stubs(:new).with('172.16.0.1', '/1.0').returns(xml_rpc)
+    XMLRPC::Client.expects(:new).with('172.16.0.1', '/1.0').returns(xml_rpc)
     
     @mollom.send_command('mollom.testMessage', {:options => 'foo'})
   end
   
   
   def test_send_command_with_bad_server
-    Mollom.any_instance.stubs(:server_list).returns([{:ip => '172.16.0.1', :proto => 'http'}, {:ip => '172.16.0.2', :proto => 'http'}])
+    Mollom.any_instance.expects(:server_list).returns([{:ip => '172.16.0.1', :proto => 'http'}, {:ip => '172.16.0.2', :proto => 'http'}])
     xml_rpc = mock
     xml_rpc.expects(:call).with('mollom.testMessage', has_entry(:options => 'foo')).raises(XMLRPC::FaultException.new(1200, "Redirect"))
     xml_rpc2 = mock
     xml_rpc2.expects(:call).with('mollom.testMessage', has_entry(:options => 'foo'))
     
-    XMLRPC::Client.stubs(:new).with('172.16.0.1', '/1.0').returns(xml_rpc)
-    XMLRPC::Client.stubs(:new).with('172.16.0.2', '/1.0').returns(xml_rpc2)
+    XMLRPC::Client.expects(:new).with('172.16.0.1', '/1.0').returns(xml_rpc)
+    XMLRPC::Client.expects(:new).with('172.16.0.2', '/1.0').returns(xml_rpc2)
     @mollom.send_command('mollom.testMessage', {:options => 'foo'})
   end
   
   def test_send_command_with_reload_exception
-    # TODO: Test this
-    # @mollom.send_command('mollom.testMessage', {:options => 'foo'})
+    Mollom.any_instance.stubs(:server_list).returns([{:ip => '172.16.0.1', :proto => 'http'}], [{:ip => '172.16.0.2', :proto => 'http'}])
+    xml_rpc = mock
+    xml_rpc.expects(:call).with('mollom.testMessage', has_entry(:options => 'foo')).raises(XMLRPC::FaultException.new(1100, "Refresh"))
+    xml_rpc2 = mock
+    xml_rpc2.expects(:call).with('mollom.testMessage', has_entry(:options => 'foo'))
+
+    XMLRPC::Client.expects(:new).with('172.16.0.1', '/1.0').returns(xml_rpc)
+    XMLRPC::Client.expects(:new).with('172.16.0.2', '/1.0').returns(xml_rpc2)
+    @mollom.send_command('mollom.testMessage', {:options => 'foo'})
   end
   
   def test_send_command_with_bad_command
-    Mollom.any_instance.stubs(:server_list).returns([{:ip => '172.16.0.1', :proto => 'http'}])
+    Mollom.any_instance.expects(:server_list).returns([{:ip => '172.16.0.1', :proto => 'http'}])
     xml_rpc = mock
     xml_rpc.expects(:call).with('mollom.testMessage', has_entry(:options => 'foo')).raises(XMLRPC::FaultException.new(1000, "Fault String"))
-    XMLRPC::Client.stubs(:new).with('172.16.0.1', '/1.0').returns(xml_rpc)
+    XMLRPC::Client.expects(:new).with('172.16.0.1', '/1.0').returns(xml_rpc)
     
     assert_raise(Mollom::Error) { @mollom.send_command('mollom.testMessage', {:options => 'foo'}) }
   end
   
   def test_send_command_with_bad_server_and_no_more_available
-    Mollom.any_instance.stubs(:server_list).returns([{:ip => '172.16.0.1', :proto => 'http'}])
+    Mollom.any_instance.expects(:server_list).returns([{:ip => '172.16.0.1', :proto => 'http'}])
     xml_rpc = mock
     xml_rpc.expects(:call).with('mollom.testMessage', has_entry(:options => 'foo')).raises(XMLRPC::FaultException.new(1200, "Redirect"))
     
-    XMLRPC::Client.stubs(:new).with('172.16.0.1', '/1.0').returns(xml_rpc)
+    XMLRPC::Client.expects(:new).with('172.16.0.1', '/1.0').returns(xml_rpc)
     
     assert_raise(Mollom::NoAvailableServers) { @mollom.send_command('mollom.testMessage', {:options => 'foo'}) }
   end
@@ -122,7 +129,12 @@ class TestMollom < Test::Unit::TestCase
 
   def test_key_ok
     Mollom.any_instance.expects(:send_command).with('mollom.verifyKey').returns(true)
-    @mollom.key_ok?
+    assert @mollom.key_ok?
+  end
+  
+  def test_invalid_key
+    Mollom.any_instance.expects(:send_command).with('mollom.verifyKey').raises(XMLRPC::FaultException.new(1000, "Internal server error due to malformed request, or the hamster powering the server died..."))
+    assert !@mollom.key_ok?
   end
   
   def test_statistics

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mollom
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Jan De Poorter
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-24 00:00:00 +02:00
+date: 2008-06-17 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -46,7 +46,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: mollom
-rubygems_version: 1.1.0
+rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
 summary: Ruby class for easy interfacing with the mollom.com open API for spam detection and content quality assesment.