facebook-social_plugins 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/facebook-social_plugins.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "facebook-social_plugins"
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = "2012-04-17"
+  s.date = "2012-05-03"
   s.description = "HTML5 compatible social plugin helpers for Rails 3"
   s.email = "kmandrup@gmail.com"
   s.extra_rdoc_files = [
@@ -59,7 +59,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/kristianmandrup/facebook-social_plugins"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.22"
+  s.rubygems_version = "1.8.24"
   s.summary = "Facebook HTML5 style social plugins for Rails 3"
 
   if s.respond_to? :specification_version then

data/lib/facebook-social_plugins/helper/script.rb

@@ -98,11 +98,21 @@ module FacebookSocialPlugins::Helper
 		# options - status, cookie, xfbml (true|false)
 		# - :channel => 'channel.html'
 		def fb_async_init_script app_id, domain, options = {}
+			raise ArgumentError, "Not a valid Facebook App ID. It should be a 15 digit number, was: #{app_id}, length=#{app_id.size}" unless valid_facebook_id?(app_id)
+			raise ArgumentError, "No domain name specified" if domain.blank?
+
+			if options[:channel] || options[:channel_url]
+				locale = options[:locale] || I18n.locale
+				channel = options[:channel_url] || "assets/facebook_channel_#{locale}" 
+				channelAttrib = "channelUrl : '//#{domain}/#{channel}.html', // Channel File"
+			else
+				channelAttrib = '// No Facebook channel defined (use fx #fb_channel_script)'
+			end
 			%Q{
   window.fbAsyncInit = function() {
     FB.init({
-      appId      : '#{app_id}', // App ID
-      channelUrl : '//#{domain}/#{options[:channel] || 'assets/facebook_channel'}.html', // Channel File
+      appId      : '#{app_id}', // App ID    
+      #{channelAttrib}
       status     : #{options[:status] || true}, // check login status
       cookie     : #{options[:cookie] || true}, // enable cookies to allow the server to access the session
       xfbml      : #{options[:xfbml] || true }  // parse XFBML
@@ -113,12 +123,19 @@ module FacebookSocialPlugins::Helper
 }
 		 end			
 
+		def valid_facebook_id? id
+			raise ArgumentError, "No Facebook app id specified" if id.blank?
+			id = /\d{15}/
+		end
+
 		def fb_channel_script locale = :en_US
 			%Q{
 (function(d){
    var js, id = 'facebook-jssdk'; if (d.getElementById(id)) {return;}
-   js = d.createElement('script'); js.id = id; js.async = true;
-   js.src = "#{all_script locale}";
+   js 			= d.createElement('script'); 
+   js.id 		= id; 
+   js.async = true;
+   js.src 	= '#{all_script(locale)}';
    d.getElementsByTagName('head')[0].appendChild(js);
  }(document));
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: facebook-social_plugins
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-17 00:00:00.000000000 Z
+date: 2012-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -200,7 +200,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2068637524663629491
+      hash: 363436722533423850
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -209,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.22
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Facebook HTML5 style social plugins for Rails 3