facebooker 1.0.58 → 1.0.59

data/Manifest.txt

@@ -113,7 +113,9 @@ lib/facebooker/stream_post.rb
 lib/facebooker/version.rb
 lib/net/http_multipart_post.rb
 lib/rack/facebook.rb
+lib/rack/facebook_session.rb
 lib/tasks/facebooker.rake
+lib/tasks/facebooker.rb
 lib/tasks/tunnel.rake
 rails/init.rb
 setup.rb
@@ -142,5 +144,6 @@ 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/rack/facebook_session_test.rb
 test/rails_test_helper.rb
 test/test_helper.rb

data/README.rdoc

@@ -48,6 +48,12 @@ Facebooker can be installed as a Rails plugin by:
 
 If you don't have git, the plugin can be downloaded from http://github.com/mmangino/facebooker/tarball/master
 
+=== Using Gem in Rails
+
+The rake task would not be added automatically, so to use it in rails you would have to add the following towards the end of your Rakefile:
+  
+  require 'tasks/facebooker'
+
 Once the plugin is installed, you will need to configure your Facebook app in config/facebooker.yml. 
 
 Your application users will need to have added the application in facebook to access all of facebooker's features. You enforce this by adding

data/facebooker.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{facebooker}
-  s.version = "1.0.58"
+  s.version = "1.0.59"
 
   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", "Mike Mangino"]
-  s.date = %q{2009-12-11}
+  s.date = %q{2010-01-15}
   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
