facebooker 1.0.56 → 1.0.58

data/Manifest.txt

@@ -47,6 +47,7 @@ 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
@@ -108,6 +109,7 @@ 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
@@ -119,6 +121,7 @@ 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

data/facebooker.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{facebooker}
-  s.version = "1.0.56"
+  s.version = "1.0.58"
 
   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-04}
+  s.date = %q{2009-12-11}
   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/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/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/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/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.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.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/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_test.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/lib/facebooker.rb

@@ -26,14 +26,14 @@ require 'digest/md5'
 
 module Facebooker
 
-    @facebooker_configuration = {}
-    @raw_facebooker_configuration = {}
-    @current_adapter = nil
-    @set_asset_host_to_callback_url = true
-    @path_prefix = nil
-    @use_curl    = false
+  @facebooker_configuration = {}
+  @raw_facebooker_configuration = {}
+  @current_adapter = nil
+  @set_asset_host_to_callback_url = true
+  @path_prefix = nil
+  @use_curl    = false
 
-    class << self
+  class << self
 
     def load_configuration(facebooker_yaml_file)
       return false unless File.exist?(facebooker_yaml_file)
@@ -200,6 +200,7 @@ module Facebooker
   end
 end
 
+require 'facebooker/attachment'
 require 'facebooker/batch_request'
 require 'facebooker/feed'
 require 'facebooker/logging'
@@ -227,6 +228,7 @@ require 'facebooker/admin'
 require 'facebooker/application'
 require 'facebooker/mobile'
 require 'facebooker/session'
+require 'facebooker/stream_post'
 require 'facebooker/version'
 require 'facebooker/models/location'
 require 'facebooker/models/affiliation'

data/lib/facebooker/adapters/bebo_adapter.rb

@@ -34,7 +34,7 @@ end
 
 # Things that don't actually work as expected in BEBO
 module Facebooker
-   class User
+  class User
     def set_profile_fbml_with_bebo_adapter(profile_fbml, mobile_fbml, profile_action_fbml, profile_main = nil)
       if(Facebooker.is_for?(:bebo))
         self.session.post('facebook.profile.setFBML', :uid => @id, :markup => profile_fbml)
@@ -61,14 +61,14 @@ module Facebooker
   end
 
 
-   class PublishTemplatizedAction < Parser#:nodoc:
+  class PublishTemplatizedAction < Parser#:nodoc:
     class <<self
-     def process_with_bebo_adapter(data)
-       if(Facebooker.is_for?(:bebo))
-       element('feed_publishTemplatizedAction_response', data).content
-       else
-         process_without_bebo_adapter(data)
-       end
+      def process_with_bebo_adapter(data)
+        if(Facebooker.is_for?(:bebo))
+          element('feed_publishTemplatizedAction_response', data).content
+        else
+          process_without_bebo_adapter(data)
+        end
       end
       alias_method :process_without_bebo_adapter, :process
       alias_method :process, :process_with_bebo_adapter

data/lib/facebooker/attachment.rb

@@ -0,0 +1,51 @@
+class Facebooker::Attachment
+  
+  def initialize
+    @storage = {}
+  end
+  
+  def self.hash_populating_accessor(*names)
+    names.each do |name|
+      define_method(name) do
+        @storage[name]
+      end
+      define_method("#{name}=") do |val|
+        @storage[name]=val
+      end
+    end
+  end
+  
+  hash_populating_accessor :name,:href, :comments_xid, :description, :caption
+  
+  def add_media(hash)
+    @storage[:media]||=[]
+    @storage[:media] << hash
+  end
+  
+  def add_image(source,href)
+    add_media({:type=>"image",:src=>source,:href=>href})
+  end
+  
+  def add_mp3(source,title=nil,artist=nil,album=nil)
+    params = {:src=>source,:type=>"mp3"}
+    params[:title] =  title unless title.nil?
+    params[:artist] =  artist unless artist.nil?
+    params[:album] =  album unless album.nil?
+    add_media(params)
+  end
+  
+  def add_flash(swfsource, imgsource, width=nil, height=nil, expanded_width=nil, expanded_height=nil)
+    params={:type=>"flash",:swfsrc=>swfsource,:imgsrc=>imgsource}
+    params[:width] = width unless width.nil?
+    params[:height] = height unless height.nil?
+    params[:expanded_width] = expanded_width unless expanded_width.nil?
+    params[:expanded_height] = expanded_height unless expanded_height.nil?
+    add_media(params)
+  end
+  
+  def to_hash
+    @storage
+  end
+  
+  
+end

