Fixing lots of warnings, making test file run on their own, adding a

.autotest file.

Author: tenderlove

.autotest

@@ -0,0 +1,15 @@
+Autotest.add_hook(:initialize) do |at|
+  at.clear_mappings
+  at.find_directories = %w(lib test)
+
+  at.add_exception("test/test_helper.rb")
+  at.add_exception("test/rails_test_helper.rb")
+
+  at.add_mapping(/^lib\/.*\.rb$/) do |file, _|
+    at.files_matching(/^test\/.*_test\.rb$/)
+  end
+
+  at.add_mapping(/^test\/.*_test\.rb$/) do |file, _|
+    file
+  end
+end

Rakefile

@@ -1,7 +1,6 @@
 # -*- ruby -*-
 # 
 require 'rubygems'
-ENV['RUBY_FLAGS']="-I#{%w(lib ext bin test).join(File::PATH_SEPARATOR)}"
 require 'hoe'
 begin
   require 'load_multi_rails_rake_tasks'

lib/facebooker.rb

@@ -1,6 +1,6 @@
 begin
   unless Object.const_defined?("ActiveSupport") and ActiveSupport.const_defined?("JSON")
-    require 'json' 
+    require 'json'
     module Facebooker
       def self.json_decode(str)
         JSON.parse(str)
@@ -12,19 +12,25 @@ def self.json_decode(str)
         ActiveSupport::JSON.decode(str)
       end
     end
-  end 
+  end
 rescue
-  require 'json' 
+  require 'json'
 end
 require 'zlib'
 require 'digest/md5'
 
 
 
 module Facebooker
-      
+
+    @facebooker_configuration = {}
+    @current_adapter = nil
+    @set_asset_host_to_callback_url = nil
+    @path_prefix = nil
+    @use_curl    = false
+
     class << self
-    
+
     def load_configuration(facebooker_yaml_file)
       if File.exist?(facebooker_yaml_file)
         if defined? RAILS_ENV
@@ -35,7 +41,7 @@ def load_configuration(facebooker_yaml_file)
         apply_configuration(config)
       end
     end
-    
+
     # Sets the Facebook environment based on a hash of options. 
     # By default the hash passed in is loaded from facebooker.yml, but it can also be passed in
     # manually every request to run multiple Facebook apps off one Rails app. 
@@ -53,70 +59,66 @@ def apply_configuration(config)
       Facebooker.timeout = config['timeout']
       @facebooker_configuration = config
     end
-    
+
     def facebooker_config
-      @facebooker_configuration || {} # to prevent pretty_errors error if the config hasn't been set yet
-    end
-    
-     def current_adapter=(adapter_class)
-      @current_adapter = adapter_class
+      @facebooker_configuration
     end
-    
+
+    # TODO: This should be converted to attr_accessor, but we need to
+    # get all the require statements at the top of the file to work.
+
+    # Set the current adapter
+    attr_writer :current_adapter
+
+    # Get the current adapter
     def current_adapter
       @current_adapter || Facebooker::AdapterBase.default_adapter
     end
-    
+
     def load_adapter(params)
       self.current_adapter = Facebooker::AdapterBase.load_adapter(params)
     end
-      
+
     def facebook_path_prefix=(path)
       current_adapter.facebook_path_prefix = path
     end
-  
+
     # Default is canvas_page_name in yml file
     def facebook_path_prefix
       current_adapter.facebook_path_prefix
     end
-    
+
     def is_for?(application_container)
       current_adapter.is_for?(application_container)
     end
-    
+
     def set_asset_host_to_callback_url=(val)
       @set_asset_host_to_callback_url=val
     end
-    
+
     def set_asset_host_to_callback_url
-      @set_asset_host_to_callback_url.nil? ? true : @set_asset_host_to_callback_url
-    end
-    
-    def use_curl=(val)
-      @use_curl=val
-    end
-    
-    def use_curl?
-      @use_curl
+      @set_asset_host_to_callback_url || true
     end
-    
+
+    attr_accessor :use_curl
+    alias :use_curl? :use_curl
+
     def timeout=(val)
       @timeout = val.to_i
     end
