eventfulapi 2.1 → 2.1.1

data/lib/eventful/api.rb

@@ -5,7 +5,7 @@
 # See http://api.eventful.com for more information about the Eventful API and
 # the available API methods.
 #
-# = Example Usage
+# == Example Usage
 #
 #  require 'rubygems'
 #  require 'eventful/api'
@@ -34,15 +34,21 @@
 #  end
 #
 #
-# = API Key
+# == API Key
 #
-# Use of the Eventful API requires an application key (see http://api.eventful.com/keys for more information).
+# Use of the Eventful API requires an application key 
+# (see http://api.eventful.com/keys for more information).
 #
-# = Change Notes
+# == Change Notes
 #
-# == Eventful API
+# === Eventful API
 #
-# === Version 2.1
+# ==== Version 2.1.1
+#
+# - Includes a workaround fix for an authentication bug. This fix may be rolled
+#   back should the workaround become unecessary in the future.
+#
+# ==== Version 2.1
 #
 # - As EVDB Inc. has been renamed Eventful Inc., the EVDB module has been 
 #   renamed Eventful, and the gem is now named eventfulapi. Support for the 
@@ -51,13 +57,13 @@
 #   rather than failing silently and mysteriously
 # - Documentation improvements
 #
-# == EVDB API
+# === EVDB API
 #
-# === Version 2.0.1
+# ==== Version 2.0.1
 #
 # - Fixed a minor documentation error
 #
-# === Version 2.0 
+# ==== Version 2.0 
 #
 # Version 2.0 of this library includes some significant changes which may not
 # be backwards compatible. Specifically:
@@ -69,10 +75,10 @@
 # XML, and the objects returned from a call can be used like hashes instead of
 # REXML objects.
 #
-# = Information
+# == Information
 #
 # Status::             Stable
-# Version::            2.1
+# Version::            2.1.1
 # Date::               2007-03-24
 # Current Author::     Paul Knight (mailto:pknight@eventful.com)
 # Previous Authors::   Joe Auricchio
@@ -98,7 +104,8 @@ require 'cgi'
 require 'net/http'
 require 'base64'
 require 'digest/md5'
-
+require 'open-uri'
+require 'rexml/document'
 
 
 
@@ -157,7 +164,6 @@ module Eventful
     #
     # <tt>'user'</tt>:: Authenticate as this user, required for some API methods. A password must also be specified.
     # <tt>'password'</tt>:: Password for user authentication.
-    # <tt>'api_server'</tt>, <tt>'api_root'</tt>, <tt>'api_port'</tt>:: For specifying a different API server.
     #
     # Example:
     # 
@@ -177,14 +183,7 @@ module Eventful
       
       # User authentication
       if (options['user'] && options['password'])
-        # Get a nonce; we expect an error response here, so rescue the exception and continue
-        begin
-          response = call 'users/login', 
-                          'app_key' => app_key
-        rescue APIError => err
-          raise if !err.response['nonce']
-          nonce = err.response['nonce']
-        end
+        nonce = get_nonce app_key
         
         # Login with a hash of the nonce and our password
         login_hash = Digest::MD5.hexdigest("#{nonce}:#{Digest::MD5.hexdigest(options['password'])}")
@@ -264,6 +263,13 @@ module Eventful
       return yaml
     end
     
+    # Only intended for the first users/login authentication call
+    def get_nonce(app_key) # :nodoc:
+      open "http://#{@api_server}/rest/users/login?app_key=#{CGI::escape app_key}" do |f|
+        (REXML::Document.new f.read).elements["error/nonce"].text
+      end
+    end
+    
     
     
   end # class API

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: eventfulapi
 version: !ruby/object:Gem::Version 
-  version: "2.1"
-date: 2007-03-26 00:00:00 -07:00
+  version: 2.1.1
+date: 2007-04-24 00:00:00 -07:00
 summary: Interface to the Eventful API. http://eventful.com
 require_paths: 
 - lib