@@ -15,14 +15,14 @@ Gem::Specification.new do |s|
 * Well tested}
   s.email = ["chad@chadfowlwer.com", "", "", "", "", "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_ssl.html", "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/attachment.rb", "lib/facebooker/admin.rb", "lib/facebooker/application.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/family_relative_info.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/service/base_service.rb", "lib/facebooker/service/curl_service.rb", "lib/facebooker/service/net_http_service.rb", "lib/facebooker/service/typhoeus_service.rb", "lib/facebooker/service/typhoeus_multi_service.rb", "lib/facebooker/session.rb", "lib/facebooker/stream_post.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/application_test.rb", "test/facebooker/attachment_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/page_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", "test/facebooker/rails/integration_session_test.rb", "test/facebooker/service_test.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_ssl.html", "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/attachment.rb", "lib/facebooker/admin.rb", "lib/facebooker/application.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/family_relative_info.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/service/base_service.rb", "lib/facebooker/service/curl_service.rb", "lib/facebooker/service/net_http_service.rb", "lib/facebooker/service/typhoeus_service.rb", "lib/facebooker/service/typhoeus_multi_service.rb", "lib/facebooker/session.rb", "lib/facebooker/stream_post.rb", "lib/facebooker/version.rb", "lib/net/http_multipart_post.rb", "lib/rack/facebook.rb", "lib/rack/facebook_session.rb", "lib/tasks/facebooker.rake", "lib/tasks/facebooker.rb", "lib/tasks/tunnel.rake", "rails/init.rb", "setup.rb", "templates/layout.erb", "test/facebooker/adapters_test.rb", "test/facebooker/admin_test.rb", "test/facebooker/application_test.rb", "test/facebooker/attachment_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/page_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/rack/facebook_session_test.rb", "test/rails_test_helper.rb", "test/test_helper.rb", "test/facebooker/rails/facebook_url_rewriting_test.rb", "test/facebooker/rails/integration_session_test.rb", "test/facebooker/service_test.rb"]
   s.homepage = %q{http://facebooker.rubyforge.org}
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{facebooker}
-  s.rubygems_version = %q{1.3.4}
+  s.rubygems_version = %q{1.3.5}
   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/adapters_test.rb", "test/facebooker/admin_test.rb", "test/facebooker/application_test.rb", "test/facebooker/attachment_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/page_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/integration_session_test.rb", "test/facebooker/rails/publisher_test.rb", "test/facebooker/rails_integration_test.rb", "test/facebooker/server_cache_test.rb", "test/facebooker/service_test.rb", "test/facebooker/session_test.rb", "test/facebooker_test.rb", "test/net/http_multipart_post_test.rb", "test/rack/facebook_test.rb"]
+  s.test_files = ["test/facebooker/adapters_test.rb", "test/facebooker/admin_test.rb", "test/facebooker/application_test.rb", "test/facebooker/attachment_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/page_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/integration_session_test.rb", "test/facebooker/rails/publisher_test.rb", "test/facebooker/rails_integration_test.rb", "test/facebooker/server_cache_test.rb", "test/facebooker/service_test.rb", "test/facebooker/session_test.rb", "test/facebooker_test.rb", "test/net/http_multipart_post_test.rb", "test/rack/facebook_session_test.rb", "test/rack/facebook_test.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
@@ -30,13 +30,13 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<json>, [">= 1.0.0"])
-      s.add_development_dependency(%q<hoe>, [">= 2.3.2"])
+      s.add_development_dependency(%q<hoe>, [">= 2.4.0"])
     else
       s.add_dependency(%q<json>, [">= 1.0.0"])
-      s.add_dependency(%q<hoe>, [">= 2.3.2"])
+      s.add_dependency(%q<hoe>, [">= 2.4.0"])
     end
   else
     s.add_dependency(%q<json>, [">= 1.0.0"])
-    s.add_dependency(%q<hoe>, [">= 2.3.2"])
+    s.add_dependency(%q<hoe>, [">= 2.4.0"])
   end
 end

data/lib/facebooker/models/user.rb

@@ -183,6 +183,15 @@ module Facebooker
       @session.post('facebook.stream.addComment', {:post_id=>post_id, :comment=>comment})
     end
 
+    ###
+    # Add a like on a post
+    #
+    # See: http://wiki.developers.facebook.com/index.php/Stream.addLike
+    #
+    # +post_id+ the post_id for the post that is being commented on
+    def add_like_on(post_id)
+      @session.post('facebook.stream.addLike', {:post_id=>post_id})
+    end
 
      def friend_lists
        @friend_lists ||= @session.post('facebook.friends.getLists').map do |hash|

data/lib/facebooker/parser.rb

@@ -223,6 +223,12 @@ module Facebooker
     end
   end  
 
+  class StreamAddLike < Parser#:nodoc:
+    def self.process(data)
+      element('stream_addLike_response', data).content.strip
+    end
+  end  
+
   class RegisterTemplateBundle < Parser#:nodoc:
     def self.process(data)
       element('feed_registerTemplateBundle_response', data).content.to_i
@@ -699,6 +705,7 @@ module Facebooker
       'facebook.photos.upload' => UploadPhoto,
       'facebook.stream.publish' => StreamPublish,
       'facebook.stream.addComment' => StreamAddComment,
+      'facebook.stream.addLike' => StreamAddLike,
       'facebook.events.create' => EventsCreate,
       'facebook.events.cancel' => EventsCancel,
       'facebook.events.get' => EventsGet,

data/lib/facebooker/rails/controller.rb

@@ -131,17 +131,14 @@ module Facebooker
 
       def secure_with_cookies!
           parsed = {}
-          
-          # josephsofaer finds the cookies[key] returns an array, 
-          # it doesn't happen for me (mmangino)
-          # so force it to array and take the first value
-          fb_cookie_names.each { |key| parsed[key[fb_cookie_prefix.size,key.size]] = Array(cookies[key]).first }
+
+          fb_cookie_names.each { |key| parsed[key[fb_cookie_prefix.size,key.size]] = cookies[key] }
 
           #returning gracefully if the cookies aren't set or have expired
           return unless parsed['session_key'] && parsed['user'] && parsed['expires'] && parsed['ss'] 
           return unless (Time.at(parsed['expires'].to_s.to_f) > Time.now) || (parsed['expires'] == "0")      
           #if we have the unexpired cookies, we'll throw an exception if the sig doesn't verify
-          verify_signature(parsed,cookies[Facebooker.api_key],true)
+          verify_signature(parsed,cookies[Facebooker.api_key], true)
 
           @facebook_session = new_facebook_session
           @facebook_session.secure_with!(parsed['session_key'],parsed['user'],parsed['expires'],parsed['ss'])

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

@@ -1,6 +1,14 @@
 # Somewhere in 2.3 RewindableInput was removed- rack supports it natively
 require 'rack/facebook'
+require 'rack/facebook_session'
+
 ActionController::Dispatcher.middleware.insert_before( 
   ActionController::ParamsParser,
   Rack::Facebook
 )
+
+# ActionController::Dispatcher.middleware.insert_before(
+#   ActionController::Base.session_store,
+#   Rack::FacebookSession,
+#   lambda { ActionController::Base.session_options[:key] }
+# )

data/lib/facebooker/rails/helpers.rb

@@ -25,6 +25,7 @@ module Facebooker
       # cancel_button is true or false
       def fb_dialog( id, cancel_button, &block )
         content = capture(&block)
+        cancel_button = cancel_button ? 1 : 0 unless cancel_button == 0
         versioned_concat( content_tag("fb:dialog", content, {:id => id, :cancel_button => cancel_button}), block.binding )
       end
       
@@ -107,17 +108,17 @@ module Facebooker
 
       # Create an fb:request-form with an fb_multi_friend_selector inside
       # 
-      # The content of the block are used as the message on the form,
+      # The content of the block are used as the message on the form, the options hash is passed onto fb_multi_friend_selector.
       #
       # For example:
-      #  <% fb_multi_friend_request("Poke","Choose some friends to Poke",create_poke_path) do %>
+      #  <% fb_multi_friend_request("Poke","Choose some friends to Poke",create_poke_path,:exclude_ids => "123456789,987654321") do %>
       #    If you select some friends, they will see this message.
       #    <%= fb_req_choice("They will get this button, too",new_poke_path) %>
       #  <% end %>
-      def fb_multi_friend_request(type,friend_selector_message,url,&block)
+      def fb_multi_friend_request(type,friend_selector_message,url, fb_multi_friend_selector_options = {},&block)
         content = capture(&block)
         versioned_concat(content_tag("fb:request-form",
-                            fb_multi_friend_selector(friend_selector_message) + token_tag,
+                            fb_multi_friend_selector(friend_selector_message, fb_multi_friend_selector_options) + token_tag,
                             {:action=>url,:method=>"post",:invite=>true,:type=>type,:content=>content}
                             ),
               block.binding)
@@ -697,8 +698,11 @@ module Facebooker
       # more details
       def fb_intl(text=nil, options={}, &proc)
         raise ArgumentError, "Missing block or text" unless block_given? or text
-        content = block_given? ? capture(&proc) : text
-        content_tag("fb:intl", content, stringify_vals(options))
+        if block_given?
+          versioned_concat(fb_intl(capture(&proc), options))
+        else
+          content_tag("fb:intl", text, stringify_vals(options))
+        end
       end
 
       # Renders a fb:intl-token element
@@ -710,8 +714,11 @@ module Facebooker
       # more details
       def fb_intl_token(name, text=nil, &proc)
         raise ArgumentError, "Missing block or text" unless block_given? or text
-        content = block_given? ? capture(&proc) : text
-        content_tag("fb:intl-token", content, stringify_vals({:name => name}))
+        if block_given?
+          versioned_concat(fb_intl_token(name, capture(&proc)))
+        else
+          content_tag("fb:intl-token", text, stringify_vals({:name => name}))
+        end
       end
 
       # Renders a fb:date element

data/lib/facebooker/rails/publisher.rb

@@ -109,6 +109,7 @@ module Facebooker
         @full_story_template  = nil
         @recipients           = nil
         @controller           = PublisherController.new(self)
+        @action_links         = nil
       end
 
       def self.default_url_options

data/lib/facebooker/session.rb

@@ -709,6 +709,7 @@ module Facebooker
       end
 
       def signature_for(params)
+        params.delete_if { |k,v| v.nil? }
         raw_string = params.inject([]) do |collection, pair|
           collection << pair.map { |x|
             Array === x ? Facebooker.json_encode(x) : x

data/lib/facebooker/version.rb

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

data/lib/rack/facebook_session.rb

@@ -0,0 +1,21 @@
+require 'rack/request'
+
+module Rack 
+  class FacebookSession
+  
+    FACEBOOK_SESSION_KEY = 'fb_sig_session_key'
+  
+    def initialize(app, session_key = lambda { '_session_id' })
+      @app = app
+      @session_key = session_key
+    end
+
+    def call(env)
+      req = Rack::Request.new(env)
+      key = req.POST[FACEBOOK_SESSION_KEY] || req.GET[FACEBOOK_SESSION_KEY]
+      env['HTTP_COOKIE'] = [ @session_key.call, key ].join('=').freeze unless key.nil?
+    
+      @app.call(env)
+    end
+  end
+end

data/lib/tasks/facebooker.rb

@@ -0,0 +1,2 @@
+load 'tasks/facebooker.rake'
+load 'tasks/tunnel.rake'

data/test/facebooker/models/user_test.rb

@@ -183,6 +183,12 @@ class Facebooker::UserTest < Test::Unit::TestCase
     assert_equal('703826862_78463536863', @user.comment_on('703826862_78463536862', :message => 'that was hilarious!'))
   end
 
+  def test_add_like_on
+    @user = Facebooker::User.new(548871286, @session)
+    expect_http_posts_with_responses(example_add_like_on_response)
+    assert_equal('1', @user.add_like_on('703826862_78463536862'))
+  end
+
   def test_can_send_email
     @user.expects(:send_email).with("subject", "body text")
     @user.send_email("subject", "body text")
@@ -405,6 +411,13 @@ class Facebooker::UserTest < Test::Unit::TestCase
 <stream_addComment_response xmlns="http://api.facebook.com/1.0/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://api.facebook.com/1.0/ http://api.facebook.com/1.0/facebook.xsd">703826862_78463536863</stream_addComment_response>
     eoxml
   end
+  
+  def example_add_like_on_response
+        <<-eoxml
+    <?xml version="1.0" encoding="UTF-8"?>
+    <stream_addLike_response xmlns="http://api.facebook.com/1.0/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://api.facebook.com/1.0/ http://api.facebook.com/1.0/facebook.xsd">1</stream_addLike_response>
+        eoxml
+  end
 
   def example_events_rsvp_xml
       <<-E

data/test/facebooker/rails_integration_test.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../rails_test_helper')
 
 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).first}
   end
 
   def expired_cookie_hash_for_auth