-    
+
     def timeout
       @timeout
     end
-   
+
     [:api_key,:secret_key, :www_server_base_url,:login_url_base,:install_url_base,:api_rest_path,:api_server_base,:api_server_base_url,:canvas_server_base, :video_server_base].each do |delegated_method|
       define_method(delegated_method){ return current_adapter.send(delegated_method)}
     end
-    
-    
-       def path_prefix
-      @path_prefix
-      end
-    
-    
+
+
+    attr_reader :path_prefix
+
+
     # Set the asset path to the canvas path for just this one request
     # by definition, we will make this a canvas request
     def with_asset_path_for_canvas
@@ -130,7 +132,7 @@ def with_asset_path_for_canvas
         ActionController::Base.asset_host = original_asset_host
       end
     end
-  
+
     # If this request is_canvas_request
     # then use the application name as the url root
     def request_for_canvas(is_canvas_request)

lib/facebooker/adapters/adapter_base.rb

@@ -37,7 +37,7 @@ def  self.facebooker_config
     def self.load_adapter(params)
 
       config_key_base = params[:config_key_base] # This allows for loading of a aspecific adapter
-      config_key_base += "_" unless config_key_base.blank?
+      config_key_base += "_" if config_key_base && config_key_base.length > 0
 
       unless api_key = (params[:fb_sig_api_key] || facebooker_config["#{config_key_base}api_key"])
         raise Facebooker::AdapterBase::UnableToLoadAdapter
@@ -52,7 +52,7 @@ def self.load_adapter(params)
 
         key_base = key.match(/(.*)[_]?api_key/)[1]
 
-        adapter_class_name = if key_base.blank?
+        adapter_class_name = if !key_base || key_base.length == 0
            "FacebookAdapter"
         else
           facebooker_config[key_base + "adapter"]

lib/facebooker/adapters/bebo_adapter.rb

@@ -12,16 +12,16 @@ def api_server_base
     def api_rest_path
       "/restserver.php"
     end
-      
+
     def is_for?(application_context)
       application_context == :bebo
     end
-       
+
     def www_server_base_url
       "www.bebo.com"
     end
 
-       
+
     def login_url_base
       "http://#{www_server_base_url}/SignIn.jsp?ApiKey=#{api_key}&v=1.0"
     end
@@ -33,7 +33,6 @@ def install_url_base
 end
 
 # Things that don't actually work as expected in BEBO
-Facebooker::PublishTemplatizedAction
 module Facebooker
    class User
     def set_profile_fbml_with_bebo_adapter(profile_fbml, mobile_fbml, profile_action_fbml, profile_main = nil)
@@ -49,6 +48,9 @@ def set_profile_fbml_with_bebo_adapter(profile_fbml, mobile_fbml, profile_action
     private
 
     BEBO_FIELDS = FIELDS - [:meeting_sex, :wall_count, :meeting_for]
+
+    remove_method :collect
+
     def collect(fields)
       if(Facebooker.is_for?(:bebo) )
          BEBO_FIELDS.reject{|field_name| !fields.empty? && !fields.include?(field_name)}.join(',')

lib/facebooker/batch_request.rb

@@ -5,32 +5,33 @@ class BatchRequest
     attr_reader :method
     class UnexecutedRequest < StandardError; end
     def initialize(params,proc)
-      @method=params[:method]
-      @uri=params.map{|k,v| "#{k}=#{CGI.escape(v.to_s)}"}.join("&")
-      @proc=proc
+      @exception  = nil
+      @result     = nil
+      @method     = params[:method]
+      @uri        = params.map{|k,v| "#{k}=#{CGI.escape(v.to_s)}"}.join("&")
+      @proc       = proc
     end
-  
+
     def result=(result_object)
       @result = @proc.nil? ? result_object : @proc.call(result_object)
     end
-    
+
     def exception_raised=(ex)
       @exception=ex
     end
-    
+
     def exception_raised?
       @exception.nil? ? false : raise(@exception)
     end
 
     def respond_to?(name)
       super || @result.respond_to?(name)
     end
-  
+
     def ===(other)
       other === @result
     end
-  
-  
+
     def method_missing(name,*args,&proc)
       if @exception
         raise @exception
@@ -41,4 +42,4 @@ def method_missing(name,*args,&proc)
       end
     end
   end
-end
+end

lib/facebooker/logging.rb

@@ -9,16 +9,9 @@ def self.logger
   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,16 +29,16 @@ def self.log_fb_api(method, params)
       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}"
       Facebooker.logger.info(log_message)
     end
 
   end  
-end
+end

lib/facebooker/mobile.rb

@@ -3,12 +3,12 @@ class Mobile
     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)

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 @@ def from_hash(hash)
         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 @@ def hash_settable_accessor(symbol, klass)
       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 @@ def #{attribute}=(value)
         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 @@ def populate
     end
 
     def populated?
-      !@populated.nil?
+      @populated
     end
 
     ##

lib/facebooker/models/applicationproperties.rb

@@ -33,7 +33,7 @@ class ApplicationProperties
                :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

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

lib/facebooker/models/event.rb

@@ -21,8 +21,8 @@ def event
     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

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

lib/facebooker/models/group.rb

@@ -8,10 +8,10 @@ class Membership
       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 @@ def memberships
       end
     end
   end
-end
+end

lib/facebooker/models/page.rb

@@ -5,7 +5,7 @@ class Page
     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 @@ def initialize(*args)
     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

lib/facebooker/models/photo.rb

@@ -2,11 +2,11 @@
 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

lib/facebooker/models/user.rb

@@ -10,23 +10,30 @@ class Status
       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
+      @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
@@ -36,7 +43,7 @@ def initialize(*args)
       end
       if args.last.kind_of?(Hash)
         populate_from_hash!(args.pop)
-      end     
+      end
     end
 
     id_is :uid

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

lib/facebooker/rails/controller.rb

@@ -12,7 +12,12 @@ def self.included(controller)
         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

lib/facebooker/rails/facebook_request_fix.rb

@@ -8,19 +8,21 @@ def request_method_with_facebooker
       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" ||
       xml_http_request_without_facebooker?
     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

lib/facebooker/rails/facebook_session_handling.rb

@@ -24,7 +24,6 @@ def initialize(cgi, session_options = {})
 
 class CGI  
   class Session
-    private
       alias :initialize_aliased_by_facebooker :initialize
       attr_reader :request, :initialization_options
 
@@ -66,4 +65,4 @@ def create_new_id
         @session_id || create_new_id_aliased_by_facebooker
       end
   end
-end
+end

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

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

lib/facebooker/rails/publisher.rb

@@ -88,31 +88,32 @@ module Rails
     #
     # 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 @@ def hashed_content(klass, method)
                (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 @@ class Ref
       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 @@ def one_line_story_template(str)
         @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 @@ def helper(*args)
           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

lib/facebooker/session.rb

@@ -1,46 +1,48 @@
 require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
-class Facebooker::SessionTest < Test::Unit::TestCase
+class Facebooker::AdaptersTest < Test::Unit::TestCase
   def setup
     ENV['FACEBOOK_API_KEY'] = '1234567'
-    ENV['FACEBOOK_SECRET_KEY'] = '7654321'   
-    Facebooker.current_adapter = nil 
-    @bebo_api_key = "bebo_api_key"; @bebo_secret_key = "bebo_secret_key"    
+    ENV['FACEBOOK_SECRET_KEY'] = '7654321'
+    @current_adapter = Facebooker.current_adapter
+    Facebooker.current_adapter = nil
+    @bebo_api_key = "bebo_api_key"; @bebo_secret_key = "bebo_secret_key"
   end
 
   def teardown
    flexmock_close
+    Facebooker.current_adapter = @current_adapter
   end
-  
+
   def test_load_default_adapter
     session = Facebooker::CanvasSession.create(ENV['FACEBOOK_API_KEY'], ENV['FACEBOOK_SECRET_KEY'])
     assert_equal(ENV['FACEBOOK_API_KEY'], Facebooker::Session.api_key)
     assert( Facebooker::FacebookAdapter === Facebooker.current_adapter)
-    
+
     ENV['FACEBOOK_API_KEY'] = nil
-    ENV['FACEBOOK_SECRET_KEY'] = nil   
-    Facebooker.current_adapter = nil 
+    ENV['FACEBOOK_SECRET_KEY'] = nil
+    Facebooker.current_adapter = nil
     Facebooker::AdapterBase.stubs(:facebooker_config).returns({"api_key" => "facebook_key", "secret_key" => "facebook_secret" })
     assert( Facebooker::FacebookAdapter === Facebooker.current_adapter)
     assert_equal("facebook_key", Facebooker::Session.api_key)
   end
-  
+
   def test_load_bebo_adapter
-   
+
     load_bebo_adapter
     assert_equal(@bebo_api_key, Facebooker::Session.api_key)
     assert_equal(@bebo_secret_key, Facebooker::Session.secret_key)
     assert(Facebooker::BeboAdapter === Facebooker.current_adapter, " Bebo adapter not loaded correctly.")
   end
-  
+
   def load_bebo_adapter
-    @bebo_api_key = "bebo_api_key"; @bebo_secret_key = "bebo_secret_key"    
+    @bebo_api_key = "bebo_api_key"; @bebo_secret_key = "bebo_secret_key"
 
     Facebooker::AdapterBase.stubs(:facebooker_config).returns({"bebo_api_key" => @bebo_api_key, "bebo_adapter" => "BeboAdapter", "bebo_secret_key" => @bebo_secret_key, "foo" => "bar"})
     Facebooker.load_adapter(:config_key_base => "bebo")
     @session = Facebooker::CanvasSession.create(@bebo_api_key, @bebo_secret_key)
   end
-  
+
   def test_adapter_details
      test_load_default_adapter
 
@@ -50,28 +52,28 @@ def test_adapter_details
      assert_equal("http://api.facebook.com", Facebooker.api_server_base_url)
      assert(Facebooker.is_for?(:facebook))
     load_bebo_adapter
-    
+
       assert_equal("apps.bebo.com", Facebooker.canvas_server_base)
      assert_equal("apps.bebo.com", Facebooker.api_server_base)
      assert_equal("www.bebo.com", Facebooker.www_server_base_url)
      assert_equal("http://apps.bebo.com", Facebooker.api_server_base_url)
      assert_equal("http://www.bebo.com/SignIn.jsp?ApiKey=bebo_api_key&v=1.0&canvas=true", @session.login_url)
      assert_equal("http://www.bebo.com/c/apps/add?ApiKey=bebo_api_key&v=1.0", @session.install_url)
      assert(Facebooker.is_for?(:bebo))
-     
+
   end
-  
+
   def test_adapter_failures
       Facebooker::AdapterBase.stubs(:facebooker_config).returns({})
-      
+
       assert_raises(Facebooker::AdapterBase::UnableToLoadAdapter){
         Facebooker.load_adapter(:config_key_base => "bebo")
       }
   end
-  
+
   def test_bebo_specific_issues
     load_bebo_adapter
-     
+
     # @session.send(:service).stubs(:post).returns([{:name => "foo"}])
      Net::HTTP.stubs(:post_form).returns("<profile_setFBML_response></profile_setFBML_response>")
      user = Facebooker::User.new(:uid => "123456")
@@ -87,10 +89,8 @@ def test_bebo_specific_issues
      Net::HTTP.stubs(:post_form).returns("<feed_publishTemplatizedAction_response>1</feed_publishTemplatizedAction_response>")
      user.publish_templatized_action(action)
   end
-  
+
   def test_bebo_process_data
-    
-  end
-  
 
+  end
 end

test/facebooker/adapters_test.rb

@@ -12,11 +12,21 @@ class Thing
     attr_accessor :name, :job
     hash_settable_accessor :complex_thing, ComplexThing
     hash_settable_list_accessor :list_of_complex_things, ComplexThing
+
+    def initialize *args
+      @session = nil
+      super
+    end
   end
 
   class PopulatingThing
     include Facebooker::Model
     populating_attr_accessor :first_name
+
+    def initialize
+      @first_name = nil
+      @populated  = false
+    end
   end
 
   def test_can_instantiate_an_object_with_a_hash

test/facebooker/model_test.rb

@@ -1,17 +1,8 @@
 require File.expand_path(File.dirname(__FILE__) + '/../rails_test_helper')
 
-ActionController::Routing::Routes.draw do |map|
-  map.connect '', :controller=>"facebook",:conditions=>{:canvas=>true}
-  map.connect '', :controller=>"plain_old_rails"
-  map.resources :comments, :controller=>"plain_old_rails"
-  map.connect 'require_auth/:action', :controller => "controller_which_requires_facebook_authentication"
-  map.connect 'require_install/:action', :controller => "controller_which_requires_application_installation"
-  map.connect ':controller/:action/:id', :controller => "plain_old_rails"
-end  
-
 module FBConnectTestHelpers
   def setup_fb_connect_cookies(params=cookie_hash_for_auth)
-    params.each {|k,v| @request.cookies[ENV['FACEBOOK_API_KEY']+k] = CGI::Cookie.new(ENV['FACEBOOK_API_KEY']+k,v)} 
+    params.each {|k,v| @request.cookies[ENV['FACEBOOK_API_KEY']+k] = CGI::Cookie.new(ENV['FACEBOOK_API_KEY']+k,v)}
   end
 
   def expired_cookie_hash_for_auth
@@ -193,7 +184,7 @@ def setup
 
   def test_url_for_links_to_callback_if_canvas_is_false_and_in_canvas
     get :link_test
-    assert_match /test.host/,@response.body
+    assert_match(/test.host/, @response.body)
   end
 
   def test_named_route_doesnt_include_canvas_path_when_not_in_canvas
@@ -444,33 +435,33 @@ def test_redirect_to_renders_javascript_redirect_if_request_is_for_a_facebook_if
     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&v=1.0", @response.body
-  end  
-  
+  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
+    assert_match(/apps.facebook.com/, @response.body)
   end
-  
+
   def test_includes_relative_url_root_when_linked_to_canvas
     get :link_test,facebook_params(:fb_sig_in_canvas=>0,:canvas=>true)
-    assert_match /root/,@response.body
+    assert_match(/root/,@response.body)
   end
 
   def test_url_for_links_to_callback_if_canvas_is_false_and_in_canvas
     get :link_test,facebook_params(:fb_sig_in_canvas=>0,:canvas=>false)
-    assert_match /test.host/,@response.body
+    assert_match(/test.host/,@response.body)
   end
 
   def test_url_for_doesnt_include_url_root_when_not_linked_to_canvas
     get :link_test,facebook_params(:fb_sig_in_canvas=>0,:canvas=>false)
     assert !@response.body.match(/root/)
   end
-  
+
   def test_url_for_links_to_canvas_if_canvas_is_not_set
     get :link_test,facebook_params
-    assert_match /apps.facebook.com/,@response.body
+    assert_match(/apps.facebook.com/,@response.body)
   end
-  
+
   def test_image_tag
     get :image_test, facebook_params
     assert_equal "<img alt=\"Image\" src=\"http://root.example.com/images/image.png\" />",@response.body
@@ -660,35 +651,35 @@ def test_fb_add_info_section
     assert_equal "<fb:add-section-button section=\"info\" />",@h.fb_add_info_section
   end
 
-  def test_fb_name_with_invalid_key
+  def test_fb_name_with_invalid_key_sizee
     assert_raises(ArgumentError) {@h.fb_name(1234, :sizee => false)}
   end
 
   def test_fb_name
     assert_equal "<fb:name uid=\"1234\"></fb:name>",@h.fb_name("1234")
   end
-    
+
   def test_fb_name_with_transformed_key
     assert_equal "<fb:name uid=\"1234\" useyou=\"true\"></fb:name>", @h.fb_name(1234, :use_you => true)
   end
-  
+
   def test_fb_name_with_user_responding_to_facebook_id
     user = flexmock("user", :facebook_id => "5678")
     assert_equal "<fb:name uid=\"5678\"></fb:name>", @h.fb_name(user)
   end
-  
-  def test_fb_name_with_invalid_key
+
+  def test_fb_name_with_invalid_key_linkd
     assert_raises(ArgumentError) {@h.fb_name(1234, :linkd => false)}
   end
-  
+
   def test_fb_tabs
     assert_equal "<fb:tabs></fb:tabs>", @h.fb_tabs{}
   end
-  
+
   def test_fb_tab_item
     assert_equal "<fb:tab-item href=\"http://www.google.com\" title=\"Google\" />", @h.fb_tab_item("Google", "http://www.google.com")
   end
-  
+
   def test_fb_tab_item_raises_exception_for_invalid_option
     assert_raises(ArgumentError) {@h.fb_tab_item("Google", "http://www.google.com", :alignn => :right)}
   end
@@ -708,10 +699,6 @@ def test_fb_multi_friend_selector_with_options
     assert_equal "<fb:multi-friend-selector actiontext=\"This is a message\" exclude_ids=\"1,2\" max=\"20\" showborder=\"false\" />", @h.fb_multi_friend_selector("This is a message",:exclude_ids=>"1,2")
   end
 
-  def test_fb_comments
-    assert_equal "<fb:comments candelete=\"false\" canpost=\"true\" numposts=\"7\" showform=\"true\" xid=\"a:1\" />", @h.fb_comments("a:1",true,false,7,:showform=>true)
-  end
-  
   def test_fb_title
     assert_equal "<fb:title>This is the canvas page window title</fb:title>", @h.fb_title("This is the canvas page window title")
   end
@@ -919,9 +906,15 @@ def test_fb_help
   def test_fb_create_button
     assert_equal "<fb:create-button href=\"/growingpets/invite\">Invite Friends</fb:create-button>", @h.fb_create_button('Invite Friends', '/growingpets/invite')
   end
-  def test_fb_comments
-    assert_equal "<fb:comments candelete=\"false\" canpost=\"true\" numposts=\"4\" optional=\"false\" xid=\"xxx\"></fb:comments>", @h.fb_comments("xxx",true,false,4,:optional=>false) 
+
+  def test_fb_comments_a_1
+    assert_equal "<fb:comments candelete=\"false\" canpost=\"true\" numposts=\"7\" showform=\"true\" xid=\"a:1\"></fb:comments>", @h.fb_comments("a:1",true,false,7,:showform=>true)
   end
+
+  def test_fb_comments_xxx
+    assert_equal "<fb:comments candelete=\"false\" canpost=\"true\" numposts=\"4\" optional=\"false\" xid=\"xxx\"></fb:comments>", @h.fb_comments("xxx",true,false,4,:optional=>false)
+  end
+
   def test_fb_comments_with_title
     assert_equal "<fb:comments candelete=\"false\" canpost=\"true\" numposts=\"4\" optional=\"false\" xid=\"xxx\"><fb:title>TITLE</fb:title></fb:comments>", @h.fb_comments("xxx",true,false,4,:optional=>false, :title => "TITLE") 
   end
@@ -1003,13 +996,15 @@ 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\");"
   end
-  
-  
+
+
   def test_fb_connect_javascript_tag
-    assert_equal "<script src=\"http://static.ak.connect.facebook.com/js/api_lib/v0.4/FeatureLoader.js.php\" type=\"text/javascript\"></script>",
-      @h.fb_connect_javascript_tag
+    silence_warnings do
+      assert_equal "<script src=\"http://static.ak.connect.facebook.com/js/api_lib/v0.4/FeatureLoader.js.php\" type=\"text/javascript\"></script>",
+        @h.fb_connect_javascript_tag
+    end
   end
-  
+
   def test_fb_container
     @h.expects(:capture).returns("Inner Stuff")
     @h.fb_container(:condition=>"somejs") do
@@ -1157,19 +1152,23 @@ def test_pretty_errors_disabled_success
     post :pass, facebook_params
     assert_response 200
   end
-  
+
   def test_pretty_errors_disabled_error
     Facebooker.apply_configuration('api_key'=>"1234", 'secret_key'=>"34278",'canvas_page_name'=>'mike','pretty_errors'=>false)
-    post :fail, facebook_params
+    silence_warnings do
+      post :fail, facebook_params
+    end
     assert_response :error
   end
-  
+
   def test_pretty_errors_enabled_success
     post :pass, facebook_params
     assert_response 200
   end
   def test_pretty_errors_enabled_error
-    post :fail, facebook_params
+    silence_warnings do
+      post :fail, facebook_params
+    end
     assert_response 200
   end
 end

test/facebooker/rails/publisher_test.rb

@@ -14,19 +14,19 @@ def setup
 
   def teardown
     Facebooker::Session.configuration_file_path = nil
-    super    
+    super
   end
-  
+
   def test_install_url_escapes_optional_next_parameter
     session = Facebooker::CanvasSession.create(ENV['FACEBOOK_API_KEY'], ENV['FACEBOOK_SECRET_KEY'])
     assert_equal("http://www.facebook.com/install.php?api_key=1234567&v=1.0&next=next_url%3Fa%3D1%26b%3D2", session.install_url(:next => "next_url?a=1&b=2"))
   end
-  
+
   def test_can_get_api_and_secret_key_from_environment
     assert_equal('1234567', Facebooker::Session.api_key)
-    assert_equal('7654321', Facebooker::Session.secret_key)    
+    assert_equal('7654321', Facebooker::Session.secret_key)
   end
-  
+
   def test_if_keys_are_not_available_via_environment_then_they_are_gotten_from_a_file
     ENV['FACEBOOK_API_KEY'], ENV['FACEBOOK_SECRET_KEY'] = nil
     flexmock(File).should_receive(:read).with(File.expand_path("~/.facebookerrc")).once.and_return('{:api => "foo"}')

test/facebooker/rails_integration_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 require 'rack/facebook'
 require 'rack/lint'
 require 'rack/mock'

test/facebooker/session_test.rb

@@ -1,8 +1,11 @@
 require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 
+tmp = $-w
+$-w = nil
 require 'action_controller'
 require 'action_controller/test_process'
 require 'active_record'
+$-w = tmp
 gem 'rails'
 require 'initializer'
 require File.dirname(__FILE__)+'/../init'
@@ -11,3 +14,14 @@
 require 'facebooker/rails/helpers'
 require 'facebooker/rails/publisher'
 require 'facebooker/rails/facebook_form_builder'
+
+ActionController::Routing::Routes.draw do |map|
+  map.connect '', :controller=>"facebook",:conditions=>{:canvas=>true}
+  map.connect '', :controller=>"plain_old_rails"
+  map.resources :comments, :controller=>"plain_old_rails"
+  map.connect 'require_auth/:action', :controller => "controller_which_requires_facebook_authentication"
+  map.connect 'require_install/:action', :controller => "controller_which_requires_application_installation"
+  silence_warnings do
+    map.connect ':controller/:action/:id', :controller => "plain_old_rails"
+  end
+end

test/rack/facebook_test.rb

@@ -1,5 +1,6 @@
 require 'test/unit'
 require 'rubygems'
+
 begin
   require 'multi_rails_init'
 rescue LoadError
@@ -24,16 +25,16 @@
 
 class Test::Unit::TestCase
   include Facebooker::Rails::TestHelpers
-    
+
   private
-  
+
   def expect_http_posts_with_responses(*responses_xml)
     mock_http = establish_session
     responses_xml.each do |xml_string|
       mock_http.should_receive(:post_form).and_return(xml_string).once.ordered(:posts)
-    end   
+    end
   end
-  
+
   def establish_session(session = @session)
     mock = flexmock(Net::HTTP).should_receive(:post_form).and_return(example_auth_token_xml).once.ordered(:posts)
     mock.should_receive(:post_form).and_return(example_get_session_xml).once.ordered(:posts)