mollom 0.1.3 → 0.1.4

data/lib/mollom.rb

@@ -7,6 +7,10 @@ require 'base64'
 
 class Mollom
   API_VERSION = '1.0'
+  STATIC_SERVER_LIST = [{:proto => 'http', :host => 'xmlrpc3.mollom.com'},
+                        {:proto => 'http', :host => 'xmlrpc2.mollom.com'},
+                        {:proto => 'http', :host => 'xmlrpc1.mollom.com'}].freeze
+  
   module Errors
     Standard = 1000
     Refresh = 1100
@@ -14,7 +18,6 @@ class Mollom
   end
 
   attr_accessor :private_key, :public_key
-  attr_writer :server_list
 
   # Creates a new Mollom object. Takes +private_key+ and +public_key+ as keys.
   # 
@@ -123,20 +126,38 @@ class Mollom
   # Takes an optional parameter +refresh+, which resets the cached value.
   #
   #  mollom.server_list
-  #  # => [{:proto=>"http", :ip=>"88.151.243.81"}, {:proto=>"http", :ip=>"82.103.131.136"}]
+  #  # => [{:proto=>"http", :host=>"88.151.243.81"}, {:proto=>"http", :host=>"82.103.131.136"}]
   def server_list refresh = false
-    @server_list = nil if refresh
-    @server_list ||= XMLRPC::Client.new("xmlrpc.mollom.com", "/#{API_VERSION}").call('mollom.getServerList', authentication_hash).collect do |server| 
-      proto, ip = server.split('://')
-      {:proto => proto, :ip => ip}
+    return @server_list if @server_list && refresh
+    STATIC_SERVER_LIST.each do |static_server|
+      @server_list = get_server_list_from(static_server)
+      return @server_list if @server_list
+    end
+    # Should have returned a server_list here..
+    raise(Error.new("Can't get mollom server-list"))
+  end
+  
+  def server_list=(list)
+    # Check if we get an actual serverlist-array
+    if list.is_a?(Array) && list.all? {|hash| hash.has_key?(:host) && hash.has_key?(:proto) } 
+      @server_list = list
     end
   end
 
   private
+  def get_server_list_from(server)
+    XMLRPC::Client.new(server[:host], "/#{API_VERSION}").call('mollom.getServerList', authentication_hash).collect do |server| 
+        proto, ip = server.split('://')
+        {:proto => proto, :host => ip}
+    end
+  rescue
+    nil
+  end
+  
   def send_command(command, data = {})
     server_list.each do |server|
       begin
-        return XMLRPC::Client.new(server[:ip], "/#{API_VERSION}").call(command, data.merge(authentication_hash))
+        return XMLRPC::Client.new(server[:host], "/#{API_VERSION}").call(command, data.merge(authentication_hash))
       # TODO: Rescue more stuff (Connection Timeout and such)
       rescue XMLRPC::FaultException => error
         case error.faultCode

data/test/mollom_test.rb

@@ -34,25 +34,63 @@ class TestMollom < Test::Unit::TestCase
   end
   
   def test_server_list
+    Mollom.any_instance.expects(:get_server_list_from).with(:host => 'xmlrpc3.mollom.com', :proto => 'http').returns([{:host => '172.16.0.1', :proto => 'http'}, {:host => '172.16.0.2', :proto => 'http'}, {:host => '172.16.0.2', :proto => 'https'}])
+    assert_equal [{:host => '172.16.0.1', :proto => 'http'}, {:host => '172.16.0.2', :proto => 'http'}, {:host => '172.16.0.2', :proto => 'https'}], @mollom.server_list
+  end
+
+  def test_server_list_with_first_server_bad
+    Mollom.any_instance.expects(:get_server_list_from).with(:host => 'xmlrpc3.mollom.com', :proto => 'http').returns(nil)
+    Mollom.any_instance.expects(:get_server_list_from).with(:host => 'xmlrpc2.mollom.com', :proto => 'http').returns([{:host => '172.16.0.1', :proto => 'http'}, {:host => '172.16.0.2', :proto => 'http'}, {:host => '172.16.0.2', :proto => 'https'}])
+    assert_equal [{:host => '172.16.0.1', :proto => 'http'}, {:host => '172.16.0.2', :proto => 'http'}, {:host => '172.16.0.2', :proto => 'https'}], @mollom.server_list
+  end
+
+  def test_server_list_with_all_servers_bad
+    Mollom.any_instance.expects(:get_server_list_from).with(:host => 'xmlrpc3.mollom.com', :proto => 'http').returns(nil)
+    Mollom.any_instance.expects(:get_server_list_from).with(:host => 'xmlrpc2.mollom.com', :proto => 'http').returns(nil)
+    Mollom.any_instance.expects(:get_server_list_from).with(:host => 'xmlrpc1.mollom.com', :proto => 'http').returns(nil)
+    assert_raise(Mollom::Error) { @mollom.server_list }
+  end
+  
+  def test_get_server_list_from_with_ok_return
     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.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
