ymdp 0.4.1 → 0.4.2

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/lib/ymdp/javascripts/init.js

@@ -48,7 +48,7 @@ YAHOO.init.startup = function() {
 	  } catch(omg) {
 	    Debug.error(omg);
 	  }
-    YAHOO.init.local();
+    YAHOO.oib.getUserState(YAHOO.init.local, YAHOO.init.local);
   });
 };
 
@@ -133,27 +133,3 @@ YAHOO.init.showAndFinish = function() {
   YAHOO.init.show();
   YAHOO.init.after();
 };
-
-YAHOO.init.translateToolbar = function() {
-  Debug.log("begin YAHOO.init.translateToolbar");
-  // will we have a toolbar?
-  Debug.log("end YAHOO.init.translateToolbar");
-};
-
-YAHOO.init.translateGreeting = function() {
-  Debug.log("begin YAHOO.init.translateGreeting");
-};
-
-YAHOO.init.translateSubhead = function() {
-  Debug.log("YAHOO.init.translateSubhead");
-};
-
-
-YAHOO.init.translateFooter = function() {
-  I18n.update('copyright', 'COPYRIGHT');
-  I18n.update('about_link', 'ABOUT');
-  I18n.update('support_link', 'SUPPORT');
-  I18n.update('contact_link', 'CONTACT');
-  I18n.update('privacy_link', 'PRIVACY');
-  I18n.update('terms_and_conditions_link', 'TERMS_AND_CONDITIONS');
-};

data/lib/ymdp/javascripts/user.js

@@ -1,32 +1,11 @@
-// gets both guid and ymail_wssid and stores them then runs the callback_function
-//
-// YAHOO.oib.ymail_wssid
-// YAHOO.oib.guid
-//
-YAHOO.oib.getGuidAndYmailWssid = function(callback_function) {
-  Debug.log("YAHOO.oib.getGuidAndYmailWssid");
-	YAHOO.oib.getGuid(function(guid) {
-		YAHOO.oib.getYmailWssid(function(ymail_wssid) {
-			callback_function(guid, ymail_wssid);
-		});
-	});
-};
-
 // gets user's state info from /ymdp/state
 // including the user's OIB login
 //
