facebooker 1.0.29 → 1.0.30

data/lib/facebooker/logging.rb

@@ -9,16 +9,9 @@ module Facebooker
   end
 
   module Logging
-    
-    def self.skip_api_logging=(val)
-      @skip_api_logging=val
-    end
-    
-    def self.skip_api_logging
-      @skip_api_logging
-    end
-    
-    
+    @skip_api_logging = nil
+    class << self; attr_accessor :skip_api_logging; end
+
     def self.log_fb_api(method, params)
       message = method # might customize later
       dump = format_fb_params(params)
@@ -36,11 +29,11 @@ module Facebooker
       log_info(message, exception)
       raise
     end
-    
+
     def self.format_fb_params(params)
       params.map { |key,value| "#{key} = #{value}" }.join(', ')
     end
-    
+
     def self.log_info(message, dump, seconds = 0)
       return unless Facebooker.logger
       log_message = "#{message} (#{seconds}) #{dump}"
@@ -48,4 +41,4 @@ module Facebooker
     end
     
   end  
-end
+end

data/lib/facebooker/mobile.rb

@@ -3,12 +3,12 @@ module Facebooker
     def initialize(session)
       @session = session
     end
-  
+
     # Used to determine whether the user identified by "uid" has enabled SMS for this application.
     def can_send(user)
       @session.post('facebook.sms.canSend', :uid => User.cast_to_facebook_id(user))
     end
-    
+
     # Send the given message to the user.
     # See http://wiki.developers.facebook.com/index.php/Mobile
     def send(user, message)

data/lib/facebooker/model.rb

@@ -1,6 +1,6 @@
 module Facebooker
   ##
-  # helper methods primarily supporting the management of Ruby objects which are populatable via Hashes.  
+  # helper methods primarily supporting the management of Ruby objects which are populatable via Hashes.
   # Since most Facebook API calls accept and return hashes of data (as XML), the Model module allows us to
   # directly populate a model's attributes given a Hash with matching key names.
   module Model
@@ -19,15 +19,15 @@ module Facebooker
         yield instance if block_given?
         instance
       end
-      
+
       ##
-      # Create a standard attr_writer and a populating_attr_reader      
+      # Create a standard attr_writer and a populating_attr_reader
       def populating_attr_accessor(*symbols)
-        attr_writer *symbols
-        populating_attr_reader *symbols
+        attr_writer(*symbols)
+        populating_attr_reader(*symbols)
       end
 
-      ## 
+      ##
       # Create a reader that will attempt to populate the model if it has not already been populated
       def populating_attr_reader(*symbols)
         symbols.each do |symbol|
@@ -59,27 +59,29 @@ module Facebooker
       def hash_settable_writer(symbol, klass)
         define_method("#{symbol}=") do |value|
           instance_variable_set("@#{symbol}", value.kind_of?(Hash) ? klass.from_hash(value) : value)
-        end        
+        end
       end
       
       #
       # Declares an attribute named ::symbol:: which can be set with either a list of instances of ::klass::
-      # or a list of Hashes which will be used to populate a new instance of ::klass::.      
+      # or a list of Hashes which will be used to populate a new instance of ::klass::.
       def hash_settable_list_accessor(symbol, klass)
         attr_reader symbol
         hash_settable_list_writer(symbol, klass)
       end
-      
+
       def hash_settable_list_writer(symbol, klass)
         define_method("#{symbol}=") do |list|
           instance_variable_set("@#{symbol}", list.map do |item|
             item.kind_of?(Hash) ? klass.from_hash(item) : item
           end)
         end
-      end      
+      end
 
       def id_is(attribute)
-        class_eval <<-EOS
+        (file, line) = caller.first.split(':')
+
+        class_eval(<<-EOS, file, line.to_i)
         def #{attribute}=(value)
           @#{attribute} = value.to_i
         end
@@ -90,7 +92,7 @@ module Facebooker
         EOS
       end
     end
-    
+
     ##
     # Centralized, error-checked place for a model to get the session to which it is bound.
     # Any Facebook API queries require a Session instance.
@@ -113,7 +115,7 @@ module Facebooker
     end
 
     def populated?
-      !@populated.nil?
+      @populated
     end
     
     ##

data/lib/facebooker/models/applicationproperties.rb

@@ -33,7 +33,7 @@ module Facebooker
                :private_install, :installable, :privacy_url, :help_url, :see_all_url, :tos_url,
                :dev_mode, :preload_fql, :icon_url, :canvas_name, :logo_url, :connect_logo_url ]
     
-    attr_accessor *FIELDS
+    attr_accessor(*FIELDS)
          
   end
 end

data/lib/facebooker/models/applicationrestrictions.rb

@@ -3,8 +3,8 @@ module Facebooker
   class ApplicationRestrictions
     include Model
     FIELDS = [ :age, :location, :age_distribution, :type ]
-    
-    attr_accessor *FIELDS
-         
+
+    attr_accessor(*FIELDS)
+
   end
 end

data/lib/facebooker/models/event.rb

@@ -21,8 +21,8 @@ module Facebooker
     end
     
     include Model
-    attr_accessor :eid, :pic, :pic_small, :pic_big, :name, :creator, :update_time, :description, :tagline, :venue, :host, :event_type, :nid, :location, :end_time, :start_time, :event_subtype
+    attr_accessor :pic, :pic_small, :pic_big, :name, :creator, :update_time, :description, :tagline, :venue, :host, :event_type, :nid, :location, :end_time, :start_time, :event_subtype
 
     id_is :eid
   end
-end
+end

data/lib/facebooker/models/friend_list.rb

@@ -4,8 +4,8 @@ module Facebooker
   # A simple representation of a friend list.
   class FriendList
     include Model
-    attr_accessor :flid, :name
-    
+    attr_accessor :name
+
     id_is :flid
 
     # We need this to be an integer, so do the conversion

data/lib/facebooker/models/group.rb

@@ -8,10 +8,10 @@ module Facebooker
       attr_accessor :position, :gid, :uid
     end
     include Model
-    attr_accessor :pic, :pic_small, :pic_big, :name, :creator, :recent_news, :gid, :update_time, :group_subtype, :group_type, :website, :office, :description, :venue, :nid
-    
+    attr_accessor :pic, :pic_small, :pic_big, :name, :creator, :recent_news, :update_time, :group_subtype, :group_type, :website, :office, :description, :venue, :nid
+
     id_is :gid
-    
+
     ##
     # Get the full list of members as populated User objects.  First time fetches group members via Facebook API call.  
     # Subsequent calls return cached values.
@@ -33,4 +33,4 @@ module Facebooker
       end
     end
   end
-end
+end

data/lib/facebooker/models/page.rb

@@ -5,7 +5,7 @@ module Facebooker
     class Genre
       include Model
       FIELDS = [ :dance, :party, :relax, :talk, :think, :workout, :sing, :intimate, :raunchy, :headphones ]
-      attr_accessor *FIELDS
+      attr_accessor(*FIELDS)
 
       def initialize(*args)
         super
@@ -18,7 +18,8 @@ module Facebooker
     end
 
     include Model
-    attr_accessor :page_id, :name, :pic_small, :pic_big, :pic_square, :pic_large, :type, :type, :website, :location, :hours, :band_members, :bio, :hometown, :genre, :record_label, :influences, :has_added_app, :founded, :company_overview, :mission, :products, :release_date, :starring, :written_by, :directed_by, :produced_by, :studio, :awards, :plot_outline, :network, :season, :schedule
+    attr_accessor :page_id, :name, :pic_small, :pic_big, :pic_square, :pic_large, :type, :type, :website, :location, :hours, :band_members, :bio, :hometown, :record_label, :influences, :has_added_app, :founded, :company_overview, :mission, :products, :release_date, :starring, :written_by, :directed_by, :produced_by, :studio, :awards, :plot_outline, :network, :season, :schedule
+    attr_reader :genre
 
     def genre=(value)
       @genre = value.kind_of?(Hash) ? Genre.from_hash(value) : value

data/lib/facebooker/models/photo.rb

@@ -2,11 +2,11 @@ require 'facebooker/model'
 module Facebooker
   class Photo
     include Model
-    attr_accessor :pid, :aid, :owner, :title,
+    attr_accessor :aid, :owner, :title,
                   :link, :caption, :created,
                   :src, :src_big, :src_small,
                   :story_fbid
 
     id_is :pid
   end
-end
+end

data/lib/facebooker/models/user.rb

@@ -10,22 +10,30 @@ 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, :pic_with_logo, :pic_big_with_logo, :pic_small_with_logo, :pic_square_with_logo]
+    FIELDS = [: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, :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
+    populating_attr_accessor(*FIELDS)
     attr_reader :affiliations
     populating_hash_settable_accessor :current_location, Location
     populating_hash_settable_accessor :hometown_location, Location
     populating_hash_settable_accessor :hs_info, EducationInfo::HighschoolInfo
-    populating_hash_settable_accessor :status, Status
     populating_hash_settable_list_accessor :affiliations, Affiliation
     populating_hash_settable_list_accessor :education_history, EducationInfo
     populating_hash_settable_list_accessor :work_history, WorkInfo
-    
+
+    populating_attr_reader :status
+
     # Can pass in these two forms:
     # id, session, (optional) attribute_hash
     # attribute_hash
     def initialize(*args)
+      @friends            = nil
+      @current_location   = nil
+      @pic                = nil
+      @hometown_location  = nil
+      @populated          = false
+      @session            = nil
+      @id                 = nil
       if (args.first.kind_of?(String) || args.first.kind_of?(Integer)) && args.size==1
         self.uid = args.shift
         @session = Session.current
@@ -35,7 +43,7 @@ module Facebooker
       end
       if args.last.kind_of?(Hash)
         populate_from_hash!(args.pop)
-      end     
+      end
     end
 
     id_is :uid

data/lib/facebooker/models/work_info.rb

@@ -1,9 +1,10 @@
 module Facebooker
   class WorkInfo
     include Model
-    attr_accessor :end_date, :start_date, :company_name, :description, :position, :location
+    attr_accessor :end_date, :start_date, :company_name, :description, :position
+    attr_reader :location
     def location=(location)
       @location = location.kind_of?(Hash) ? Location.from_hash(location) : location
     end
   end
-end
+end

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.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/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