data/lib/facebooker/models/page.rb

@@ -26,7 +26,7 @@ module Facebooker
     end
 
     include Model
-    attr_accessor :page_id, :name, :pic_small, :pic_big, :pic_square, :pic_large, :page_url, :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_accessor :page_id,:name,:pic_small,:pic_big,:pic_square,:pic,:pic_large,:type,:website,:has_added_app,:founded,:company_overview,:mission,:products,:location,:parking,:public_transit,:hours,:attire,:payment_options,:culinary_team,:general_manager,:price_range,:restaurant_services,:restaurant_specialties,:release_date,:genre,:starring,:screenplay_by,:directed_by,:produced_by,:studio,:awards,:plot_outline,:network,:season,:schedule,:written_by,:band_members,:hometown,:current_location,:record_label,:booking_agent,:artists_we_like,:influences,:band_interests,:bio,:affiliation,:birthday,:personal_info,:personal_interests,:members,:built,:features,:mpg,:general_info,:fan_count
     attr_reader :genre
 
     def genre=(value)

data/lib/facebooker/models/user.rb

@@ -152,8 +152,8 @@ module Facebooker
               :target_id    => target.id,
               :message      => options[:message]}
 
-      if(attachment = options[:attachment] && Facebooker.json_encode(options[:attachment]))
-        opts[:attachment] = attachment
+      if a = options[:attachment]
+        opts[:attachment] = convert_attachment_to_json(a)
       end
       if (links = options[:action_links] && Facebooker.json_encode(options[:action_links]))
         opts[:action_links] = links
@@ -166,6 +166,11 @@ module Facebooker
       end
       opts
     end
+    
+    def convert_attachment_to_json(attachment)
+      a = attachment.respond_to?(:to_hash) ? attachment.to_hash : attachment
+      Facebooker.json_encode(a)
+    end
 
     ###
     # Publish a comment on a post

data/lib/facebooker/parser.rb

@@ -473,10 +473,10 @@ module Facebooker
   end
   
   class EventsRsvp < Parser#:nodoc:
-     def self.process(data)
+    def self.process(data)
        element('events_rsvp_response', data).content.strip
-     end
-   end
+    end
+  end
    
   class EventsCreate < Parser#:nodoc:
     def self.process(data)

data/lib/facebooker/rails/controller.rb

@@ -132,14 +132,17 @@ module Facebooker
       def secure_with_cookies!
           parsed = {}
           
-          fb_cookie_names.each { |key| parsed[key[fb_cookie_prefix.size,key.size]] = cookies[key] }
- 
+          # 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 }
+
           #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")          
+          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])
-          
+          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'])
           @facebook_session
@@ -223,9 +226,9 @@ module Facebooker
         48.hours.ago
       end
       
-      def verify_signature(facebook_sig_params,expected_signature)
+      def verify_signature(facebook_sig_params,expected_signature,force=false)
         # Don't verify the signature if rack has already done so.
-        unless ::Rails.version >= "2.3" and ActionController::Dispatcher.middleware.include? Rack::Facebook
+        unless ::Rails.version >= "2.3" and ActionController::Dispatcher.middleware.include? Rack::Facebook and !force
           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

data/lib/facebooker/rails/facebook_form_builder.rb

@@ -11,7 +11,7 @@ module Facebooker
         define_method name do |field,*args|
           options = args[offset] || {}
           build_shell(field,options.with_indifferent_access) do
-            super
+            super(field,*args)
           end
         end    
       end

data/lib/facebooker/rails/helpers.rb

@@ -12,16 +12,20 @@ module Facebooker
 
       include Facebooker::Rails::Helpers::FbConnect
 
+      def versioned_concat(string,binding)
+        if ignore_binding?
+          concat(string)
+        else
+          concat(string,binding)
+        end
+      end
+
       # Create an fb:dialog
       # id must be a unique name e.g. "my_dialog"
       # cancel_button is true or false
       def fb_dialog( id, cancel_button, &block )
         content = capture(&block)
-        if ignore_binding?
-          concat( content_tag("fb:dialog", content, {:id => id, :cancel_button => cancel_button}) )
-        else
-          concat( content_tag("fb:dialog", content, {:id => id, :cancel_button => cancel_button}), block.binding )
-        end
+        versioned_concat( content_tag("fb:dialog", content, {:id => id, :cancel_button => cancel_button}), block.binding )
       end
       
       def fbjs_library
