@@ -1,2 +1,4 @@ .DS_Store -pkg/* \ No newline at end of file +pkg/* +.svn + .gitignore @@ -4,7 +4,7 @@ module Hominid class HominidError < StandardError def initialize(error) - super("#{error.message}") + super("<#{error.faultCode}> #{error.message}") end end @@ -29,12 +29,11 @@ module Hominid class NotSubscribed < HominidListEmailError end - class HominidCommunicationError < HominidError + class HominidCommunicationError < StandardError def initialize(message) super(message) end end - end begin lib/hominid.rb @@ -19,10 +19,10 @@ module Hominid @config = defaults.merge(config).freeze @chimpApi = XMLRPC::Client.new2("http://#{api_endpoint}.api.mailchimp.com/#{MAILCHIMP_API_VERSION}/") end - + # Security related methods # -------------------------------- - + def add_api_key @chimpApi.call("apikeyAdd", *@config.values_at(:username, :password, :api_key)) end @@ -35,7 +35,7 @@ module Hominid username, password = *@config.values_at(:username, :password) @chimpApi.call("apikeys", username, password, include_expired) end - + # Used internally by Hominid # -------------------------------- @@ -58,12 +58,17 @@ module Hominid else raise HominidError.new(error) end - + rescue RuntimeError => error + if error.message =~ /Wrong type NilClass\. Not allowed!/ + hashes = args.select{|a| a.is_a? Hash} + errors = hashes.select{|k, v| v.nil? }.collect{ |k, v| "#{k} is Nil." }.join(' ') + raise HominidCommunicationError.new(errors) + else + raise error + end rescue Exception => error raise HominidCommunicationError.new(error.message) end end end - - - \ No newline at end of file + lib/hominid/base.rb @@ -1,13 +1,13 @@ module Hominid class List < Base - + # List related methods # -------------------------------- attr_reader :list_id attr_reader :attributes - + def initialize(*args) options = args.last.is_a?(Hash) ? args.last : {} raise HominidError.new('Please provide a List ID.') unless options[:id] @@ -115,7 +115,7 @@ module Hominid options = apply_defaults_to({:update_existing => true}.merge(options)) call("listBatchSubscribe", @list_id, subscribers, *options.values_at(:double_opt_in, :update_existing, :replace_interests)) end - + def unsubscribe(current_email, options = {}) # Unsubscribe a list member options = apply_defaults_to({:delete_member => true}.merge(options)) @@ -135,4 +135,5 @@ module Hominid end end -end \ No newline at end of file +end + lib/hominid/list.rb 3974591e2e874293be4ca5fe599953a1fe698d63 Michael Strüder mike@mike-desktop.(none) http://github.com/bgetting/hominid/commit/737b3ececac0e7550d4d2cadc407ec6bad078451 737b3ececac0e7550d4d2cadc407ec6bad078451 2009-10-23T09:51:56-07:00 2009-10-23T09:51:56-07:00 more Exception Handling 38ab35f314fac1114aca5fa772e8fbb08e56b8fd Michael Strüder mike@mike-desktop.(none)