mmangino-facebooker 1.0.29 → 1.0.30

data/lib/facebooker/rails/controller.rb

@@ -12,7 +12,12 @@ module Facebooker
         controller.helper_method :request_comes_from_facebook?
       end
 
-    
+      def initialize *args
+        @facebook_session       = nil
+        @installation_required  = nil
+        super
+      end
+
       def facebook_session
         @facebook_session
       end

data/lib/facebooker/rails/facebook_request_fix.rb

@@ -1,16 +1,18 @@
 module ::ActionController
   class AbstractRequest
     def request_method_with_facebooker
-      if parameters[:fb_sig_request_method]=="GET" and parameters[:_method].blank?
-        parameters[:_method]="GET"
+      if parameters[:_method].blank?
+        if %w{GET HEAD}.include?(parameters[:fb_sig_request_method])
+          parameters[:_method] = parameters[:fb_sig_request_method]
+        end
       end
       request_method_without_facebooker
     end
-    
+
     if new.methods.include?("request_method")
-      alias_method_chain :request_method, :facebooker 
+      alias_method_chain :request_method, :facebooker
     end
-    
+
     def xml_http_request_with_facebooker?
       parameters["fb_sig_is_mockajax"] == "1"  ||
       parameters["fb_sig_is_ajax"] == "1" ||
@@ -18,7 +20,9 @@ module ::ActionController
     end
     alias_method_chain :xml_http_request?, :facebooker
     # we have to re-alias xhr? since it was pointing to the old method
-    alias xhr? :xml_http_request?
-    
+    unless defined? :xhr?
+      alias xhr? :xml_http_request?
+    end
+
   end
-end
+end

data/lib/facebooker/rails/facebook_session_handling.rb

@@ -24,7 +24,6 @@ end
 
 class CGI  
   class Session
-    private
       alias :initialize_aliased_by_facebooker :initialize
       attr_reader :request, :initialization_options
 
@@ -66,4 +65,4 @@ class CGI
         @session_id || create_new_id_aliased_by_facebooker
       end
   end
-end
+end

data/lib/facebooker/rails/facebook_url_rewriting.rb

@@ -1,35 +1,38 @@
 module ::ActionController
   if Rails.version < '2.3'
-    class AbstractRequest                         
+    class AbstractRequest
       def relative_url_root
         Facebooker.path_prefix
-      end                                         
+      end
     end
   else
-    class Request                         
+    class Request
       def relative_url_root
         Facebooker.path_prefix
-      end                                         
+      end
     end
   end
-  
+
   class Base
-    def self.relative_url_root
-      Facebooker.path_prefix
+    class << self
+      alias :old_relative_url_root :relative_url_root
+      def relative_url_root
+        Facebooker.path_prefix
+      end
     end
-  end  
-  
+  end
+
   class UrlRewriter
     RESERVED_OPTIONS << :canvas
     def link_to_new_canvas?
-      @request.parameters["fb_sig_in_new_facebook"] == "1" 
+      @request.parameters["fb_sig_in_new_facebook"] == "1"
     end
     def link_to_canvas?(params, options)
       option_override = options[:canvas]
       return false if option_override == false # important to check for false. nil should use default behavior
       option_override || (can_safely_access_request_parameters? && (@request.parameters["fb_sig_in_canvas"] == "1" ||  @request.parameters[:fb_sig_in_canvas] == "1" ))
     end
-    
+
     #rails blindly tries to merge things that may be nil into the parameters. Make sure this won't break
     def can_safely_access_request_parameters?
       @request.request_parameters

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

@@ -36,8 +36,14 @@ module Facebooker
               });
               FBML
           end
-          if block_given? && block_is_within_action_view?(proc)
-            concat(javascript_tag(init_string), proc.binding)
+
+          # block_is_within_action_view? is rails 2.1.x and has been
+          # deprecated.  rails >= 2.2.x uses block_called_from_erb?
+          block_tester = respond_to?(:block_is_within_action_view?) ?
+            :block_is_within_action_view? : :block_called_from_erb?
+
+          if block_given? && send(block_tester, proc)
+            concat(javascript_tag(init_string))
           else
             javascript_tag init_string
           end

data/lib/facebooker/rails/helpers.rb

@@ -1,16 +1,17 @@
 require 'action_pack'
+
 module Facebooker
   module Rails