@@ -43,11 +47,7 @@ module Facebooker
       
       def fb_dialog_content( &block )
         content = capture(&block)
-        if ignore_binding?
-          concat( content_tag("fb:dialog-content", content) )
-        else
-          concat( content_tag("fb:dialog-content", content), block.binding )
-        end
+        versioned_concat( content_tag("fb:dialog-content", content), block.binding )
       end
       
       def fb_dialog_button( type, value, options={} )
@@ -83,14 +83,9 @@ module Facebooker
       def fb_request_form(type,message_param,url,options={},&block)
         content = capture(&block)
         message = @template.instance_variable_get("@content_for_#{message_param}")
-        if ignore_binding?
-          concat(content_tag("fb:request-form", content + token_tag,
-                    {:action=>url,:method=>"post",:invite=>true,:type=>type,:content=>message}.merge(options)))
-        else
-          concat(content_tag("fb:request-form", content + token_tag,
-                    {:action=>url,:method=>"post",:invite=>true,:type=>type,:content=>message}.merge(options)),
-                block.binding)
-        end
+        versioned_concat(content_tag("fb:request-form", content + token_tag,
+                  {:action=>url,:method=>"post",:invite=>true,:type=>type,:content=>message}.merge(options)),
+              block.binding)
       end
 
       # Create a submit button for an <fb:request-form>
@@ -121,18 +116,11 @@ module Facebooker
       #  <% end %>
       def fb_multi_friend_request(type,friend_selector_message,url,&block)
         content = capture(&block)
-        if ignore_binding?
-          concat(content_tag("fb:request-form",
-                              fb_multi_friend_selector(friend_selector_message) + token_tag,
-                              {:action=>url,:method=>"post",:invite=>true,:type=>type,:content=>content}
-                              ))
-        else
-          concat(content_tag("fb:request-form",
-                              fb_multi_friend_selector(friend_selector_message) + token_tag,
-                              {:action=>url,:method=>"post",:invite=>true,:type=>type,:content=>content}
-                              ),
-                block.binding)
-        end
+        versioned_concat(content_tag("fb:request-form",
+                            fb_multi_friend_selector(friend_selector_message) + token_tag,
+                            {:action=>url,:method=>"post",:invite=>true,:type=>type,:content=>content}
+                            ),
+              block.binding)
       end
       
       # Render an <fb:friend-selector> element
@@ -222,19 +210,11 @@ module Facebooker
         width=options.delete(:labelwidth)
         editor_options[:labelwidth]=width unless width.blank?
 
-        if ignore_binding?
-          concat(tag("fb:editor",editor_options,true))
-          concat(tag(:input,{:type=>"hidden",:name=>:_method, :value=>method},false)) unless method.blank?
-          concat(token_tag)
-          fields_for( object_name,*(args << options), &proc)
-          concat("</fb:editor>")
-        else
-          concat(tag("fb:editor",editor_options,true) , proc.binding)
-          concat(tag(:input,{:type=>"hidden",:name=>:_method, :value=>method},false), proc.binding) unless method.blank?
-          concat(token_tag, proc.binding)
-          fields_for( object_name,*(args << options), &proc)
-          concat("</fb:editor>",proc.binding)
-        end
+        versioned_concat(tag("fb:editor",editor_options,true) , proc.binding)
+        versioned_concat(tag(:input,{:type=>"hidden",:name=>:_method, :value=>method},false), proc.binding) unless method.blank?
+        versioned_concat(token_tag, proc.binding)
+        fields_for( object_name,*(args << options), &proc)
+        versioned_concat("</fb:editor>",proc.binding)
       end
       
       # Render an fb:application-name tag
@@ -365,11 +345,7 @@ module Facebooker
       # <% end %>        
       def fb_tabs(&block)
         content = capture(&block)
-        if ignore_binding?
-          concat(content_tag("fb:tabs", content))
-        else
-          concat(content_tag("fb:tabs", content), block.binding)
-        end
+        versioned_concat(content_tag("fb:tabs", content), block.binding)
       end
       
       # Render an fb:tab_item tag. 
@@ -412,11 +388,7 @@ module Facebooker
       #   <% end %>
       def fb_wall(&proc)
         content = capture(&proc)
-        if ignore_binding?
-          concat(content_tag("fb:wall",content,{}))
-        else
-          concat(content_tag("fb:wall",content,{}),proc.binding)
-        end
+        versioned_concat(content_tag("fb:wall",content,{}),proc.binding)
       end
       
       # Render an <fb:wallpost> tag
