Localize loading of facebook javascript

.gitignore

@@ -13,3 +13,5 @@ local.properties
 .classpath
 .settings/
 .loadpath
+.idea
+tapestry-facebook.iml

README

@@ -19,9 +19,9 @@ This Tapestry component library implements the Facebook XFBML async javascript l
 Currently to use the components you need to build the source then add the following to your pom file.
 
      <dependency>
-    	<groupId>com.trsvax</groupId>
-    	<artifactId>tapestry-facebook</artifactId>
-    	<version>0.0.1-SNAPSHOT</version>
+        <groupId>com.trsvax</groupId>
+        <artifactId>tapestry-facebook</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
     </dependency>
 
 

pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.trsvax</groupId>
     <artifactId>tapestry-facebook</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>0.2.0-alpha-1</version>
     <packaging>jar</packaging>
     <name>tapestry-facebook Tapestry 5 Application</name>
         <dependencies>
@@ -57,36 +57,23 @@ of testing facilities designed for use with TestNG (http://testng.org/), so it's
                     <optimize>true</optimize>
                 </configuration>
             </plugin>
-
-            <plugin>
-           <groupId>org.apache.maven.plugins</groupId>
-           <artifactId>maven-jar-plugin</artifactId>
-           <configuration>
-           <archive>
-             <manifestEntries>
-               <Tapestry-Module-Classes>com.trsvax.tapestry.facebook.services.FBModule</Tapestry-Module-Classes>
-             </manifestEntries>
-           </archive>
-           </configuration>
-       </plugin>
-
-        </plugins>
-    </build>
-
-    <reporting>
 
-        <!-- Adds a report detailing the components, mixins and base classes defined by this module. -->
-        <plugins>
             <plugin>
-                <groupId>org.apache.tapestry</groupId>
-                <artifactId>tapestry-component-report</artifactId>
-                <version>${tapestry-release-version}</version>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
-                    <rootPackage>com.trsvax.tapestry.facebook</rootPackage>
+                    <archive>
+                        <manifestEntries>
+                            <Tapestry-Module-Classes>com.trsvax.tapestry.facebook.services.FBModule</Tapestry-Module-Classes>
+                        </manifestEntries>
+                    </archive>
                 </configuration>
             </plugin>
+
         </plugins>
-    </reporting>
+    </build>
+
+    <reporting />
 
     <repositories>
 
@@ -109,6 +96,6 @@ of a Tapestry Maven plugin is not required.   -->
     </pluginRepositories>
 
     <properties>
-        <tapestry-release-version>5.2.4</tapestry-release-version>
+        <tapestry-release-version>5.3.1</tapestry-release-version>
     </properties>
 </project>

src/main/java/com/trsvax/tapestry/facebook/components/Activity.java

@@ -1,4 +1,3 @@
-
 //Copyright [2011] [Barry Books]
 
 //   Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,32 +17,27 @@
 import org.apache.tapestry5.ComponentResources;
 import org.apache.tapestry5.MarkupWriter;
 import org.apache.tapestry5.annotations.BeginRender;
-import org.apache.tapestry5.annotations.Environmental;
 import org.apache.tapestry5.annotations.SupportsInformalParameters;
 import org.apache.tapestry5.ioc.annotations.Inject;
 
-import com.trsvax.tapestry.facebook.services.FBAsyncSupport;
-
 /**
- * @author bfb
- * Facebook XFBML Activity component
+ * @author bfb Facebook XFBML Activity component
  * @see <a href="http://developers.facebook.com/docs/reference/plugins/activity/">Activity</a>
- *
+ * 
  */
 @SupportsInformalParameters
-public class Activity {
-	
+public class Activity
+{
 	@Inject
 	private ComponentResources componentResources;
-
-	@Environmental
-	private FBAsyncSupport fbAsyncSupport;
 
 	@BeginRender
-	void beginRender(MarkupWriter writer) {
-		fbAsyncSupport.render();
+	void beginRender(MarkupWriter writer)
+	{
 		writer.element("fb:activity");
+
 		componentResources.renderInformalParameters(writer);
+
 		writer.end();
 	}
 }

src/main/java/com/trsvax/tapestry/facebook/components/AsyncInit.java

@@ -1,4 +1,3 @@
-
 //Copyright [2011] [Barry Books]
 
 //   Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,26 +14,69 @@
 
 package com.trsvax.tapestry.facebook.components;
 
+import java.util.Locale;
+
 import org.apache.tapestry5.MarkupWriter;
 import org.apache.tapestry5.annotations.BeginRender;
 import org.apache.tapestry5.annotations.Environmental;
 import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.services.RequestGlobals;
+import org.apache.tapestry5.services.javascript.InitializationPriority;
+import org.apache.tapestry5.services.javascript.JavaScriptSupport;
+import org.slf4j.Logger;
 
-import com.trsvax.tapestry.facebook.FBInit;
-import com.trsvax.tapestry.facebook.services.FBAsyncSupport;
-
-public class AsyncInit {
-
-	@Parameter(autoconnect=true,required=true)
-	private FBInit fbinit;
+/**
+ * 
+ *
+ */
+public class AsyncInit
+{
+	@Inject
+	private Logger logger;
+	@Inject
+	private RequestGlobals requestGlobals;
 
 	@Environmental
-	private FBAsyncSupport fbAsyncSupport;
+	private JavaScriptSupport javaScriptSupport;
+
+	@Parameter(required = true)
+	private String appId;
+	@Parameter(value = "literal:true")
+	private boolean status;
+	@Parameter(value = "literal:true")
+	private boolean cookie;
+	@Parameter(value = "literal:true")
+	private boolean xfbml;
+	@Parameter(value = "literal:false")
+	private boolean logging;
+
+	void setupRender(MarkupWriter writer)
+	{
+		// Facebook app registration and initialization
+		writer.element("div", "id", "fb-root");
+		writer.end();
+	}
 
 	@BeginRender
-	void beginRender(MarkupWriter writer) {				
-		fbAsyncSupport.init(fbinit);		
+	void beginRender(MarkupWriter writer)
+	{
+		Locale locale = requestGlobals.getRequest().getLocale();
+		String lang = locale.getLanguage();
+		String country = locale.getCountry();
+
+		if (country == null || country.trim().length() == 0)
+			country = lang.toUpperCase();
+
+		logger.debug("Intializing FB object. Locale defined as {} {}", lang, country);
+
+		javaScriptSupport.importJavaScriptLibrary(String.format("http://connect.facebook.net/%s_%s/all.js", lang, country));
+
+		String fbInit = "FB.init({appId: '%s', status: %s, cookie: %s, xfbml: %s, logging: %s});";
+
+		javaScriptSupport.addScript(
+				InitializationPriority.IMMEDIATE,
+				fbInit,
+				appId, status, cookie, xfbml, logging);
 	}
-
-}
-
+}

src/main/java/com/trsvax/tapestry/facebook/components/Comments.java

@@ -1,4 +1,3 @@
-
 //Copyright [2011] [Barry Books]
 
 //   Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,35 +17,28 @@
 import org.apache.tapestry5.ComponentResources;
 import org.apache.tapestry5.MarkupWriter;
 import org.apache.tapestry5.annotations.BeginRender;
-import org.apache.tapestry5.annotations.Environmental;
 import org.apache.tapestry5.annotations.SupportsInformalParameters;
 import org.apache.tapestry5.ioc.annotations.Inject;
 
-import com.trsvax.tapestry.facebook.services.FBAsyncSupport;
-
-
 /**
- * @author bfb
- * Facebook XFBML Comments component
+ * @author bfb Facebook XFBML Comments component
  * @see <a href="http://developers.facebook.com/docs/reference/plugins/comments/">Comments</a>
- *
+ * 
  */
 @SupportsInformalParameters
-public class Comments {
-	
+public class Comments
+{
 	@Inject
 	private ComponentResources componentResources;
-
-	@Environmental
-	private FBAsyncSupport fbAsyncSupport;
 
 	@BeginRender
-	void beginRender(MarkupWriter writer) {
-		fbAsyncSupport.render();
+	void beginRender(MarkupWriter writer)
+	{
 		writer.element("fb:comments");
+
 		componentResources.renderInformalParameters(writer);
+
 		writer.end();
 	}
 
-
-}
+}