-    
+
     # Facebook specific helpers for creating FBML
     # 
     # All helpers that take a user as a parameter will get the Facebook UID from the facebook_id attribute if it exists.
     # It will use to_s if the facebook_id attribute is not present.
     #
     module Helpers
-      
+
       include Facebooker::Rails::Helpers::FbConnect
-      
+
       # Create an fb:dialog
       # id must be a unique name e.g. "my_dialog"
       # cancel_button is true or false

data/lib/facebooker/rails/publisher.rb

@@ -88,31 +88,32 @@ module Facebooker
     #
     # Publisher makes many helpers available, including the linking and asset helpers
     class Publisher
-      
+
       #story sizes from the Facebooker API
       ONE_LINE=1
       SHORT=2
       FULL=4
-      
+
       def initialize
-        @controller = PublisherController.new        
+        @from                 = nil
+        @full_story_template  = nil
+        @recipients           = nil
+        @controller           = PublisherController.new
       end
-      
+
       # use facebook options everywhere
       def request_comes_from_facebook?
         true
       end
-      
+
       class FacebookTemplate < ::ActiveRecord::Base
-        
-        
         cattr_accessor :template_cache
         self.template_cache = {}
-        
+
         def self.inspect(*args)
           "FacebookTemplate"
         end
-        
+
         def template_changed?(hash)
           if respond_to?(:content_hash)
             content_hash != hash 
@@ -180,20 +181,21 @@ module Facebooker
                (publisher.full_story_template and publisher.full_story_template.to_a.sort_by{|e| e[0].to_s})
                ].to_json
           end
-          
+
           def template_name(klass,method)
             "#{klass.name}::#{method}"
           end
         end
       end
-      
+
       class_inheritable_accessor :master_helper_module
-      attr_accessor :one_line_story_templates, :short_story_templates, :action_links
-      
+      attr_accessor :one_line_story_templates, :short_story_templates
+      attr_writer :action_links
+
       cattr_accessor :skip_registry
       self.skip_registry = false
-      
-      
+
+
       class InvalidSender < StandardError; end
       class UnknownBodyType < StandardError; end
       class UnspecifiedBodyType < StandardError; end
@@ -219,20 +221,21 @@ module Facebooker
       end
       class UserAction
         attr_accessor :data
-        attr_accessor :target_ids
+        attr_reader   :target_ids
         attr_accessor :body_general
         attr_accessor :template_id
         attr_accessor :template_name
         attr_accessor :story_size
-        
+
         def target_ids=(val)
           @target_ids = val.is_a?(Array) ? val.join(",") : val
         end
+
         def data_hash
           data||{}
         end
       end
-      
+
       cattr_accessor :ignore_errors
       attr_accessor :_body
 
@@ -288,12 +291,12 @@ module Facebooker
         @one_line_story_templates ||= []
         @one_line_story_templates << str
       end
-      
+
       def short_story_template(title,body,params={})
         @short_story_templates ||= []
         @short_story_templates << params.merge(:template_title=>title, :template_body=>body)
       end
-      
+
       def action_links(*links)
         if links.blank?
           @action_links
@@ -493,38 +496,41 @@ module Facebooker
           args.each do |arg|
             case arg
             when Symbol,String
-              add_template_helper("#{arg.to_s.classify}Helper".constantize)              
+              add_template_helper("#{arg.to_s.classify}Helper".constantize)
             when Module
               add_template_helper(arg)
             end
           end
         end
-        
+
         def add_template_helper(helper_module) #:nodoc:
           master_helper_module.send :include,helper_module
           include master_helper_module
         end
 
-    
+
         def inherited(child)
-          super          
+          super
           child.master_helper_module=Module.new
           child.master_helper_module.__send__(:include,self.master_helper_module)
           child.send(:include, child.master_helper_module)
           FacebookTemplate.clear_cache!
         end
-    
+
       end
       class PublisherController
         include Facebooker::Rails::Publisher.master_helper_module
         include ActionController::UrlWriter
-        
-        def self.default_url_options(*args)
-          Facebooker::Rails::Publisher.default_url_options(*args)
+
+        class << self
+          alias :old_default_url_options :default_url_options
+          def default_url_options(*args)
+            Facebooker::Rails::Publisher.default_url_options(*args)
+          end
         end
-        
+
       end
-      
+
     end
   end
 end