@@ -171,7 +171,6 @@ class RailsIntegrationTestForFBConnect < Test::Unit::TestCase
   def test_doesnt_set_cookie_but_facebook_session_is_available
     setup_fb_connect_cookies
     get :index
-    p "this one"
     assert_not_nil @controller.facebook_session
     assert_nil @response.cookies[:facebook_session] 
     
@@ -884,8 +883,7 @@ class RailsHelperTest < Test::Unit::TestCase
   
   def test_fb_dialog
     @h.expects(:capture).returns("dialog content")
-    @h.fb_dialog( "my_dialog", "1" ) do
-    end
+    @h.fb_dialog( "my_dialog", true ) {}
     assert_equal '<fb:dialog cancel_button="1" id="my_dialog">dialog content</fb:dialog>', @h.output_buffer
   end
   def test_fb_dialog_title
@@ -1124,7 +1122,7 @@ class RailsHelperTest < Test::Unit::TestCase
     stream_post.target="12451752"
     stream_post.attachment = attachment
     
-    assert @h.fb_connect_stream_publish(stream_post).match(/FB.Connect\.streamPublish\(\"message\", {\"name\":\s?\"name\"}, \[], \"12451752\", null, null, false, null\);/)
+    assert @h.fb_connect_stream_publish(stream_post).match(/FB.Connect\.streamPublish\(\"message\", \{\"name\":\s?\"name\"\}, \[\], \"12451752\", null, null, false, null\);/)
   end
 
   def test_fb_connect_javascript_tag

data/test/rack/facebook_session_test.rb

@@ -0,0 +1,34 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+require 'rack/facebook_session'
+require 'rack/lint'
+require 'rack/mock'
+
+class Rack::FacebookSessionTest < Test::Unit::TestCase
+  
+  def setup
+    @app = lambda do |env|
+      @env = env
+      Rack::Response.new().to_a
+    end
+    
+    @facebook = Rack::FacebookSession.new(@app, lambda { '_top_sekrit' })
+  end
+  
+  def params(p)
+    p.map{|*args| args.join('=') }.join('&')
+  end
+  
+  def app
+    Rack::MockRequest.new(Rack::Lint.new(@facebook))
+  end
+  
+  def test_converts_session_key_on_get
+    response = app.get '/', :input => params(:fb_sig_session_key => 'foo')
+    assert_equal '_top_sekrit=foo', @env['HTTP_COOKIE']
+  end
+  
+  def test_converts_session_key_on_post
+    response = app.post '/', :input => params(:fb_sig_session_key => 'foo')
+    assert_equal '_top_sekrit=foo', @env['HTTP_COOKIE']
+  end
+end

data/test/test_helper.rb

@@ -11,7 +11,7 @@ begin
   require 'multi_rails_init'
 rescue LoadError
   # multi rails not installed, test against newest supported version of Rails
-  gem 'rails', '2.2.2'
+  gem 'rails', '2.3.5'
 end
 require 'activesupport'
 require 'flexmock/test_unit'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: facebooker
 version: !ruby/object:Gem::Version 
-  version: 1.0.58
+  version: 1.0.59
 platform: ruby
 authors: 
 - Chad Fowler
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-11 00:00:00 -05:00
+date: 2010-01-15 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,7 +35,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.2
+        version: 2.4.0
     version: 
 description: |-
   Facebooker is a Ruby wrapper over the Facebook[http://facebook.com] {REST API}[http://wiki.developers.facebook.com/index.php/API].  Its goals are:
@@ -177,7 +177,9 @@ files:
 - lib/facebooker/version.rb
 - lib/net/http_multipart_post.rb
 - lib/rack/facebook.rb
+- lib/rack/facebook_session.rb
 - lib/tasks/facebooker.rake
+- lib/tasks/facebooker.rb
 - lib/tasks/tunnel.rake
 - rails/init.rb
 - setup.rb
@@ -206,6 +208,7 @@ files:
 - 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/rack/facebook_session_test.rb
 - test/rails_test_helper.rb
 - test/test_helper.rb
 has_rdoc: true
@@ -233,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: facebooker
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Facebooker is a Ruby wrapper over the Facebook[http://facebook.com] {REST API}[http://wiki.developers.facebook.com/index.php/API]
@@ -261,4 +264,5 @@ test_files:
 - test/facebooker/session_test.rb
 - test/facebooker_test.rb
 - test/net/http_multipart_post_test.rb
+- test/rack/facebook_session_test.rb
 - test/rack/facebook_test.rb