lib/gattica/auth.rb in cannikin-gattica-0.2.0 vs lib/gattica/auth.rb in cannikin-gattica-0.3.1

@@ -8,26 +8,39 @@
   class Auth
     
     include Convertible
 
     SCRIPT_NAME = '/accounts/ClientLogin'
-    HEADERS = { 'Content-Type' => 'application/x-www-form-urlencoded' }
-    OPTIONS = { :source => '', :service => 'analytics' }
+    HEADERS = { 'Content-Type' => 'application/x-www-form-urlencoded', 'User-Agent' => 'Ruby Net::HTTP' }   # Google asks that you be nice and provide a user-agent string
+    OPTIONS = { :source => 'gattica-'+VERSION, :service => 'analytics' }                                    # Google asks that you provide the name of your app as a 'source' parameter in your POST
+
+    attr_reader :tokens
   
-    attr_reader :response, :data, :tokens, :token
-  
-    # Prepare the user info along with options and header
-    def initialize(http, user, options={}, headers={})
-      data = OPTIONS.merge(options)
-      data = data.merge(user.to_h)
-      headers = HEADERS.merge(headers)
-    
-      @response, @data = http.post(SCRIPT_NAME, data.to_query, headers)
-      @tokens = parse_tokens(@data)
+    # Try to authenticate the user
+    def initialize(http, user)
+      options = OPTIONS.merge(user.to_h)
+      
+      response, data = http.post(SCRIPT_NAME, options.to_query, HEADERS)
+      if response.code != '200'
+        case response.code
+        when '403'
+          raise GatticaError::CouldNotAuthenticate, 'Your email and/or password is not recognized by the Google ClientLogin system (status code: 403)'
+        else
+          raise GatticaError::UnknownAnalyticsError, response.body + " (status code: #{response.code})"
+        end
+      end
+      @tokens = parse_tokens(data)
     end
   
+  
     private
-    # Parse the authentication tokens out of the response
+    
+    # Parse the authentication tokens out of the response and makes them available as a hash
+    #
+    # tokens[:auth] => Google requires this for every request (added to HTTP headers on GET requests)
+    # tokens[:sid]  => Not used
+    # tokens[:lsid] => Not used
+    
     def parse_tokens(data)
       tokens = {}
       data.split("\n").each do |t|
         tokens.merge!({ t.split('=').first.downcase.to_sym => t.split('=').last })
       end