mmangino-facebooker 1.0.36 → 1.0.37

data/facebooker.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{facebooker}
-  s.version = "1.0.36"
+  s.version = "1.0.37"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chad Fowler", "Patrick Ewing", "Mike Mangino", "Shane Vitarana", "Corey Innis"]
-  s.date = %q{2009-05-28}
+  s.date = %q{2009-06-04}
   s.description = %q{Facebooker is a Ruby wrapper over the Facebook[http://facebook.com] {REST API}[http://wiki.developers.facebook.com/index.php/API].  Its goals are:  * Idiomatic Ruby * No dependencies outside of the Ruby standard library (This is true with Rails 2.1. Previous Rails versions require the JSON gem) * Concrete classes and methods modeling the Facebook data, so it's easy for a Rubyist to understand what's available * Well tested}
   s.email = %q{mmangino@elevatedrails.com}
   s.extra_rdoc_files = ["Manifest.txt", "CHANGELOG.rdoc", "COPYING.rdoc", "README.rdoc", "TODO.rdoc"]

data/lib/facebooker/rails/helpers/fb_connect.rb

@@ -11,21 +11,29 @@ module Facebooker
           end
         end
         
+        # 
+        # For information on the :app_settings argument see http://wiki.developers.facebook.com/index.php/JS_API_M_FB.Facebook.Init_2 
+        # While it would be nice to treat :app_settings as a hash, some of the arguments do different things if they are a string vs a javascript function
+        # and Rails' Hash#to_json always quotes strings so there is no way to indicate when the value should be a javascript function.
+        # For this reason :app_settings needs to be a string that is valid JSON (including the {}'s).
+        #
         def init_fb_connect(*required_features,&proc)
           additions = ""
           if block_given?
             additions = capture(&proc)
           end
 
-          options = {:js => :prototype}
+          # Yes, app_settings is set to a string of an empty JSON element. That's intentional.
+          options = {:js => :prototype, :app_settings => '{}'}
+
           if required_features.last.is_a?(Hash)
             options.merge!(required_features.pop.symbolize_keys)
           end
 
           if request.ssl?
-            init_string = "FB.Facebook.init('#{Facebooker.api_key}','/xd_receiver_ssl.html');"
+            init_string = "FB.Facebook.init('#{Facebooker.api_key}','/xd_receiver_ssl.html', #{options[:app_settings]});"
           else
-            init_string = "FB.Facebook.init('#{Facebooker.api_key}','/xd_receiver.html');"
+            init_string = "FB.Facebook.init('#{Facebooker.api_key}','/xd_receiver.html', #{options[:app_settings]});"
           end
           unless required_features.blank?
              init_string = <<-FBML
@@ -98,9 +106,9 @@ module Facebooker
           link_to_function text, js, *args
         end
         
-        def fb_user_action(action, user_message = "", prompt = "", callback = nil)
+        def fb_user_action(action, user_message = nil, prompt = "", callback = nil)
           update_page do |page|
-            page.call "FB.Connect.showFeedDialog",action.template_id,action.data,action.target_ids,action.body_general,nil,page.literal("FB.RequireConnect.promptConnect"),callback,prompt,user_message
+            page.call("FB.Connect.showFeedDialog",action.template_id,action.data,action.target_ids,action.body_general,nil,page.literal("FB.RequireConnect.promptConnect"),callback,prompt,user_message.nil? ? nil : {:value=>user_message})
           end
         end
         

data/lib/facebooker/rails/publisher.rb

@@ -56,15 +56,15 @@ module Facebooker
     #       fbml 'text'
     #       text fbml
     #     end
-    #     # This will render the profile in /users/profile.erb
+    #     # This will render the profile in /users/profile.fbml.erb
     #     #   it will set @user to user_to_update in the template
     #     #  The mobile profile will be rendered from the app/views/test_publisher/_mobile.erb
     #     #   template
     #     def profile_update(user_to_update,user_with_session_to_use)
     #       send_as :profile
     #       from user_with_session_to_use
-    #       to user_to_update
-    #       profile render(:action=>"/users/profile",:assigns=>{:user=>user_to_update})
+    #       recipients user_to_update
+    #       profile render(:file=>"users/profile.fbml.erb",:assigns=>{:user=>user_to_update})
     #       profile_action "A string"
     #       mobile_profile render(:partial=>"mobile",:assigns=>{:user=>user_to_update})
     #   end
@@ -74,7 +74,7 @@ module Facebooker
     #     def ref_update(user)
     #       send_as :ref
     #       from user
-    #       fbml render(:action=>"/users/profile",:assigns=>{:user=>user_to_update})
+    #       fbml render(:file=>"users/profile",:assigns=>{:user=>user_to_update})
     #       handle "a_ref_handle"
     #   end
     #
@@ -415,8 +415,11 @@ module Facebooker
 	          ActionController::Base.append_view_path(controller_root) 
 	          ActionController::Base.append_view_path(controller_root+"/..") 
 	        end
+          view_paths = ActionController::Base.view_paths
+        else
+          view_paths = [template_root, controller_root]
 	      end
-        returning ActionView::Base.new([template_root,controller_root], assigns, self) do |template|
+        returning ActionView::Base.new(view_paths, assigns, self) do |template|
           template.controller=self
           template.extend(self.class.master_helper_module)
           def template.request_comes_from_facebook?

data/lib/facebooker/version.rb

@@ -2,7 +2,7 @@ module Facebooker #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 0
-    TINY  = 36
+    TINY  = 37
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/facebooker/rails_integration_test.rb

@@ -1000,6 +1000,14 @@ class RailsHelperTest < Test::Unit::TestCase
     assert @h.init_fb_connect("XFBML", :js => :jquery).match(/\$\(document\).ready\(/)
   end
 
+  def test_init_fb_connect_without_options_app_settings
+    assert @h.init_fb_connect().match(/, \{\}\)/)
+  end
+  
+  def test_init_fb_connect_with_options_app_settings
+    assert @h.init_fb_connect(:app_settings => "{foo: bar}").match(/, \{foo: bar\}\)/)
+  end
+  
   
   def test_fb_login_and_redirect
     assert_equal @h.fb_login_and_redirect("/path"),"<fb:login-button onlogin=\"window.location.href = &quot;/path&quot;;\"></fb:login-button>"
@@ -1010,7 +1018,7 @@ class RailsHelperTest < Test::Unit::TestCase
   end
   def test_fb_user_action
     action = Facebooker::Rails::Publisher::UserAction.new
-    assert_equal @h.fb_user_action(action,"message","prompt"),"FB.Connect.showFeedDialog(null, null, null, null, null, FB.RequireConnect.promptConnect, null, \"prompt\", \"message\");"
+    assert_equal @h.fb_user_action(action,"message","prompt"),"FB.Connect.showFeedDialog(null, null, null, null, null, FB.RequireConnect.promptConnect, null, \"prompt\", {\"value\": \"message\"});"
   end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mmangino-facebooker
 version: !ruby/object:Gem::Version 
-  version: 1.0.36
+  version: 1.0.37
 platform: ruby
 authors: 
 - Chad Fowler
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-28 00:00:00 -07:00
+date: 2009-06-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency