mmangino-facebooker 1.0.32 → 1.0.36

data/Manifest.txt

@@ -75,6 +75,7 @@ lib/facebooker/models/user.rb
 lib/facebooker/models/video.rb
 lib/facebooker/models/work_info.rb
 lib/facebooker/parser.rb
+lib/facebooker/rails/backwards_compatible_param_checks.rb
 lib/facebooker/rails/controller.rb
 lib/facebooker/rails/cucumber.rb
 lib/facebooker/rails/cucumber/world.rb
@@ -84,6 +85,7 @@ lib/facebooker/rails/extensions/routing.rb
 lib/facebooker/rails/facebook_form_builder.rb
 lib/facebooker/rails/facebook_pretty_errors.rb
 lib/facebooker/rails/facebook_request_fix.rb
+lib/facebooker/rails/facebook_request_fix_2-3.rb
 lib/facebooker/rails/facebook_session_handling.rb
 lib/facebooker/rails/facebook_url_helper.rb
 lib/facebooker/rails/facebook_url_rewriting.rb
@@ -114,9 +116,11 @@ test/facebooker/logging_test.rb
 test/facebooker/mobile_test.rb
 test/facebooker/model_test.rb
 test/facebooker/models/event_test.rb
+test/facebooker/models/photo_test.rb
 test/facebooker/models/user_test.rb
 test/facebooker/rails/publisher_test.rb
 test/facebooker/rails_integration_test.rb
+test/facebooker/rails/facebook_request_fix_2-3_test.rb
 test/facebooker/server_cache_test.rb
 test/facebooker/session_test.rb
 test/facebooker_test.rb

data/facebooker.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{facebooker}
-  s.version = "1.0.32"
+  s.version = "1.0.36"
 
   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-12}
+  s.date = %q{2009-05-28}
   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"]
-  s.files = [".autotest", "CHANGELOG.rdoc", "COPYING.rdoc", "Manifest.txt", "README.rdoc", "Rakefile", "TODO.rdoc", "examples/desktop_login.rb", "facebooker.gemspec", "generators/facebook/facebook_generator.rb", "generators/facebook/templates/config/facebooker.yml", "generators/facebook/templates/public/javascripts/facebooker.js", "generators/facebook_controller/USAGE", "generators/facebook_controller/facebook_controller_generator.rb", "generators/facebook_controller/templates/controller.rb", "generators/facebook_controller/templates/functional_test.rb", "generators/facebook_controller/templates/helper.rb", "generators/facebook_controller/templates/view.fbml.erb", "generators/facebook_controller/templates/view.html.erb", "generators/facebook_publisher/facebook_publisher_generator.rb", "generators/facebook_publisher/templates/create_facebook_templates.rb", "generators/facebook_publisher/templates/publisher.rb", "generators/facebook_scaffold/USAGE", "generators/facebook_scaffold/facebook_scaffold_generator.rb", "generators/facebook_scaffold/templates/controller.rb", "generators/facebook_scaffold/templates/facebook_style.css", "generators/facebook_scaffold/templates/functional_test.rb", "generators/facebook_scaffold/templates/helper.rb", "generators/facebook_scaffold/templates/layout.fbml.erb", "generators/facebook_scaffold/templates/layout.html.erb", "generators/facebook_scaffold/templates/style.css", "generators/facebook_scaffold/templates/view_edit.fbml.erb", "generators/facebook_scaffold/templates/view_edit.html.erb", "generators/facebook_scaffold/templates/view_index.fbml.erb", "generators/facebook_scaffold/templates/view_index.html.erb", "generators/facebook_scaffold/templates/view_new.fbml.erb", "generators/facebook_scaffold/templates/view_new.html.erb", "generators/facebook_scaffold/templates/view_show.fbml.erb", "generators/facebook_scaffold/templates/view_show.html.erb", "generators/publisher/publisher_generator.rb", "generators/xd_receiver/templates/xd_receiver.html", "generators/xd_receiver/xd_receiver_generator.rb", "init.rb", "install.rb", "lib/facebooker.rb", "lib/facebooker/adapters/adapter_base.rb", "lib/facebooker/adapters/bebo_adapter.rb", "lib/facebooker/adapters/facebook_adapter.rb", "lib/facebooker/admin.rb", "lib/facebooker/batch_request.rb", "lib/facebooker/data.rb", "lib/facebooker/feed.rb", "lib/facebooker/logging.rb", "lib/facebooker/mobile.rb", "lib/facebooker/mock/service.rb", "lib/facebooker/mock/session.rb", "lib/facebooker/model.rb", "lib/facebooker/models/affiliation.rb", "lib/facebooker/models/album.rb", "lib/facebooker/models/applicationproperties.rb", "lib/facebooker/models/applicationrestrictions.rb", "lib/facebooker/models/cookie.rb", "lib/facebooker/models/education_info.rb", "lib/facebooker/models/event.rb", "lib/facebooker/models/friend_list.rb", "lib/facebooker/models/group.rb", "lib/facebooker/models/info_item.rb", "lib/facebooker/models/info_section.rb", "lib/facebooker/models/location.rb", "lib/facebooker/models/notifications.rb", "lib/facebooker/models/page.rb", "lib/facebooker/models/photo.rb", "lib/facebooker/models/tag.rb", "lib/facebooker/models/user.rb", "lib/facebooker/models/video.rb", "lib/facebooker/models/work_info.rb", "lib/facebooker/parser.rb", "lib/facebooker/rails/controller.rb", "lib/facebooker/rails/cucumber.rb", "lib/facebooker/rails/cucumber/world.rb", "lib/facebooker/rails/extensions/action_controller.rb", "lib/facebooker/rails/extensions/rack_setup.rb", "lib/facebooker/rails/extensions/routing.rb", "lib/facebooker/rails/facebook_form_builder.rb", "lib/facebooker/rails/facebook_pretty_errors.rb", "lib/facebooker/rails/facebook_request_fix.rb", "lib/facebooker/rails/facebook_session_handling.rb", "lib/facebooker/rails/facebook_url_helper.rb", "lib/facebooker/rails/facebook_url_rewriting.rb", "lib/facebooker/rails/helpers.rb", "lib/facebooker/rails/helpers/fb_connect.rb", "lib/facebooker/rails/integration_session.rb", "lib/facebooker/rails/profile_publisher_extensions.rb", "lib/facebooker/rails/publisher.rb", "lib/facebooker/rails/routing.rb", "lib/facebooker/rails/test_helpers.rb", "lib/facebooker/rails/utilities.rb", "lib/facebooker/server_cache.rb", "lib/facebooker/service.rb", "lib/facebooker/session.rb", "lib/facebooker/version.rb", "lib/net/http_multipart_post.rb", "lib/rack/facebook.rb", "lib/tasks/facebooker.rake", "lib/tasks/tunnel.rake", "rails/init.rb", "setup.rb", "templates/layout.erb", "test/facebooker/adapters_test.rb", "test/facebooker/admin_test.rb", "test/facebooker/batch_request_test.rb", "test/facebooker/data_test.rb", "test/facebooker/logging_test.rb", "test/facebooker/mobile_test.rb", "test/facebooker/model_test.rb", "test/facebooker/models/event_test.rb", "test/facebooker/models/user_test.rb", "test/facebooker/rails/publisher_test.rb", "test/facebooker/rails_integration_test.rb", "test/facebooker/server_cache_test.rb", "test/facebooker/session_test.rb", "test/facebooker_test.rb", "test/fixtures/multipart_post_body_with_only_parameters.txt", "test/fixtures/multipart_post_body_with_single_file.txt", "test/fixtures/multipart_post_body_with_single_file_that_has_nil_key.txt", "test/net/http_multipart_post_test.rb", "test/rack/facebook_test.rb", "test/rails_test_helper.rb", "test/test_helper.rb"]
+  s.files = [".autotest", "CHANGELOG.rdoc", "COPYING.rdoc", "Manifest.txt", "README.rdoc", "Rakefile", "TODO.rdoc", "examples/desktop_login.rb", "facebooker.gemspec", "generators/facebook/facebook_generator.rb", "generators/facebook/templates/config/facebooker.yml", "generators/facebook/templates/public/javascripts/facebooker.js", "generators/facebook_controller/USAGE", "generators/facebook_controller/facebook_controller_generator.rb", "generators/facebook_controller/templates/controller.rb", "generators/facebook_controller/templates/functional_test.rb", "generators/facebook_controller/templates/helper.rb", "generators/facebook_controller/templates/view.fbml.erb", "generators/facebook_controller/templates/view.html.erb", "generators/facebook_publisher/facebook_publisher_generator.rb", "generators/facebook_publisher/templates/create_facebook_templates.rb", "generators/facebook_publisher/templates/publisher.rb", "generators/facebook_scaffold/USAGE", "generators/facebook_scaffold/facebook_scaffold_generator.rb", "generators/facebook_scaffold/templates/controller.rb", "generators/facebook_scaffold/templates/facebook_style.css", "generators/facebook_scaffold/templates/functional_test.rb", "generators/facebook_scaffold/templates/helper.rb", "generators/facebook_scaffold/templates/layout.fbml.erb", "generators/facebook_scaffold/templates/layout.html.erb", "generators/facebook_scaffold/templates/style.css", "generators/facebook_scaffold/templates/view_edit.fbml.erb", "generators/facebook_scaffold/templates/view_edit.html.erb", "generators/facebook_scaffold/templates/view_index.fbml.erb", "generators/facebook_scaffold/templates/view_index.html.erb", "generators/facebook_scaffold/templates/view_new.fbml.erb", "generators/facebook_scaffold/templates/view_new.html.erb", "generators/facebook_scaffold/templates/view_show.fbml.erb", "generators/facebook_scaffold/templates/view_show.html.erb", "generators/publisher/publisher_generator.rb", "generators/xd_receiver/templates/xd_receiver.html", "generators/xd_receiver/xd_receiver_generator.rb", "init.rb", "install.rb", "lib/facebooker.rb", "lib/facebooker/adapters/adapter_base.rb", "lib/facebooker/adapters/bebo_adapter.rb", "lib/facebooker/adapters/facebook_adapter.rb", "lib/facebooker/admin.rb", "lib/facebooker/batch_request.rb", "lib/facebooker/data.rb", "lib/facebooker/feed.rb", "lib/facebooker/logging.rb", "lib/facebooker/mobile.rb", "lib/facebooker/mock/service.rb", "lib/facebooker/mock/session.rb", "lib/facebooker/model.rb", "lib/facebooker/models/affiliation.rb", "lib/facebooker/models/album.rb", "lib/facebooker/models/applicationproperties.rb", "lib/facebooker/models/applicationrestrictions.rb", "lib/facebooker/models/cookie.rb", "lib/facebooker/models/education_info.rb", "lib/facebooker/models/event.rb", "lib/facebooker/models/friend_list.rb", "lib/facebooker/models/group.rb", "lib/facebooker/models/info_item.rb", "lib/facebooker/models/info_section.rb", "lib/facebooker/models/location.rb", "lib/facebooker/models/notifications.rb", "lib/facebooker/models/page.rb", "lib/facebooker/models/photo.rb", "lib/facebooker/models/tag.rb", "lib/facebooker/models/user.rb", "lib/facebooker/models/video.rb", "lib/facebooker/models/work_info.rb", "lib/facebooker/parser.rb", "lib/facebooker/rails/backwards_compatible_param_checks.rb", "lib/facebooker/rails/controller.rb", "lib/facebooker/rails/cucumber.rb", "lib/facebooker/rails/cucumber/world.rb", "lib/facebooker/rails/extensions/action_controller.rb", "lib/facebooker/rails/extensions/rack_setup.rb", "lib/facebooker/rails/extensions/routing.rb", "lib/facebooker/rails/facebook_form_builder.rb", "lib/facebooker/rails/facebook_pretty_errors.rb", "lib/facebooker/rails/facebook_request_fix.rb", "lib/facebooker/rails/facebook_request_fix_2-3.rb", "lib/facebooker/rails/facebook_session_handling.rb", "lib/facebooker/rails/facebook_url_helper.rb", "lib/facebooker/rails/facebook_url_rewriting.rb", "lib/facebooker/rails/helpers.rb", "lib/facebooker/rails/helpers/fb_connect.rb", "lib/facebooker/rails/integration_session.rb", "lib/facebooker/rails/profile_publisher_extensions.rb", "lib/facebooker/rails/publisher.rb", "lib/facebooker/rails/routing.rb", "lib/facebooker/rails/test_helpers.rb", "lib/facebooker/rails/utilities.rb", "lib/facebooker/server_cache.rb", "lib/facebooker/service.rb", "lib/facebooker/session.rb", "lib/facebooker/version.rb", "lib/net/http_multipart_post.rb", "lib/rack/facebook.rb", "lib/tasks/facebooker.rake", "lib/tasks/tunnel.rake", "rails/init.rb", "setup.rb", "templates/layout.erb", "test/facebooker/adapters_test.rb", "test/facebooker/admin_test.rb", "test/facebooker/batch_request_test.rb", "test/facebooker/data_test.rb", "test/facebooker/logging_test.rb", "test/facebooker/mobile_test.rb", "test/facebooker/model_test.rb", "test/facebooker/models/event_test.rb", "test/facebooker/models/photo_test.rb", "test/facebooker/models/user_test.rb", "test/facebooker/rails/publisher_test.rb", "test/facebooker/rails_integration_test.rb", "test/facebooker/rails/facebook_request_fix_2-3_test.rb", "test/facebooker/server_cache_test.rb", "test/facebooker/session_test.rb", "test/facebooker_test.rb", "test/fixtures/multipart_post_body_with_only_parameters.txt", "test/fixtures/multipart_post_body_with_single_file.txt", "test/fixtures/multipart_post_body_with_single_file_that_has_nil_key.txt", "test/net/http_multipart_post_test.rb", "test/rack/facebook_test.rb", "test/rails_test_helper.rb", "test/test_helper.rb", "test/facebooker/rails/facebook_url_rewriting_test.rb"]
   s.has_rdoc = true
   s.homepage = %q{http://facebooker.rubyforge.org}
   s.rdoc_options = ["--main", "README.rdoc"]
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = %q{facebooker}
   s.rubygems_version = %q{1.3.1}
   s.summary = %q{Facebooker is a Ruby wrapper over the Facebook[http://facebook.com] {REST API}[http://wiki.developers.facebook.com/index.php/API]}
-  s.test_files = ["test/facebooker_test.rb", "test/facebooker/adapters_test.rb", "test/facebooker/admin_test.rb", "test/facebooker/batch_request_test.rb", "test/facebooker/data_test.rb", "test/facebooker/logging_test.rb", "test/facebooker/mobile_test.rb", "test/facebooker/model_test.rb", "test/facebooker/rails_integration_test.rb", "test/facebooker/server_cache_test.rb", "test/facebooker/session_test.rb", "test/facebooker/models/event_test.rb", "test/facebooker/models/user_test.rb", "test/facebooker/rails/publisher_test.rb", "test/net/http_multipart_post_test.rb", "test/rack/facebook_test.rb"]
+  s.test_files = ["test/facebooker_test.rb", "test/facebooker/adapters_test.rb", "test/facebooker/admin_test.rb", "test/facebooker/batch_request_test.rb", "test/facebooker/data_test.rb", "test/facebooker/logging_test.rb", "test/facebooker/mobile_test.rb", "test/facebooker/model_test.rb", "test/facebooker/rails_integration_test.rb", "test/facebooker/server_cache_test.rb", "test/facebooker/session_test.rb", "test/facebooker/models/event_test.rb", "test/facebooker/models/photo_test.rb", "test/facebooker/models/user_test.rb", "test/facebooker/rails/facebook_request_fix_2-3_test.rb", "test/facebooker/rails/facebook_url_rewriting_test.rb", "test/facebooker/rails/publisher_test.rb", "test/net/http_multipart_post_test.rb", "test/rack/facebook_test.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/init.rb

@@ -5,15 +5,17 @@ facebook_config = "#{RAILS_ROOT}/config/facebooker.yml"
 require 'facebooker'
 FACEBOOKER = Facebooker.load_configuration(facebook_config)
 
-# enable logger before including everything else, in case we ever want to log initialization 
+# enable logger before including everything else, in case we ever want to log initialization
 Facebooker.logger = RAILS_DEFAULT_LOGGER if Object.const_defined? :RAILS_DEFAULT_LOGGER
 
 require 'net/http_multipart_post'
 if defined? Rails
+  require 'facebooker/rails/backwards_compatible_param_checks'
   require 'facebooker/rails/controller'
   require 'facebooker/rails/facebook_url_rewriting'
   require 'facebooker/rails/facebook_session_handling' if Rails.version < '2.3'
   require 'facebooker/rails/facebook_request_fix' if Rails.version < '2.3'
+  require 'facebooker/rails/facebook_request_fix_2-3' if Rails.version >= '2.3'
   require 'facebooker/rails/routing'
   require 'facebooker/rails/facebook_pretty_errors' rescue nil
   require 'facebooker/rails/facebook_url_helper'

data/lib/facebooker/models/photo.rb

@@ -8,5 +8,12 @@ module Facebooker
                   :story_fbid
 
     id_is :pid
+    
+    #override the generated method for id_is to use a string
+    def pid=(val)
+      @pid = val
+    end
+    
+    alias :id= :pid=
   end
 end

data/lib/facebooker/models/user.rb

@@ -10,7 +10,7 @@ module Facebooker
       include Model
       attr_accessor :message, :time, :status_id
     end
-    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]
+    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, :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/backwards_compatible_param_checks.rb

@@ -0,0 +1,31 @@
+module Facebooker::Rails::BackwardsCompatibleParamChecks
+
+    def one_or_true( value )
+      case value
+        when String then
+          value == "1"
+        when Numeric then
+          value.to_f == 1.0
+        when TrueClass then
+          true
+        else
+          false
+      end
+    end
+
+    def zero_or_false( value )
+      case value
+        when String then
+          value == "0"
+        when Numeric then
+          value.to_f == 0.0
+        when FalseClass then
+          true
+        when NilClass then
+          true
+        else
+          false
+      end
+    end
+
+end

data/lib/facebooker/rails/controller.rb

@@ -3,6 +3,7 @@ require 'facebooker/rails/profile_publisher_extensions'
 module Facebooker
   module Rails
     module Controller
+      include Facebooker::Rails::BackwardsCompatibleParamChecks
       include Facebooker::Rails::ProfilePublisherExtensions
       def self.included(controller)
         controller.extend(ClassMethods)
@@ -205,6 +206,10 @@ module Facebooker
       end
       
       def verify_signature(facebook_sig_params,expected_signature)
+        # Don't verify the signature if rack has already done so.
+        if ::Rails.version >= "2.3"
+          return if ActionController::Dispatcher.middleware.include? Rack::Facebook
+        end
         raw_string = facebook_sig_params.map{ |*args| args.join('=') }.sort.join
         actual_sig = Digest::MD5.hexdigest([raw_string, Facebooker::Session.secret_key].join)
         raise Facebooker::Session::IncorrectSignature if actual_sig != expected_signature
@@ -249,14 +254,13 @@ module Facebooker
       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
+        one_or_true(params["fb_sig_is_mockajax"]) || one_or_true(params["fb_sig_is_ajax"])
       end
+
       def xml_http_request?
         request_is_facebook_ajax? || super
       end
       
-      
-      
       def application_is_installed?
         facebook_params['added']
       end

data/lib/facebooker/rails/extensions/rack_setup.rb

@@ -1,8 +1,6 @@
 # Somewhere in 2.3 RewindableInput was removed- rack supports it natively
 require 'rack/facebook'
-ActionController::Dispatcher.middleware.insert_after( 
-  (Object.const_get('ActionController::RewindableInput') rescue false) ?
-    'ActionController::RewindableInput' :
-    'ActionController::Session::CookieStore',
+ActionController::Dispatcher.middleware.insert_before( 
+  ActionController::ParamsParser,
   Rack::Facebook,
   Facebooker.secret_key )

data/lib/facebooker/rails/facebook_request_fix.rb

@@ -1,5 +1,7 @@
 module ::ActionController
   class AbstractRequest
+    include Facebooker::Rails::BackwardsCompatibleParamChecks
+
     def request_method_with_facebooker
       if parameters[:_method].blank?
         if %w{GET HEAD}.include?(parameters[:fb_sig_request_method])
@@ -14,8 +16,8 @@ module ::ActionController
     end
 
     def xml_http_request_with_facebooker?
-      parameters["fb_sig_is_mockajax"] == "1"  ||
-      parameters["fb_sig_is_ajax"] == "1" ||
+      one_or_true(parameters["fb_sig_is_mockajax"])  ||
+      one_or_true(parameters["fb_sig_is_ajax"]) ||
       xml_http_request_without_facebooker?
     end
     alias_method_chain :xml_http_request?, :facebooker

data/lib/facebooker/rails/facebook_request_fix_2-3.rb

@@ -0,0 +1,31 @@
+module ::ActionController
+
+  class Request
+
+    include Facebooker::Rails::BackwardsCompatibleParamChecks
+
+    def request_method_with_facebooker
+      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
+    end
+
+    def xml_http_request_with_facebooker?
+      one_or_true(parameters["fb_sig_is_mockajax"])  ||
+      one_or_true(parameters["fb_sig_is_ajax"]) ||
+      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?
+
+  end
+end

data/lib/facebooker/rails/facebook_url_rewriting.rb

@@ -23,14 +23,18 @@ module ::ActionController
   end
 
   class UrlRewriter
+    include Facebooker::Rails::BackwardsCompatibleParamChecks
+
     RESERVED_OPTIONS << :canvas
+
     def link_to_new_canvas?
-      @request.parameters["fb_sig_in_new_facebook"] == "1"
+      one_or_true @request.parameters["fb_sig_in_new_facebook"]
     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" ))
+      option_override || (can_safely_access_request_parameters? && (one_or_true(@request.parameters["fb_sig_in_canvas"]) || one_or_true(@request.parameters[:fb_sig_in_canvas]) ))
     end
 
     #rails blindly tries to merge things that may be nil into the parameters. Make sure this won't break
@@ -51,5 +55,6 @@ module ::ActionController
     end
     
     alias_method_chain :rewrite_url, :facebooker
+
   end
 end

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

@@ -31,6 +31,7 @@ module Facebooker
              init_string = <<-FBML
              #{case options[:js]
                when :jquery then "$(document).ready("
+               when :dojo then "dojo.addOnLoad("
                else "Element.observe(window,'load',"
                end} function() {
                 FB_RequireFeatures(#{required_features.to_json}, function() {

data/lib/facebooker/version.rb

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

data/test/facebooker/models/photo_test.rb

@@ -0,0 +1,16 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
+require 'active_support'
+
+class Facebooker::UserTest < Test::Unit::TestCase
+
+  def test_pid_should_be_treated_as_a_string
+    @photo = Facebooker::Photo.new(:pid=>"100000025509592_6801")
+    assert_equal("100000025509592_6801",@photo.pid)
+  end
+  
+  def test_setting_id_should_also_use_new_method
+    @photo = Facebooker::Photo.new(:id=>"100000025509592_6801")
+    assert_equal("100000025509592_6801",@photo.id)
+  end
+
+end

data/test/facebooker/rails/facebook_request_fix_2-3_test.rb

@@ -0,0 +1,24 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../rails_test_helper')
+
+class Facebooker::Rails::FacebookRequestFix23Test < Test::Unit::TestCase
+
+  def setup
+    ENV['FACEBOOK_API_KEY'] = '1234567'
+    ENV['FACEBOOK_SECRET_KEY'] = '7654321'
+    if Rails.version < '2.3'
+      @request = ActionController::TestRequest.new({"fb_sig_is_ajax"=>"1"}, {}, nil)
+    else
+      @request = ActionController::TestRequest.new
+      @request.query_parameters[:fb_sig_is_ajax] = "1"
+    end
+  end
+
+  def test_xhr_when_is_ajax
+    assert @request.xhr?
+  end
+
+  def test_xml_http_request_when_is_ajax
+    assert @request.xml_http_request?
+  end
+
+end

data/test/facebooker/rails/facebook_url_rewriting_test.rb

@@ -0,0 +1,39 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../rails_test_helper')
+
+class Facebooker::Rails::FacebookUrlRewritingTest < Test::Unit::TestCase
+
+  def setup
+    @request = ActionController::TestRequest.new
+    @params = {}
+    @rewriter = ActionController::UrlRewriter.new(@request, @params)
+  end
+
+  def test_one_or_true_on_string_1
+    assert @rewriter.one_or_true( "1" )
+  end
+  
+  def test_one_or_true_on_string_0
+    assert !@rewriter.one_or_true( "0" )
+  end
+
+  def test_one_or_true_on_integer_1
+    assert @rewriter.one_or_true( 1 )
+  end
+
+  def test_one_or_true_on_float_1
+    assert @rewriter.one_or_true( 1.0 )
+  end
+  
+  def test_one_or_true_on_true
+    assert @rewriter.one_or_true( true )
+  end
+
+  def test_one_or_true_on_false
+    assert !@rewriter.one_or_true( false )
+  end
+
+  def test_one_or_true_on_nil
+    assert !@rewriter.one_or_true( nil )
+  end
+
+end

data/test/facebooker_test.rb

@@ -232,7 +232,7 @@ class TestFacebooker < Test::Unit::TestCase
     photos = @session.get_photos([97503428461115590, 97503428461115573])
     assert_equal 2, photos.size
     assert_equal "Rooftop barbecues make me act funny", photos.first.caption
-    assert_equal 97503428461115590, photos[0].id
+    assert_equal "97503428461115590", photos[0].id
   end
 
   def test_can_get_photos_by_subject_and_album

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mmangino-facebooker
 version: !ruby/object:Gem::Version 
-  version: 1.0.32
+  version: 1.0.36
 platform: ruby
 authors: 
 - Chad Fowler
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-12 00:00:00 -07:00
+date: 2009-05-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -126,6 +126,7 @@ files:
 - lib/facebooker/models/video.rb
 - lib/facebooker/models/work_info.rb
 - lib/facebooker/parser.rb
+- lib/facebooker/rails/backwards_compatible_param_checks.rb
 - lib/facebooker/rails/controller.rb
 - lib/facebooker/rails/cucumber.rb
 - lib/facebooker/rails/cucumber/world.rb
@@ -135,6 +136,7 @@ files:
 - lib/facebooker/rails/facebook_form_builder.rb
 - lib/facebooker/rails/facebook_pretty_errors.rb
 - lib/facebooker/rails/facebook_request_fix.rb
+- lib/facebooker/rails/facebook_request_fix_2-3.rb
 - lib/facebooker/rails/facebook_session_handling.rb
 - lib/facebooker/rails/facebook_url_helper.rb
 - lib/facebooker/rails/facebook_url_rewriting.rb
@@ -165,9 +167,11 @@ files:
 - test/facebooker/mobile_test.rb
 - test/facebooker/model_test.rb
 - test/facebooker/models/event_test.rb
+- test/facebooker/models/photo_test.rb
 - test/facebooker/models/user_test.rb
 - test/facebooker/rails/publisher_test.rb
 - test/facebooker/rails_integration_test.rb
+- test/facebooker/rails/facebook_request_fix_2-3_test.rb
 - test/facebooker/server_cache_test.rb
 - test/facebooker/session_test.rb
 - test/facebooker_test.rb
@@ -178,6 +182,7 @@ files:
 - test/rack/facebook_test.rb
 - test/rails_test_helper.rb
 - test/test_helper.rb
+- test/facebooker/rails/facebook_url_rewriting_test.rb
 has_rdoc: true
 homepage: http://facebooker.rubyforge.org
 post_install_message: 
@@ -218,7 +223,10 @@ test_files:
 - test/facebooker/server_cache_test.rb
 - test/facebooker/session_test.rb
 - test/facebooker/models/event_test.rb
+- test/facebooker/models/photo_test.rb
 - test/facebooker/models/user_test.rb
+- test/facebooker/rails/facebook_request_fix_2-3_test.rb
+- test/facebooker/rails/facebook_url_rewriting_test.rb
 - test/facebooker/rails/publisher_test.rb
 - test/net/http_multipart_post_test.rb
 - test/rack/facebook_test.rb