RubyGems - mmangino-facebooker - Versions diffs - 1.0.28 → 1.0.29 - Mend

mmangino-facebooker 1.0.28 → 1.0.29

Files changed (10) hide show

data/generators/facebook/templates/config/facebooker.yml +3 -0
data/lib/facebooker/models/user.rb +1 -1
data/lib/facebooker/rails/controller.rb +29 -4
data/lib/facebooker/rails/helpers/fb_connect.rb +12 -3
data/lib/facebooker/rails/helpers.rb +7 -0
data/lib/facebooker/rails/publisher.rb +1 -0
data/lib/facebooker/version.rb +1 -1
data/lib/tasks/tunnel.rake +3 -3
data/test/facebooker/rails_integration_test.rb +28 -0
metadata +2 -2

data/generators/facebook/templates/config/facebooker.yml CHANGED Viewed

@@ -20,6 +20,7 @@ development:
     public_host:
     public_port: 4007
     local_port: 3000
+    server_alive_interval: 0
 test:
   api_key:
@@ -32,6 +33,7 @@ test:
     public_host:
     public_port: 4007
     local_port: 3000
+    server_alive_interval: 0
 production:
   api_key:
@@ -44,3 +46,4 @@ production:
     public_host:
     public_port: 4007
     local_port: 3000
+    server_alive_interval: 0

data/lib/facebooker/models/user.rb CHANGED Viewed

@@ -10,7 +10,7 @@ module Facebooker
       include Model
       attr_accessor :message, :time, :status_id
     end
-    FIELDS = [:status, :political, :pic_small, :name, :quotes, :is_app_user, :tv, :profile_update_time, :meeting_sex, :hs_info, :timezone, :relationship_status, :hometown_location, :about_me, :wall_count, :significant_other_id, :pic_big, :music, :uid, :work_history, :sex, :religion, :notes_count, :activities, :pic_square, :movies, :has_added_app, :education_history, :birthday, :first_name, :meeting_for, :last_name, :interests, :current_location, :pic, :books, :affiliations, :locale, :profile_url, :proxied_email, :email_hashes, :allowed_restrictions]
+    FIELDS = [:status, :political, :pic_small, :name, :quotes, :is_app_user, :tv, :profile_update_time, :meeting_sex, :hs_info, :timezone, :relationship_status, :hometown_location, :about_me, :wall_count, :significant_other_id, :pic_big, :music, :uid, :work_history, :sex, :religion, :notes_count, :activities, :pic_square, :movies, :has_added_app, :education_history, :birthday, :first_name, :meeting_for, :last_name, :interests, :current_location, :pic, :books, :affiliations, :locale, :profile_url, :proxied_email, :email_hashes, :allowed_restrictions, :pic_with_logo, :pic_big_with_logo, :pic_small_with_logo, :pic_square_with_logo]
     STANDARD_FIELDS = [:uid, :first_name, :last_name, :name, :timezone, :birthday, :sex, :affiliations, :locale, :profile_url, :pic_square]
     populating_attr_accessor *FIELDS
     attr_reader :affiliations

data/lib/facebooker/rails/controller.rb CHANGED Viewed

@@ -45,6 +45,27 @@ module Facebooker
         @facebook_params ||= verified_facebook_params
       end
+      # Redirects the top window to the given url if the content is in an iframe, otherwise performs
+      # a normal redirect_to call.
+      def top_redirect_to(*args)
+        if request_is_facebook_iframe?
+          @redirect_url = url_for(*args)
+          render :layout => false, :inline => <<-HTML
+            <html><head>
+              <script type="text/javascript">
+                window.top.location.href = <%= @redirect_url.to_json -%>;
+              </script>
+              <noscript>
+                <meta http-equiv="refresh" content="0;url=<%=h @redirect_url %>" />
+                <meta http-equiv="window-target" content="_top" />
+              </noscript>
+            </head></html>
+          HTML
+        else
+          redirect_to(*args)
+        end
+      end
       def redirect_to(*args)
         if request_is_for_a_facebook_canvas? and !request_is_facebook_tab?
           render :text => fbml_redirect_tag(*args)
@@ -140,7 +161,7 @@ module Facebooker
       def create_new_facebook_session_and_redirect!
         session[:facebook_session] = new_facebook_session
         url_params = after_facebook_login_url.nil? ? {} : {:next=>after_facebook_login_url}
-        redirect_to session[:facebook_session].login_url(url_params) unless @installation_required
+        top_redirect_to session[:facebook_session].login_url(url_params) unless @installation_required
         false
       end
@@ -218,6 +239,10 @@ module Facebooker
         !params["fb_sig_in_profile_tab"].blank?
       end
+      def request_is_facebook_iframe?
+        !params["fb_sig_in_iframe"].blank?
+      end
       def request_is_facebook_ajax?
         params["fb_sig_is_mockajax"]=="1" || params["fb_sig_is_ajax"]=="1" || params["fb_sig_is_ajax"]==true || params["fb_sig_is_mockajax"]==true
       end
@@ -245,7 +270,7 @@ module Facebooker
       end
       def application_needs_permission(perm)
-        redirect_to(facebook_session.permission_url(perm))
+        top_redirect_to(facebook_session.permission_url(perm))
       end
       def has_extended_permission?(perm)
@@ -265,13 +290,13 @@ module Facebooker
       def application_is_not_installed_by_facebook_user
         url_params = after_facebook_login_url.nil? ? {} : { :next => after_facebook_login_url }
-        redirect_to session[:facebook_session].install_url(url_params)
+        top_redirect_to session[:facebook_session].install_url(url_params)
       end
       def set_facebook_request_format
         if request_is_facebook_ajax?
           request.format = :fbjs
-        elsif request_comes_from_facebook?
+        elsif request_comes_from_facebook? && !request_is_facebook_iframe?
           request.format = :fbml
         end
       end

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

@@ -16,10 +16,19 @@ module Facebooker
           if block_given?
             additions = capture(&proc)
           end
+          options = {:js => :prototype}
+          if required_features.last.is_a?(Hash)
+            options.merge!(required_features.pop.symbolize_keys)
+          end
           init_string = "FB.Facebook.init('#{Facebooker.api_key}','/xd_receiver.html');"
           unless required_features.blank?
              init_string = <<-FBML
-              Element.observe(window,'load', function() {
+             #{case options[:js]
+               when :jquery then "$(document).ready("
+               else "Element.observe(window,'load',"
+               end} function() {
                 FB_RequireFeatures(#{required_features.to_json}, function() {
                   #{init_string}
                   #{additions}
@@ -27,8 +36,8 @@ module Facebooker
               });
               FBML
           end
-          if block_given?
-            concat javascript_tag(init_string)
+          if block_given? && block_is_within_action_view?(proc)
+            concat(javascript_tag(init_string), proc.binding)
           else
             javascript_tag init_string
           end

data/lib/facebooker/rails/helpers.rb CHANGED Viewed

@@ -44,6 +44,13 @@ module Facebooker
       FB_DIALOG_BUTTON_VALID_OPTION_KEYS = [:close_dialog, :href, :form_id, :clickrewriteurl, :clickrewriteid, :clickrewriteform]
+      def fb_show_feed_dialog(action, user_message = "", prompt = "", callback = nil)
+        update_page do |page|
+          page.call "Facebook.showFeedDialog",action.template_id,action.data,action.body_general,action.target_ids,callback,prompt,user_message
+        end
+      end
       # Create an fb:request-form without a selector
       #
       # The block passed to this tag is used as the content of the form

data/lib/facebooker/rails/publisher.rb CHANGED Viewed

@@ -430,6 +430,7 @@ module Facebooker
         include ActionView::Helpers::FormHelper
         include ActionView::Helpers::FormTagHelper
         include ActionView::Helpers::AssetTagHelper
+        include ActionView::Helpers::NumberHelper
         include Facebooker::Rails::Helpers
         #define this for the publisher views

data/lib/facebooker/version.rb CHANGED Viewed

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

data/lib/tasks/tunnel.rake CHANGED Viewed

@@ -19,8 +19,7 @@ namespace :facebooker do
     # Adapted from Evan Weaver: http://blog.evanweaver.com/articles/2007/07/13/developing-a-facebook-app-locally/
     desc "Check if reverse tunnel is running"
     task :status => [ :environment, :config ] do
-     if `ssh #{@public_host} -l #{@public_host_username} netstat -an |
-         egrep "tcp.*:#{@public_port}.*LISTEN" | wc`.to_i > 0
+     if `ssh #{@public_host} -l #{@public_host_username} netstat -an | egrep "tcp.*:#{@public_port}.*LISTEN" | wc`.to_i > 0
        puts "Seems ok"
      else
        puts "Down"
@@ -35,10 +34,11 @@ namespace :facebooker do
      @public_port = FACEBOOKER['tunnel']['public_port']
      @local_port = FACEBOOKER['tunnel']['local_port']
      @ssh_port = FACEBOOKER['tunnel']['ssh_port'] || 22
+     @server_alive_interval = FACEBOOKER['tunnel']['server_alive_interval'] || 0
      @notification = "Starting tunnel #{@public_host}:#{@public_port} to 0.0.0.0:#{@local_port}"
      @notification << " using SSH port #{@ssh_port}" unless @ssh_port == 22
      # "GatewayPorts yes" needs to be enabled in the remote's sshd config
-     @ssh_command = "ssh -v -p #{@ssh_port} -nNT4 -R *:#{@public_port}:localhost:#{@local_port} #{@public_host_username}@#{@public_host}"
+     @ssh_command = %Q[ssh -v -p #{@ssh_port} -nNT4 -o "ServerAliveInterval #{@server_alive_interval}" -R *:#{@public_port}:localhost:#{@local_port} #{@public_host_username}@#{@public_host}]
     end
   end
   desc "Create a reverse ssh tunnel from a public server to a private development server."

data/test/facebooker/rails_integration_test.rb CHANGED Viewed

@@ -437,6 +437,15 @@ class RailsIntegrationTest < Test::Unit::TestCase
     assert_equal("<fb:redirect url=\"http://www.facebook.com/login.php?api_key=1234567&v=1.0\" />", @response.body)
   end
+  def test_redirect_to_renders_javascript_redirect_if_request_is_for_a_facebook_iframe
+    get :index, facebook_params(:fb_sig_user => nil, :fb_sig_in_iframe => 1)
+    assert_response :success
+    assert_match "javascript", @response.body
+    assert_match "http-equiv", @response.body
+    assert_match "http://www.facebook.com/login.php?api_key=1234567&v=1.0".to_json, @response.body
+    assert_match "http://www.facebook.com/login.php?api_key=1234567&amp;v=1.0", @response.body
+  end
   def test_url_for_links_to_canvas_if_canvas_is_true_and_not_in_canvas
     get :link_test, facebook_params(:fb_sig_in_canvas=>0,:canvas=>true)
     assert_match /apps.facebook.com/,@response.body
@@ -966,6 +975,20 @@ class RailsHelperTest < Test::Unit::TestCase
     end
     assert @h.output_buffer =~ /Body Content/
   end
+  def test_init_fb_connect_no_options
+    assert ! @h.init_fb_connect.match(/Element.observe\(window,'load',/)
+  end
+  def test_init_fb_connect_with_options_js_jquery
+    assert ! @h.init_fb_connect(:js => :jquery).match(/\$\(document\).ready\(/)
+  end
+  def test_init_fb_connect_with_features_and_options_js_jquery
+    assert @h.init_fb_connect("XFBML", :js => :jquery).match(/XFBML.*/)
+    assert @h.init_fb_connect("XFBML", :js => :jquery).match(/\$\(document\).ready\(/)
+  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>"
@@ -1327,4 +1350,9 @@ class RailsRequestFormatTest < Test::Unit::TestCase
     assert_equal 'fbjs', @response.body
   end
+  def test_responds_to_html_when_iframe
+    get :index, facebook_params(:fb_sig_in_iframe => '1')
+    assert_equal 'html', @response.body
+  end
 end

metadata CHANGED Viewed

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