-YAHOO.oib.getUserState = function(success_function) {
+YAHOO.oib.getUserState = function(success_function, error_function) {
   Debug.log("YAHOO.oib.getUserState");
 	OIB.get("ymdp/state", {}, function(response) {
 	  Debug.log("YAHOO.oib.getUserState callback", response);
-	  YAHOO.oib.response = response;
-    try {
-          YAHOO.oib.since_date = formatUnixDate(YAHOO.oib.response.since_date.s);
-        } catch(omg) {
-          YAHOO.oib.since_date = 1294869484;
-        }
-	  YAHOO.oib.login = response.login;
-	  YAHOO.oib.state = response.state;
+    YAHOO.oib.setUserVariables(response);
 
 	  if (success_function) {
 	    Debug.log("YAHOO.oib.getUserState: About to success function")
@@ -34,25 +13,40 @@ YAHOO.oib.getUserState = function(success_function) {
 	  }
 	},
 	function() {
-	  YAHOO.logger.error("Failed to get user's state");
+    // YAHOO.logger.error("Failed to get user's state");
+    Debug.log("Failed to get user's state");
+    if (error_function) {
+      error_function();
+    }
 	});
 };
 
-
+YAHOO.oib.setUserVariables = function(response) {
+  YAHOO.oib.response = response;
+  try {
+    YAHOO.oib.since_date = formatUnixDate(YAHOO.oib.response.since_date.s);
+  } catch(omg) {
+    YAHOO.oib.since_date = 1294869484;
+  }
+  YAHOO.oib.login = response.login;
+  YAHOO.oib.state = response.state;
+};
 
 /*
 	  YAHOO.oib.verifyUser
 
 	  global to all views.  calls the 'verify' action on ymdp controller and executes
 	  a function with the result.
+	  
+	  Sends the server the user's guid and 'ymail_wssid', which signs the user in if the
+	  values match what we have in the database.
 */
 YAHOO.oib.verifyUser = function(success_function, error_function) {
   Debug.log("YAHOO.oib.verifyUser");
   
   OIB.get("ymdp/verify", {
     ymail_guid: YAHOO.oib.guid,
-    ymail_wssid: YAHOO.oib.ymail_wssid,
-    application: View.application
+    ymail_wssid: YAHOO.oib.ymail_wssid
   }, function(response) {
     YAHOO.oib.user = response;
     Debug.log("YAHOO.oib.verifyUser YAHOO.oib.user", YAHOO.oib.user);
@@ -68,19 +62,17 @@ YAHOO.oib.verifyUser = function(success_function, error_function) {
 		AUTHENTICATION
 */
 
-YAHOO.oib.signInUser = function() {
-  Debug.log("YAHOO.oib.signInUser");
-	OIB.get("ymdp/signin", {}, function(response) {  
-	  Debug.log("inside ymdp/signin callback", response);
-	  Debug.log("YAHOO.oib.response", YAHOO.oib.response);
-    if (response.ymail_wssid === "false") {
-      // signin didn't work properly, display an error
-      Debug.log("YAHOO.oib.response was false");
-      YAHOO.oib.showError({
-        "method": "YAHOO.oib.signInUser",
-        "description": "no ymail_wssid"
-      });
-    } else {
+// Gets the ymail_wssid which is stored in the database on the remote server
+// for the current user.
+//
+YAHOO.oib.confirm = function() {
+  Debug.log("YAHOO.oib.confirm");
+  OIB.get("ymdp/confirm", {
+    "ymail_guid": YAHOO.oib.guid
+  }, function(response) {
+    Debug.log("inside ymdp/signin callback", response);
+    
+    if (response.ymail_wssid) {
       Debug.log("YAHOO.oib.response wasn't false");
       // store ymail_wssid in permanent store
       
@@ -91,50 +83,39 @@ YAHOO.oib.signInUser = function() {
         "ymail_wssid": sliced_wssid
       };
       
-      Debug.log("About to call Data.sore", data);
+      Debug.log("About to call Data.store", data);
       
       Data.store(data);
       YAHOO.oib.ymail_wssid = response.ymail_wssid;
   
-      YAHOO.oib.verifyUser(YAHOO.launcher.launchMain);
+      // now that we've got their ymail_wssid, we can sign them in:
+      // YAHOO.oib.verifyUser(YAHOO.launcher.launchMain);
+      YAHOO.launcher.launchMain();
+    } else {
+      // signin didn't work properly, display an error
+      Debug.log("YAHOO.oib.response was false");
+      YAHOO.oib.showError({
+        "method": "YAHOO.oib.confirm",
+        "description": "no ymail_wssid"
+      });
     }
-	});
+ });
 };
 
-
-// gets the guid from the Yahoo! environment and executes the success callback
-// if there is a guid, and the error callback if it's undefined
+// gets both guid and ymail_wssid and stores them then runs the callback_function
 //
+// YAHOO.oib.ymail_wssid
 // YAHOO.oib.guid
 //
-YAHOO.oib.getGuid = function(success_function, error_function) {
-  Debug.log("YAHOO.oib.getGuid");
-  
-  openmail.Application.getParameters(function(response) {
-    YAHOO.oib.guid = response.user.guid;
-    try {
-      Debug.log("YAHOO.oib.getGuid getParameters response", response);
-      
-      var params = {};
-      if (response.data) {
-        params = response.data.launchParams;
-      }
-      Params.init(params);
-    } catch(omg) {
-      Debug.error("error getting parameters: " + omg);
-    }
-		if (YAHOO.oib.guid !== undefined) {
-    	Try.these(
-				function() { success_function(YAHOO.oib.guid); }
-			);
-		}
-		else {
-			Try.these(error_function);
-		}
+YAHOO.oib.getGuidAndYmailWssid = function(callback_function) {
+  Debug.log("YAHOO.oib.getGuidAndYmailWssid");
+  YAHOO.oib.getGuid(function(guid) {
+   YAHOO.oib.getYmailWssid(function(ymail_wssid) {
+     callback_function(guid, ymail_wssid);
+   });
   });
 };
 
-
 // gets the ymail_wssid from the permanent store and executes the callback function
 // if there is a ymail_wssid, and the error callback if it's undefined
 //
@@ -146,42 +127,67 @@ YAHOO.oib.getYmailWssid = function(success_function, error_function) {
   // this function will show the error page if the ymail_wssid has not been set
   //
   var show_error = function() {
-    if (YAHOO.oib.ymail_wssid === undefined) {
+    if (!YAHOO.oib.ymail_wssid) {
       Debug.log("No YAHOO.oib.ymail_wssid");
       
       YAHOO.oib.showError({
         "retry": "hide"
       });
-    } else {
-      Debug.log("YAHOO.oib.ymail_wssid does exist", YAHOO.oib.ymail_wssid);
     }
   };
   
   // run the show_error function after 5 seconds
   //
-  Debug.log("Set timeout for error function to 5 seconds");
-  YAHOO.oib.setTimeoutInSeconds(show_error, 5);
-  Debug.log("About to call Data.fetch");
+  // Debug.log("Set timeout for error function to 10 seconds");
+  // YAHOO.oib.setTimeoutInSeconds(show_error, 10);
+  // Debug.log("About to call Data.fetch");
   
   // retrieve the user's ymail_wssid and store it in YAHOO.oib.ymail_wssid
   //
 	Data.fetch(["ymail_wssid"], function(response) {
 	  Debug.log("Inside Data.fetch callback");
     YAHOO.oib.ymail_wssid = response.data.ymail_wssid;
-		if (YAHOO.oib.ymail_wssid !== undefined) {
-		  Debug.log("YAHOO.oib.ymail_wssid is defined", YAHOO.oib.ymail_wssid);
-		  
-		  try {
-        success_function(YAHOO.oib.ymail_wssid);
-		  } catch(omg) {
-		    Debug.error("Error in YAHOO.oib.getYmailWssid getData callback", omg);
-		  }
-		  
+    
+	  Debug.log("YAHOO.oib.ymail_wssid is defined", YAHOO.oib.ymail_wssid);
+	  
+	  try {
+      success_function(YAHOO.oib.ymail_wssid);
+	  } catch(omg) {
+	    Debug.error("Error in YAHOO.oib.getYmailWssid getData callback", omg);
+	  }
+	});
+};
+
+// gets the guid from the Yahoo! environment and executes the success callback
+// if there is a guid, and the error callback if it's undefined
+//
+// YAHOO.oib.guid
+//
+YAHOO.oib.getGuid = function(success_function, error_function) {
+  Debug.log("YAHOO.oib.getGuid");
+  
+  openmail.Application.getParameters(function(response) {
+    YAHOO.oib.guid = response.user.guid;
+    try {
+      Debug.log("YAHOO.oib.getGuid getParameters response", response);
+      
+      var params = {};
+      if (response.data) {
+        params = response.data.launchParams;
+      }
+      Params.init(params);
+    } catch(omg) {
+      Debug.error("error getting parameters: " + omg);
+    }
+		if (YAHOO.oib.guid !== undefined) {
+    	Try.these(
+				function() { success_function(YAHOO.oib.guid); }
+			);
 		}
 		else {
 			Try.these(error_function);
 		}
-	});
+  });
 };
 
 YAHOO.oib.deactivateUser = function() {

data/ymdp.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ymdp}
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Coleman"]
-  s.date = %q{2011-04-03}
+  s.date = %q{2011-04-04}
   s.description = %q{Framework for developing applications in the Yahoo! Mail Development Platform.}
   s.email = %q{progressions@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ymdp
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Jeff Coleman
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-03 00:00:00 -05:00
+date: 2011-04-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency