pingfm 1.0.2 → 2.0.0

data/.gitignore

@@ -1 +1,3 @@
+.rvmrc
+doc/api/
 pkg/

data/Gemfile

@@ -0,0 +1,4 @@
+source :rubygems
+
+# Dependencies set in .gemspec
+gemspec

data/Gemfile.lock

@@ -0,0 +1,26 @@
+PATH
+  remote: .
+  specs:
+    pingfm (2.0.0)
+      slop
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    diff-lcs (1.1.2)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    slop (1.7.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  pingfm!
+  rspec (>= 2.6.0)

data/{README → README.rdoc}

@@ -1,85 +1,75 @@
-Ping.fm Ruby Client/Library
+= Ping.fm Ruby Library
 
-== Authors
-
-* Krunoslav Husak (http://h00s.net)
-* Dale Campbell (http://corrupt.save-state.net)
-* Kevin Williams (http://almostserio.us)
+== Library Usage
 
-== CODE:
-
-http://pingfm.rubyforge.org/
+  # Require the library and initialize it.
+  require 'pingfm'
+  pingfm = Pingfm::Client.new('user_app_key')
 
-== DESCRIPTION:
+  # Ensure proper API and User App keys.
+  pingfm.validate['status']
+  # => {'status' => 'OK'}  # if success, otherwise 'FAIL'
 
-Ping.fm (http://ping.fm) is a simple service that makes updating your social networks a snap, and this it's Ruby library.
+  # Grab latest 5 posts.
+  pingfm.latest(5)  # => {'messages' => [...]}
 
-== FEATURES/PROBLEMS:
+  # Posting to all services.
+  pingfm.post('The Dark Knight was amazing.')
+  # => {'status' => 'OK'}  # if success, otherwise 'FAIL'
 
-* Installing the gem creates a 'pingfm' shell script to post from the shell.
-* Keys are stored in a YAML file in your home directory (under Linux/OSX).
+  # Post using custom user trigger; must be defined on the Ping.fm site.
+  pingfm.tpost('The message here.', '#something_custom', 'Optional Title')
+  # => {'status' => 'OK'}  # if success, otherwise 'FAIL'
 
-== SYNOPSIS:
+Check the {documentation}[http://rdoc.info/projects/Oshuma/pingfm] for more details.
 
-Shell usage:
+== Shell Usage
 
   $ pingfm This message will post to my default services.
 
-Everything after the 'pingfm' command is what will be posted to the service.  You
+Everything after the '<tt>pingfm</tt>' command is what will be posted to the service.  You
 may also include the message within quotes (ex. using the client within a shell script).
 
-If your keys have not been stored, it will ask for them.  These keys will be saved
-in a YAML file in your home directory and you won't be asked for them again.
+If your key has not been stored, it will ask for it.  This key will be saved
+in a YAML file in your home directory and you won't be asked for it again.
 
-You can obtain your keys here:
+You can obtain your key here:
 
-* User API Key - http://ping.fm/key/
-* Application API Key - http://ping.fm/developers/
+* User API Key - {http://ping.fm/key/}[http://ping.fm/key/]
 
-Library usage:
 
-  # Require the library and initialize it.
-  require 'pingfm'
-  pingfm = Pingfm::Client.new('api_key', 'user_app_key')
+== Authors
 
-  # Ensure proper API and User App keys.
-  pingfm.validate['status']
-  # => 'OK' if success, otherwise 'FAIL'
+* {Dale Campbell}[http://oshuma.github.com/]
+* {Kevin Williams}[http://kevwil.com/]
+* {Krunoslav Husak}[http://h00s.net]
 
-  # Grab latest 5 posts.
-  pingfm.latest(5)  # => {'messages' => [...]}
+== Code
 
-  # Posting to all services.
-  pingfm.post('The Dark Knight was amazing.')
-  # => {'status' => 'OK'} if success, otherwise 'FAIL'
-
-  # Post using custom user trigger; must be defined on the Ping.fm site.
-  pingfm.tpost('The message here.', '#something_custom', 'Optional Title')
-  # => {'status' => 'OK'} if success, otherwise 'FAIL'
+{http://github.com/Oshuma/pingfm}[http://github.com/Oshuma/pingfm]
 
+== Description
 
-Check the source comments for more details.
+{Ping.fm}[http://ping.fm/] is a simple service that makes updating your social networks a snap; and this it's Ruby library.
 
-== REQUIREMENTS:
+== Additional Features
 
-Ruby!
+* Installing the gem also installs a '<tt>pingfm</tt>' binary to post from the command-line.
+* User API key is stored in a YAML file in your home directory (<tt>$HOME/.pingfm.yml</tt>).
 
-== INSTALL:
+== Requirements
 
-  # From Rubyforge...
-  $ sudo gem install pingfm
+Ruby!
 
-*OR*
+== Install
 
-  # From Github...
-  $ sudo gem sources -a http://gems.github.com (only need to do this once)
-  $ sudo gem install oshuma-pingfm
+  $ [sudo] gem install pingfm
 
-== LICENSE:
+== License
 
 (The MIT License)
 
-Copyright (c) 2008 Krunoslav Husak, Dale Campbell, Kevin Williams
+Copyright (c) 2010 Dale Campbell, Kevin Williams, Krunoslav Husak
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,31 +1,16 @@
-# Look in the tasks/setup.rb file for the various options that can be
-# configured in this Rakefile. The .rake files in the tasks directory
-# are where the options are used.
+require 'bundler'
+require 'rspec/core/rake_task'
 
-load 'tasks/setup.rb'
+Bundler::GemHelper.install_tasks  
 
-ensure_in_path 'lib'
-require 'pingfm'
+task :default => :spec
 
-task :default => 'spec:run'
-
-PROJ.name = 'pingfm'
-PROJ.authors = ['Krunoslav Husak', 'Dale Campbell', 'Kevin Williams']
-PROJ.email = ['dale@save-state.net', 'kevwil@gmail.com']
-PROJ.url = 'http://pingfm.rubyforge.org/'
-PROJ.version = ENV['VERSION'] || Pingfm.version
-PROJ.rubyforge.name = 'pingfm'
-PROJ.readme_file = 'README'
-
-PROJ.spec.opts << '--color'
-
-namespace :gem do
-  desc 'create a gemspec file to support github gems'
-  task :gemspec => 'gem:prereqs' do
-    File.open("#{PROJ.name}.gemspec", 'w+') do |f|
-      f.write PROJ.gem._spec.to_ruby
-    end
-  end
+desc 'Start a console loaded with the library'
+task :console do
+  sh "irb -I ./lib -r 'pingfm'"
 end
 
-# EOF
+desc 'Run the specs'
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = ['--color']
+end

data/bin/pingfm

@@ -1,43 +1,49 @@
 #!/usr/bin/env ruby
-# TODO: Eventually add some flags to support all Ping.fm functionality.
 
-# TODO: Move this into a YAML config?
-API_KEY = '5fcb8b7041d5c32c7e1e60dc076989ba'
+require 'rubygems' if RUBY_VERSION =~ /1\.8/
+require 'bundler/setup'
+require 'slop'
 
-require File.expand_path(
-    File.join(File.dirname(__FILE__), '..', 'lib', 'pingfm'))
+opts = Slop.parse!(:help => true) do
+  banner "Usage: #{File.basename(__FILE__)} [options] <message>"
 
-keyloader = ::Pingfm::Keyloader.new
-unless keyloader.has_keys?
-  keyloader.api_key = API_KEY
-  print 'Enter your Ping.fm User API key (http://ping.fm/key/): '
-  keyloader.app_key = STDIN.gets.chomp
-  keyloader.save
-end
-
-# post message from ARGV
-
-pingfm = ::Pingfm::Client.new(keyloader.api_key, keyloader.app_key)
+  on :debug, 'Enable debugging' do
+    $DEBUG = true
+  end
 
-s = pingfm.validate
-if s['status'] == 'OK'
-  status = ARGV.join(' ')
+  # TODO: Implement these.
+  # on :c, :config, 'Use the specified (YAML) config file', :optional => false
+  # on :l, :latest, 'List your latest <count> posts', :optional => false
+  # on :t, :title,   'Title of the post'
 
-  # Might be a good idea to throw an exception here, instead of just bailing.
-  if status.nil? || status.empty?
-    puts 'Must provide a message to send.'
+  on :version, 'Print the version' do
+    STDOUT.puts "Ping.fm v#{Pingfm::VERSION}"
     exit
   end
+end
+
+if ARGV.empty?
+  STDERR.puts "Must provide a message."
+  STDERR.puts # spacer
+  STDERR.puts opts.help
+  exit
+end
 
-  post_result = pingfm.post(status)
+# Join ARGV just in case the user didn't quote the message.
+message = ARGV.join(' ')
 
-  if post_result['status'] == 'FAIL'
-    puts post_result['message']
-  else
-    puts 'Message sent.'
-  end
-else
-  puts s['message']
+begin
+  app_key = Pingfm::Config['app_key']
+rescue Pingfm::ConfigNotFound => error
+  Pingfm::Config.ask_for_app_key!
+  app_key = Pingfm::Config['app_key']
 end
 
-# EOF
+client   = Pingfm::Client.new(app_key)
+response = client.post(message)
+
+if response['status'] == 'OK'
+  STDOUT.puts 'Message sent.'
+else
+  STDERR.puts response['message']
+end

data/lib/pingfm.rb

@@ -1,56 +1,8 @@
-# $Id$
+$LOAD_PATH.unshift(File.dirname(__FILE__))
 
-# Equivalent to a header guard in C/C++
-# Used to prevent the class/module from being loaded more than once
-unless defined? Pingfm
+require 'pingfm/client'
+require 'pingfm/config'
 
 module Pingfm
-
-  # :stopdoc:
-  VERSION = '1.0.2'
-  LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
-  PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
-  # :startdoc:
-
-  # Returns the version string for the library.
-  #
-  def self.version
-    VERSION
-  end
-
-  # Returns the library path for the module. If any arguments are given,
-  # they will be joined to the end of the libray path using
-  # <tt>File.join</tt>.
-  #
-  def self.libpath( *args )
-    args.empty? ? LIBPATH : ::File.join(LIBPATH, *args)
-  end
-
-  # Returns the lpath for the module. If any arguments are given,
-  # they will be joined to the end of the path using
-  # <tt>File.join</tt>.
-  #
-  def self.path( *args )
-    args.empty? ? PATH : ::File.join(PATH, *args)
-  end
-
-  # Utility method used to rquire all files ending in .rb that lie in the
-  # directory below this file that has the same name as the filename passed
-  # in. Optionally, a specific _directory_ name can be passed in such that
-  # the _filename_ does not have to be equivalent to the directory.
-  #
-  def self.require_all_libs_relative_to( fname, dir = nil )
-    dir ||= ::File.basename(fname, '.*')
-    search_me = ::File.expand_path(
-        ::File.join(::File.dirname(fname), dir, '**', '*.rb'))
-
-    Dir.glob(search_me).sort.each {|rb| require rb}
-  end
-
-end  # module Pingfm
-
-Pingfm.require_all_libs_relative_to __FILE__
-
-end  # unless defined?
-
-# EOF
+  VERSION = '2.0.0'
+end

data/lib/pingfm/client.rb

@@ -1,38 +1,125 @@
-# Ping.fm Ruby Client
 require 'net/http'
-require 'rexml/document'
+require 'rexml/document' # TODO: Rewrite this to use something faster (Nokogiri, possibly).
 
 module Pingfm
+  class Client
 
-  # MUST NOT end with a trailing slash, as this string is interpolated like this:
-  # "#{API_URL}/user.services"
-  API_URL = 'http://api.ping.fm/v1'
+    # The registered API key for the Ping.fm Ruby library client.
+    API_KEY = '5fcb8b7041d5c32c7e1e60dc076989ba'
 
-  class Client
+    # MUST NOT end with a trailing slash, as this string is interpolated like this:
+    # "#{API_URL}/user.services"
+    # FIXME: This should be handled better; not so brittle as to break on a trailing slash.
+    API_URL = 'http://api.ping.fm/v1'
+
+    attr_reader :user_app_key
+
+    def initialize(user_app_key)
+      @user_app_key = user_app_key
+    end
+
+    # Returns the last <tt>limit</tt> messages a user has posted through Ping.fm.
+    #
+    # Optional arguments:
+    # [limit] Limit the results returned; default is 25.
+    # [order] = Which direction to order the returned results by date; default is descending.
+    #
+    # If successful returns:
+    #   {'status' => 'OK', 'messages' => [{'id' => 'messageid', 'method' => 'messsagemethod', 'rfc' => 'date', 'unix' => 'date', 'title' => 'messagetitle', 'body' => 'messagebody', 'services' => [{'id' => 'serviceid', 'name' => 'servicename'}, ...]}, ...]}
+    # If unsuccessful returns:
+    #   {'status' => 'FAIL', 'message' => 'message what went wrong'}
+    def latest(limit = 25, order = 'DESC')
+      response = get_response('user.latest', 'limit' => limit, 'order' => order)
+      if response.elements['rsp'].attributes['status'] == 'OK'
+        latest = status_ok
+        latest['messages'] = []
+        response.elements.each('rsp/messages/message') do |message|
+          latest['messages'].push({})
+          latest['messages'].last['id'] = message.attributes['id']
+          latest['messages'].last['method'] = message.attributes['method']
+          latest['messages'].last['rfc'] = message.elements['date'].attributes['rfc']
+          latest['messages'].last['unix'] = message.elements['date'].attributes['unix']
+
+          if message.elements['*/title'] != nil
+            latest['messages'].last['title'] = message.elements['*/title'].text
+          else
+            latest['messages'].last['title'] = ''
+          end
+          if message.elements['location'] != nil
+            latest['messages'].last['location'] = message.elements['location'].text
+          else
+            latest['messages'].last['location'] = ''
+          end
+          latest['messages'].last['body'] = message.elements['*/body'].text
+          latest['messages'].last['services'] = []
+          message.elements.each('services/service') do |service|
+            latest['messages'].last['services'].push({'id' => service.attributes['id'], 'name' => service.attributes['name']})
+          end
+        end
+        return latest
+      else
+        return status_fail(response)
+      end
+    end
+
+    # Posts a message to the user's Ping.fm services.
+    #
+    # Arguments:
+    # [body] Message body.
+    #
+    # Optional <tt>args</tt>:
+    # [title] Title of the posted message; title is required for 'blog' post method.
+    # [post_method] Posting method; either 'default', 'blog', 'microblog' or 'status'.
+    # [service] A single service to post to.
+    # [debug] Set debug to 1 to avoid posting test data.
+    #
+    # If successful returns:
+    #   {'status' => 'OK'}
+    # If unsuccessful returns:
+    #   {'status' => 'FAIL', 'message' => 'message what went wrong'}
+    def post(body, opts = { :title => '', :post_method => 'default', :service => '', :debug => false })
+      response = get_response('user.post',
+                              'body' => body, 'title' => opts[:title],
+                              'post_method' => opts[:post_method], 'service' => opts[:service],
+                              'debug' => (opts[:debug] ? 1 : 0))
+
+      if response.elements['rsp'].attributes['status'] == 'OK'
+        return status_ok
+      else
+        return status_fail(response)
+      end
+    end
+
+    # Returns a list of services the user has set up through Ping.fm.
+    #
+    # If successful returns:
+    #   {'status' => 'OK', 'services' => [{'id' => 'serviceid', 'name' => 'servicename', 'trigger' => 'servicetrigger', 'url' => 'serviceurl', 'icon' => 'serviceicon', 'methods' => 'status,blog'}, ...]}
+    # If unsuccessful returns:
+    #   {'status' => 'FAIL', 'message' => 'message what went wrong'}
+    def services
+      response = get_response('user.services')
+      if response.elements['rsp'].attributes['status'] == 'OK'
+        services = status_ok()
+        services['services'] = []
+        response.elements.each('rsp/services/service') do |service|
+          services['services'].push({'id' => service.attributes['id'],
+                        'name' => service.attributes['name'],
+                        'trigger' => service.elements['trigger'].text,
+                        'url' => service.elements['url'].text,
+                        'icon' => service.elements['icon'].text,
+                        'methods' => service.elements['methods'].text})
+        end
+        return services
+      else
+        return status_fail(response)
+      end
+    end
 
-  	def initialize(api_key, user_app_key)
-  		@api_key = api_key
-  		@user_app_key = user_app_key
-  	end
-
-  	# Validates API key and user APP key
-  	# if successful returns:
-  	#   {'status' => 'OK'}
-  	# if unsuccessful returns:
-  	#   {'status' => 'FAIL', 'message' => 'message what went wrong'}
-  	def validate
-  	  response = get_response('user.validate')
-  		if response.elements['rsp'].attributes['status'] == 'OK'
-  			return status_ok
-  		else
-  			return status_fail(response)
-  		end
-  	end
-
-    # Return a complete list of supported services
-    # if successful returns:
+    # Return a complete list of supported services.
+    #
+    # If successful returns:
     #   {'status' => 'OK', 'services' => [{'id' => 'serviceid', 'name' => 'servicename', 'trigger' => 'servicetrigger', 'url' => 'serviceurl', 'icon' => 'serviceicon'}, ...]}
-    # if unsuccessful returns:
+    # If unsuccessful returns:
     #   {'status' => 'FAIL', 'message' => 'message what went wrong'}
     def system_services
       response = get_response('system.services')
@@ -52,174 +139,102 @@ module Pingfm
       end
     end
 
-  	# Returns a list of services the user has set up through Ping.fm
-  	# if successful returns:
-    #   {'status' => 'OK', 'services' => [{'id' => 'serviceid', 'name' => 'servicename', 'trigger' => 'servicetrigger', 'url' => 'serviceurl', 'icon' => 'serviceicon', 'methods' => 'status,blog'}, ...]}
-  	# if unsuccessful returns:
-  	#   {'status' => 'FAIL', 'message' => 'message what went wrong'}
-  	def services
-  	  response = get_response('user.services')
-  		if response.elements['rsp'].attributes['status'] == 'OK'
-  			services = status_ok()
-  			services['services'] = []
-  			response.elements.each('rsp/services/service') do |service|
-  				services['services'].push({'id' => service.attributes['id'],
-  											'name' => service.attributes['name'],
-  											'trigger' => service.elements['trigger'].text,
-  											'url' => service.elements['url'].text,
-  											'icon' => service.elements['icon'].text,
-  											'methods' => service.elements['methods'].text})
-  			end
-  			return services
-  		else
+    # Posts a message to the user's Ping.fm services using one of their custom triggers.
+    #
+    # Arguments:
+    # [body] Message body.
+    # [trigger] Custom trigger the user has defined from the Ping.fm website.
+    #
+    # Optional arguments:
+    # [title] Title of the posted message; title is required for 'blog' post method.
+    # [debug] Set debug to +true+ to avoid posting test data.
+    #
+    # If successful returns:
+    #   {'status' => 'OK'}
+    # If unsuccessful returns:
+    #   {'status' => 'FAIL', 'message' => 'message what went wrong'}
+    def tpost(body, trigger, opts = { :title => '', :debug => false })
+      response = get_response('user.tpost',
+                              'body' => body, 'title' => opts[:title],
+                              'trigger' => trigger, 'debug' => (opts[:debug] ? 1 : 0))
+      if response.elements['rsp'].attributes['status'] == 'OK'
+        return status_ok
+      else
         return status_fail(response)
-  		end
-  	end
-
-  	# Returns a user's custom triggers
-  	# if successful returns:
-  	#   {'status' => 'OK', 'triggers' => [{'id' => 'triggerid', 'method' => 'triggermethod', 'services' => [{'id' => 'serviceid', 'name' => 'servicename'}, ...]}, ...]}
-  	# if unsuccessful returns:
-  	#   {'status' => 'FAIL', 'message' => 'message what went wrong'}
-  	def triggers
-  	  response = get_response('user.triggers')
-  		if response.elements['rsp'].attributes['status'] == 'OK'
-  			triggers = status_ok
-  			triggers['triggers'] = []
-  			response.elements.each('rsp/triggers/trigger') do |trigger|
-  				triggers['triggers'].push({'id' => trigger.attributes['id'], 'method' => trigger.attributes['method'], 'services' => []})
-
-  				trigger.elements.each('services/service') do |service|
-  					triggers['triggers'].last['services'].push({'id' => service.attributes['id'], 'name' => service.attributes['name']})
-  				end
-  			end
-  			return triggers
-  		else
-  			return status_fail(response)
-  		end
-  	end
-
-  	# Returns the last <tt>limit</tt> messages a user has posted through Ping.fm
-  	# Optional arguments:
-  	# limit = limit the results returned, default is 25
-  	# order = which direction to order the returned results by date, default is DESC (descending)
-  	# if successful returns:
-  	#   {'status' => 'OK', 'messages' => [{'id' => 'messageid', 'method' => 'messsagemethod', 'rfc' => 'date', 'unix' => 'date', 'title' => 'messagetitle', 'body' => 'messagebody', 'services' => [{'id' => 'serviceid', 'name' => 'servicename'}, ...]}, ...]}
-  	# if unsuccessful returns:
-  	#   {'status' => 'FAIL', 'message' => 'message what went wrong'}
-  	def latest(limit = 25, order = 'DESC')
-  	  response = get_response('user.latest', 'limit' => limit, 'order' => order)
-  		if response.elements['rsp'].attributes['status'] == 'OK'
-  			latest = status_ok
-  			latest['messages'] = []
-  			response.elements.each('rsp/messages/message') do |message|
-  				latest['messages'].push({})
-  				latest['messages'].last['id'] = message.attributes['id']
-  				latest['messages'].last['method'] = message.attributes['method']
-  				latest['messages'].last['rfc'] = message.elements['date'].attributes['rfc']
-  				latest['messages'].last['unix'] = message.elements['date'].attributes['unix']
-
-  				if message.elements['*/title'] != nil
-  					latest['messages'].last['title'] = message.elements['*/title'].text
-  				else
-  					latest['messages'].last['title'] = ''
-  				end
-          if message.elements['location'] != nil
-            latest['messages'].last['location'] = message.elements['location'].text
-          else
-            latest['messages'].last['location'] = ''
+      end
+    end
+
+    # Returns a user's custom triggers.
+    #
+    # If successful returns:
+    #   {'status' => 'OK', 'triggers' => [{'id' => 'triggerid', 'method' => 'triggermethod', 'services' => [{'id' => 'serviceid', 'name' => 'servicename'}, ...]}, ...]}
+    # If unsuccessful returns:
+    #   {'status' => 'FAIL', 'message' => 'message what went wrong'}
+    def triggers
+      response = get_response('user.triggers')
+      if response.elements['rsp'].attributes['status'] == 'OK'
+        triggers = status_ok
+        triggers['triggers'] = []
+        response.elements.each('rsp/triggers/trigger') do |trigger|
+          triggers['triggers'].push({'id' => trigger.attributes['id'], 'method' => trigger.attributes['method'], 'services' => []})
+
+          trigger.elements.each('services/service') do |service|
+            triggers['triggers'].last['services'].push({'id' => service.attributes['id'], 'name' => service.attributes['name']})
           end
-  				latest['messages'].last['body'] = message.elements['*/body'].text
-  				latest['messages'].last['services'] = []
-  				message.elements.each('services/service') do |service|
-  					latest['messages'].last['services'].push({'id' => service.attributes['id'], 'name' => service.attributes['name']})
-  				end
-  			end
-  			return latest
-  		else
-  			return status_fail(response)
-  		end
-  	end
-
-  	# Posts a message to the user's Ping.fm services
-  	# Arguments:
-  	# body = message body
-  	# Optional arguments:
-  	# title = title of the posted message, title is required for 'blog' post method
-  	# post_method = posting method; either 'default', 'blog', 'microblog' or 'status.'
-  	# service = a single service to post to
-  	# debug = set debug to 1 to avoid posting test data
-  	# if successful returns:
-  	#   {'status' => 'OK'}
-  	# if unsuccessful returns:
-  	#   {'status' => 'FAIL', 'message' => 'message what went wrong'}
-  	def post(body, title = '', post_method = 'default', service = '', debug = 0)
-  	  response = get_response('user.post',
-  	                          'body' => body, 'title' => title,
-  	                          'post_method' => post_method, 'service' => service,
-  	                          'debug' => debug)
-  		if response.elements['rsp'].attributes['status'] == 'OK'
-  			return status_ok
-  		else
-  			return status_fail(response)
-  		end
-  	end
-
-  	# Posts a message to the user's Ping.fm services using one of their custom triggers
-  	# Arguments:
-  	# body = message body
-  	# trigger = custom trigger the user has defined from the Ping.fm website
-  	# Optional arguments:
-  	# title = title of the posted message, title is required for 'blog' post method
-  	# debug = set debug to 1 to avoid posting test data
-  	# if successful returns:
-  	#   {'status' => 'OK'}
-  	# if unsuccessful returns:
-  	#   {'status' => 'FAIL', 'message' => 'message what went wrong'}
-  	def tpost(body, trigger, title = '', debug = 0)
-  	  response = get_response('user.tpost',
-  	                          'body' => body, 'title' => title,
-  	                          'trigger' => trigger, 'debug' => debug)
-  		if response.elements['rsp'].attributes['status'] == 'OK'
-  			return status_ok
-  		else
-  			return status_fail(response)
-  		end
-  	end
-
-  	private
+        end
+        return triggers
+      else
+        return status_fail(response)
+      end
+    end
+
+    # Validates the API key and user APP key.
+    #
+    # If successful returns:
+    #   {'status' => 'OK'}
+    # If unsuccessful returns:
+    #   {'status' => 'FAIL', 'message' => 'message what went wrong'}
+    def validate
+      response = get_response('user.validate')
+      if response.elements['rsp'].attributes['status'] == 'OK'
+        return status_ok
+      else
+        return status_fail(response)
+      end
+    end
+
+    private
 
     # Gets a particular ping.fm response.
-    # <tt>type</tt>: The service type (ex. 'user.services'). Gets appended to <tt>API_URL</tt>.
-    # <tt>parameters</tt>: Optional (depending on the <tt>type</tt>) parameters to be passed along
-    # with the request.  The API key and user app key are merged with this on every call.
+    #
+    # [type] The service type (ex. 'user.services'). Gets appended to <tt>API_URL</tt>.
+    # [parameters] Optional (depending on the <tt>type</tt>) parameters to be passed along.  with the request.  The API key and user app key are merged with this on every call.
     def get_response(type, parameters = {})
-      parameters.merge!('api_key' => @api_key, 'user_app_key' => @user_app_key)
-  		REXML::Document.new(http_request("#{API_URL}/#{type}", parameters))
+      parameters.merge!('api_key' => API_KEY, 'user_app_key' => @user_app_key)
+      REXML::Document.new(http_request("#{API_URL}/#{type}", parameters))
     end
 
     # This makes the actual HTTP request.
-  	def http_request(url, parameters)
-  		response = Net::HTTP.post_form(URI.parse(url), parameters)
-  		return response.body
-  	end
+    def http_request(url, parameters)
+      response = Net::HTTP.post_form(URI.parse(url), parameters)
+      return response.body
+    end
 
     # Successful response.
-  	def status_ok
-  		return {'status' => 'OK'}
-  	end
+    def status_ok
+      return {'status' => 'OK'}
+    end
 
     # Failed response.
-  	def status_fail(response)
+    def status_fail(response)
       if response.elements.include? 'rsp/message'
         message = response.elements['rsp/message'].text
       else
-        message = "Unknown error from Ping.fm"
+        message = "Unknown error from Ping.fm."
       end
 
-  		return {'status' => 'FAIL', 'message' => message}
-  	end
+      return {'status' => 'FAIL', 'message' => message}
+    end
 
   end
-
 end