@@ -476,11 +448,7 @@ module Facebooker
       def fb_dashboard(&proc)
         if block_given?
           content = capture(&proc)
-          if ignore_binding?
-            concat(content_tag("fb:dashboard",content,{}))
-          else
-            concat(content_tag("fb:dashboard",content,{}),proc.binding)
-          end
+          versioned_concat(content_tag("fb:dashboard",content,{}),proc.binding)
         else
           content_tag("fb:dashboard",content,{})
         end
@@ -489,21 +457,13 @@ module Facebooker
       # Content for the wide profile box goes in this tag
       def fb_wide(&proc)
         content = capture(&proc)
-        if ignore_binding?
-          concat(content_tag("fb:wide", content, {}))
-        else
-          concat(content_tag("fb:wide", content, {}), proc.binding)
-        end
+        versioned_concat(content_tag("fb:wide", content, {}), proc.binding)
       end
 
       # Content for the narrow profile box goes in this tag
       def fb_narrow(&proc)
         content = capture(&proc)
-        if ignore_binding?
-          concat(content_tag("fb:narrow", content, {}))
-        else
-          concat(content_tag("fb:narrow", content, {}), proc.binding)
-        end
+        versioned_concat(content_tag("fb:narrow", content, {}), proc.binding)
       end
 
       # Renders an action using the <fb:action> tag
@@ -563,11 +523,7 @@ module Facebooker
         content = capture(&proc) 
         options = options.dup
         options.merge!(:uid=>cast_to_facebook_id(user)) if user
-        if ignore_binding?
-          concat(content_tag("fb:if-is-app-user",content,stringify_vals(options)))
-        else
-          concat(content_tag("fb:if-is-app-user",content,stringify_vals(options)),proc.binding)
-        end
+        versioned_concat(content_tag("fb:if-is-app-user",content,stringify_vals(options)),proc.binding)
       end
 
       # Render if-user-has-added-app tag
@@ -583,11 +539,7 @@ module Facebooker
       def fb_if_user_has_added_app(user,options={},&proc)
         content = capture(&proc) 
         options = options.dup
-        if ignore_binding?
-          concat(content_tag("fb:if-user-has-added-app", content, stringify_vals(options.merge(:uid=>cast_to_facebook_id(user)))))
-        else
-          concat(content_tag("fb:if-user-has-added-app", content, stringify_vals(options.merge(:uid=>cast_to_facebook_id(user)))),proc.binding)
-        end
+        versioned_concat(content_tag("fb:if-user-has-added-app", content, stringify_vals(options.merge(:uid=>cast_to_facebook_id(user)))),proc.binding)
       end
       
       # Render fb:if-is-user tag
@@ -605,22 +557,14 @@ module Facebooker
         content = capture(&proc) 
         user = [user] unless user.is_a? Array
         user_list=user.map{|u| cast_to_facebook_id(u)}.join(",")
-        if ignore_binding?
-          concat(content_tag("fb:if-is-user",content,{:uid=>user_list}))
-        else
-          concat(content_tag("fb:if-is-user",content,{:uid=>user_list}),proc.binding)
-        end
+        versioned_concat(content_tag("fb:if-is-user",content,{:uid=>user_list}),proc.binding)
       end
       
       # Render fb:else tag
       # Must be used within if block such as fb_if_is_user or fb_if_is_app_user . See example in fb_if_is_app_user
       def fb_else(&proc)
         content = capture(&proc)
-        if ignore_binding?
-          concat(content_tag("fb:else",content))
-        else
-          concat(content_tag("fb:else",content),proc.binding)
-        end
+        versioned_concat(content_tag("fb:else",content),proc.binding)
       end
       
       #
@@ -725,12 +669,12 @@ module Facebooker
       # Meant to be used for a Facebook Connect site or an iframe application
       def fb_serverfbml(options={},&proc)
         inner = capture(&proc)
-        concat(content_tag("fb:serverfbml",inner,options),&proc.binding)
+        versioned_concat(content_tag("fb:serverfbml",inner,options), proc.binding)
       end
 
       def fb_container(options={},&proc)
         inner = capture(&proc)
-        concat(content_tag("fb:container",inner,options),&proc.binding)
+        versioned_concat(content_tag("fb:container",inner,options), proc.binding)
       end
       
       # Renders an fb:time element

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

@@ -59,7 +59,7 @@ module Facebooker
             :block_is_within_action_view? : :block_called_from_erb?
 
           if block_given? && send(block_tester, proc)
-            concat(javascript_tag(init_string))
+            versioned_concat(javascript_tag(init_string),proc.binding)
           else
             javascript_tag init_string
           end
@@ -122,6 +122,21 @@ module Facebooker
             page.call("FB.Connect.showFeedDialog",action.template_id,action.data,action.target_ids,action.body_general,nil,page.literal("FB.RequireConnect.promptConnect"),page.literal(defaulted_callback),prompt,user_message.nil? ? nil : {:value=>user_message})
           end
         end
+        
+        def fb_connect_stream_publish(stream_post,user_message_prompt=nil,callback=nil,auto_publish=false,actor=nil)
+          defaulted_callback = callback || "null"
+          update_page do |page|
+            page.call("FB.Connect.streamPublish",
+                        stream_post.user_message,
+                        stream_post.attachment.to_hash,
+                        stream_post.action_links,
+                        Facebooker::User.cast_to_facebook_id(stream_post.target),
+                        user_message_prompt,
+                        page.literal(defaulted_callback),
+                        auto_publish,
+                        Facebooker::User.cast_to_facebook_id(actor))
+          end          
+        end
 
       end
     end

data/lib/facebooker/rails/publisher.rb

@@ -306,7 +306,7 @@ module Facebooker
         when :user_action
           UserAction.new
         when :publish_stream
-          PublishStream.new
+          StreamPost.new
         else
           raise UnknownBodyType.new("Unknown type to publish")
         end
@@ -331,6 +331,9 @@ module Facebooker
       end
 
       def action_links(*links)
+        if self._body and self._body.respond_to?(:action_links)
+          self._body.send(:action_links,*links)
+        end
         if links.blank?
           @action_links
         else
@@ -418,7 +421,7 @@ module Facebooker
           Facebooker::Session.create.server_cache.set_ref_handle(_body.handle,_body.fbml)
         when UserAction
           @from.session.publish_user_action(_body.template_id,_body.data_hash,_body.target_ids,_body.body_general,_body.story_size)
-        when PublishStream
+        when Facebooker::StreamPost
          @from.publish_to(_body.target, {:attachment => _body.attachment, :action_links => @action_links, :message => _body.message })
         else
           raise UnspecifiedBodyType.new("You must specify a valid send_as")
@@ -442,18 +445,18 @@ module Facebooker
 
       def initialize_template_class(assigns)
         template_root = "#{RAILS_ROOT}/app/views"
-	      controller_root = File.join(template_root,self.class.controller_path)
+        controller_root = File.join(template_root,self.class.controller_path)
         #only do this on Rails 2.1
-	      if ActionController::Base.respond_to?(:append_view_path)
-  	      # only add the view path once
-  	      unless ActionController::Base.view_paths.include?(controller_root)
-	          ActionController::Base.append_view_path(controller_root) 
-	          ActionController::Base.append_view_path(controller_root+"/..") 
-	        end
+        if ActionController::Base.respond_to?(:append_view_path)
+          # only add the view path once
+          unless ActionController::Base.view_paths.include?(controller_root)
+            ActionController::Base.append_view_path(controller_root) 
+            ActionController::Base.append_view_path(controller_root+"/..") 
+          end
           view_paths = ActionController::Base.view_paths
         else
           view_paths = [template_root, controller_root]
-	      end
+        end
         returning ActionView::Base.new(view_paths, assigns, self) do |template|
           template.controller=self
           template.extend(self.class.master_helper_module)

data/lib/facebooker/stream_post.rb

@@ -0,0 +1,19 @@
+class Facebooker::StreamPost
+  attr_accessor :user_message, :attachment, :action_links, :target, :actor
+  
+  def initialize
+    self.action_links = []
+  end
+  
+  alias_method :message, :user_message
+  alias_method :message=, :user_message=
+  
+  def action_links(*args)
+    if args.blank?
+      @action_links
+    else
+      @action_links = args.first
+    end
+  end
+  
+end

data/lib/facebooker/version.rb

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

data/test/facebooker/attachment_test.rb

@@ -0,0 +1,72 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+class Facebooker::AttachmentTest < Test::Unit::TestCase
+  
+  def setup
+    super
+    @attachment = Facebooker::Attachment.new
+  end
+  
+  def test_can_create_attachment
+    attachment = Facebooker::Attachment.new
+  end
+  
+  def test_can_set_name
+    @attachment.name = "my name"
+    assert_equal({:name=>"my name"},@attachment.to_hash)
+  end
+  
+  def test_can_set_href
+    @attachment.href="my href"
+    assert_equal({:href=>"my href"},@attachment.to_hash)
+  end
+  
+  def test_can_set_caption
+    @attachment.caption="my caption"
+    assert_equal({:caption=>"my caption"},@attachment.to_hash)
+  end
+  
+  def test_can_set_description
+    @attachment.description="my description"
+    assert_equal({:description=>"my description"},@attachment.to_hash)
+  end
+  
+  def test_can_set_comments_xid
+    @attachment.comments_xid="my xid"
+    assert_equal({:comments_xid=>"my xid"},@attachment.to_hash)    
+  end
+  
+  def test_can_add_media
+    @attachment.add_media(:type=>"image",:src=>"http://www.google.com",:href=>"http://www.bing.com")
+    assert_equal({:media=>[{:type=>"image",:src=>"http://www.google.com",:href=>"http://www.bing.com"}]},@attachment.to_hash)
+  end
+  
+  def test_can_add_image
+    @attachment.add_image("image_source","image_url")
+    assert_equal({:media=>[{:type=>"image",:src=>"image_source",:href=>"image_url"}]},@attachment.to_hash)
+  end
+  
+  def test_can_add_mp3_with_only_required_params
+    @attachment.add_mp3("required_source")
+    assert_equal({:media=>[{:type=>"mp3",:src=>"required_source"}]},@attachment.to_hash)
+  end
+  
+  def test_only_includes_mp3_optional_params_that_are_provided
+    @attachment.add_mp3("required_source","seven nation army","white stripes")
+    assert_equal({:media=>[{:type=>"mp3",:src=>"required_source",:title=>"seven nation army",:artist=>"white stripes"}]},@attachment.to_hash)
+  end
+  
+  def test_can_add_flash_with_only_required_params
+    @attachment.add_flash("swf_source","img_source")
+    assert_equal({:media=>[{:type=>"flash",:swfsrc=>"swf_source",:imgsrc=>"img_source"}]},@attachment.to_hash)
+  end
+  def test_can_add_flash_with_optional_params
+    @attachment.add_flash("swf_source","img_source",100,80,160)
+    assert_equal({:media=>[{:type=>"flash",
+                            :swfsrc=>"swf_source",
+                            :imgsrc=>"img_source",
+                            :width=>100,
+                            :height=>80,
+                            :expanded_width=>160}]},@attachment.to_hash)
+  end
+end

data/test/facebooker/models/page_test.rb

@@ -3,6 +3,11 @@ require 'active_support'
 
 class Facebooker::PageTest < Test::Unit::TestCase
 
+  def setup
+    super
+    Facebooker::Session.current = mock("session")
+  end
+
   def test_should_be_able_to_populate_with_photo_id_as_integer
     p = Facebooker::Page.new(12345)
     assert_equal(12345,p.page_id)

data/test/facebooker/models/user_test.rb

@@ -162,12 +162,21 @@ class Facebooker::UserTest < Test::Unit::TestCase
     expect_http_posts_with_responses(example_profile_publish_to_get_xml)
     @user.publish_to(@other_user, :message => 'i love you man')
   end
+
   def test_publish_to_converts_attachment_to_json
     @user = Facebooker::User.new(548871286, @session)
     @user.session.expects(:post).with("facebook.stream.publish",has_entry(:attachment=>instance_of(String)),false)
     @user.publish_to(@other_user, :message => 'i love you man',:attachment=>{:a=>"b"})
   end
 
+  def test_publish_to_converts_attachment_from_attachment_objecect
+    @user = Facebooker::User.new(548871286, @session)
+    @user.session.expects(:post).with("facebook.stream.publish",has_entry(:attachment=>instance_of(String)),false)
+    attachment = Facebooker::Attachment.new
+    attachment.name = "My name"
+    @user.publish_to(@other_user, :message => 'i love you man',:attachment=>attachment)
+  end
+
   def test_comment_on
     @user = Facebooker::User.new(548871286, @session)
     expect_http_posts_with_responses(example_comment_on_response)
@@ -300,7 +309,7 @@ class Facebooker::UserTest < Test::Unit::TestCase
          <src>http://ip002.facebook.com/v11/135/18/8055/s1240077_30043524_2020.jpg</src>
          <src_big>http://ip002.facebook.com/v11/135/18/8055/n1240077_30043524_2020.jpg</src_big>
          <src_small>http://ip002.facebook.com/v11/135/18/8055/t1240077_30043524_2020.jpg</src_small>
-         <link>http://www.facebook.com/photo.php?pid=30043524&id=8055</link>
+         <link>http://www.facebook.com/photo.php?pid=30043524&amp;id=8055</link>
          <caption>From The Deathmatch (Trailer) (1999)</caption>
          <created>1132553361</created>
        </photo>
@@ -311,7 +320,7 @@ class Facebooker::UserTest < Test::Unit::TestCase
          <src>http://ip002.facebook.com/v11/135/18/8055/s1240077_30043525_2184.jpg</src>
          <src_big>http://ip002.facebook.com/v11/135/18/8055/n1240077_30043525_2184.jpg</src_big>
          <src_small>http://ip002.facebook.com/v11/135/18/8055/t1240077_30043525_2184.jpg</src_small>
-         <link>http://www.facebook.com/photo.php?pid=30043525&id=8055</link>
+         <link>http://www.facebook.com/photo.php?pid=30043525&amp;id=8055</link>
          <caption>Mexico City, back cover of the CYHS Student Underground 1999.</caption>
          <created>1132553362</created>
        </photo>

data/test/facebooker/rails/publisher_test.rb

@@ -70,7 +70,7 @@ class TestPublisher < Facebooker::Rails::Publisher
 
   end
 
-   def profile_update_with_profile_main(to,f)
+  def profile_update_with_profile_main(to,f)
     send_as :profile
     recipients to
     from f
@@ -299,7 +299,7 @@ class Facebooker::Rails::Publisher::PublisherTest < Test::Unit::TestCase
     assert_equal "profile_action",p.profile_action
     assert_equal "mobile_profile",p.mobile_profile
   end
-   def test_create_profile_update_with_profile_main
+  def test_create_profile_update_with_profile_main
     p=TestPublisher.create_profile_update_with_profile_main(@user,@user)
     assert_equal Facebooker::Rails::Publisher::Profile,p.class
     assert_equal "profile",p.profile
@@ -315,7 +315,7 @@ class Facebooker::Rails::Publisher::PublisherTest < Test::Unit::TestCase
     TestPublisher.deliver_profile_update(@user,@user)
   end
 
-   def test_deliver_profile_with_main
+  def test_deliver_profile_with_main
     Facebooker::User.stubs(:new).returns(@user)
     @user.expects(:set_profile_fbml).with('profile', 'mobile_profile', 'profile_action','profile_main')
     TestPublisher.deliver_profile_update_with_profile_main(@user,@user)
@@ -436,6 +436,19 @@ class Facebooker::Rails::Publisher::PublisherTest < Test::Unit::TestCase
 
     TestPublisher.deliver_publish_post_to_own_stream(@user)
   end
+  
+  def test_publish_stream_sets_action_links
+    @user = Facebooker::User.new
+    stream_post = TestPublisher.create_publish_post_to_own_stream(@user)
+    assert_equal [{:text => "Action Link", :href => "http://www.example.com/action_link"}],stream_post.action_links
+  end
+  
+  def test_publish_stream_sets_target
+    @user = Facebooker::User.new
+    stream_post = TestPublisher.create_publish_post_to_own_stream(@user)
+    assert_equal @user,stream_post.target
+    
+  end
 
   def test_publish_post_to_friends_stream
     @from_user = Facebooker::User.new

data/test/facebooker/rails_integration_test.rb

@@ -57,7 +57,7 @@ class ControllerWhichRequiresFacebookAuthentication < NoisyController
     render :text=>url_for(options)
   end
   
-   def named_route_test
+  def named_route_test
     render :text=>comments_url()
   end
   
@@ -171,6 +171,7 @@ 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] 
     
@@ -965,7 +966,7 @@ class RailsHelperTest < Test::Unit::TestCase
     assert_equal("<fb:request-form-submit />",@h.fb_request_form_submit)  
   end   
 
-	def test_fb_request_form_submit_with_uid
+  def test_fb_request_form_submit_with_uid
     assert_equal("<fb:request-form-submit uid=\"123456789\" />",@h.fb_request_form_submit({:uid => "123456789"}))
   end
 