+    xml_rpc.expects(:call).times(1).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)
+    assert_equal([{:host => '172.16.0.1', :proto => 'http'}, {:host => '172.16.0.2', :proto => 'http'}, {:host => '172.16.0.2', :proto => 'https'}], @mollom.send(:get_server_list_from, {:host => 'xmlrpc.mollom.com', :proto => 'http'}))
   end
   
-  def test_server_list_force_reload
+  def test_get_server_list_from_with_raising_return
     xml_rpc = mock
-    xml_rpc.expects(:call).times(2).with('mollom.getServerList', is_a(Hash)).returns(['http://172.16.0.1', 'http://172.16.0.2', 'https://172.16.0.2'])
+    xml_rpc.expects(:call).times(1).with('mollom.getServerList', is_a(Hash)).raises(XMLRPC::FaultException.new(1000, "Broken mollom"))
     XMLRPC::Client.stubs(:new).with('xmlrpc.mollom.com', '/1.0').returns(xml_rpc)
+    assert_equal(nil, @mollom.send(:get_server_list_from, {:host => 'xmlrpc.mollom.com', :proto => 'http'}))
+  end
+  
+  def test_server_list_force_reload
+    Mollom.any_instance.expects(:get_server_list_from).times(2).with(:host => 'xmlrpc3.mollom.com', :proto => 'http').returns([{:host => '172.16.0.1', :proto => 'http'}, {:host => '172.16.0.2', :proto => 'http'}, {:host => '172.16.0.2', :proto => 'https'}])
     
     @mollom.server_list
     @mollom.server_list
     @mollom.server_list(true)
   end
   
+  def test_server_list_setter_with_good_list
+    @mollom.server_list = [{:host => '172.16.0.1', :proto => 'http'}, {:host => '172.16.0.2', :proto => 'http'}]
+    assert_equal [{:host => '172.16.0.1', :proto => 'http'}, {:host => '172.16.0.2', :proto => 'http'}], @mollom.instance_variable_get('@server_list')
+  end
+  
+  def test_send_command_with_old_server_list
+    @mollom.server_list = [{:ip => '172.16.0.1', :proto => 'http'}, {:ip => '172.16.0.2', :proto => 'http'}]
+    assert_equal nil, @mollom.instance_variable_get('@server_list')
+  end
+
+  def test_send_command_with_bad_server_list
+    @mollom.server_list = "404 Not Found Bad User Input"
+    assert_equal nil, @mollom.instance_variable_get('@server_list')
+  end
+
+  
   def test_send_command_with_good_server
-    Mollom.any_instance.expects(:server_list).returns([{:ip => '172.16.0.1', :proto => 'http'}])
+    Mollom.any_instance.expects(:server_list).returns([{:host => '172.16.0.1', :proto => 'http'}])
     xml_rpc = mock
     xml_rpc.expects(:call).with('mollom.testMessage', has_entry(:options => 'foo'))
     XMLRPC::Client.expects(:new).with('172.16.0.1', '/1.0').returns(xml_rpc)
@@ -62,7 +100,7 @@ class TestMollom < Test::Unit::TestCase
   
   
   def test_send_command_with_bad_server
-    Mollom.any_instance.expects(:server_list).returns([{:ip => '172.16.0.1', :proto => 'http'}, {:ip => '172.16.0.2', :proto => 'http'}])
+    Mollom.any_instance.expects(:server_list).returns([{:host => '172.16.0.1', :proto => 'http'}, {:host => '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
@@ -74,7 +112,7 @@ class TestMollom < Test::Unit::TestCase
   end
   
   def test_send_command_with_reload_exception
-    Mollom.any_instance.stubs(:server_list).returns([{:ip => '172.16.0.1', :proto => 'http'}], [{:ip => '172.16.0.2', :proto => 'http'}])
+    Mollom.any_instance.stubs(:server_list).returns([{:host => '172.16.0.1', :proto => 'http'}], [{:host => '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
@@ -86,7 +124,7 @@ class TestMollom < Test::Unit::TestCase
   end
   
   def test_send_command_with_bad_command
-    Mollom.any_instance.expects(:server_list).returns([{:ip => '172.16.0.1', :proto => 'http'}])
+    Mollom.any_instance.expects(:server_list).returns([{:host => '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.expects(:new).with('172.16.0.1', '/1.0').returns(xml_rpc)
@@ -95,7 +133,7 @@ class TestMollom < Test::Unit::TestCase
   end
   
   def test_send_command_with_bad_server_and_no_more_available
-    Mollom.any_instance.expects(:server_list).returns([{:ip => '172.16.0.1', :proto => 'http'}])
+    Mollom.any_instance.expects(:server_list).returns([{:host => '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"))
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mollom
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Jan De Poorter
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-17 00:00:00 +02:00
+date: 2008-09-25 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.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Ruby class for easy interfacing with the mollom.com open API for spam detection and content quality assesment.