mollom 0.1.1 → 0.1.2

data/{README → README.rdoc}

@@ -22,7 +22,7 @@ After you have requested a public/private key-pair from Mollom (on http://www.mo
   content = m.check_content(:post_title => 'Mollem is an open API', 
 							:post_body => "Lorem Ipsum dolor...",
 							:author_name => 'Jan De Poorter',
-							:author_url => 'http://blog.defv.be')
+							:author_url => 'http://workswithruby.com')
   if content.spam?
 	puts "You, sir, are a spammer.. Goodbye!"
   elsif content.unsure?

data/lib/mollom.rb

@@ -14,6 +14,7 @@ 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.
   # 
@@ -110,11 +111,25 @@ class Mollom
   #  low-quality
   #  unwanted
   #
-  #  mollow.send_feedback :session_id => 'a9616e6b4cd6a81ecdd509fa624d895d', :feedback => 'unwanted'
+  #  mollom.send_feedback :session_id => 'a9616e6b4cd6a81ecdd509fa624d895d', :feedback => 'unwanted'
   def send_feedback feedback = {}
     return send_command('mollom.sendFeedback', feedback)
   end
 
+  # Gets a list of servers from Mollom. You should cache this information in your application in a temporary file or in a database. You can set this with Mollom#server_list=
+  # 
+  # 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"}]
+  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}
+    end
+  end
+
   private
   def send_command(command, data = {})
     server_list.each do |server|
@@ -141,25 +156,17 @@ class Mollom
     server_list(true)
     retry
   end
-
-  # Gets a list of servers from Mollom
-  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}
-    end
-  end
-
-  # Creates a HMAC-SHA1 Hash with the current timestamp, and your private key.
+  
+  # Creates a HMAC-SHA1 Hash with the current timestamp, a nonce, and your private key.
   def authentication_hash
     now = Time.now.gmtime.strftime('%Y-%m-%dT%H:%M:%S.000+0000')
+    nonce = Kernel.rand(2**31) # Random signed int
 
     hash = Base64.encode64(
-      OpenSSL::HMAC.digest(OpenSSL::Digest::SHA1.new, @private_key, now)
+      OpenSSL::HMAC.digest(OpenSSL::Digest::SHA1.new, @private_key, "#{now}:#{nonce}:#{@private_key}")
     ).chomp
 
-    return :public_key=> @public_key, :time => now, :hash => hash
+    return :public_key=> @public_key, :time => now, :hash => hash, :nonce => nonce
   end
 
   class ContentResponse

data/test/mollom_test.rb

@@ -25,10 +25,12 @@ class TestMollom < Test::Unit::TestCase
     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))
+    Kernel.expects(:rand).with(2**31).returns(42)
     hash = @mollom.authentication_hash
-    assert_equal("24qAgAC1v1U+5NbKyrQSp/XKWAI=", hash[:hash])
+    assert_equal("oWN15TqrbLVdTAgcuDmofskaNyM=", hash[:hash])
     assert_equal('yyyyyyyyy', hash[:public_key])
     assert_equal('2008-04-01T13:54:26.000+0000', hash[:time])
+    assert_equal(42, hash[:nonce])
   end
   
   def test_server_list
@@ -73,7 +75,7 @@ class TestMollom < Test::Unit::TestCase
   
   def test_send_command_with_reload_exception
     # TODO: Test this
-    @mollom.send_command('mollom.testMessage', {:options => 'foo'})
+    # @mollom.send_command('mollom.testMessage', {:options => 'foo'})
   end
   
   def test_send_command_with_bad_command

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mollom
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Jan De Poorter
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-04 00:00:00 +02:00
+date: 2008-04-24 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -20,10 +20,10 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README
+- README.rdoc
 files: 
 - lib/mollom.rb
-- README
+- README.rdoc
 has_rdoc: true
 homepage: mollom.rubyforge.com
 post_install_message: 
@@ -46,7 +46,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: mollom
-rubygems_version: 1.0.1
+rubygems_version: 1.1.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.