@@ -1114,7 +1115,17 @@ class RailsHelperTest < Test::Unit::TestCase
     assert_equal "FB.Connect.showFeedDialog(null, null, null, null, null, FB.RequireConnect.promptConnect, null, \"prompt\", #{{"value" => "message"}.to_json});",
                  @h.fb_user_action(action,"message","prompt")
   end
-
+  
+  def test_fb_connect_stream_publish
+    stream_post = Facebooker::StreamPost.new
+    attachment = Facebooker::Attachment.new
+    attachment.name="name"
+    stream_post.message = "message"
+    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\);/)
+  end
 
   def test_fb_connect_javascript_tag
     silence_warnings do
@@ -1377,8 +1388,8 @@ class RailsUrlHelperExtensionsTest < Test::Unit::TestCase
     @prompt = "Are you sure?"
     @default_title = "Please Confirm"
     @title = "Confirm Request"
-    @style = {:color => 'black', :background => 'white'}
-    @verbose_style = "{background: 'white', color: 'black'}"
+    @style = {:color => 'black'}
+    @verbose_style = "{color: 'black'}"
     @default_okay = "Okay"
     @default_cancel = "Cancel"
     @default_style = "" #"'width','200px'"

data/test/facebooker/session_test.rb

@@ -386,14 +386,14 @@ class Facebooker::SessionTest < Test::Unit::TestCase
     assert_equal('attending', @fql_response.first.rsvp_status)
   end
   
-   def test_parses_batch_response_with_escaped_chars
-     @session = Facebooker::Session.create(ENV['FACEBOOK_API_KEY'], ENV['FACEBOOK_SECRET_KEY'])
-     expect_http_posts_with_responses(example_batch_run_with_escaped_chars_xml)
-     @session.batch do
-       @response = @session.events(:start_time => Time.now.to_i)
-     end
-     assert_kind_of(Facebooker::Event, @response.first)
-     assert_equal('Wolf & Crow', @response.first.name)
+  def test_parses_batch_response_with_escaped_chars
+    @session = Facebooker::Session.create(ENV['FACEBOOK_API_KEY'], ENV['FACEBOOK_SECRET_KEY'])
+    expect_http_posts_with_responses(example_batch_run_with_escaped_chars_xml)
+    @session.batch do
+      @response = @session.events(:start_time => Time.now.to_i)
+    end
+    assert_kind_of(Facebooker::Event, @response.first)
+    assert_equal('Wolf & Crow', @response.first.name)
   end
   
   def test_parses_batch_response_sets_exception
@@ -624,7 +624,7 @@ XML
         <modified>1132553363</modified>
         <description>No I will not make out with you</description>
         <location>York, PA</location>
-        <link>http://www.facebook.com/album.php?aid=2002205&id=8055</link>
+        <link>http://www.facebook.com/album.php?aid=2002205&amp;id=8055</link>
         <size>30</size>
         <visible>friends</visible>
         <modified_major>1241834423</modified_major>

data/test/facebooker_test.rb

@@ -854,7 +854,7 @@ class TestFacebooker < Test::Unit::TestCase
       <src>http://ip002.facebook.com/v67/161/72/219074/s219074_31637752_5455.jpg</src>
       <src_big>http://ip002.facebook.com/v67/161/72/219074/n219074_31637752_5455.jpg</src_big>
       <src_small>http://ip002.facebook.com/v67/161/72/219074/t219074_31637752_5455.jpg</src_small>
-      <link>http://www.facebook.com/photo.php?pid=31637752&id=219074</link>
+      <link>http://www.facebook.com/photo.php?pid=31637752&amp;id=219074</link>
       <caption>Under the sunset</caption>
     </photos_upload_response>
     XML
@@ -872,7 +872,7 @@ class TestFacebooker < Test::Unit::TestCase
       <modified>1132553363</modified>
       <description>No I will not make out with you</description>
       <location>York, PA</location>
-      <link>http://www.facebook.com/album.php?aid=2002205&id=8055</link>
+      <link>http://www.facebook.com/album.php?aid=2002205&amp;id=8055</link>
       <size>0</size>
     </photos_createAlbum_response>
     XML

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: facebooker
 version: !ruby/object:Gem::Version 
-  version: 1.0.56
+  version: 1.0.58
 platform: ruby
 authors: 
 - Chad Fowler
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-04 00:00:00 -05:00
+date: 2009-12-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -111,6 +111,7 @@ files:
 - 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
@@ -172,6 +173,7 @@ files:
 - 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
@@ -183,6 +185,7 @@ 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
@@ -238,6 +241,7 @@ 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